Index: head/textproc/libextractor/files/patch-git_7621a6 =================================================================== --- head/textproc/libextractor/files/patch-git_7621a6 (revision 563554) +++ head/textproc/libextractor/files/patch-git_7621a6 (nonexistent) @@ -1,127 +0,0 @@ -From bbe21db4bf8face03adf0efd2eb18540582cb5ba Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Sun, 30 Dec 2018 00:46:57 +0100 -Subject: [PATCH] Fix build with exiv2-0.27 - ---- - src/plugins/exiv2_extractor.cc | 35 +++++++++++++++++++++++++++------- - 1 file changed, 28 insertions(+), 7 deletions(-) - -diff --git src/plugins/exiv2_extractor.cc src/plugins/exiv2_extractor.cc -index 8741d40..ef402a8 100644 ---- src/plugins/exiv2_extractor.cc -+++ src/plugins/exiv2_extractor.cc -@@ -27,10 +27,7 @@ - #include - #include - #include --#include --#include --#include --#include -+#include - - /** - * Enable debugging to get error messages. -@@ -180,7 +177,7 @@ public: - * - * @return -1 on error - */ --#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0) -+#if EXIV2_TEST_VERSION(0,26,0) - virtual size_t size (void) const; - #else - virtual long int size (void) const; -@@ -316,7 +313,11 @@ ExtractorIO::getb () - const unsigned char *r; - - if (1 != ec->read (ec->cls, &data, 1)) -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError (42 /* error code */); -+#endif - r = (const unsigned char *) data; - return *r; - } -@@ -371,7 +372,11 @@ ExtractorIO::putb (Exiv2::byte data) - void - ExtractorIO::transfer (Exiv2::BasicIo& src) - { -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError (42 /* error code */); -+#endif - } - - -@@ -416,7 +421,11 @@ ExtractorIO::seek (long offset, - Exiv2::byte * - ExtractorIO::mmap (bool isWritable) - { -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError (42 /* error code */); -+#endif - } - - -@@ -449,7 +458,7 @@ ExtractorIO::tell (void) const - * - * @return -1 on error - */ --#if EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,26,0) -+#if EXIV2_TEST_VERSION(0,26,0) - size_t - #else - long int -@@ -504,7 +513,11 @@ ExtractorIO::eof () const - std::string - ExtractorIO::path () const - { -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError (42 /* error code */); -+#endif - } - - -@@ -517,7 +530,11 @@ ExtractorIO::path () const - std::wstring - ExtractorIO::wpath () const - { -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError (42 /* error code */); -+#endif - } - #endif - -@@ -531,7 +548,11 @@ Exiv2::BasicIo::AutoPtr - ExtractorIO::temporary () const - { - fprintf (stderr, "throwing temporary error\n"); -+#if EXIV2_TEST_VERSION(0,27,0) -+ throw Exiv2::BasicError (Exiv2::kerDecodeLangAltQualifierFailed); -+#else - throw Exiv2::BasicError (42 /* error code */); -+#endif - } - - -@@ -697,7 +718,7 @@ EXTRACTOR_exiv2_extract_method (struct EXTRACTOR_ExtractContext *ec) - { - try - { --#if EXIV2_MAKE_VERSION(0,23,0) <= EXIV2_VERSION -+#if !EXIV2_TEST_VERSION(0,24,0) - Exiv2::LogMsg::setLevel (Exiv2::LogMsg::mute); - #endif - std::auto_ptr eio(new ExtractorIO (ec)); --- -2.20.1 - Property changes on: head/textproc/libextractor/files/patch-git_7621a6 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/textproc/libextractor/Makefile =================================================================== --- head/textproc/libextractor/Makefile (revision 563554) +++ head/textproc/libextractor/Makefile (revision 563555) @@ -1,85 +1,87 @@ # Created by: Kevin Lo # $FreeBSD$ PORTNAME= libextractor -PORTVERSION= 1.9 -PORTREVISION= 2 +PORTVERSION= 1.11 CATEGORIES= textproc MASTER_SITES= GNU MAINTAINER= ports@FreeBSD.org COMMENT= Library for keyword extraction LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= tidy-html5>0:www/tidy-html5 LIB_DEPENDS= libltdl.so:devel/libltdl libogg.so:audio/libogg \ libtiff.so:graphics/tiff USES= gnome iconv jpeg libarchive libtool \ makeinfo pathfix pkgconfig python USE_GNOME= gtk20 gdkpixbuf2 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gtk-version=2 \ --with-ltdl=${LOCALBASE} INSTALL_TARGET= install-strip CPPFLAGS+= $$(pkg-config --cflags gtk+-2.0) \ -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} INFO= libextractor OPTIONS_DEFINE= EXIV2 FFMPEG FLAC GIF GSF GSTREAMER MPEG2 MP4 \ NLS RPM SMF TIDY VORBIS + OPTIONS_DEFAULT= EXIV2 FFMPEG FLAC GIF GSF GSTREAMER MPEG2 MP4 \ RPM SMF TIDY VORBIS + OPTIONS_SUB= yes +GSF_DESC= GSF (OLE2 (MS office) support) +RPM_DESC= RPM package format support +SMF_DESC= Standard MIDI file support via LibSMF + EXIV2_LIB_DEPENDS= libexiv2.so:graphics/exiv2 EXIV2_CONFIGURE_ENV= EXIV2_H="" EXIV2_CONFIGURE_ENV_OFF= EXIV2_H="" -FLAC_LIB_DEPENDS= libFLAC.so:audio/flac -FLAC_CONFIGURE_ENV_OFF=ac_cv_lib_FLAC_FLAC__stream_decoder_init_stream=no FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CONFIGURE_ENABLE= ffmpeg +FLAC_LIB_DEPENDS= libFLAC.so:audio/flac +FLAC_CONFIGURE_ENV_OFF=ac_cv_lib_FLAC_FLAC__stream_decoder_init_stream=no GIF_LIB_DEPENDS= libgif.so:graphics/giflib GIF_CONFIGURE_ENV_OFF= ac_cv_lib_gif_DGifOpen=no -GSF_DESC= GSF (OLE2 (MS office) support) GSF_USE= gnome=libgsf GSF_CONFIGURE_ENV_OFF= ac_cv_lib_gsf_1_gsf_init=no GSTREAMER_USE= gstreamer1=yes GSTREAMER_CONFIGURE_WITH= gstreamer -MPEG2_LIB_DEPENDS= libmpeg2.so:multimedia/libmpeg2 -MPEG2_CONFIGURE_ENV_OFF= ac_cv_lib_mpeg2_mpeg2_init=no MP4_LIB_DEPENDS= libmp4v2.so:multimedia/mp4v2 MP4_CONFIGURE_ENV_OFF= ac_cv_lib_mp4v2_MP4ReadProvider=no +MPEG2_LIB_DEPENDS= libmpeg2.so:multimedia/libmpeg2 +MPEG2_CONFIGURE_ENV_OFF= ac_cv_lib_mpeg2_mpeg2_init=no NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls -RPM_DESC= RPM package format support RPM_LIB_DEPENDS= librpm.so:archivers/rpm4 RPM_CONFIGURE_ENV= ac_cv_lib_rpm_rpmReadPackageFile=yes RPM_CONFIGURE_ENV_OFF= ac_cv_lib_rpm_rpmReadPackageFile=no -SMF_DESC= Standard MIDI file support via LibSMF SMF_LIB_DEPENDS= libsmf.so:audio/libsmf SMF_CONFIGURE_ENV_OFF= ac_cv_lib_smf_smf_load_from_memory=no TIDY_LIB_DEPENDS= libtidy.so:www/tidy-lib TIDY_CONFIGURE_ENV= TIDY_H="" TIDY_CONFIGURE_ENV_OFF= TIDY_H="" VORBIS_LIB_DEPENDS= libvorbisfile.so:audio/libvorbis VORBIS_CONFIGURE_ENV_OFF= ac_cv_lib_vorbisfile_ov_open_callbacks=no post-patch: @${REINPLACE_CMD} -e \ 's|-lstdc++|| ; \ s|-lc_r|-pthread| ; \ s||$${EXIV2_H}| ; \ s||$${TIDY_H}|' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|tidy/tidybuffio\.h|tidybuffio.h|' \ ${WRKSRC}/src/plugins/html_extractor.c .include Index: head/textproc/libextractor/distinfo =================================================================== --- head/textproc/libextractor/distinfo (revision 563554) +++ head/textproc/libextractor/distinfo (revision 563555) @@ -1,3 +1,3 @@ -TIMESTAMP = 1549817150 -SHA256 (libextractor-1.9.tar.gz) = f08f257d26c5e9b503f068d6753c8e55cb76f47f73a81da6ed2bba3de3fee2ff -SIZE (libextractor-1.9.tar.gz) = 8323852 +TIMESTAMP = 1612111719 +SHA256 (libextractor-1.11.tar.gz) = 16f633ab8746a38547c4a1da3f4591192b0825ad83c4336f0575b85843d8bd8f +SIZE (libextractor-1.11.tar.gz) = 8367637 Index: head/textproc/libextractor/pkg-plist =================================================================== --- head/textproc/libextractor/pkg-plist (revision 563554) +++ head/textproc/libextractor/pkg-plist (revision 563555) @@ -1,92 +1,94 @@ bin/extract include/extractor.h lib/libextractor.a lib/libextractor.so lib/libextractor.so.3 -lib/libextractor.so.3.1.7 +lib/libextractor.so.3.1.8 lib/libextractor/libextractor_archive.a lib/libextractor/libextractor_archive.so lib/libextractor/libextractor_deb.a lib/libextractor/libextractor_deb.so lib/libextractor/libextractor_dvi.a lib/libextractor/libextractor_dvi.so %%EXIV2%%lib/libextractor/libextractor_exiv2.a %%EXIV2%%lib/libextractor/libextractor_exiv2.so %%FLAC%%lib/libextractor/libextractor_flac.a %%FLAC%%lib/libextractor/libextractor_flac.so %%GIF%%lib/libextractor/libextractor_gif.a %%GIF%%lib/libextractor/libextractor_gif.so %%GSTREAMER%%lib/libextractor/libextractor_gstreamer.a %%GSTREAMER%%lib/libextractor/libextractor_gstreamer.so %%TIDY%%lib/libextractor/libextractor_html.a %%TIDY%%lib/libextractor/libextractor_html.so lib/libextractor/libextractor_it.a lib/libextractor/libextractor_it.so lib/libextractor/libextractor_jpeg.a lib/libextractor/libextractor_jpeg.so lib/libextractor/libextractor_man.a lib/libextractor/libextractor_man.so %%SMF%%lib/libextractor/libextractor_midi.a %%SMF%%lib/libextractor/libextractor_midi.so lib/libextractor/libextractor_mime.a lib/libextractor/libextractor_mime.so %%MPEG2%%lib/libextractor/libextractor_mpeg.a %%MPEG2%%lib/libextractor/libextractor_mpeg.so lib/libextractor/libextractor_nsf.a lib/libextractor/libextractor_nsf.so lib/libextractor/libextractor_nsfe.a lib/libextractor/libextractor_nsfe.so lib/libextractor/libextractor_odf.a lib/libextractor/libextractor_odf.so %%VORBIS%%lib/libextractor/libextractor_ogg.a %%VORBIS%%lib/libextractor/libextractor_ogg.so %%GSF%%lib/libextractor/libextractor_ole2.a %%GSF%%lib/libextractor/libextractor_ole2.so lib/libextractor/libextractor_pdf.a lib/libextractor/libextractor_pdf.so lib/libextractor/libextractor_png.a lib/libextractor/libextractor_png.so %%FFMPEG%%lib/libextractor/libextractor_previewopus.a %%FFMPEG%%lib/libextractor/libextractor_previewopus.so lib/libextractor/libextractor_ps.a lib/libextractor/libextractor_ps.so lib/libextractor/libextractor_riff.a lib/libextractor/libextractor_riff.so %%RPM%%lib/libextractor/libextractor_rpm.a %%RPM%%lib/libextractor/libextractor_rpm.so lib/libextractor/libextractor_s3m.a lib/libextractor/libextractor_s3m.so lib/libextractor/libextractor_sid.a lib/libextractor/libextractor_sid.so %%FFMPEG%%lib/libextractor/libextractor_thumbnailffmpeg.a %%FFMPEG%%lib/libextractor/libextractor_thumbnailffmpeg.so lib/libextractor/libextractor_thumbnailgtk.a lib/libextractor/libextractor_thumbnailgtk.so lib/libextractor/libextractor_tiff.a lib/libextractor/libextractor_tiff.so lib/libextractor/libextractor_wav.a lib/libextractor/libextractor_wav.so lib/libextractor/libextractor_xm.a lib/libextractor/libextractor_xm.so lib/libextractor/libextractor_zip.a lib/libextractor/libextractor_zip.so lib/libextractor_common.a lib/libextractor_common.so lib/libextractor_common.so.1 lib/libextractor_common.so.1.0.0 libdata/pkgconfig/libextractor.pc man/man1/extract.1.gz man/man3/libextractor.3.gz +%%NLS%%share/locale/da/LC_MESSAGES/libextractor.mo %%NLS%%share/locale/de/LC_MESSAGES/libextractor.mo %%NLS%%share/locale/es/LC_MESSAGES/libextractor.mo %%NLS%%share/locale/fr/LC_MESSAGES/libextractor.mo %%NLS%%share/locale/ga/LC_MESSAGES/libextractor.mo %%NLS%%share/locale/it/LC_MESSAGES/libextractor.mo %%NLS%%share/locale/nl/LC_MESSAGES/libextractor.mo %%NLS%%share/locale/pl/LC_MESSAGES/libextractor.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/libextractor.mo %%NLS%%share/locale/ro/LC_MESSAGES/libextractor.mo %%NLS%%share/locale/rw/LC_MESSAGES/libextractor.mo %%NLS%%share/locale/sr/LC_MESSAGES/libextractor.mo %%NLS%%share/locale/sv/LC_MESSAGES/libextractor.mo %%NLS%%share/locale/uk/LC_MESSAGES/libextractor.mo %%NLS%%share/locale/vi/LC_MESSAGES/libextractor.mo