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.

5 files changed, 46 insertions, 9 deletions

diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index 2ec3a22fca2..c8a8bcdc4ed 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2002/10/21 15:44:13 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2002/12/24 17:50:23 jmmv Exp $
 #
 
 DISTNAME=	pspp-0.3.0
+PKGREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	ftp://franz.stat.wisc.edu/pub/PSPP/ \
 		ftp://alpha.gnu.org/gnu/pspp/ \
@@ -21,8 +22,16 @@ BUILD_USES_MSGFMT=	yes
 USE_BUILDLINK2=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-Dunix=1
-MAKE_ENV+=	pkgsysconfdir="${PREFIX}/etc/pspp"
+CONFIGURE_ARGS=	--sysconfdir="${PKG_SYSCONFDIR}"
+
+PKG_SYSCONFSUBDIR=	pspp
+EGDIR=		${PREFIX}/share/examples/pspp
+CONF_FILES=	${EGDIR}/devices ${PKG_SYSCONFDIR}/devices
+CONF_FILES+=	${EGDIR}/html-prologue ${PKG_SYSCONFDIR}/html-prologue
+CONF_FILES+=	${EGDIR}/papersize ${PKG_SYSCONFDIR}/papersize
+CONF_FILES+=	${EGDIR}/ps-prologue ${PKG_SYSCONFDIR}/ps-prologue
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../mk/texinfo.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/pspp/PLIST b/math/pspp/PLIST
index 2a663a00c6e..637c9b6b2c2 100644
--- a/math/pspp/PLIST
+++ b/math/pspp/PLIST
@@ -1,9 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:33 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/12/24 17:50:23 jmmv Exp $
 bin/pspp
-etc/pspp/devices
-etc/pspp/html-prologue
-etc/pspp/papersize
-etc/pspp/ps-prologue
 @unexec ${INSTALL_INFO} --delete %D/info/pspp.info %D/info/dir
 info/pspp.info
 info/pspp.info-1
@@ -18,5 +14,9 @@ info/pspp.info-8
 share/doc/pspp/NEWS
 share/doc/pspp/README
 share/doc/pspp/TODO
-@dirrm etc/pspp
+share/examples/pspp/devices
+share/examples/pspp/html-prologue
+share/examples/pspp/papersize
+share/examples/pspp/ps-prologue
+@dirrm share/examples/pspp
 @dirrm share/doc/pspp
diff --git a/math/pspp/distinfo b/math/pspp/distinfo
index 2347329294f..f832b604d29 100644
--- a/math/pspp/distinfo
+++ b/math/pspp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/10/02 21:23:18 dillo Exp $
+$NetBSD: distinfo,v 1.6 2002/12/24 17:50:23 jmmv Exp $
 
 SHA1 (pspp-0.3.0.tar.gz) = 1d07a7e7ef0677e5934331ed0b80b92c7bba7074
 Size (pspp-0.3.0.tar.gz) = 1122999 bytes
@@ -12,3 +12,5 @@ SHA1 (patch-ah) = 8fd5821c09fcc5ea4f96a198186c99e0d958842d
 SHA1 (patch-ai) = f6886d4cd3779f71353dc0e013f3b37b86fe7474
 SHA1 (patch-aj) = e34a0638b8226efdf33cee4eccd40fc4dcaf6210
 SHA1 (patch-ak) = fc3eee590babb3730c76a8226a4549f32a942280
+SHA1 (patch-al) = b998fc5f7f6c11bc4b862c0c25fd6a810c60ec97
+SHA1 (patch-am) = 0a9cf92a8b15faa73002d7000a4fa8f6e86e1973
diff --git a/math/pspp/patches/patch-al b/math/pspp/patches/patch-al
new file mode 100644
index 00000000000..08434ac7484
--- /dev/null
+++ b/math/pspp/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2002/12/24 17:50:24 jmmv Exp $
+
+--- config/Makefile.in.orig	Sat Jan  8 03:04:18 2000
++++ config/Makefile.in
+@@ -95,7 +95,7 @@ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+ l = @l@
+ 
+-pkgsysconfdir = $(sysconfdir)/$(PACKAGE)
++pkgsysconfdir = $(datadir)/examples/@PACKAGE@
+ pkgsysconf_DATA = devices html-prologue papersize ps-prologue
+ EXTRA_DIST = devices html-prologue papersize ps-prologue
+ 
diff --git a/math/pspp/patches/patch-am b/math/pspp/patches/patch-am
new file mode 100644
index 00000000000..b61c3e637c9
--- /dev/null
+++ b/math/pspp/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2002/12/24 17:50:24 jmmv Exp $
+
+--- src/Makefile.in.orig	Sat Jan  8 03:04:16 2000
++++ src/Makefile.in
+@@ -564,7 +564,7 @@ version.c:
+ 	echo "const char host_system[] = \"$(host_triplet)\";" >> version.c
+ 	echo "const char build_system[] = \"$(build_triplet)\";" >> version.c
+ 	echo "const char default_config_path[] =\
+-\"~/.pspp:$(pkgsysconfdir)\";" >> version.c
++\"~/.pspp:$(sysconfdir)\";" >> version.c
+ 	echo "const char include_path[] =\
+ \"./:~/.pspp/include:$(pkgdatadir)\";" >> version.c
+ 	echo "const char groff_font_path[] = \"~/.pspp/font:\" \\" >> version.c