Upgrade textproc/libextractor from 0.5.17a to 0.5.18

patch-src_test_plugintest.c: fix a failing test.
  Christian Grothoff confirmed that the test program should be fixed,
  rather than the library.

patch-configure: fix ``if test "foo" == "bar"'' (the double eq sign is
  not supported by /bin/sh).

5 files changed, 49 insertions, 5 deletions

diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index fc3b8cb2d6a7..7382150e580f 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libextractor
-PORTVERSION=	0.5.17a
+PORTVERSION=	0.5.18
 CATEGORIES=	textproc
 MASTER_SITES=	http://gnunet.org/libextractor/download/ \
 		${MASTER_SITE_GNU}
@@ -24,7 +24,7 @@ USE_AUTOTOOLS=	libltdl:15
 USE_DOS2UNIX=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	${PREFIX}/lib/libextractor
-CONFIGURE_ARGS=	--disable-ltdl-install --mandir=${PREFIX}/man
+CONFIGURE_ARGS=	--disable-ltdl-install --mandir=${PREFIX}/man --enable-exiv2
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/textproc/libextractor/distinfo b/textproc/libextractor/distinfo
index de461775496c..9507b97521fa 100644
--- a/textproc/libextractor/distinfo
+++ b/textproc/libextractor/distinfo
@@ -1,3 +1,3 @@
-MD5 (libextractor-0.5.17a.tar.gz) = 10b67ec5387e2b819e928c14436e4635
-SHA256 (libextractor-0.5.17a.tar.gz) = 942198b4a81a82e26cab8285e8d67ab1772728f3328adef726aa3475ba0cd832
-SIZE (libextractor-0.5.17a.tar.gz) = 7784955
+MD5 (libextractor-0.5.18.tar.gz) = 80cc90c7784a964834a8744b8de7ea96
+SHA256 (libextractor-0.5.18.tar.gz) = 33d058db6fa02cc633c996284cf31d42da54d33f9ea83c4a12d6645b7f32c827
+SIZE (libextractor-0.5.18.tar.gz) = 7798032
diff --git a/textproc/libextractor/files/patch-configure b/textproc/libextractor/files/patch-configure
new file mode 100644
index 000000000000..af69b9df4008
--- /dev/null
+++ b/textproc/libextractor/files/patch-configure
@@ -0,0 +1,29 @@
+--- 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
new file mode 100644
index 000000000000..1fae2938af89
--- /dev/null
+++ b/textproc/libextractor/files/patch-src_test_plugintest.c
@@ -0,0 +1,13 @@
+--- 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 b9ca07ed7350..3a5fcf899cb1 100644
--- a/textproc/libextractor/pkg-plist
+++ b/textproc/libextractor/pkg-plist
@@ -45,6 +45,8 @@ lib/libextractor/libextractor_mpeg.la
 lib/libextractor/libextractor_mpeg.so
 lib/libextractor/libextractor_nsf.la
 lib/libextractor/libextractor_nsf.so
+lib/libextractor/libextractor_nsfe.la
+lib/libextractor/libextractor_nsfe.so
 %%VORBIS%%lib/libextractor/libextractor_ogg.la
 %%VORBIS%%lib/libextractor/libextractor_ogg.so
 lib/libextractor/libextractor_oo.la