Use config file handling from pkginstall. Bump PKGREVISION.

Ok rh@

4 files changed, 25 insertions, 7 deletions

diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 820d79f0063..645b401a0ee 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2006/02/05 23:08:43 joerg Exp $
+# $NetBSD: Makefile,v 1.27 2006/03/03 07:24:10 wiz Exp $
 
 DISTNAME=	gnustep-make-1.11.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP:=core/}
 
@@ -14,6 +14,9 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		INSTALL_PROGRAM=${INSTALL_SCRIPT:Q}
 
+CONF_FILES+=		${PREFIX}/share/examples/GNUstep/GNUstep.conf \
+			${PREFIX}/etc/GNUstep.conf
+
 .include "../../mk/x11.buildlink3.mk"
 .include "gnustep.mk"
 
diff --git a/devel/gnustep-make/PLIST b/devel/gnustep-make/PLIST
index bd1f6d5278e..eb6a42d9fa6 100644
--- a/devel/gnustep-make/PLIST
+++ b/devel/gnustep-make/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2006/01/17 07:35:55 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2006/03/03 07:24:10 wiz Exp $
 share/GNUstep/System/Library/Makefiles/GNUstep-reset.sh
 share/GNUstep/System/Library/Makefiles/GNUstep.csh
 share/GNUstep/System/Library/Makefiles/GNUstep.sh
@@ -115,6 +115,8 @@ share/GNUstep/System/Tools/debugapp
 share/GNUstep/System/Tools/openapp
 share/GNUstep/System/Tools/opentool
 share/GNUstep/System/share/config.site
+share/examples/GNUstep/GNUstep.conf
+@dirrm share/examples/GNUstep
 @dirrm share/GNUstep/System/share
 @exec ${MKDIR} %D/share/GNUstep/System/Tools/Resources
 @dirrm share/GNUstep/System/Tools/Resources
diff --git a/devel/gnustep-make/distinfo b/devel/gnustep-make/distinfo
index 7c063bad16b..0d07299159b 100644
--- a/devel/gnustep-make/distinfo
+++ b/devel/gnustep-make/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2006/01/17 07:35:55 adam Exp $
+$NetBSD: distinfo,v 1.17 2006/03/03 07:24:10 wiz Exp $
 
 SHA1 (gnustep-make-1.11.2.tar.gz) = 8557a1c79389a47d71860dd138eebdd6c88bbc0d
 RMD160 (gnustep-make-1.11.2.tar.gz) = d92d81363b2b57df50a3069e3f1a5695645270e5
@@ -6,4 +6,4 @@ Size (gnustep-make-1.11.2.tar.gz) = 395036 bytes
 SHA1 (patch-aa) = 2b727a92404aeead88c9699fee144bfb0114370b
 SHA1 (patch-ac) = 89ef9d05f3059443b3bf262b2efb1c6679d62708
 SHA1 (patch-ad) = 9815debc95e9abf056b791560f32b41d4369cf2f
-SHA1 (patch-ae) = 72b446e914a59b8cfe4d5edc164fa33bc8ea3c4b
+SHA1 (patch-ae) = 8a5bc5c0606c8e667607874eeee72d46333ea00f
diff --git a/devel/gnustep-make/patches/patch-ae b/devel/gnustep-make/patches/patch-ae
index a73cc2d9999..6d8f70315f7 100644
--- a/devel/gnustep-make/patches/patch-ae
+++ b/devel/gnustep-make/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.2 2006/01/17 07:35:55 adam Exp $
+$NetBSD: patch-ae,v 1.3 2006/03/03 07:24:10 wiz Exp $
 
---- GNUmakefile.in.orig	2005-11-28 22:07:45.000000000 +0100
+--- GNUmakefile.in.orig	2005-11-28 21:07:45.000000000 +0000
 +++ GNUmakefile.in
 @@ -113,7 +113,7 @@ all: generated-files which_lib$(EXEEXT)
  # used. (I mean: 'cd core/make; cd ..; mkdir make-build; cd
@@ -11,3 +11,16 @@ $NetBSD: patch-ae,v 1.2 2006/01/17 07:35:55 adam Exp $
  
  ifeq ($(messages),yes)
    EC = 
+@@ -141,9 +141,9 @@ install: all @GNUSTEP_MOVE_OBSOLETE@
+ 		$(makedir)/Instance \
+ 		$(makedir)/Instance/Shared \
+ 		$(makedir)/Instance/Documentation)
+-	$(EC)(echo "Installing GNUstep configuration file in $(GNUSTEP_CONFIG_FILE)"; \
+-	 $(srcdir)/mkinstalldirs "$(GNUSTEP_CONFIG_FILE_DIR)"; \
+-	 $(INSTALL_DATA) GNUstep.conf "$(GNUSTEP_CONFIG_FILE)")
++	$(EC)(echo "Installing GNUstep configuration file"; \
++	 $(srcdir)/mkinstalldirs "${PREFIX}/share/examples/GNUstep"; \
++	 $(INSTALL_DATA) GNUstep.conf "${PREFIX}/share/examples/GNUstep")
+ 	-$(EC) rm -f "$(GNUSTEP_SYSTEM_ROOT)/Makefiles"
+ 	 $(EC)(echo "Installing gnustep-make support software"; \
+ 	   $(INSTALL_PROGRAM) -m 755 which_lib$(EXEEXT) \