Work around a broken configure script (which failed to expand an m4

macro during generation, leading to GCONF_SCHEMA_FILE_DIR not set),
and a Makefile not using the GCONF_SCHEMAS_INSTALL conditional
correctly. Now the schema file is installed again.
bump PKGREVISION

4 files changed, 25 insertions, 3 deletions

diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 0c3e4c3bdb1..1395d0998e3 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.47 2007/07/19 22:40:29 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2007/07/28 14:42:17 drochner Exp $
 #
 
 DISTNAME=	libgsf-1.14.5
+PKGREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgsf/1.14/}
 EXTRACT_SUFX=	.tar.bz2
@@ -22,6 +23,9 @@ PKGCONFIG_OVERRIDE+=	libgsf-gnome-1.pc.in
 
 CONFIGURE_ARGS+=	--without-python
 
+# XXX workaround for missing substitution in configure
+MAKE_ENV+=	GCONF2_SCHEMAS_DIR=${GCONF2_SCHEMAS_DIR}
+
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
diff --git a/devel/libgsf/PLIST b/devel/libgsf/PLIST
index 526e19a188a..8016c433795 100644
--- a/devel/libgsf/PLIST
+++ b/devel/libgsf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2007/07/19 22:40:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.19 2007/07/28 14:42:18 drochner Exp $
 bin/gsf
 bin/gsf-office-thumbnailer
 bin/gsf-vba-dump
@@ -59,6 +59,7 @@ lib/pkgconfig/libgsf-1.pc
 lib/pkgconfig/libgsf-gnome-1.pc
 man/man1/gsf-office-thumbnailer.1
 man/man1/gsf.1
+share/gconf/schemas/gsf-office-thumbnailer.schemas
 share/gtk-doc/html/gsf/GsfClipData.html
 share/gtk-doc/html/gsf/api.html
 share/gtk-doc/html/gsf/dependencies.html
diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo
index 3789a1015c8..75eae37322a 100644
--- a/devel/libgsf/distinfo
+++ b/devel/libgsf/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.20 2007/07/19 22:40:30 wiz Exp $
+$NetBSD: distinfo,v 1.21 2007/07/28 14:42:18 drochner Exp $
 
 SHA1 (libgsf-1.14.5.tar.bz2) = 92b2f1f5e2d9a5b940b9a387928785f1e93220a4
 RMD160 (libgsf-1.14.5.tar.bz2) = c1ca17872d308a7d9b611af6b9f576bd8523f0f9
 Size (libgsf-1.14.5.tar.bz2) = 541647 bytes
+SHA1 (patch-aa) = 2bfd206d45abd91ed8d5237df76a6128383e1322
diff --git a/devel/libgsf/patches/patch-aa b/devel/libgsf/patches/patch-aa
new file mode 100644
index 00000000000..dfc335ad08f
--- /dev/null
+++ b/devel/libgsf/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.5 2007/07/28 14:42:18 drochner Exp $
+
+--- thumbnailer/Makefile.in.orig	2007-07-10 12:34:49.000000000 +0200
++++ thumbnailer/Makefile.in
+@@ -296,8 +296,9 @@ schema_files = \
+ 	gsf-office-thumbnailer.schemas.in
+ 
+ schemas = gsf-office-thumbnailer.schemas
+-schemadir = $(GCONF_SCHEMA_FILE_DIR)
+-@GCONF_SCHEMAS_INSTALL_TRUE@schema_DATA = $(schemas)
++# XXX workaround for missing substitution in configure
++schemadir = ${GCONF2_SCHEMAS_DIR}
++schema_DATA = $(schemas)
+ EXTRA_DIST = \
+ 	$(schema_files)  
+