ports/183343: [PATCH] textproc/libextractor: update to 1.2

William Grzybowski wg at FreeBSD.org
Sat Oct 26 18:50:01 UTC 2013 

>Number:         183343
>Category:       ports
>Synopsis:       [PATCH] textproc/libextractor: update to 1.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 26 18:50:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     William Grzybowski
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #1 r251226: Sat Jun 1 21:56:43 UTC 2013 peter at freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64

>Description:

	- Update to 1.2

>How-To-Repeat:

>Fix:

	See attached patch



--- libextractor.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 331726)
+++ Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libextractor
-PORTVERSION=	0.6.2
-PORTREVISION=	14
+PORTVERSION=	1.2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -13,34 +12,26 @@
 
 USE_GNOME=	glib20 gtk20
 USES=		pathfix pkgconfig
-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=	--disable-ltdl-install --disable-static
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 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
+OPTIONS_DEFINE=	EXIV2 FLAC MPEG2 VORBIS GSF RPM FFMPEG
 GSF_DESC=	GSF (OLE2 (MS office) support)
 RPM_DESC=	RPM support
-OPTIONS_DEFAULT=	EXIV2 FLAC MPEG2 VORBIS GSF POPPLER RPM QT FFMPEG
+OPTIONS_DEFAULT=	EXIV2 FLAC MPEG2 VORBIS GSF RPM FFMPEG
+OPTIONS_SUB=	yes
 
-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' \
@@ -51,12 +42,6 @@
 
 #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
@@ -64,76 +49,37 @@
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEXIV2}
-LIB_DEPENDS+=	exiv2.12:${PORTSDIR}/graphics/exiv2
-PLIST_SUB+=	EXIV2=""
-.else
-PLIST_SUB+=	EXIV2="@comment "
+LIB_DEPENDS+=	libexiv2.so:${PORTSDIR}/graphics/exiv2
 .endif
 
 .if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
-PLIST_SUB+=	FLAC=""
-.else
-PLIST_SUB+=	FLAC="@comment "
+LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
 .endif
 
 .if ${PORT_OPTIONS:MMPEG2}
-LIB_DEPENDS+=	mpeg2:${PORTSDIR}/multimedia/libmpeg2
-PLIST_SUB+=	MPEG2=""
-.else
-PLIST_SUB+=	MPEG2="@comment "
+LIB_DEPENDS+=	libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2
 .endif
 
 .if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	vorbisfile:${PORTSDIR}/audio/libvorbis
-PLIST_SUB+=	VORBIS=""
-.else
-PLIST_SUB+=	VORBIS="@comment "
+LIB_DEPENDS+=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
 .endif
 
 .if ${PORT_OPTIONS:MGSF}
-LIB_DEPENDS+=	gsf-1:${PORTSDIR}/devel/libgsf
-PLIST_SUB+=	GSF=""
-.else
-PLIST_SUB+=	GSF="@comment "
+LIB_DEPENDS+=	libgsf-1.so:${PORTSDIR}/devel/libgsf
 .endif
 
-.if ${PORT_OPTIONS:MPOPPLER}
-LIB_DEPENDS+=	poppler:${PORTSDIR}/graphics/poppler
-PLIST_SUB+=	POPPLER=""
-.else
-PLIST_SUB+=	POPPLER="@comment "
-.endif
-
 .if ${PORT_OPTIONS:MRPM}
-LIB_DEPENDS+=	rpm:${PORTSDIR}/archivers/rpm4
-PLIST_SUB+=	RPM=""
-.else
-PLIST_SUB+=	RPM="@comment "
+LIB_DEPENDS+=	librpm.so:${PORTSDIR}/archivers/rpm4
 .endif
 
