diff options
| author | jlam <jlam> | 2004-07-30 21:05:41 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-07-30 21:05:41 +0000 |
| commit | 3d5f4414d5d0e6a5a3f5320af17da17f7d34259d (patch) | |
| tree | 90f33a51019f85b91b5f29838193d07638327f1c /print/cups | |
| parent | 854dc1c371d836ece9a9fb75616fb435cf79a60e (diff) | |
| download | pkgsrc-3d5f4414d5d0e6a5a3f5320af17da17f7d34259d.tar.gz | |
Convert to use bsd.options.mk. The relevant options variable to set
for each package can be determined by invoking:
make show-var VARNAME=PKG_OPTIONS_VAR
The old options are still supported unless the variable named in
PKG_OPTIONS_VAR is set within make(1) (usually via /etc/mk.conf).
Diffstat (limited to 'print/cups')
| -rw-r--r-- | print/cups/Makefile | 23 | ||||
| -rw-r--r-- | print/cups/PLIST | 3 | ||||
| -rw-r--r-- | print/cups/PLIST.pam | 2 |
3 files changed, 18 insertions, 10 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile index a5976cc80da..1c0c70abcce 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.77 2004/06/23 11:04:37 recht Exp $ +# $NetBSD: Makefile,v 1.78 2004/07/30 21:05:41 jlam Exp $ # # The CUPS author is very good about taking back changes into the main # CUPS distribution. The correct place to send patches or bug-fixes is: @@ -54,18 +54,27 @@ CONFIGURE_ENV+= DSOFLAGS="${LDFLAGS}" .include "../../mk/bsd.prefs.mk" +# Global and legacy options .if defined(USE_PAM) +. if !defined(PKG_OPTIONS.cups) +PKG_OPTIONS.cups+= PAM +. endif +.endif + +PKG_OPTIONS_VAR= PKG_OPTIONS.cups +PKG_SUPPORTED_OPTIONS= PAM +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:MPAM) . include "../../security/PAM/buildlink3.mk" -BUILD_DEFS+= USE_PAM CONFIGURE_ARGS+= --enable-pam -PLIST_SRC= ${PKGDIR}/PLIST.pam -PLIST_SRC+= ${PKGDIR}/PLIST MESSAGE_SRC= ${PKGDIR}/MESSAGE MESSAGE_SRC+= ${PKGDIR}/MESSAGE.pam +PLIST_SUBST+= PAM= .else CONFIGURE_ARGS+= --disable-pam MESSAGE_SRC= ${.CURDIR}/MESSAGE -PLIST_SRC= ${PKGDIR}/PLIST +PLIST_SUBST+= PAM="@comment " .endif # CUPS_USER username of the CUPS administrator @@ -108,7 +117,7 @@ OWN_DIRS_PERMS+= ${CUPS_REQUESTS}/tmp ${CUPS_USER} ${CUPS_GROUP} 1770 pre-configure: cd ${WRKSRC} && ${AUTOCONF} -pre-install: +post-build: @${SED} ${FILES_SUBST_SED} ${FILESDIR}/cups.pam > ${WRKDIR}/cups.pam post-install: @@ -126,7 +135,7 @@ post-install: ;; \ esac; \ done -.if defined(USE_PAM) +.if !empty(PKG_OPTIONS:MPAM) ${INSTALL_DATA} ${WRKDIR}/cups.pam ${EGDIR} .endif diff --git a/print/cups/PLIST b/print/cups/PLIST index a793333202e..babd9ab5415 100644 --- a/print/cups/PLIST +++ b/print/cups/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2004/04/23 22:07:57 reed Exp $ +@comment $NetBSD: PLIST,v 1.13 2004/07/30 21:05:41 jlam Exp $ bin/cancel bin/cups-config bin/cupstestppd @@ -502,6 +502,7 @@ share/doc/html/cups/translation.html share/doc/html/cups/translation.pdf share/examples/cups/classes.conf share/examples/cups/client.conf +${PAM}share/examples/cups/cups.pam share/examples/cups/cupsd.conf share/examples/cups/mime.convs share/examples/cups/mime.types diff --git a/print/cups/PLIST.pam b/print/cups/PLIST.pam deleted file mode 100644 index 3a15738d7d8..00000000000 --- a/print/cups/PLIST.pam +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST.pam,v 1.1 2001/10/31 23:32:53 zuntum Exp $ -share/examples/cups/cups.pam |