Make this package install its configuration files in the examples directory

and use PKG_SYSCONFDIR stuff to copy them to the right place. Bump
PKGREVISION to 2.

Approved by wiz.

This closes my own PR 18998.

5 files changed, 48 insertions, 10 deletions

diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 1c436d855e1..b106a0f50a9 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2002/10/30 03:09:33 rh Exp $
+# $NetBSD: Makefile,v 1.72 2002/11/26 12:32:20 jmmv Exp $
 #
 
 DISTNAME=		imlib-1.9.14
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/imlib/1.9/}
 
@@ -24,6 +24,18 @@ USE_BUILDLINK2=		yes
 CPPFLAGS+=		-DENABLE_NLS
 CONFIGURE_ENV+=		ac_cv_path_CONVERT_PROG="${LOCALBASE}/bin/convert"
 CONFIGURE_ENV+=		X_LDFLAGS="${X_LDFLAGS}"
+CONFIGURE_ARGS+=	--sysconfdir="${PKG_SYSCONFDIR}"
+
+PKG_SYSCONFSUBDIR=	imlib
+
+EGDIR=			${PREFIX}/share/examples/imlib
+CONF_FILES=		${EGDIR}/imrc ${PKG_SYSCONFDIR}/imrc
+CONF_FILES+=		${EGDIR}/im_palette.pal \
+			${PKG_SYSCONFDIR}/im_palette.pal
+CONF_FILES+=		${EGDIR}/im_palette-small.pal \
+			${PKG_SYSCONFDIR}/im_palette-small.pal
+CONF_FILES+=		${EGDIR}/im_palette-tiny.pal \
+			${PKG_SYSCONFDIR}/im_palette-tiny.pal
 
 # The following ensures that `imlib-config --libs' includes the correct
 # linker flags for linking the X11 libs.
@@ -46,4 +58,5 @@ post-install:
 .include "../../graphics/tiff/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/imlib/PLIST b/graphics/imlib/PLIST
index 68b6079c58c..659ead41092 100644
--- a/graphics/imlib/PLIST
+++ b/graphics/imlib/PLIST
@@ -1,10 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2002/03/29 18:01:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/11/26 12:32:20 jmmv Exp $
 bin/imlib_config
 bin/imlib-config
-etc/imrc
-etc/im_palette.pal
-etc/im_palette-small.pal
-etc/im_palette-tiny.pal
 include/gdk_imlib.h
 include/gdk_imlib_private.h
 include/gdk_imlib_types.h
@@ -59,6 +55,11 @@ share/doc/imlib/curve1.gif
 share/doc/imlib/curve2.gif
 share/doc/imlib/imlib.gif
 share/doc/imlib/index.html
+share/examples/imlib/imrc
+share/examples/imlib/im_palette.pal
+share/examples/imlib/im_palette-small.pal
+share/examples/imlib/im_palette-tiny.pal
+@dirrm share/examples/imlib
 @dirrm share/doc/imlib
 @exec test %D = ${LOCALBASE} || ln -fs %D/share/aclocal/imlib.m4 ${LOCALBASE}/share/aclocal/imlib.m4
 @unexec test %D = ${LOCALBASE} || ${RM} ${LOCALBASE}/share/aclocal/imlib.m4
diff --git a/graphics/imlib/buildlink2.mk b/graphics/imlib/buildlink2.mk
index 912c944c313..ecf1c73435f 100644
--- a/graphics/imlib/buildlink2.mk
+++ b/graphics/imlib/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:11 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2002/11/26 12:32:20 jmmv Exp $
 
 .if !defined(IMLIB_BUILDLINK2_MK)
 IMLIB_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		imlib
-BUILDLINK_DEPENDS.imlib?=	imlib>=1.9.11nb1
+BUILDLINK_DEPENDS.imlib?=	imlib>=1.9.11nb2
 BUILDLINK_PKGSRCDIR.imlib?=	../../graphics/imlib
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.imlib=imlib
diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo
index 1a6875ce0f3..86c34a94c29 100644
--- a/graphics/imlib/distinfo
+++ b/graphics/imlib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2002/10/30 03:09:33 rh Exp $
+$NetBSD: distinfo,v 1.13 2002/11/26 12:32:20 jmmv Exp $
 
 SHA1 (imlib-1.9.14.tar.gz) = 3c8c8c3aaec3cc5a9fc924060a71223862a313f6
 Size (imlib-1.9.14.tar.gz) = 748591 bytes
@@ -6,3 +6,4 @@ SHA1 (patch-aa) = 185a5229af781d3dbc57978a3f4acd8308ca4c14
 SHA1 (patch-ab) = df9f9f7c85f0794748a4ca6f58836f8dd230c805
 SHA1 (patch-ae) = 3ed6fff2e73f04ec83c27dc6e3f2db2fa446abbb
 SHA1 (patch-ag) = 0ed464cb26492f3eebb8812efdb49ee83ef4ae6b
+SHA1 (patch-ah) = 703f83ad25e0a8af8427ccd4d8492f7fa83f26a3
diff --git a/graphics/imlib/patches/patch-ah b/graphics/imlib/patches/patch-ah
new file mode 100644
index 00000000000..bf1841071ef
--- /dev/null
+++ b/graphics/imlib/patches/patch-ah
@@ -0,0 +1,23 @@
+$NetBSD: patch-ah,v 1.1 2002/11/26 12:32:21 jmmv Exp $
+
+--- config/Makefile.in.orig	Mon Mar 25 17:50:27 2002
++++ config/Makefile.in
+@@ -23,7 +23,8 @@ bindir = @bindir@
+ sbindir = @sbindir@
+ libexecdir = @libexecdir@
+ datadir = @datadir@
+-sysconfdir = @sysconfdir@
++realsysconfdir = @sysconfdir@
++sysconfdir = @datadir@/examples/@PACKAGE@
+ sharedstatedir = @sharedstatedir@
+ localstatedir = @localstatedir@
+ libdir = @libdir@
+@@ -219,7 +220,7 @@ maintainer-clean-generic clean mostlycle
+ 
+ 
+ imrc: imrc.in
+-	sed -e 's,\@sysconfdir\@,$(sysconfdir),g' \
++	sed -e 's,\@sysconfdir\@,$(realsysconfdir),g' \
+ 		< $(srcdir)/imrc.in > imrc.tmp \
+ 	&& mv imrc.tmp imrc
+