summaryrefslogtreecommitdiff
path: root/print/cups
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-08-22 19:32:51 +0000
committerjlam <jlam@pkgsrc.org>2004-08-22 19:32:51 +0000
commit9d5426ff76defa85311d3e55ed2c442fb5ae9977 (patch)
treebe106f064832dabfe855335adc4a7d14708a360a /print/cups
parent3c0724db4840983688df4cd77ea88653e9b13249 (diff)
downloadpkgsrc-9d5426ff76defa85311d3e55ed2c442fb5ae9977.tar.gz
Change the way that legacy USE_* and FOO_USE_* options are converted
into the bsd.options.mk framework. Instead of appending to ${PKG_OPTIONS_VAR}, it appends to PKG_DEFAULT_OPTIONS. This causes the default options to be the union of PKG_DEFAULT_OPTIONS and any old USE_* and FOO_USE_* settings. This fixes PR pkg/26590.
Diffstat (limited to 'print/cups')
-rw-r--r--print/cups/Makefile7
1 files changed, 2 insertions, 5 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 1c0c70abcce..12cf71bd32b 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2004/07/30 21:05:41 jlam Exp $
+# $NetBSD: Makefile,v 1.79 2004/08/22 19:32:52 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,11 +54,8 @@ 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
+PKG_DEFAULT_OPTIONS+= PAM
.endif
PKG_OPTIONS_VAR= PKG_OPTIONS.cups