Wed Nov 2 23:44:43 2011 UTC ()
Correct the comments for CUPS_USER and CUPS_GROUP and add CUPS_SYSTEM_GROUPS
comment.


(sbd)
diff -r1.180 -r1.181 pkgsrc/print/cups/Makefile
cvs diff -r1.180 -r1.181 pkgsrc/print/cups/Makefile (expand / switch to unified diff)

--- pkgsrc/print/cups/Makefile 2011/09/17 14:12:11 1.180
+++ pkgsrc/print/cups/Makefile 2011/11/02 23:44:43 1.181
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.180 2011/09/17 14:12:11 wiz Exp $ 1# $NetBSD: Makefile,v 1.181 2011/11/02 23:44:43 sbd Exp $
2# 2#
3# The CUPS author is very good about taking back changes into the main 3# The CUPS author is very good about taking back changes into the main
4# CUPS distribution. The correct place to send patches or bug-fixes is: 4# CUPS distribution. The correct place to send patches or bug-fixes is:
5# cups-bugs@cups.org. 5# cups-bugs@cups.org.
6 6
7DISTNAME= cups-${DIST_VERS}-source 7DISTNAME= cups-${DIST_VERS}-source
8PKGNAME= cups-${DIST_VERS:S/-/./g} 8PKGNAME= cups-${DIST_VERS:S/-/./g}
9BASE_VERS= 1.4.8 9BASE_VERS= 1.4.8
10DIST_VERS= ${BASE_VERS} 10DIST_VERS= ${BASE_VERS}
11PKGREVISION= 1 11PKGREVISION= 1
12 12
13CATEGORIES= print 13CATEGORIES= print
14MASTER_SITES= http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \ 14MASTER_SITES= http://ftp.easysw.com/pub/cups/${BASE_VERS}/ \
@@ -66,28 +66,29 @@ CONFIGURE_ARGS+= --without-java @@ -66,28 +66,29 @@ CONFIGURE_ARGS+= --without-java
66CONFIGURE_ARGS+= --disable-gssapi 66CONFIGURE_ARGS+= --disable-gssapi
67CONFIGURE_ARGS+= --disable-gnutls 67CONFIGURE_ARGS+= --disable-gnutls
68 68
69CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} 69CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q}
70 70
71.include "../../mk/bsd.prefs.mk" 71.include "../../mk/bsd.prefs.mk"
72.include "options.mk" 72.include "options.mk"
73 73
74PLIST_VARS+= notmac 74PLIST_VARS+= notmac
75.if ${OPSYS} != "Darwin" 75.if ${OPSYS} != "Darwin"
76PLIST.notmac= yes 76PLIST.notmac= yes
77.endif 77.endif
78 78
79# CUPS_USER username of the CUPS administrator 79# CUPS_USER user to run filter and CGI programs as
80# CUPS_GROUP group of the CUPS administrator 80# CUPS_GROUP group to run filter and CGI programs as
 81# CUPS_SYSTEM_GROUPS group for system administration
81# 82#
82CUPS_USER?= lp 83CUPS_USER?= lp
83CUPS_GROUP?= lp 84CUPS_GROUP?= lp
84CUPS_SYSTEM_GROUPS?= ${REAL_ROOT_GROUP} 85CUPS_SYSTEM_GROUPS?= ${REAL_ROOT_GROUP}
85FILES_SUBST+= CUPS_USER=${CUPS_USER} 86FILES_SUBST+= CUPS_USER=${CUPS_USER}
86FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP} 87FILES_SUBST+= CUPS_GROUP=${CUPS_GROUP}
87FILES_SUBST+= CUPS_SYSTEM_GROUPS=${CUPS_SYSTEM_GROUPS:Q} 88FILES_SUBST+= CUPS_SYSTEM_GROUPS=${CUPS_SYSTEM_GROUPS:Q}
88 89
89PKG_GROUPS_VARS+= CUPS_GROUP CUPS_SYSTEM_GROUPS 90PKG_GROUPS_VARS+= CUPS_GROUP CUPS_SYSTEM_GROUPS
90PKG_USERS_VARS+= CUPS_USER 91PKG_USERS_VARS+= CUPS_USER
91 92
92BUILD_DEFS+= CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS VARBASE 93BUILD_DEFS+= CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS VARBASE
93 94