Upgrade textproc/libextractor from 0.5.20b to 0.6.2

4 files changed, 26 insertions, 64 deletions

diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index 7116fd2a96a2..b636d2851f43 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libextractor
-PORTVERSION=	0.5.20b
-PORTREVISION=	7
+PORTVERSION=	0.6.2
 CATEGORIES=	textproc
-MASTER_SITES=	http://gnunet.org/libextractor/download/
+MASTER_SITES=	${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	vd@FreeBSD.org
 COMMENT=	Library for keyword extraction
@@ -19,7 +19,6 @@ LIB_DEPENDS=	mpeg2:${PORTSDIR}/multimedia/libmpeg2
 USE_GNOME=	glib20
 USE_PYTHON=	yes
 USE_AUTOTOOLS=	libltdl
-USE_DOS2UNIX=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/libextractor
 CONFIGURE_ARGS=	--disable-ltdl-install --enable-exiv2
@@ -35,13 +34,9 @@ MAN3=	libextractor.3
 post-patch:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/src/plugins/Makefile.* \
-		${WRKSRC}/src/plugins/exiv2/Makefile.* \
-		${WRKSRC}/src/plugins/rpm/Makefile.*
+		${WRKSRC}/src/plugins/Makefile.*
 	@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|^#ifdef EXV_HAVE_STDINT_H$$|#if EXV_HAVE_STDINT_H|' \
-		${WRKSRC}/src/plugins/exiv2/types.hpp
 
 check: build
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} check)
diff --git a/textproc/libextractor/distinfo b/textproc/libextractor/distinfo
index 5cbdcf447074..cd47c6123d6c 100644
--- a/textproc/libextractor/distinfo
+++ b/textproc/libextractor/distinfo
@@ -1,3 +1,2 @@
-MD5 (libextractor-0.5.20b.tar.gz) = 118ef97ed6eb64f4f5151d598e57f3ce
-SHA256 (libextractor-0.5.20b.tar.gz) = 62575c49b7e1118dce0e51faebf93d9841aca2d00c955f363494f3eeda8d4e8f
-SIZE (libextractor-0.5.20b.tar.gz) = 8008774
+SHA256 (libextractor-0.6.2.tar.gz) = 5c15aeaf2b7eab16fe0ddd9e8c7f86ae37a7ccc92541263d5d729f70522ad0df
+SIZE (libextractor-0.6.2.tar.gz) = 955346
diff --git a/textproc/libextractor/files/patch-Makefile.in b/textproc/libextractor/files/patch-Makefile.in
deleted file mode 100644
index 684efe700ce3..000000000000
--- a/textproc/libextractor/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2008-06-03 07:14:32.000000000 +0300
-+++ Makefile.in	2008-06-03 07:14:38.000000000 +0300
-@@ -237,7 +237,7 @@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = m4 po libltdl src doc . 
-+SUBDIRS = m4 po src doc . 
- EXTRA_DIST = config.rpath \
-   ABOUT-NLS mkinstalldirs install-sh \
-   PLATFORMS README.debian 
diff --git a/textproc/libextractor/pkg-plist b/textproc/libextractor/pkg-plist
index 93b3c96c7a48..3540a240dd16 100644
--- a/textproc/libextractor/pkg-plist
+++ b/textproc/libextractor/pkg-plist
@@ -3,7 +3,10 @@ include/extractor.h
 info/extractor.info
 lib/libextractor.la
 lib/libextractor.so
-lib/libextractor.so.2
+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
@@ -16,30 +19,26 @@ lib/libextractor/libextractor_elf.la
 lib/libextractor/libextractor_elf.so
 lib/libextractor/libextractor_exiv2.la
 lib/libextractor/libextractor_exiv2.so
-lib/libextractor/libextractor_filename.la
-lib/libextractor/libextractor_filename.so
+lib/libextractor/libextractor_flac.la
+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_hash_md5.la
-lib/libextractor/libextractor_hash_md5.so
-lib/libextractor/libextractor_hash_rmd160.la
-lib/libextractor/libextractor_hash_rmd160.so
-lib/libextractor/libextractor_hash_sha1.la
-lib/libextractor/libextractor_hash_sha1.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
 lib/libextractor/libextractor_jpeg.so
