Changes 0.5.18:

This release adds support for NSFE files. Removal of duplicate keywords
is now biased against keywords obtained from splitting. The build process
should now work properly if no C++ compiler is found. The thumbnail-extractors
should now load properly in all cases (resolved a symbol naming problem).

8 files changed, 47 insertions, 29 deletions

diff --git a/devel/libextractor/Makefile b/devel/libextractor/Makefile
index 7f1c3b66eef..c2926bd6f2a 100644
--- a/devel/libextractor/Makefile
+++ b/devel/libextractor/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2007/01/17 23:47:19 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2007/03/18 12:34:30 adam Exp $
 
-DISTNAME=	libextractor-0.5.17
-PKGREVISION=	1
+DISTNAME=	libextractor-0.5.18
 CATEGORIES=	devel
 MASTER_SITES=	http://gnunet.org/libextractor/download/
 
diff --git a/devel/libextractor/PLIST b/devel/libextractor/PLIST
index 164737c26de..fd90d083c84 100644
--- a/devel/libextractor/PLIST
+++ b/devel/libextractor/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2007/01/02 15:53:23 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2007/03/18 12:34:30 adam Exp $
 bin/extract
 include/extractor.h
 lib/libextractor.la
@@ -23,6 +23,7 @@ lib/libextractor/libextractor_mime.la
 lib/libextractor/libextractor_mp3.la
 lib/libextractor/libextractor_mpeg.la
 lib/libextractor/libextractor_nsf.la
+lib/libextractor/libextractor_nsfe.la
 lib/libextractor/libextractor_ogg.la
 lib/libextractor/libextractor_ole2.la
 lib/libextractor/libextractor_oo.la
diff --git a/devel/libextractor/distinfo b/devel/libextractor/distinfo
index 122e3da08a9..46ef658f259 100644
--- a/devel/libextractor/distinfo
+++ b/devel/libextractor/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.19 2007/01/02 15:53:23 adam Exp $
+$NetBSD: distinfo,v 1.20 2007/03/18 12:34:31 adam Exp $
 
-SHA1 (libextractor-0.5.17.tar.gz) = f3a0b078fdae49ab55afb642306355ac53d32758
-RMD160 (libextractor-0.5.17.tar.gz) = 3553437b82ddea1852c85dde7b0f60103f421efe
-Size (libextractor-0.5.17.tar.gz) = 7788475 bytes
+SHA1 (libextractor-0.5.18.tar.gz) = 46c055bca5c689f09410ad7c3533eecf0febc08b
+RMD160 (libextractor-0.5.18.tar.gz) = b9b839bf8fd3d5aa10de41c12af16a4485fdd1ae
+Size (libextractor-0.5.18.tar.gz) = 7798032 bytes
 SHA1 (patch-aa) = f0923e6cba8e6bb327a7959a3d7679bb78a530b2
-SHA1 (patch-ab) = 8ba9e9c120e4c466a6de3801da9eea15d2de67cc
-SHA1 (patch-ac) = 83d0f6c5906c2300a17d24a25f73dae0e5f9cc22
-SHA1 (patch-ad) = a524291a5cd49c00ee35eca9e8002585fe06407a
-SHA1 (patch-ae) = f7f89aee1a7b2a8340dc6c4d644ce6aa59761e2b
-SHA1 (patch-af) = 72b45afaf4b2c378d187637e75215ac114c8d24e
+SHA1 (patch-ab) = e45d1a5cbca514d096c64979fed442494544fc95
+SHA1 (patch-ac) = 4d67217e57d70d90db39d8d7b748ad3355f3bbe2
+SHA1 (patch-ad) = 27ab6716a1c1bac9923810237401808010ea906d
+SHA1 (patch-ae) = 495f4f1f11f3892c28e81a28edd098e42773a6fc
+SHA1 (patch-af) = 6e36d8d8c4ad20a8b43860ab851be1d10622b927
diff --git a/devel/libextractor/patches/patch-ab b/devel/libextractor/patches/patch-ab
index ac697956c63..5c4bb4a16c9 100644
--- a/devel/libextractor/patches/patch-ab
+++ b/devel/libextractor/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2007/01/02 15:53:23 adam Exp $
+$NetBSD: patch-ab,v 1.7 2007/03/18 12:34:31 adam Exp $
 
---- src/main/extractor.c.orig	2006-12-29 04:47:45.000000000 +0100
+--- src/main/extractor.c.orig	2007-03-12 01:03:21.000000000 +0100
 +++ src/main/extractor.c
-@@ -226,7 +226,6 @@ libextractor_id3v24:\
+@@ -234,7 +234,6 @@ libextractor_id3v24:\
  libextractor_mime:\
  libextractor_tar:\
  libextractor_dvi:\
