Make this package install its configuration files under the examples tree

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

6 files changed, 56 insertions, 6 deletions

diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index a24dc7e1233..12a15de70c1 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2002/11/25 20:48:42 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2003/01/02 23:54:55 jmmv Exp $
 #
 
 DISTNAME=	libggi-2.0b2.1
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.ggi-project.org/pub/ggi/ggi/current/
 
@@ -19,6 +20,12 @@ LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--disable-debug
 CONFIGURE_ARGS+=	--with-x
+CONFIGURE_ARGS+=	--sysconfdir="${PKG_SYSCONFDIR}"
+
+PKG_SYSCONFSUBDIR=	ggi
+EGDIR=			${PREFIX}/share/examples/ggi
+CONF_FILES=		${EGDIR}/libggi.conf ${PKG_SYSCONFDIR}/libggi.conf
+CONF_FILES+=		${EGDIR}/libggimisc.conf ${PKG_SYSCONFDIR}/libggimisc.conf
 
 PLIST_SRC=	${WRKDIR}/PLIST
 
@@ -33,4 +40,5 @@ post-configure:
 .include "../../devel/ncurses/buildlink2.mk"
 .include "../../graphics/libgii/buildlink2.mk"
 
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/libggi/PLIST b/graphics/libggi/PLIST
index 7d936431594..ccf3a860fac 100644
--- a/graphics/libggi/PLIST
+++ b/graphics/libggi/PLIST
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2002/01/17 01:13:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/01/02 23:54:55 jmmv Exp $
 bin/cube3d
 bin/monitest
-etc/ggi/libggi.conf
-etc/ggi/libggimisc.conf
 include/ggi/display/aa.h
 include/ggi/display/fbdev.h
 include/ggi/display/file.h
@@ -213,10 +211,12 @@ man/man3/ggiUnmapPixel.3
 man/man3/ggiUnpackPixels.3
 man/man6/cube3d.6
 man/man7/libggi.7
+share/examples/ggi/libggi.conf
+share/examples/ggi/libggimisc.conf
+@comment in libgii: @dirrm share/examples/ggi
 @dirrm lib/ggi/display
 @dirrm lib/ggi/default
 @comment in libgii: @dirrm lib/ggi
 @comment in libgii: @dirrm include/ggi/internal
 @dirrm include/ggi/display
 @comment in libgii: @dirrm include/ggi
-@comment in libgii: @dirrm etc/ggi
diff --git a/graphics/libggi/distinfo b/graphics/libggi/distinfo
index e2866429ef0..4ba112cf5d6 100644
--- a/graphics/libggi/distinfo
+++ b/graphics/libggi/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.4 2002/11/25 20:48:42 jlam Exp $
+$NetBSD: distinfo,v 1.5 2003/01/02 23:54:56 jmmv Exp $
 
 SHA1 (libggi-2.0b2.1.tar.gz) = 698de63108a58fa1fc08942266118dc2fccf482c
 Size (libggi-2.0b2.1.tar.gz) = 658294 bytes
+SHA1 (patch-aa) = a911683d105418a8825e1ed8e3405a1069ca8ff2
+SHA1 (patch-ab) = 01b34bfced54470e53259fdb36f1e7def711d7d3
 SHA1 (patch-ac) = 144fe4919dbc1d6434cf764db52a5752be06974b
 SHA1 (patch-ad) = e89cc8c86efabee6495c66d031004c6bf36b152b
+SHA1 (patch-ae) = 62dcb369166ebe88d73bbccedcad0b9b9b1dde4a
diff --git a/graphics/libggi/patches/patch-aa b/graphics/libggi/patches/patch-aa
new file mode 100644
index 00000000000..897f99dfff8
--- /dev/null
+++ b/graphics/libggi/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2003/01/02 23:54:56 jmmv Exp $
+
+--- configure.orig	Sun May 16 19:57:10 1999
++++ configure
+@@ -5613,7 +5613,7 @@ test "x$exec_prefix" = xNONE && exec_pre
+ 
+ eval foo="$libdir"
+ eval ggi_libdir="$foo"
+-eval ggi_confdir="$sysconfdir/ggi"
++eval ggi_confdir="$sysconfdir"
+ 
+ 
+ 
diff --git a/graphics/libggi/patches/patch-ab b/graphics/libggi/patches/patch-ab
new file mode 100644
index 00000000000..a3d0304983f
--- /dev/null
+++ b/graphics/libggi/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.4 2003/01/02 23:54:57 jmmv Exp $
+
+--- Makefile.in.orig	Sun May 16 22:49:35 1999
++++ Makefile.in
+@@ -93,7 +93,7 @@ AUTOMAKE_OPTIONS = foreign
+ 
+ SUBDIRS = include ggi display default extensions programs doc
+ 
+-ggiconfdatadir = @ggi_confdir@
++ggiconfdatadir = @datadir@/examples/ggi
+ ggiconfdata_DATA = libggi.conf
+ 
+ noinst_PROGRAMS = patchlib
diff --git a/graphics/libggi/patches/patch-ae b/graphics/libggi/patches/patch-ae
new file mode 100644
index 00000000000..79518a29391
--- /dev/null
+++ b/graphics/libggi/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2003/01/02 23:54:58 jmmv Exp $
+
+--- extensions/misc/Makefile.in.orig	Fri Jan  3 00:45:40 2003
++++ extensions/misc/Makefile.in
+@@ -92,7 +92,7 @@ xf86dga_libs = @xf86dga_libs@
+ 
+ SUBDIRS = ggimisc display demos
+ 
+-ggiconfdatadir = @ggi_confdir@
++ggiconfdatadir = @datadir@/examples/ggi
+ ggiconfdata_DATA = libggimisc.conf
+ 
+ DISTCLEANFILES = libggimisc.conf