Honour PKG_SYSCONFDIR properly. Bump PKGREVISION to 1.

4 files changed, 28 insertions, 10 deletions

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index c22089dccec..150ea919138 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2004/03/30 20:24:35 minskim Exp $
+# $NetBSD: Makefile,v 1.90 2004/04/05 22:07:27 jmmv Exp $
 #
 
 DISTNAME=	gimp-${GIMP_VER}
@@ -25,7 +25,7 @@ USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 USE_GNU_TOOLS+=		make
 
-PKG_SYSCONFSUBDIR=	gimp-2.0
+PKG_SYSCONFSUBDIR=	gimp/2.0
 
 PKGCONFIG_OVERRIDE=	gimp-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	gimpthumb-2.0.pc.in
@@ -39,6 +39,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-perl
 CONFIGURE_ARGS+=	--disable-print
 CONFIGURE_ARGS+=	--disable-python
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html/${PKGNAME}
 
 EGDIR=			${PREFIX}/share/examples/gimp-2.0
diff --git a/graphics/gimp/PLIST b/graphics/gimp/PLIST
index ac0c05bd138..2871f8f8f8e 100644
--- a/graphics/gimp/PLIST
+++ b/graphics/gimp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/04/05 08:02:56 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/04/05 22:07:27 jmmv Exp $
 bin/gimp
 bin/gimp-2.0
 bin/gimp-remote
@@ -416,12 +416,6 @@ share/doc/html/${PKGNAME}/libgimp/libgimp.html
 share/doc/html/${PKGNAME}/libgimp/libgimpui.html
 share/doc/html/${PKGNAME}/libgimp/right.png
 share/doc/html/${PKGNAME}/libgimp/up.png
-share/examples/gimp-2.0/gimprc
-share/examples/gimp-2.0/gtkrc
-share/examples/gimp-2.0/ps-menurc
-share/examples/gimp-2.0/sessionrc
-share/examples/gimp-2.0/templaterc
-share/examples/gimp-2.0/unitrc
 share/doc/html/${PKGNAME}/libgimpbase/home.png
 share/doc/html/${PKGNAME}/libgimpbase/index.html
 share/doc/html/${PKGNAME}/libgimpbase/index.sgml
@@ -792,6 +786,12 @@ share/doc/html/${PKGNAME}/libgimpwidgets/stock-wilber-48.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-wilber-64.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-wilber-eek-64.png
 share/doc/html/${PKGNAME}/libgimpwidgets/up.png
+share/examples/gimp-2.0/gimprc
+share/examples/gimp-2.0/gtkrc
+share/examples/gimp-2.0/ps-menurc
+share/examples/gimp-2.0/sessionrc
+share/examples/gimp-2.0/templaterc
+share/examples/gimp-2.0/unitrc
 share/gimp/2.0/brushes/10x10square.gbr
 share/gimp/2.0/brushes/10x10squareBlur.gbr
 share/gimp/2.0/brushes/11circle.gbr
@@ -1710,6 +1710,7 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gimp20-script-fu.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gimp20-std-plug-ins.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gimp20.mo
 share/mime-info/gimp-2.0.keys
+@comment in xdg-dirs: @dirrm share/mime-info
 @dirrm share/gimp/2.0/tips
 @dirrm share/gimp/2.0/themes/Small
 @dirrm share/gimp/2.0/themes/Default/images/preferences
@@ -1744,6 +1745,8 @@ share/mime-info/gimp-2.0.keys
 @dirrm share/doc/html/${PKGNAME}/libgimpbase
 @dirrm share/doc/html/${PKGNAME}/libgimp
 @dirrm share/doc/html/${PKGNAME}
+@comment in xdg-dirs: @dirrm share/applications
+@comment in xdg-dirs: @dirrm share/application-registry
 @dirrm lib/gimp/2.0/plug-ins
 @dirrm lib/gimp/2.0/modules
 @dirrm lib/gimp/2.0/environ
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 19004842712..e641ce0fe61 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.7 2004/03/30 19:04:19 minskim Exp $
+$NetBSD: distinfo,v 1.8 2004/04/05 22:07:27 jmmv Exp $
 
 SHA1 (gimp-2.0.0.tar.bz2) = a11ef68bc363049bdbb902854d3161faa8cb67f7
 Size (gimp-2.0.0.tar.bz2) = 13208717 bytes
 SHA1 (patch-aa) = b233a944fa69481685770aa4d5b24a07f127afcf
+SHA1 (patch-ab) = e64e0f80bff3697b549c33a5f8c140928b7bb4b1
diff --git a/graphics/gimp/patches/patch-ab b/graphics/gimp/patches/patch-ab
new file mode 100644
index 00000000000..45b0facc1c3
--- /dev/null
+++ b/graphics/gimp/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.7 2004/04/05 22:07:27 jmmv Exp $
+
+--- configure.orig	2004-03-23 16:51:10.000000000 +0100
++++ configure
+@@ -32872,7 +32872,7 @@ fi;
+ 
+ gimpdatadir="$datadir/$PACKAGE/2.0"
+ gimpplugindir="$libdir/$PACKAGE/2.0"
+-gimpsysconfdir="$sysconfdir/$PACKAGE/2.0"
++gimpsysconfdir="$sysconfdir"
+ 
+ localedir='${prefix}/${DATADIRNAME}/locale'
+