diff --git a/devel/libextractor/patches/patch-ac b/devel/libextractor/patches/patch-ac
index ccfaecd4b05..8533548c46c 100644
--- a/devel/libextractor/patches/patch-ac
+++ b/devel/libextractor/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.8 2007/01/02 15:53:23 adam Exp $
+$NetBSD: patch-ac,v 1.9 2007/03/18 12:34:31 adam Exp $
 
---- src/main/Makefile.in.orig	2007-01-02 04:02:20.000000000 +0100
+--- src/main/Makefile.in.orig	2007-03-11 22:48:26.000000000 +0100
 +++ src/main/Makefile.in
-@@ -292,7 +292,7 @@ lib_LTLIBRARIES = \
+@@ -295,7 +295,7 @@ lib_LTLIBRARIES = \
  extract_LDADD = \
    $(top_builddir)/src/main/libextractor.la 
  
diff --git a/devel/libextractor/patches/patch-ad b/devel/libextractor/patches/patch-ad
index e531ba563fa..76a4a973b32 100644
--- a/devel/libextractor/patches/patch-ad
+++ b/devel/libextractor/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.9 2007/01/02 15:53:23 adam Exp $
+$NetBSD: patch-ad,v 1.10 2007/03/18 12:34:31 adam Exp $
 
---- src/plugins/exiv2/Makefile.in.orig	2007-01-02 04:02:22.000000000 +0100
+--- src/plugins/exiv2/Makefile.in.orig	2007-03-12 01:35:07.000000000 +0100
 +++ src/plugins/exiv2/Makefile.in
-@@ -305,11 +305,11 @@ libextractor_exiv2_la_LINK = \
+@@ -308,11 +308,11 @@ libextractor_exiv2_la_LINK = \
    /bin/sh ../../../libtool --mode=link $(CXXLD) -o libextractor_exiv2.la
  
  libextractor_exiv2_la_LDFLAGS = \
diff --git a/devel/libextractor/patches/patch-ae b/devel/libextractor/patches/patch-ae
index d54c7520f77..4f56f27aa09 100644
--- a/devel/libextractor/patches/patch-ae
+++ b/devel/libextractor/patches/patch-ae
@@ -1,8 +1,17 @@
-$NetBSD: patch-ae,v 1.6 2007/01/02 15:53:23 adam Exp $
+$NetBSD: patch-ae,v 1.7 2007/03/18 12:34:31 adam Exp $
 
---- configure.orig	2007-01-02 04:02:29.000000000 +0100
+--- configure.orig	2007-03-11 22:48:17.000000000 +0100
 +++ configure
-@@ -23612,7 +23612,7 @@ _ACEOF
+@@ -4415,7 +4415,7 @@ fi
+ 
+ 
+ 
+-if test "x$HAVE_CXX" == "xyes"; then
++if test "x$HAVE_CXX" = "xyes"; then
+   HAVE_CXX_TRUE=
+   HAVE_CXX_FALSE='#'
+ else
+@@ -23663,7 +23663,7 @@ _ACEOF
    exec_prefix_NONE=
    test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
    test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
@@ -11,7 +20,7 @@ $NetBSD: patch-ae,v 1.6 2007/01/02 15:53:23 adam Exp $
    LOCALEDIR="$ac_define_dir"
  
  
-@@ -29031,7 +29031,7 @@ fi
+@@ -29082,7 +29082,7 @@ fi
  
  if test x$without_glib != xtrue
  then
@@ -20,3 +29,12 @@ $NetBSD: patch-ae,v 1.6 2007/01/02 15:53:23 adam Exp $
    then
  # We need both GNU LD and GLIB here!
  
+@@ -29488,7 +29488,7 @@ qt_svg=0
+ xpdf=0
+ exiv2=0
+ 
+-if test "x$HAVE_CXX" == "xyes"
++if test "x$HAVE_CXX" = "xyes"
+ then
+ 
+ # check for Qt 4
diff --git a/devel/libextractor/patches/patch-af b/devel/libextractor/patches/patch-af
index 867284c186d..bce94b5c6c1 100644
--- a/devel/libextractor/patches/patch-af
+++ b/devel/libextractor/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.5 2007/01/02 15:53:23 adam Exp $
+$NetBSD: patch-af,v 1.6 2007/03/18 12:34:31 adam Exp $
 
---- configure.ac.orig	2007-01-02 04:01:41.000000000 +0100
+--- configure.ac.orig	2007-03-11 22:46:56.000000000 +0100
 +++ configure.ac
-@@ -235,7 +235,7 @@ AC_ARG_ENABLE(glib,
+@@ -236,7 +236,7 @@ AC_ARG_ENABLE(glib,
  
  if test x$without_glib != xtrue
  then