Date: Thu, 31 Jul 2014 17:45:39 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363643 - in head/textproc/libextractor: . files Message-ID: <201407311745.s6VHjdMn015657@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Thu Jul 31 17:45:38 2014 New Revision: 363643 URL: http://svnweb.freebsd.org/changeset/ports/363643 QAT: https://qat.redports.org/buildarchive/r363643/ Log: textproc/libextractor: Upgrade version 0.6.2 => 1.3 and stage PR: 191830 Submitted by: Ports Fury Added: head/textproc/libextractor/files/ head/textproc/libextractor/files/patch-configure (contents, props changed) Modified: head/textproc/libextractor/Makefile head/textproc/libextractor/distinfo head/textproc/libextractor/pkg-descr head/textproc/libextractor/pkg-plist Modified: head/textproc/libextractor/Makefile ============================================================================== --- head/textproc/libextractor/Makefile Thu Jul 31 17:31:14 2014 (r363642) +++ head/textproc/libextractor/Makefile Thu Jul 31 17:45:38 2014 (r363643) @@ -2,146 +2,76 @@ # $FreeBSD$ PORTNAME= libextractor -PORTVERSION= 0.6.2 -PORTREVISION= 16 +PORTVERSION= 1.3 CATEGORIES= textproc MASTER_SITES= GNU MAINTAINER= ports@FreeBSD.org COMMENT= Library for keyword extraction -USE_GNOME= glib20 gtk20 -USES= pathfix pkgconfig +LICENSE= GPLv3 # (or later) + +USES= iconv gettext libtool makeinfo pathfix pkgconfig +USE_GNOME= gtk20 USE_PYTHON= yes USE_AUTOTOOLS= libltdl GNU_CONFIGURE= yes -USE_LDCONFIG= ${PREFIX}/lib/libextractor -CONFIGURE_ARGS= --disable-ltdl-install -CPPFLAGS+= -I${LOCALBASE}/include/ffmpeg0 -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib/ffmpeg0 -L${LOCALBASE}/lib +CONFIGURE_ARGS= --with-gtk-version=2 \ + --with-ltdl=${LOCALBASE} +INSTALL_TARGET= install-strip +USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes -EXTRACT_AFTER_ARGS= --exclude libltdl - -MAN1= extract.1 -MAN3= libextractor.3 - -OPTIONS_DEFINE= EXIV2 FLAC MPEG2 VORBIS GSF POPPLER RPM QT FFMPEG -GSF_DESC= GSF (OLE2 (MS office) support) -RPM_DESC= RPM support -OPTIONS_DEFAULT= EXIV2 FLAC MPEG2 VORBIS GSF POPPLER RPM QT FFMPEG +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 \ + RPM SMF TIDY VORBIS +OPTIONS_DEFAULT= EXIV2 FFMPEG FLAC GIF GSF GSTREAMER MPEG2 MP4 \ + RPM SMF TIDY VORBIS +OPTIONS_SUB= yes + +EXIV2_LIB_DEPENDS= libexiv2.so:${PORTSDIR}/graphics/exiv2 +EXIV2_CONFIGURE_ENV= EXIV2_H="<exiv2/image.hpp>" +EXIV2_CONFIGURE_ENV_OFF= EXIV2_H="" +FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac +FLAC_CONFIGURE_ENV_OFF= ac_cv_lib_FLAC_FLAC__stream_decoder_init_stream=no +FFMPEG_LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg +FFMPEG_CONFIGURE_ENABLE= ffmpeg +GIF_LIB_DEPENDS= libgif.so:${PORTSDIR}/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:${PORTSDIR}/multimedia/libmpeg2 +MPEG2_CONFIGURE_ENV_OFF= ac_cv_lib_mpeg2_mpeg2_init=no +MP4_LIB_DEPENDS= libmp4v2.so:${PORTSDIR}/multimedia/mp4v2 +MP4_CONFIGURE_ENV_OFF= ac_cv_lib_mp4v2_MP4ReadProvider=no +RPM_DESC= RPM support +RPM_LIB_DEPENDS= librpm.so:${PORTSDIR}/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:${PORTSDIR}/audio/libsmf +SMF_CONFIGURE_ENV_OFF= ac_cv_lib_smf_smf_load_from_memory=no +TIDY_LIB_DEPENDS= libtidy.so:${PORTSDIR}/www/tidy-lib +TIDY_CONFIGURE_ENV= TIDY_H="<tidy/tidy.h>" +TIDY_CONFIGURE_ENV_OFF= TIDY_H="" +VORBIS_LIB_DEPENDS= libvorbisfile.so:${PORTSDIR}/audio/libvorbis +VORBIS_CONFIGURE_ENV_OFF= ac_cv_lib_vorbisfile_ov_open_callbacks=no -NO_STAGE= yes post-patch: - @${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f - @${REINPLACE_CMD} \ - -e 's|-lpthread|${PTHREAD_LIBS}|g' \ - -e 's|-lavcodec|-lavcodec0|g' \ - -e 's|-lavformat|-lavformat0|g' \ - -e 's|-lswscale|-lswscale0|g' \ - -e 's|-lavutil|-lavutil0|g' \ - ${WRKSRC}/src/plugins/Makefile.* - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \ - -e 's|-lstdc++||g' \ - ${WRKSRC}/configure - -check: build install - @(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check) - -#regression-test: check - -.include <bsd.port.pre.mk> - -.if ${ARCH} == i386 -BROKEN= does not package -.endif - -# libextractor's configure logic is: if exiv2 is present it will add support -# for it, if not present then it will not add support for it, but it cannot -# be disabled if present - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MEXIV2} -LIB_DEPENDS+= libexiv2.so:${PORTSDIR}/graphics/exiv2 -PLIST_SUB+= EXIV2="" -.else -PLIST_SUB+= EXIV2="@comment " -.endif - -.if ${PORT_OPTIONS:MFLAC} -LIB_DEPENDS+= libFLAC.so:${PORTSDIR}/audio/flac -PLIST_SUB+= FLAC="" -.else -PLIST_SUB+= FLAC="@comment " -.endif - -.if ${PORT_OPTIONS:MMPEG2} -LIB_DEPENDS+= libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 -PLIST_SUB+= MPEG2="" -.else -PLIST_SUB+= MPEG2="@comment " -.endif - -.if ${PORT_OPTIONS:MVORBIS} -LIB_DEPENDS+= libvorbisfile.so:${PORTSDIR}/audio/libvorbis -PLIST_SUB+= VORBIS="" -.else -PLIST_SUB+= VORBIS="@comment " -.endif - -.if ${PORT_OPTIONS:MGSF} -LIB_DEPENDS+= libgsf-1.so:${PORTSDIR}/devel/libgsf -PLIST_SUB+= GSF="" -.else -PLIST_SUB+= GSF="@comment " -.endif - -.if ${PORT_OPTIONS:MPOPPLER} -LIB_DEPENDS+= libpoppler.so:${PORTSDIR}/graphics/poppler -PLIST_SUB+= POPPLER="" -.else -PLIST_SUB+= POPPLER="@comment " -.endif - -.if ${PORT_OPTIONS:MRPM} -LIB_DEPENDS+= librpm.so:${PORTSDIR}/archivers/rpm4 -PLIST_SUB+= RPM="" -.else -PLIST_SUB+= RPM="@comment " -.endif - -# QT can be disabled -.if ${PORT_OPTIONS:MQT} -LIB_DEPENDS+= libQtGui.so:${PORTSDIR}/x11-toolkits/qt4-gui -LDFLAGS+= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/qt4 -CONFIGURE_ARGS+=--with-qt=${LOCALBASE} -PLIST_SUB+= QT="" -.else -CONFIGURE_ARGS+=--with-qt=no -PLIST_SUB+= QT="@comment " -.endif - -# FFMPEG can be disabled -.if ${PORT_OPTIONS:MFFMPEG} -LIB_DEPENDS+= libavformat0.so:${PORTSDIR}/multimedia/ffmpeg0 -LIB_DEPENDS+= libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 -LIB_DEPENDS+= libswscale0.so:${PORTSDIR}/multimedia/ffmpeg0 -LIB_DEPENDS+= libavutil0.so:${PORTSDIR}/multimedia/ffmpeg0 -CONFIGURE_ARGS+=--enable-ffmpeg -PLIST_SUB+= FFMPEG="" -.else -CONFIGURE_ARGS+=--disable-ffmpeg -PLIST_SUB+= FFMPEG="@comment " -.endif - -patch-autotools-libtool:: - @(cd ${PATCH_WRKSRC}; \ - for f in ${LIBTOOLFILES}; do \ - ${CP} $$f $$f.tmp; \ - ${SED} -e "/^ltmain=/s^\$$ac_aux_dir/ltmain.sh^${LTMAIN}^g" \ - $$f.tmp > $$f; \ - ${RM} $$f.tmp; \ - done); + @${REINPLACE_CMD} -e \ + 's|-lstdc++|| ; \ + s|-lc_r|-pthread| ; \ + s|<exiv2/image.hpp>|$${EXIV2_H}| ; \ + s|<tidy/tidy.h>|$${TIDY_H}|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + 's|-lpthread|-pthread|' ${WRKSRC}/src/plugins/Makefile.in -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/textproc/libextractor/distinfo ============================================================================== --- head/textproc/libextractor/distinfo Thu Jul 31 17:31:14 2014 (r363642) +++ head/textproc/libextractor/distinfo Thu Jul 31 17:45:38 2014 (r363643) @@ -1,2 +1,2 @@ -SHA256 (libextractor-0.6.2.tar.gz) = 5c15aeaf2b7eab16fe0ddd9e8c7f86ae37a7ccc92541263d5d729f70522ad0df -SIZE (libextractor-0.6.2.tar.gz) = 955346 +SHA256 (libextractor-1.3.tar.gz) = 868ad64c9a056d6b923d451d746935bffb1ddf5d89c3eb4f67d786001a3f7b7f +SIZE (libextractor-1.3.tar.gz) = 7942021 Added: head/textproc/libextractor/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/libextractor/files/patch-configure Thu Jul 31 17:45:38 2014 (r363643) @@ -0,0 +1,24 @@ +--- configure.orig ++++ configure +@@ -22674,17 +22674,14 @@ + withval=$with_gtk_version; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_gtk_version" >&5 + $as_echo "$with_gtk_version" >&6; } + case $with_gtk_version in +- *) +- if test "x${with_gtk_version:0:1}" == "x2" +- then ++ 2*) + check_for_3=false + check_for_2=$with_gtk_version +- elif test "x${with_gtk_version:0:1}" == "x3" +- then ++ ;; ++ 3*) + check_for_3=$with_gtk_version + check_for_2=false +- fi +- ;; ++ ;; + esac + + else Modified: head/textproc/libextractor/pkg-descr ============================================================================== --- head/textproc/libextractor/pkg-descr Thu Jul 31 17:31:14 2014 (r363642) +++ head/textproc/libextractor/pkg-descr Thu Jul 31 17:45:38 2014 (r363643) @@ -3,4 +3,4 @@ arbitrary type. It is designed to use he actual extraction, and to be trivially extendable by linking against external extractors for additional file types. -WWW: http://gnunet.org/libextractor/ +WWW: http://www.gnu.org/software/libextractor/ Modified: head/textproc/libextractor/pkg-plist ============================================================================== --- head/textproc/libextractor/pkg-plist Thu Jul 31 17:31:14 2014 (r363642) +++ head/textproc/libextractor/pkg-plist Thu Jul 31 17:45:38 2014 (r363643) @@ -1,101 +1,89 @@ bin/extract include/extractor.h -info/extractor.info -lib/libextractor.la +lib/libextractor.a lib/libextractor.so lib/libextractor.so.3 -lib/libextractor_common.la +lib/libextractor.so.3.1.3 +lib/libextractor_common.a lib/libextractor_common.so -lib/libextractor_common.so.0 -lib/libextractor/libextractor_applefile.la -lib/libextractor/libextractor_applefile.so -lib/libextractor/libextractor_asf.la -lib/libextractor/libextractor_asf.so -lib/libextractor/libextractor_deb.la +lib/libextractor_common.so.1 +lib/libextractor_common.so.1.0.0 +lib/libextractor/libextractor_archive.a +lib/libextractor/libextractor_archive.so +lib/libextractor/libextractor_deb.a lib/libextractor/libextractor_deb.so -lib/libextractor/libextractor_dvi.la +lib/libextractor/libextractor_dvi.a lib/libextractor/libextractor_dvi.so -lib/libextractor/libextractor_elf.la -lib/libextractor/libextractor_elf.so -%%EXIV2%%lib/libextractor/libextractor_exiv2.la +%%EXIV2%%lib/libextractor/libextractor_exiv2.a %%EXIV2%%lib/libextractor/libextractor_exiv2.so -%%FLAC%%lib/libextractor/libextractor_flac.la +%%FLAC%%lib/libextractor/libextractor_flac.a %%FLAC%%lib/libextractor/libextractor_flac.so -lib/libextractor/libextractor_flv.la -lib/libextractor/libextractor_flv.so -lib/libextractor/libextractor_gif.la -lib/libextractor/libextractor_gif.so -lib/libextractor/libextractor_html.la -lib/libextractor/libextractor_html.so -lib/libextractor/libextractor_id3.la -lib/libextractor/libextractor_id3.so -lib/libextractor/libextractor_id3v2.la -lib/libextractor/libextractor_id3v2.so -lib/libextractor/libextractor_id3v23.la -lib/libextractor/libextractor_id3v23.so -lib/libextractor/libextractor_id3v24.la -lib/libextractor/libextractor_id3v24.so -lib/libextractor/libextractor_it.la +%%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.la +lib/libextractor/libextractor_jpeg.a lib/libextractor/libextractor_jpeg.so -lib/libextractor/libextractor_man.la +lib/libextractor/libextractor_man.a lib/libextractor/libextractor_man.so -lib/libextractor/libextractor_mime.la +%%SMF%%lib/libextractor/libextractor_midi.a +%%SMF%%lib/libextractor/libextractor_midi.so +lib/libextractor/libextractor_mime.a lib/libextractor/libextractor_mime.so -lib/libextractor/libextractor_mp3.la -lib/libextractor/libextractor_mp3.so -%%MPEG2%%lib/libextractor/libextractor_mpeg.la +%%MPEG2%%lib/libextractor/libextractor_mpeg.a %%MPEG2%%lib/libextractor/libextractor_mpeg.so -lib/libextractor/libextractor_nsf.la +lib/libextractor/libextractor_nsf.a lib/libextractor/libextractor_nsf.so -lib/libextractor/libextractor_nsfe.la +lib/libextractor/libextractor_nsfe.a lib/libextractor/libextractor_nsfe.so -lib/libextractor/libextractor_odf.la +lib/libextractor/libextractor_odf.a lib/libextractor/libextractor_odf.so -%%VORBIS%%lib/libextractor/libextractor_ogg.la +%%VORBIS%%lib/libextractor/libextractor_ogg.a %%VORBIS%%lib/libextractor/libextractor_ogg.so -%%GSF%%lib/libextractor/libextractor_ole2.la +%%GSF%%lib/libextractor/libextractor_ole2.a %%GSF%%lib/libextractor/libextractor_ole2.so -lib/libextractor/libextractor_png.la +lib/libextractor/libextractor_png.a lib/libextractor/libextractor_png.so -lib/libextractor/libextractor_ps.la +%%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_qt.la -lib/libextractor/libextractor_qt.so -lib/libextractor/libextractor_real.la -lib/libextractor/libextractor_real.so -lib/libextractor/libextractor_riff.la +lib/libextractor/libextractor_riff.a lib/libextractor/libextractor_riff.so -%%RPM%%lib/libextractor/libextractor_rpm.la +%%RPM%%lib/libextractor/libextractor_rpm.a %%RPM%%lib/libextractor/libextractor_rpm.so -lib/libextractor/libextractor_s3m.la +lib/libextractor/libextractor_s3m.a lib/libextractor/libextractor_s3m.so -lib/libextractor/libextractor_sid.la +lib/libextractor/libextractor_sid.a lib/libextractor/libextractor_sid.so -lib/libextractor/libextractor_tar.la -lib/libextractor/libextractor_tar.so -%%FFMPEG%%lib/libextractor/libextractor_thumbnailffmpeg.la +%%FFMPEG%%lib/libextractor/libextractor_thumbnailffmpeg.a %%FFMPEG%%lib/libextractor/libextractor_thumbnailffmpeg.so -lib/libextractor/libextractor_thumbnailgtk.la +lib/libextractor/libextractor_thumbnailgtk.a lib/libextractor/libextractor_thumbnailgtk.so -%%QT%%lib/libextractor/libextractor_thumbnailqt.la -%%QT%%lib/libextractor/libextractor_thumbnailqt.so -lib/libextractor/libextractor_tiff.la +lib/libextractor/libextractor_tiff.a lib/libextractor/libextractor_tiff.so -lib/libextractor/libextractor_wav.la +lib/libextractor/libextractor_wav.a lib/libextractor/libextractor_wav.so -lib/libextractor/libextractor_xm.la +lib/libextractor/libextractor_xm.a lib/libextractor/libextractor_xm.so -lib/libextractor/libextractor_zip.la +lib/libextractor/libextractor_zip.a lib/libextractor/libextractor_zip.so libdata/pkgconfig/libextractor.pc +man/man1/extract.1.gz +man/man3/libextractor.3.gz share/locale/de/LC_MESSAGES/libextractor.mo -share/locale/ga/LC_MESSAGES/libextractor.mo share/locale/fr/LC_MESSAGES/libextractor.mo +share/locale/ga/LC_MESSAGES/libextractor.mo +share/locale/it/LC_MESSAGES/libextractor.mo share/locale/nl/LC_MESSAGES/libextractor.mo +share/locale/pl/LC_MESSAGES/libextractor.mo share/locale/ro/LC_MESSAGES/libextractor.mo share/locale/rw/LC_MESSAGES/libextractor.mo share/locale/sv/LC_MESSAGES/libextractor.mo +share/locale/uk/LC_MESSAGES/libextractor.mo share/locale/vi/LC_MESSAGES/libextractor.mo @dirrm lib/libextractor
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407311745.s6VHjdMn015657>