-# QT can be disabled
-.if ${PORT_OPTIONS:MQT}
-LIB_DEPENDS+=	QtGui:${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
+LIB_DEPENDS+=	libavformat.so:${PORTSDIR}/multimedia/ffmpeg \
+		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
+		libswscale.so:${PORTSDIR}/multimedia/ffmpeg \
+		libavutil.so:${PORTSDIR}/multimedia/ffmpeg
 CONFIGURE_ARGS+=--enable-ffmpeg
-PLIST_SUB+=	FFMPEG=""
 .else
 CONFIGURE_ARGS+=--disable-ffmpeg
-PLIST_SUB+=	FFMPEG="@comment "
 .endif
 
 patch-autotools-libtool::
@@ -145,4 +91,4 @@
 		${RM} $$f.tmp; \
 	done);
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 331726)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (libextractor-0.6.2.tar.gz) = 5c15aeaf2b7eab16fe0ddd9e8c7f86ae37a7ccc92541263d5d729f70522ad0df
-SIZE (libextractor-0.6.2.tar.gz) = 955346
+SHA256 (libextractor-1.2.tar.gz) = 26290167a6453355bbf7941b1b1849b2ab1a886a3d7cb08cabdd681a8b36ffd8
+SIZE (libextractor-1.2.tar.gz) = 7966908
Index: pkg-descr
===================================================================
--- pkg-descr	(revision 331726)
+++ pkg-descr	(working copy)
@@ -1,6 +1,6 @@
-Libextractor is a library used to extract meta-data from files of 
-arbitrary type. It is designed to use helper-libraries to perform the 
-actual extraction, and to be trivially extendable by linking against 
-external extractors for additional file types. 
+Libextractor is a library used to extract meta-data from files of
+arbitrary type. It is designed to use helper-libraries to perform the
+actual extraction, and to be trivially extendable by linking against
+external extractors for additional file types.
 
-WWW:	http://gnunet.org/libextractor/
+WWW: http://gnunet.org/libextractor/
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 331726)
+++ pkg-plist	(working copy)
@@ -1,40 +1,22 @@
 bin/extract
 include/extractor.h
-info/extractor.info
+info/dir
+info/libextractor.info
 lib/libextractor.la
 lib/libextractor.so
-lib/libextractor.so.3
-lib/libextractor_common.la
-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.so.4
+lib/libextractor/libextractor_archive.la
+lib/libextractor/libextractor_archive.so
 lib/libextractor/libextractor_deb.la
 lib/libextractor/libextractor_deb.so
 lib/libextractor/libextractor_dvi.la
 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.so
 %%FLAC%%lib/libextractor/libextractor_flac.la
 %%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
 lib/libextractor/libextractor_it.so
 lib/libextractor/libextractor_jpeg.la
@@ -41,10 +23,10 @@
 lib/libextractor/libextractor_jpeg.so
 lib/libextractor/libextractor_man.la
 lib/libextractor/libextractor_man.so
+lib/libextractor/libextractor_midi.la
+lib/libextractor/libextractor_midi.so
 lib/libextractor/libextractor_mime.la
 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.so
 lib/libextractor/libextractor_nsf.la
@@ -61,10 +43,6 @@
 lib/libextractor/libextractor_png.so
 lib/libextractor/libextractor_ps.la
 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.so
 %%RPM%%lib/libextractor/libextractor_rpm.la
@@ -73,14 +51,8 @@
 lib/libextractor/libextractor_s3m.so
 lib/libextractor/libextractor_sid.la
 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.so
-lib/libextractor/libextractor_thumbnailgtk.la
-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.so
 lib/libextractor/libextractor_wav.la
@@ -89,13 +61,23 @@
 lib/libextractor/libextractor_xm.so
 lib/libextractor/libextractor_zip.la
 lib/libextractor/libextractor_zip.so
+lib/libextractor_common.la
+lib/libextractor_common.so
+lib/libextractor_common.so.1
 libdata/pkgconfig/libextractor.pc
+man/man1/extract.1.gz
+man/man3/libextractor.3.gz
 share/locale/de/LC_MESSAGES/libextractor.mo
+share/locale/fr/LC_MESSAGES/libextractor.mo
 share/locale/ga/LC_MESSAGES/libextractor.mo
-share/locale/fr/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
- at dirrm lib/libextractor
+ at dirrmtry share/locale/rw/LC_MESSAGES
+ at dirrmtry share/locale/rw
+ at dirrmtry lib/libextractor
--- libextractor.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list