-lib/libextractor/libextractor_lower.la
-lib/libextractor/libextractor_lower.so
 lib/libextractor/libextractor_man.la
 lib/libextractor/libextractor_man.so
 lib/libextractor/libextractor_mime.la
@@ -52,36 +51,16 @@ lib/libextractor/libextractor_nsf.la
 lib/libextractor/libextractor_nsf.so
 lib/libextractor/libextractor_nsfe.la
 lib/libextractor/libextractor_nsfe.so
+lib/libextractor/libextractor_odf.la
+lib/libextractor/libextractor_odf.so
 %%VORBIS%%lib/libextractor/libextractor_ogg.la
 %%VORBIS%%lib/libextractor/libextractor_ogg.so
-lib/libextractor/libextractor_oo.la
-lib/libextractor/libextractor_oo.so
+lib/libextractor/libextractor_ole2.la
+lib/libextractor/libextractor_ole2.so
 lib/libextractor/libextractor_pdf.la
 lib/libextractor/libextractor_pdf.so
 lib/libextractor/libextractor_png.la
 lib/libextractor/libextractor_png.so
-lib/libextractor/libextractor_printable_da.la
-lib/libextractor/libextractor_printable_da.so
-lib/libextractor/libextractor_printable_de.la
-lib/libextractor/libextractor_printable_de.so
-lib/libextractor/libextractor_printable_en.la
-lib/libextractor/libextractor_printable_en.so
-lib/libextractor/libextractor_printable_es.la
-lib/libextractor/libextractor_printable_es.so
-lib/libextractor/libextractor_printable_fi.la
-lib/libextractor/libextractor_printable_fi.so
-lib/libextractor/libextractor_printable_fr.la
-lib/libextractor/libextractor_printable_fr.so
-lib/libextractor/libextractor_printable_ga.la
-lib/libextractor/libextractor_printable_ga.so
-lib/libextractor/libextractor_printable_it.la
-lib/libextractor/libextractor_printable_it.so
-lib/libextractor/libextractor_printable_no.la
-lib/libextractor/libextractor_printable_no.so
-lib/libextractor/libextractor_printable_pt.la
-lib/libextractor/libextractor_printable_pt.so
-lib/libextractor/libextractor_printable_sv.la
-lib/libextractor/libextractor_printable_sv.so
 lib/libextractor/libextractor_ps.la
 lib/libextractor/libextractor_ps.so
 lib/libextractor/libextractor_qt.la
@@ -90,20 +69,20 @@ lib/libextractor/libextractor_real.la
 lib/libextractor/libextractor_real.so
 lib/libextractor/libextractor_riff.la
 lib/libextractor/libextractor_riff.so
-lib/libextractor/libextractor_rpm.la
-lib/libextractor/libextractor_rpm.so
+lib/libextractor/libextractor_s3m.la
+lib/libextractor/libextractor_s3m.so
 lib/libextractor/libextractor_sid.la
 lib/libextractor/libextractor_sid.so
-lib/libextractor/libextractor_split.la
-lib/libextractor/libextractor_split.so
 lib/libextractor/libextractor_tar.la
 lib/libextractor/libextractor_tar.so
+lib/libextractor/libextractor_thumbnailgtk.la
+lib/libextractor/libextractor_thumbnailgtk.so
 lib/libextractor/libextractor_tiff.la
 lib/libextractor/libextractor_tiff.so
-lib/libextractor/libextractor_translit.la
-lib/libextractor/libextractor_translit.so
 lib/libextractor/libextractor_wav.la
 lib/libextractor/libextractor_wav.so
+lib/libextractor/libextractor_xm.la
+lib/libextractor/libextractor_xm.so
 lib/libextractor/libextractor_zip.la
 lib/libextractor/libextractor_zip.so
 lib/pkgconfig/libextractor.pc