Make this package install its configuration file under the examples tree

and use bsd.pkg.install.mk to copy it to PKG_SYSCONFDIR.
Bump PKGREVISION to 1.

5 files changed, 40 insertions, 5 deletions

diff --git a/graphics/libgii/Makefile b/graphics/libgii/Makefile
index 3b1f453baef..d7ff8b53e5f 100644
--- a/graphics/libgii/Makefile
+++ b/graphics/libgii/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/11/25 20:16:26 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/02 23:15:44 jmmv Exp $
 #
 
 DISTNAME=	libgii-0.6
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.ggi-project.org/pub/ggi/ggi/current/
 
@@ -18,5 +19,11 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--enable-mutexes=int
 CONFIGURE_ARGS+=	--with-x
+CONFIGURE_ARGS+=	--sysconfdir="${PKG_SYSCONFDIR}"
 
+PKG_SYSCONFSUBDIR=	ggi
+EGDIR=			${PREFIX}/share/examples/ggi
+CONF_FILES=		${EGDIR}/libgii.conf ${PKG_SYSCONFDIR}/libgii.conf
+
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libgii/PLIST b/graphics/libgii/PLIST
index b5ac7ff44f0..42da8a02c3c 100644
--- a/graphics/libgii/PLIST
+++ b/graphics/libgii/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2002/11/25 20:16:26 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/01/02 23:15:44 jmmv Exp $
 bin/mhub
 bin/xsendbut
-etc/ggi/libgii.conf
 include/ggi/errors.h
 include/ggi/events.h
 include/ggi/gg.h
@@ -68,10 +67,11 @@ man/man3/giiOpen.3
 man/man3/giiPanic.3
 man/man3/giiRemoveEventMask.3
 man/man3/giiSetEventMask.3
+share/examples/ggi/libgii.conf
+@dirrm share/examples/ggi
 @dirrm lib/ggi/input
 @dirrm lib/ggi/filter
 @dirrm lib/ggi
 @dirrm include/ggi/internal
 @dirrm include/ggi/input
 @dirrm include/ggi
-@dirrm etc/ggi
diff --git a/graphics/libgii/distinfo b/graphics/libgii/distinfo
index 1b9b8415dac..9bdd3f3006b 100644
--- a/graphics/libgii/distinfo
+++ b/graphics/libgii/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.4 2002/11/25 20:40:13 jlam Exp $
+$NetBSD: distinfo,v 1.5 2003/01/02 23:15:44 jmmv Exp $
 
 SHA1 (libgii-0.6.tar.gz) = d83d7b045343b1f745e6557208532c959e9e825f
 Size (libgii-0.6.tar.gz) = 258201 bytes
 SHA1 (patch-aa) = addcc0f20a0676464806f152e9466d344ef052ef
 SHA1 (patch-ab) = a3052dbb66ffcd6815709cbcaf6eda3d2b138c77
 SHA1 (patch-ac) = 3c1787495d633f04e7a430de074f36ce19cfb390
+SHA1 (patch-ad) = 0a3ca686488d26b7a55f2e86a3f10ec2d52e1643
+SHA1 (patch-ae) = 56fd144dd17a270838935ac333f27e4948aae28e
diff --git a/graphics/libgii/patches/patch-ad b/graphics/libgii/patches/patch-ad
new file mode 100644
index 00000000000..954ef790451
--- /dev/null
+++ b/graphics/libgii/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2003/01/02 23:15:45 jmmv Exp $
+
+--- Makefile.in.orig	Sun May 16 22:48:52 1999
++++ Makefile.in
+@@ -93,7 +93,7 @@ AUTOMAKE_OPTIONS = foreign
+ 
+ SUBDIRS = include gg gii input filter demos doc
+ 
+-giiconfdatadir = @gii_confdir@
++giiconfdatadir = @datadir@/examples/ggi
+ giiconfdata_DATA = libgii.conf
+ 
+ DISTCLEANFILES = libgii.conf
diff --git a/graphics/libgii/patches/patch-ae b/graphics/libgii/patches/patch-ae
new file mode 100644
index 00000000000..9943409ddbe
--- /dev/null
+++ b/graphics/libgii/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2003/01/02 23:15:46 jmmv Exp $
+
+--- configure.orig	Sun May 16 19:53:19 1999
++++ configure
+@@ -4238,7 +4238,7 @@ test "x$exec_prefix" = xNONE && exec_pre
+ 
+ eval foo="$libdir"
+ eval gii_libdir="$foo"
+-eval gii_confdir="$sysconfdir/ggi"
++eval gii_confdir="$sysconfdir"
+ 
+ 
+