summaryrefslogtreecommitdiff
path: root/print/cups/Makefile
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-01-11 19:00:42 +0000
committerjlam <jlam@pkgsrc.org>2001-01-11 19:00:42 +0000
commitbfa4a03f5209211e95d1b5df9184d72b3a860f50 (patch)
treef7f9363a66b548418ffad09731f7f0068ea7ff32 /print/cups/Makefile
parent7bcf86a073bfde205c7e8c2d90b38f62e1b000bf (diff)
downloadpkgsrc-bfa4a03f5209211e95d1b5df9184d72b3a860f50.tar.gz
Update cups to 1.1.5.2. No functional changes from 1.1.5.1, but NetBSD
changes were folded back into the main source tree.
Diffstat (limited to 'print/cups/Makefile')
-rw-r--r--print/cups/Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile
index ab6afb70c3a..a25700621c7 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2000/12/28 00:09:38 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2001/01/11 19:00:42 jlam Exp $
#
-DISTNAME= cups-${VERS}-1-source
-PKGNAME= cups-${VERS}.1
+DISTNAME= cups-${VERS}-2-source
+PKGNAME= cups-${VERS}.2
VERS= 1.1.5
WRKSRC= ${WRKDIR}/cups-${VERS}
CATEGORIES= print
@@ -29,8 +29,6 @@ GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --sysconfdir=/etc
CONFIGURE_ARGS+= --localstatedir=/var
CONFIGURE_ARGS+= --enable-libtool-unsupported="${LIBTOOL}"
-CONFIGURE_ARGS+= --with-cups-user="${CUPS_USER}"
-CONFIGURE_ARGS+= --with-cups-group="${CUPS_GROUP}"
USE_SSL= # defined
CONFIGURE_ARGS+= --enable-ssl
@@ -84,6 +82,9 @@ pre-configure:
cd ${WRKSRC} && autoconf
post-build:
+ ${SED} -e "s,@CUPS_USER@,${CUPS_USER},g" \
+ -e "s,@CUPS_GROUP@,${CUPS_GROUP},g" \
+ < ${WRKSRC}/conf/cupsd.conf.in > ${WRKSRC}/conf/cupsd.conf
${SED} -e "s,@PREFIX@,${PREFIX},g" \
< ${FILESDIR}/cupsd.sh > ${WRKDIR}/cupsd.sh
${SED} -e "s,@PREFIX@,${PREFIX},g" \