From 906cf9f397dbf8a8964b9ad7c4abe10a40c89cfd Mon Sep 17 00:00:00 2001
From: jmmv <jmmv>
Date: Tue, 26 Nov 2002 11:02:05 +0000
Subject: Make this package install its configuration files in the examples
 directory and copy them to the right place using PKG_SYSCONFDIR. Bump
 PKGREVISION to 1 because this change.

Approved by wiz.

This closes PR 18992.
---
 print/a2ps/Makefile         | 11 +++++++++--
 print/a2ps/PLIST            |  7 ++++---
 print/a2ps/distinfo         |  3 ++-
 print/a2ps/patches/patch-ab | 13 +++++++++++++
 4 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 print/a2ps/patches/patch-ab

(limited to 'print/a2ps')

diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index 5c07ff45d9b..864a3712785 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2002/07/06 13:29:09 tron Exp $
+# $NetBSD: Makefile,v 1.37 2002/11/26 11:02:05 jmmv Exp $
 
 DISTNAME=		a2ps-4.13b
 PKGNAME=		a2ps-4.13.0.2
+PKGREVISION=		1
 WRKSRC=			${WRKDIR}/a2ps-4.13
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_GNU:=a2ps/} \
@@ -12,7 +13,7 @@ HOMEPAGE=		http://www-inf.enst.fr/~demaille/a2ps/
 COMMENT=		Formats an ascii file for printing on a postscript printer
 
 DEPENDS+=		papersize>=1.0.2:../../print/papersize
-DEPENDS+=		psutils-1.17:../../print/psutils
+DEPENDS+=		psutils>=1.17:../../print/psutils
 
 STRIP=			# empty
 USE_PERL5=		YES
@@ -23,8 +24,13 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/auxdir/ltconfig
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		LPR=lpr
 CONFIGURE_ARGS+=	--with-medium="${PAPERSIZE}"
+CONFIGURE_ARGS+=	--sysconfdir="${PKG_SYSCONFDIR}"
 AUTOMAKE_OVERRIDE=	NO
 
+EGDIR=			${PREFIX}/share/examples/a2ps
+CONF_FILES=		${EGDIR}/a2ps-site.cfg ${PKG_SYSCONFDIR}/a2ps-site.cfg
+CONF_FILES+=		${EGDIR}/a2ps.cfg ${PKG_SYSCONFDIR}/a2ps.cfg
+
 INFO_FILES=		a2ps.info ogonkify.info regex.info
 
 pre-build:
@@ -32,4 +38,5 @@ pre-build:
 	${TOUCH} ${WRKSRC}/doc/*.dvi
 
 .include "../../mk/texinfo.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/a2ps/PLIST b/print/a2ps/PLIST
index 180de08527a..3c71f831e66 100644
--- a/print/a2ps/PLIST
+++ b/print/a2ps/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:37 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/11/26 11:02:05 jmmv Exp $
 bin/a2ps
 bin/card
 bin/composeglyphs
@@ -9,8 +9,6 @@ bin/pdiff
 bin/psmandup
 bin/psset
 bin/texi2dvi4a2ps
-etc/a2ps-site.cfg
-etc/a2ps.cfg
 include/liba2ps.h
 @unexec ${INSTALL_INFO} --delete %D/info/a2ps.info %D/info/dir
 @unexec ${INSTALL_INFO} --delete %D/info/ogonkify.info %D/info/dir
@@ -216,6 +214,8 @@ share/a2ps/sheets/yacc.ssh
 share/a2ps/sheets/zsh.ssh
 share/emacs/site-lisp/a2ps-print.el
 share/emacs/site-lisp/a2ps.el
+share/examples/a2ps/a2ps-site.cfg
+share/examples/a2ps/a2ps.cfg
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/a2ps.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/a2ps.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/a2ps.mo
@@ -292,6 +292,7 @@ share/ogonkify/ptmri-o.ps
 @dirrm share/ogonkify/fonts
 @dirrm share/ogonkify/afm
 @dirrm share/ogonkify
+@dirrm share/examples/a2ps
 @dirrm share/a2ps/sheets
 @dirrm share/a2ps/ps
 @dirrm share/a2ps/ppd
diff --git a/print/a2ps/distinfo b/print/a2ps/distinfo
index bae3354315e..e4dd7f331a6 100644
--- a/print/a2ps/distinfo
+++ b/print/a2ps/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2001/09/09 12:24:45 tron Exp $
+$NetBSD: distinfo,v 1.6 2002/11/26 11:02:05 jmmv Exp $
 
 SHA1 (a2ps-4.13b.tar.gz) = cfc79a3e54115e569f667fa3fd2c2ec16d22b31a
 Size (a2ps-4.13b.tar.gz) = 1944289 bytes
 SHA1 (patch-aa) = 67f0c9ddf6e9829aeecb3de596c925d451990877
+SHA1 (patch-ab) = ba7446a32733d60910036190be957045d4ec1218
diff --git a/print/a2ps/patches/patch-ab b/print/a2ps/patches/patch-ab
new file mode 100644
index 00000000000..10f4d23585d
--- /dev/null
+++ b/print/a2ps/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.5 2002/11/26 11:02:06 jmmv Exp $
+
+--- etc/Makefile.in.orig	Thu Feb 24 18:55:34 2000
++++ etc/Makefile.in
+@@ -136,7 +136,7 @@ libpath = $(pkgdatadir)/sheets:$(pkgdata
+ 
+ pkgdata_DATA = README
+ 
+-dsysconf = $(DESTDIR)$(sysconfdir)
++dsysconf = $(DESTDIR)$(datadir)/examples/@PACKAGE@
+ 
+ EXTRA_DIST = README.in
+ 
-- 
cgit v1.2.3