From ffceca11a9acb11623d00829c993ca1022b4d164 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sun, 25 Nov 2001 18:59:45 +0000
Subject: PKG_SYSCONFDIR is where the configuration files for a package may be
 found. This value may be customized in various ways:

PKG_SYSCONFBASE is the main config directory under which all package
	configuration files are to be found.

PKG_SYSCONFSUBDIR is the subdirectory of PKG_SYSCONFBASE under which the
	configuration files for a particular package may be found.

PKG_SYSCONFDIR.${PKGBASE} overrides the value of ${PKG_SYSCONFDIR} for a
	particular package.

Users will typically want to set PKG_SYSCONFBASE to /etc, or accept the
default location of ${PREFIX}/etc.

This obsoletes the use of CONFDIR, which was active for only 6 days, so no
need to have a workaround to still accept old CONFDIR settings.
---
 print/cups/Makefile | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'print')

diff --git a/print/cups/Makefile b/print/cups/Makefile
index ee00f4a92f5..7894d407893 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2001/11/21 15:44:23 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2001/11/25 18:59:47 jlam Exp $
 
 DISTNAME=		cups-${DIST_VERS}-source
 PKGNAME=		cups-${VERS}
@@ -25,7 +25,7 @@ USE_BUILDLINK_ONLY=	# defined
 USE_GMAKE=		# defined
 USE_LIBTOOL=		# defined
 GNU_CONFIGURE=		# defined
-CONFIGURE_ARGS+=	--sysconfdir=${CONFDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=/var
 CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/html/cups
 CONFIGURE_ARGS+=	--with-cups-user=${CUPS_USER}
@@ -65,20 +65,21 @@ PKG_USER=		${CUPS_USER}
 PKG_USER_DESCR=		Common UNIX Printing System user
 PKG_GROUP=		${CUPS_GROUP}
 
-CONF_FILES=		${EGDIR}/client.conf ${CONFDIR}/cups/client.conf
-CONF_FILES+=		${EGDIR}/cupsd.conf ${CONFDIR}/cups/cupsd.conf
-SUPPORT_FILES=		${EGDIR}/classes.conf ${CONFDIR}/cups/classes.conf
-SUPPORT_FILES+=		${EGDIR}/mime.convs ${CONFDIR}/cups/mime.convs
-SUPPORT_FILES+=		${EGDIR}/mime.types ${CONFDIR}/cups/mime.types
-SUPPORT_FILES+=		${EGDIR}/printers.conf ${CONFDIR}/cups/printers.conf
-RCD_SCRIPTS=		cupsd
+CONF_FILES=	${EGDIR}/client.conf ${PKG_SYSCONFDIR}/cups/client.conf
+CONF_FILES+=	${EGDIR}/cupsd.conf ${PKG_SYSCONFDIR}/cups/cupsd.conf
+SUPPORT_FILES=	${EGDIR}/classes.conf ${PKG_SYSCONFDIR}/cups/classes.conf
+SUPPORT_FILES+=	${EGDIR}/mime.convs ${PKG_SYSCONFDIR}/cups/mime.convs
+SUPPORT_FILES+=	${EGDIR}/mime.types ${PKG_SYSCONFDIR}/cups/mime.types
+SUPPORT_FILES+=	${EGDIR}/printers.conf ${PKG_SYSCONFDIR}/cups/printers.conf
+RCD_SCRIPTS=	cupsd
 
-OWN_DIRS+=		${CONFDIR}/cups
-OWN_DIRS+=		${CONFDIR}/cups/interfaces
-OWN_DIRS+=		${CONFDIR}/cups/ppd
+OWN_DIRS+=		${PKG_SYSCONFDIR}/cups
+OWN_DIRS+=		${PKG_SYSCONFDIR}/cups/interfaces
+OWN_DIRS+=		${PKG_SYSCONFDIR}/cups/ppd
 OWN_DIRS+=		/var/log/cups
 OWN_DIRS+=		/var/spool/cups
-OWN_DIRS_PERMS=		${CONFDIR}/cups/certs ${CUPS_USER} ${CUPS_GROUP} 0711
+OWN_DIRS_PERMS=		${PKG_SYSCONFDIR}/cups/certs			\
+			${CUPS_USER} ${CUPS_GROUP} 0711
 OWN_DIRS_PERMS+=	/var/spool/cups/tmp ${CUPS_USER} ${CUPS_GROUP} 1700
 
 pre-install:
-- 
cgit v1.2.3