Make gimp-base install its configuration files under the examples directory

and place them in the right directory using PKG_SYSCONFDIR stuff.
Bump PKGREVISION to 3.

Approved by wiz.

4 files changed, 38 insertions, 12 deletions

diff --git a/graphics/gimp-base/Makefile b/graphics/gimp-base/Makefile
index 226bfca3ce5..7802fbf1902 100644
--- a/graphics/gimp-base/Makefile
+++ b/graphics/gimp-base/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/12/01 13:49:40 salo Exp $
+# $NetBSD: Makefile,v 1.8 2002/12/21 23:29:25 jmmv Exp $
 
 DISTNAME=		gimp-1.2.3
 PKGNAME=		gimp-base-1.2.3
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		graphics
 MASTER_SITES=		ftp://ftp.gimp.org/pub/gimp/v1.2/v1.2.3/ \
 			ftp://ftp.fu-berlin.de/unix/X11/graphics/gimp/v1.2/v1.2.3/ \
@@ -28,6 +28,7 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 .include "../../mk/bsd.prefs.mk"
 
 GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--disable-perl
 CONFIGURE_ARGS+=	--disable-python
 
@@ -47,6 +48,16 @@ PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
 BUILD_DEFS+=		GIMP_WITH_HELPBROWSER
 
+# Configuration files
+PKG_SYSCONFSUBDIR=	gimp/1.2
+EGDIR=			${PREFIX}/share/examples/gimp/1.2
+CONF_FILES+=		${EGDIR}/gimprc ${PKG_SYSCONFDIR}/gimprc
+CONF_FILES+=		${EGDIR}/gimprc_user ${PKG_SYSCONFDIR}/gimprc_user
+CONF_FILES+=		${EGDIR}/gtkrc ${PKG_SYSCONFDIR}/gtkrc
+CONF_FILES+=		${EGDIR}/gtkrc_user ${PKG_SYSCONFDIR}/gtkrc_user
+CONF_FILES+=		${EGDIR}/ps-menurc ${PKG_SYSCONFDIR}/ps-menurc
+CONF_FILES+=		${EGDIR}/unitrc ${PKG_SYSCONFDIR}/unitrc
+
 pre-build:
 	${BUILDLINK_CC} -o ${WRKSRC}/docs/pdb_self_doc			\
 		${FILESDIR}/pdb_self_doc.c
@@ -69,4 +80,5 @@ PLIST_SUBST+=	HELPBROWSER="@comment "
 .include "../../x11/gtk/buildlink2.mk"
 .endif
 
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp-base/PLIST b/graphics/gimp-base/PLIST
index a37dfb69c49..8557993bc40 100644
--- a/graphics/gimp-base/PLIST
+++ b/graphics/gimp-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/09 16:01:26 tron Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/12/21 23:29:25 jmmv Exp $
 bin/gimp
 bin/gimp-1.2
 bin/gimp-config
@@ -6,12 +6,6 @@ bin/gimp-remote
 bin/gimp-remote-1.2
 bin/gimptool
 bin/gimptool-1.2
-etc/gimp/1.2/gimprc
-etc/gimp/1.2/gimprc_user
-etc/gimp/1.2/gtkrc
-etc/gimp/1.2/gtkrc_user
-etc/gimp/1.2/ps-menurc
-etc/gimp/1.2/unitrc
 include/gck/gck.h
 include/libgimp/gimp.h
 include/libgimp/gimp_pdb.h
@@ -283,6 +277,12 @@ man/man1/gimptool.1
 man/man5/gimprc-1.2.5
 man/man5/gimprc.5
 share/aclocal/gimp.m4
+share/examples/gimp/1.2/gimprc
+share/examples/gimp/1.2/gimprc_user
+share/examples/gimp/1.2/gtkrc
+share/examples/gimp/1.2/gtkrc_user
+share/examples/gimp/1.2/ps-menurc
+share/examples/gimp/1.2/unitrc
 share/gimp/1.2/brushes/10x10square.gbr
 share/gimp/1.2/brushes/10x10squareBlur.gbr
 share/gimp/1.2/brushes/11circle.gbr
@@ -1512,6 +1512,8 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gimp.mo
 @dirrm share/gimp/1.2/brushes
 @dirrm share/gimp/1.2
 @dirrm share/gimp
+@dirrm share/examples/gimp/1.2
+@dirrm share/examples/gimp
 @unexec ${RMDIR} %D/share/aclocal 2>/dev/null || ${TRUE}
 @dirrm lib/gimp/1.2/plug-ins
 @dirrm lib/gimp/1.2/modules
@@ -1519,7 +1521,5 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gimp.mo
 @dirrm lib/gimp
 @dirrm include/libgimp
 @dirrm include/gck
-@dirrm etc/gimp/1.2
-@dirrm etc/gimp
 @exec test %D = ${LOCALBASE} || ln -s %D/share/aclocal/gimp.m4 ${LOCALBASE}/share/aclocal/gimp.m4
 @unexec test %D = ${LOCALBASE} || ${RM} ${LOCALBASE}/share/aclocal/gimp.m4
diff --git a/graphics/gimp-base/distinfo b/graphics/gimp-base/distinfo
index 55e13934999..fa1c1d9a140 100644
--- a/graphics/gimp-base/distinfo
+++ b/graphics/gimp-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/09/24 09:34:38 jlam Exp $
+$NetBSD: distinfo,v 1.3 2002/12/21 23:29:26 jmmv Exp $
 
 SHA1 (gimp-1.2.3.tar.bz2) = 3cb2686fcdc7995888b76d175e1c7bc33b2b4707
 Size (gimp-1.2.3.tar.bz2) = 10795020 bytes
@@ -6,3 +6,4 @@ SHA1 (gimp-data-extras-1.2.0.tar.bz2) = 93e966544a4f507e2b9045e0cc0745bd0ae1ee81
 Size (gimp-data-extras-1.2.0.tar.bz2) = 4432926 bytes
 SHA1 (patch-aa) = 2d2f7ce110822522314aebfd86c06ebcbdbabb9d
 SHA1 (patch-ab) = fd8dcdaffc70e4fc905f98d1af82b2ee13e3eed1
+SHA1 (patch-ac) = 9949ba730b031132a183cabf69025e36500c70f0
diff --git a/graphics/gimp-base/patches/patch-ac b/graphics/gimp-base/patches/patch-ac
new file mode 100644
index 00000000000..8cbd5fc1f4c
--- /dev/null
+++ b/graphics/gimp-base/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.3 2002/12/21 23:29:26 jmmv Exp $
+
+--- Makefile.in.orig	Mon Feb 11 22:45:59 2002
++++ Makefile.in
+@@ -173,7 +173,7 @@ brushdata = @brushdata@
+ gimpdatadir = @gimpdatadir@
+ gimpdir = @gimpdir@
+ gimpplugindir = @gimpplugindir@
+-gimpsysconfdir = @gimpsysconfdir@
++gimpsysconfdir = @datadir@/examples/@PACKAGE@/@GIMP_MAJOR_VERSION@.@GIMP_MINOR_VERSION@
+ gradientdata = @gradientdata@
+ localedir = @localedir@
+ ms_librarian = @ms_librarian@