Use pkginstall framework for one config file.

Bump PKGREVISION.

4 files changed, 20 insertions, 23 deletions

diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index 182841d41ed..23b6df53b54 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2006/02/05 23:08:38 joerg Exp $
+# $NetBSD: Makefile,v 1.52 2006/02/28 17:41:02 wiz Exp $
 #
 
 DISTNAME=		GConf-1.0.9
-PKGREVISION=		8
+PKGREVISION=		9
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/GConf/1.0/}
 EXTRACT_SUFX=		.tar.bz2
@@ -23,18 +23,14 @@ PKGCONFIG_OVERRIDE=	gconf.pc.in
 
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE:Q}
 
+REQD_DIRS+=		${PKG_SYSCONFDIR}/gconf ${PKG_SYSCONFDIR}/gconf/1
+CONF_FILES+=		${PREFIX}/share/examples/gconf/default.path \
+			${PKG_SYSCONFDIR}/gconf/1/path
+
 pre-build:
 	${RM} -f ${WRKSRC}/gconf/libxml
 	${LN} -sf ${BUILDLINK_DIR}/include/gnome-xml ${WRKSRC}/gconf/libxml
 
-post-install:
-	${TEST} ${PREFIX} = ${LOCALBASE} || \
-	${LN} -fs ${PREFIX}/share/aclocal/gconf-1.m4 \
-	    ${LOCALBASE}/share/aclocal/gconf-1.m4
-	${TEST} -f ${PREFIX}/etc/gconf/1/path || \
-	    ${CP} -p ${PREFIX}/etc/gconf/1/path.example \
-	    ${PREFIX}/etc/gconf/1/path
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/oaf/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
diff --git a/devel/GConf/PLIST b/devel/GConf/PLIST
index c883318254d..d904ecc88f0 100644
--- a/devel/GConf/PLIST
+++ b/devel/GConf/PLIST
@@ -1,13 +1,10 @@
-@comment $NetBSD: PLIST,v 1.17 2005/10/23 17:23:49 wiz Exp $
+@comment $NetBSD: PLIST,v 1.18 2006/02/28 17:41:02 wiz Exp $
 bin/gconf-config
 bin/gconf-config-1
 bin/gconf-sanity-check-1
 bin/gconfd-1
 bin/gconftool
 bin/gconftool-1
-@unexec cmp -s %D/etc/gconf/1/path.example %D/etc/gconf/1/path && rm %D/etc/gconf/1/path || ${TRUE}
-etc/gconf/1/path.example
-@exec test -f %D/etc/gconf/1/path || cp -p %D/%F %D/etc/gconf/1/path
 etc/gconf/schemas/desktop.schemas
 include/gconf/1/gconf/gconf-changeset.h
 include/gconf/1/gconf/gconf-client.h
@@ -24,6 +21,7 @@ lib/libgconf-gtk-1.la
 lib/pkgconfig/gconf.pc
 lib/pkgconfig/gconfgtk.pc
 share/aclocal/gconf-1.m4
+share/examples/gconf/default.path
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/GConf.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/GConf.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/GConf.mo
@@ -55,6 +53,7 @@ ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/GConf.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/GConf.mo
 @exec ${MKDIR} %D/share/gconf/1
 @dirrm share/gconf/1
+@dirrm share/examples/gconf
 @unexec ${RMDIR} %D/share/gconf 2>/dev/null || ${TRUE}
 @dirrm lib/GConf/1
 @unexec ${RMDIR} %D/lib/GConf 2>/dev/null || ${TRUE}
@@ -66,5 +65,5 @@ ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/GConf.mo
 @unexec ${RMDIR} %D/etc/gconf/gconf.xml.mandatory 2>/dev/null || ${TRUE}
 @exec ${MKDIR} %D/etc/gconf/gconf.xml.defaults
 @unexec ${RMDIR} %D/etc/gconf/gconf.xml.defaults 2>/dev/null || ${TRUE}
-@dirrm etc/gconf/1
-@unexec ${RMDIR} %D/etc/gconf 2>/dev/null || ${TRUE}
+@comment in REQD_DIRS: @dirrm etc/gconf/1
+@comment in REQD_DIRS: @unexec ${RMDIR} %D/etc/gconf 2>/dev/null || ${TRUE}
diff --git a/devel/GConf/distinfo b/devel/GConf/distinfo
index 04088575ccc..00e7ec6aa3f 100644
--- a/devel/GConf/distinfo
+++ b/devel/GConf/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2005/06/07 15:37:54 minskim Exp $
+$NetBSD: distinfo,v 1.14 2006/02/28 17:41:02 wiz Exp $
 
 SHA1 (GConf-1.0.9.tar.bz2) = 91a1172c7855a235bf09e2ab925343a2e5250c13
 RMD160 (GConf-1.0.9.tar.bz2) = d5cb8ae92146c33bc6ea073b485c3ad6f12f6cc7
@@ -6,4 +6,4 @@ Size (GConf-1.0.9.tar.bz2) = 784363 bytes
 SHA1 (patch-aa) = 2ca0b21fb70f9355235a8bd1fc38f6a75175f493
 SHA1 (patch-ab) = f5aeeab7156015f813203d49879c4f7dd7015c4f
 SHA1 (patch-ac) = 349322bdbf90f70f77c548286ea3a8768ae95c63
-SHA1 (patch-ae) = 91a8bcd108b4f6682fe559db5b6af7f37a41533b
+SHA1 (patch-ae) = 184a4dae4837832cb0625c112ea51c802e225d0c
diff --git a/devel/GConf/patches/patch-ae b/devel/GConf/patches/patch-ae
index f2594bd8f86..ad1dc12043f 100644
--- a/devel/GConf/patches/patch-ae
+++ b/devel/GConf/patches/patch-ae
@@ -1,13 +1,15 @@
-$NetBSD: patch-ae,v 1.3 2002/03/20 12:36:45 wiz Exp $
+$NetBSD: patch-ae,v 1.4 2006/02/28 17:41:02 wiz Exp $
 
---- gconf/Makefile.in.orig	Fri Mar 15 05:18:42 2002
+--- gconf/Makefile.in.orig	2002-03-15 04:18:42.000000000 +0000
 +++ gconf/Makefile.in
-@@ -615,7 +615,7 @@
+@@ -614,8 +614,8 @@ install-exec-local:
+ 	(cd $(DESTDIR)$(bindir) && $(LN_S) -f gconftool-$(MAJOR_VERSION) gconftool)
  
  install-data-local:
- 	-mkdir -p $(DESTDIR)$(sysconfdir)/gconf/$(MAJOR_VERSION)
+-	-mkdir -p $(DESTDIR)$(sysconfdir)/gconf/$(MAJOR_VERSION)
 -	$(INSTALL_DATA) default.path $(DESTDIR)$(sysconfdir)/gconf/$(MAJOR_VERSION)/path
-+	$(INSTALL_DATA) default.path $(DESTDIR)$(sysconfdir)/gconf/$(MAJOR_VERSION)/path.example
++	-mkdir -p $(DESTDIR)$(datadir)/examples/gconf
++	$(INSTALL_DATA) default.path $(DESTDIR)$(datadir)/examples/gconf
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.