6 files changed, 17 insertions, 55 deletions

diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index 7f7d5bc8375f..fa3570e9554e 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libextractor
-PORTVERSION=	0.5.18
-PORTREVISION=	3
+PORTVERSION=	0.5.20b
 CATEGORIES=	textproc
 MASTER_SITES=	http://gnunet.org/libextractor/download/ \
 		${MASTER_SITE_GNU}
diff --git a/textproc/libextractor/distinfo b/textproc/libextractor/distinfo
index 9507b97521fa..5cbdcf447074 100644
--- a/textproc/libextractor/distinfo
+++ b/textproc/libextractor/distinfo
@@ -1,3 +1,3 @@
-MD5 (libextractor-0.5.18.tar.gz) = 80cc90c7784a964834a8744b8de7ea96
-SHA256 (libextractor-0.5.18.tar.gz) = 33d058db6fa02cc633c996284cf31d42da54d33f9ea83c4a12d6645b7f32c827
-SIZE (libextractor-0.5.18.tar.gz) = 7798032
+MD5 (libextractor-0.5.20b.tar.gz) = 118ef97ed6eb64f4f5151d598e57f3ce
+SHA256 (libextractor-0.5.20b.tar.gz) = 62575c49b7e1118dce0e51faebf93d9841aca2d00c955f363494f3eeda8d4e8f
+SIZE (libextractor-0.5.20b.tar.gz) = 8008774
diff --git a/textproc/libextractor/files/patch-Makefile.in b/textproc/libextractor/files/patch-Makefile.in
index a9a00e1a0f89..684efe700ce3 100644
--- a/textproc/libextractor/files/patch-Makefile.in
+++ b/textproc/libextractor/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Tue Oct  4 21:26:35 2005
-+++ Makefile.in	Tue Oct  4 21:26:52 2005
-@@ -229,7 +229,7 @@
- subdirs = @subdirs@
- sysconfdir = @sysconfdir@
+--- 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 \
-   PLATFORMS \
+   ABOUT-NLS mkinstalldirs install-sh \
+   PLATFORMS README.debian 
diff --git a/textproc/libextractor/files/patch-configure b/textproc/libextractor/files/patch-configure
deleted file mode 100644
index af69b9df4008..000000000000
--- a/textproc/libextractor/files/patch-configure
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.orig	Mon Apr 30 22:07:59 2007
-+++ configure	Mon Apr 30 22:08:34 2007
-@@ -4415,7 +4415,7 @@
- 
- 
- 
--if test "x$HAVE_CXX" == "xyes"; then
-+if test "x$HAVE_CXX" = "xyes"; then
-   HAVE_CXX_TRUE=
-   HAVE_CXX_FALSE='#'
- else
-@@ -29082,7 +29082,7 @@
- 
- if test x$without_glib != xtrue
- then
--  if test $with_gnu_ld == yes
-+  if test $with_gnu_ld = yes
-   then
- # We need both GNU LD and GLIB here!
- 
-@@ -29488,7 +29488,7 @@
- xpdf=0
- exiv2=0
- 
--if test "x$HAVE_CXX" == "xyes"
-+if test "x$HAVE_CXX" = "xyes"
- then
- 
- # check for Qt 4
diff --git a/textproc/libextractor/files/patch-src_test_plugintest.c b/textproc/libextractor/files/patch-src_test_plugintest.c
deleted file mode 100644
index 1fae2938af89..000000000000
--- a/textproc/libextractor/files/patch-src_test_plugintest.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/test/plugintest.c.orig	Mon Apr 30 07:44:21 2007
-+++ src/test/plugintest.c	Mon Apr 30 07:43:45 2007
-@@ -58,8 +58,8 @@
- 				      "-libextractor_split");
-   list = EXTRACTOR_getKeywords(arg,
- 			       "/etc/resolv.conf");
--  if (3 != EXTRACTOR_countKeywords(list)) {
--    printf("Invalid number of keywords (3 != %d)\n",
-+  if (4 != EXTRACTOR_countKeywords(list)) {
-+    printf("Invalid number of keywords (4 != %d)\n",
- 	   EXTRACTOR_countKeywords(list));
-     return -1;
-   }
diff --git a/textproc/libextractor/pkg-plist b/textproc/libextractor/pkg-plist
index 3a5fcf899cb1..93b3c96c7a48 100644
--- a/textproc/libextractor/pkg-plist
+++ b/textproc/libextractor/pkg-plist
@@ -1,8 +1,11 @@
 bin/extract
 include/extractor.h
+info/extractor.info
 lib/libextractor.la
 lib/libextractor.so
 lib/libextractor.so.2
+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
@@ -15,6 +18,8 @@ lib/libextractor/libextractor_exiv2.la
 lib/libextractor/libextractor_exiv2.so
 lib/libextractor/libextractor_filename.la
 lib/libextractor/libextractor_filename.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
@@ -93,7 +98,6 @@ lib/libextractor/libextractor_split.la
 lib/libextractor/libextractor_split.so
 lib/libextractor/libextractor_tar.la
 lib/libextractor/libextractor_tar.so
-lib/libextractor/libextractor_thumbnail.so
 lib/libextractor/libextractor_tiff.la
 lib/libextractor/libextractor_tiff.so
 lib/libextractor/libextractor_translit.la
@@ -105,6 +109,7 @@ lib/libextractor/libextractor_zip.so
 lib/pkgconfig/libextractor.pc
 share/locale/de/LC_MESSAGES/libextractor.mo
 share/locale/ga/LC_MESSAGES/libextractor.mo
+share/locale/nl/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