Changes 0.5.18a:

* Fixes various build problems, a crash with recent versions of libgsf
* Adds an (incomplete) manual

6 files changed, 15 insertions, 70 deletions

diff --git a/devel/libextractor/Makefile b/devel/libextractor/Makefile
index 4a25d501caf..f6c8d66dd2b 100644
--- a/devel/libextractor/Makefile
+++ b/devel/libextractor/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2007/09/21 13:03:37 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2007/10/13 18:41:20 adam Exp $
 
-DISTNAME=	libextractor-0.5.18
-PKGREVISION=	3
+DISTNAME=	libextractor-0.5.18a
 CATEGORIES=	devel
 MASTER_SITES=	http://gnunet.org/libextractor/download/
 
@@ -14,6 +13,7 @@ USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake pkg-config
 GNU_CONFIGURE=		yes
+INFO_FILES=		yes
 PTHREAD_OPTS+=		require
 
 CONFLICTS=		csound-{bath,dev}-*	# bin/extract
diff --git a/devel/libextractor/distinfo b/devel/libextractor/distinfo
index 46ef658f259..a2eb4b92f22 100644
--- a/devel/libextractor/distinfo
+++ b/devel/libextractor/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.20 2007/03/18 12:34:31 adam Exp $
+$NetBSD: distinfo,v 1.21 2007/10/13 18:41:21 adam Exp $
 
-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 (libextractor-0.5.18a.tar.gz) = 327a7357093575faa230a6533791f08ed5086e9e
+RMD160 (libextractor-0.5.18a.tar.gz) = cc6c95f70b7605ca015d53e93bfe8b38f42fab5c
+Size (libextractor-0.5.18a.tar.gz) = 7915435 bytes
 SHA1 (patch-aa) = f0923e6cba8e6bb327a7959a3d7679bb78a530b2
 SHA1 (patch-ab) = e45d1a5cbca514d096c64979fed442494544fc95
-SHA1 (patch-ac) = 4d67217e57d70d90db39d8d7b748ad3355f3bbe2
-SHA1 (patch-ad) = 27ab6716a1c1bac9923810237401808010ea906d
-SHA1 (patch-ae) = 495f4f1f11f3892c28e81a28edd098e42773a6fc
-SHA1 (patch-af) = 6e36d8d8c4ad20a8b43860ab851be1d10622b927
+SHA1 (patch-ac) = 74635709553832f8ba5a46c421e1efa29f4df7e8
+SHA1 (patch-ad) = 4ce97a658d9a3d3cafc43ca20f65a316e12c0ef9
diff --git a/devel/libextractor/patches/patch-ac b/devel/libextractor/patches/patch-ac
index 8533548c46c..017517f5a95 100644
--- a/devel/libextractor/patches/patch-ac
+++ b/devel/libextractor/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.9 2007/03/18 12:34:31 adam Exp $
+$NetBSD: patch-ac,v 1.10 2007/10/13 18:41:21 adam Exp $
 
---- src/main/Makefile.in.orig	2007-03-11 22:48:26.000000000 +0100
+--- src/main/Makefile.in.orig	2007-07-05 01:39:11.000000000 +0200
 +++ src/main/Makefile.in
-@@ -295,7 +295,7 @@ lib_LTLIBRARIES = \
+@@ -299,7 +299,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 76a4a973b32..416b493087e 100644
--- a/devel/libextractor/patches/patch-ad
+++ b/devel/libextractor/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.10 2007/03/18 12:34:31 adam Exp $
+$NetBSD: patch-ad,v 1.11 2007/10/13 18:41:21 adam Exp $
 
---- src/plugins/exiv2/Makefile.in.orig	2007-03-12 01:35:07.000000000 +0100
+--- src/plugins/exiv2/Makefile.in.orig	2007-07-05 01:39:12.000000000 +0200
 +++ src/plugins/exiv2/Makefile.in
-@@ -308,11 +308,11 @@ libextractor_exiv2_la_LINK = \
+@@ -312,11 +312,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
deleted file mode 100644
index 4f56f27aa09..00000000000
--- a/devel/libextractor/patches/patch-ae
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ae,v 1.7 2007/03/18 12:34:31 adam Exp $
-
---- configure.orig	2007-03-11 22:48:17.000000000 +0100
-+++ configure
-@@ -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
--  eval ac_define_dir="\"$datadir/locale\""
-+  eval eval ac_define_dir="\"$datadir/locale\""
-   LOCALEDIR="$ac_define_dir"
- 
- 
-@@ -29082,7 +29082,7 @@ fi
- 
- 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 @@ 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
deleted file mode 100644
index bce94b5c6c1..00000000000
--- a/devel/libextractor/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.6 2007/03/18 12:34:31 adam Exp $
-
---- configure.ac.orig	2007-03-11 22:46:56.000000000 +0100
-+++ configure.ac
-@@ -236,7 +236,7 @@ AC_ARG_ENABLE(glib,
- 
- 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!
-     AM_CONDITIONAL(HAVE_GLIB,true)