>Number:         18992
>Category:       pkg
>Synopsis:       Make print/a2ps honor PKG_SYSCONFDIR
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Nov 09 02:37:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Julio Merino
>Release:        NetBSD 1.6K
>Organization:
HispaBSD
>Environment:
	
	
System: NetBSD darkstar.local 1.6K NetBSD 1.6K (DARKSTAR) #130: Thu Nov 7 23:22:44 CET 2002 jmmv@darkstar.local:/var/build/kernel/DARKSTAR i386
Architecture: i386
Machine: i386
>Description:
	The print/a2ps package currently installs two configuration files
	directly inside ${PREFIX}/etc, while it should use PKG_SYSCONFDIR
	stuff (thus installing the files in the examples dir and using
	bsd.pkg.install.mk to install them in the right place).
>How-To-Repeat:
	
>Fix:
	Apply this patch. Note the change of the DEPENDS line; this will
	allow the package to work when pkg/18991 is fixed:

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/a2ps/Makefile,v
retrieving revision 1.36
diff -u -u -r1.36 Makefile
--- Makefile	2002/07/06 13:29:09	1.36
+++ Makefile	2002/11/09 10:33:30
@@ -2,6 +2,7 @@
 
 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 @@
 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 @@
 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 @@
 	${TOUCH} ${WRKSRC}/doc/*.dvi
 
 .include "../../mk/texinfo.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/print/a2ps/PLIST,v
retrieving revision 1.2
diff -u -u -r1.2 PLIST
--- PLIST	2002/02/18 15:14:37	1.2
+++ PLIST	2002/11/09 10:33:30
@@ -9,8 +9,6 @@
 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/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 @@
 @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
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/print/a2ps/distinfo,v
retrieving revision 1.5
diff -u -u -r1.5 distinfo
--- distinfo	2001/09/09 12:24:45	1.5
+++ distinfo	2002/11/09 10:33:30
@@ -3,3 +3,4 @@
 SHA1 (a2ps-4.13b.tar.gz) = cfc79a3e54115e569f667fa3fd2c2ec16d22b31a
 Size (a2ps-4.13b.tar.gz) = 1944289 bytes
 SHA1 (patch-aa) = 67f0c9ddf6e9829aeecb3de596c925d451990877
+SHA1 (patch-ab) = ba7446a32733d60910036190be957045d4ec1218


	And import this new patch as patches/patch-ab:

$NetBSD$

--- 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
 
>Release-Note:
>Audit-Trail:
>Unformatted: