pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Change the way that legacy USE_* and FOO_USE_* options...
details: https://anonhg.NetBSD.org/pkgsrc/rev/65bdd2aeb822
branches: trunk
changeset: 479795:65bdd2aeb822
user: jlam <jlam%pkgsrc.org@localhost>
date: Sun Aug 22 19:32:51 2004 +0000
description:
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:
databases/openldap/options.mk | 17 +--------
devel/rt3/Makefile.options | 4 +-
emulators/vice/Makefile | 4 +-
graphics/freetype2/Makefile | 11 +----
mail/clamav/Makefile | 11 +----
mail/cyrus-imapd21/Makefile | 25 +++----------
mail/cyrus-imapd22/Makefile | 14 +-------
mail/dovecot/options.mk | 37 ++++++--------------
mail/dspam/options.mk | 66 +++++++++++++++---------------------
mail/ezmlm-idx/options.mk | 14 +++----
mail/fetchmail/options.mk | 29 +++++++--------
mail/mutt-devel/options.mk | 35 +++++++++----------
mail/mutt/options.mk | 35 +++++++++----------
mail/postfix-current/options.mk | 59 +++++++++++---------------------
mail/postfix/options.mk | 59 +++++++++++---------------------
mail/qmail/options.mk | 6 ++-
mk/bsd.options.mk | 22 ++++++-----
net/flow-tools/Makefile | 13 +++---
net/samba/options.mk | 41 ++++++++--------------
print/cups/Makefile | 7 +--
security/PAM/Makefile | 11 +----
security/amavisd-new/Makefile | 11 +----
security/cy2-sql/Makefile | 8 +++-
security/cyrus-sasl/Makefile | 17 +-------
security/cyrus-saslauthd/options.mk | 21 +----------
security/heimdal/Makefile | 14 +------
security/mit-krb5/Makefile | 11 +----
security/openssl/Makefile | 10 +---
security/sudo/Makefile | 9 +----
shells/bash2/Makefile | 11 +----
www/apache/Makefile | 17 +++------
www/lynx/options.mk | 35 ++++++------------
www/php4/Makefile.php | 15 ++-----
33 files changed, 249 insertions(+), 450 deletions(-)
diffs (truncated from 1133 to 300 lines):
diff -r 09708308b9d8 -r 65bdd2aeb822 databases/openldap/options.mk
--- a/databases/openldap/options.mk Sun Aug 22 19:10:26 2004 +0000
+++ b/databases/openldap/options.mk Sun Aug 22 19:32:51 2004 +0000
@@ -1,19 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2004/08/05 03:04:33 jlam Exp $
-
-# Global and legacy options
-.if defined(KERBEROS) || defined(USE_SASL) || defined(USE_SASL2)
-. if !defined(PKG_OPTIONS.openldap)
-. if defined(KERBEROS)
-PKG_OPTIONS.openldap+= kerberos
-. endif
-. if defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS])
-PKG_OPTIONS.openldap+= sasl
-. endif
-. if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
-PKG_OPTIONS.openldap+= sasl
-. endif
-. endif
-.endif
+# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:51 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.openldap
PKG_SUPPORTED_OPTIONS= dynamic kerberos sasl slp
diff -r 09708308b9d8 -r 65bdd2aeb822 devel/rt3/Makefile.options
--- a/devel/rt3/Makefile.options Sun Aug 22 19:10:26 2004 +0000
+++ b/devel/rt3/Makefile.options Sun Aug 22 19:32:51 2004 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.options,v 1.1.1.1 2004/08/03 15:33:50 cube Exp $
+# $NetBSD: Makefile.options,v 1.2 2004/08/22 19:32:51 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.rt
PKG_SUPPORTED_OPTIONS= backend-mysql backend-pgsql \
frontend-modperl1 frontend-modperl2 \
frontend-fastcgi
-PKG_DEFAULT_OPTIONS= backend-mysql frontend-fastcgi
+PKG_DEFAULT_OPTIONS?= backend-mysql frontend-fastcgi
.include "../../mk/bsd.options.mk"
diff -r 09708308b9d8 -r 65bdd2aeb822 emulators/vice/Makefile
--- a/emulators/vice/Makefile Sun Aug 22 19:10:26 2004 +0000
+++ b/emulators/vice/Makefile Sun Aug 22 19:32:51 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2004/08/03 20:47:50 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2004/08/22 19:32:51 jlam Exp $
#
DISTNAME= vice-1.14
@@ -34,7 +34,7 @@
.include "../../mk/bsd.prefs.mk"
.if !empty(VICE_USE_FFMPEG:M[Yy][Ee][Ss])
-PKG_OPTIONS.vice+= ffmpeg
+PKG_DEFAULT_OPTIONS+= ffmpeg
.endif
PKG_OPTIONS_VAR= PKG_OPTIONS.vice
diff -r 09708308b9d8 -r 65bdd2aeb822 graphics/freetype2/Makefile
--- a/graphics/freetype2/Makefile Sun Aug 22 19:10:26 2004 +0000
+++ b/graphics/freetype2/Makefile Sun Aug 22 19:32:51 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2004/08/05 02:51:09 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2004/08/22 19:32:51 jlam Exp $
DISTNAME= freetype-2.1.9
PKGNAME= freetype2-2.1.9
@@ -29,13 +29,8 @@
.include "../../mk/bsd.prefs.mk"
.include "../../mk/compiler.mk"
-# Global and legacy options
-.if defined(MKTTINTERP)
-. if !defined(PKG_OPTIONS.freetype2)
-. if defined(MKTTINTERP) && !empty(MKTTINTERP:M[yY][eE][sS])
-PKG_OPTIONS.freetype2+= truetype
-. endif
-. endif
+.if defined(MKTTINTERP) && !empty(MKTTINTERP:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+= truetype
.endif
PKG_OPTIONS_VAR+= PKG_OPTIONS.freetype2
PKG_SUPPORTED_OPTIONS= truetype
diff -r 09708308b9d8 -r 65bdd2aeb822 mail/clamav/Makefile
--- a/mail/clamav/Makefile Sun Aug 22 19:10:26 2004 +0000
+++ b/mail/clamav/Makefile Sun Aug 22 19:32:51 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/08/03 11:28:37 tv Exp $
+# $NetBSD: Makefile,v 1.24 2004/08/22 19:32:51 jlam Exp $
DISTNAME= clamav-${CLAMAV_VERSION}
PKGNAME= clamav-${CLAMAV_VERSION:S/-/./}
@@ -56,13 +56,8 @@
INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} CFGINST=${EGDIR} DBINST=${EGDIR}
-# Global and legacy options
-.if defined(USE_MILTER)
-. if !defined(PKG_OPTIONS.clamav)
-. if defined(USE_MILTER) && !empty(USE_MILTER:M[yY][eE][sS])
-PKG_OPTIONS.clamav+= milter
-. endif
-. endif
+.if defined(USE_MILTER) && !empty(USE_MILTER:M[yY][eE][sS])
+PKG_DEFAULT_OPTIONS+= milter
.endif
PKG_OPTIONS_VAR= PKG_OPTIONS.clamav
diff -r 09708308b9d8 -r 65bdd2aeb822 mail/cyrus-imapd21/Makefile
--- a/mail/cyrus-imapd21/Makefile Sun Aug 22 19:10:26 2004 +0000
+++ b/mail/cyrus-imapd21/Makefile Sun Aug 22 19:32:51 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/07/31 03:52:00 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2004/08/22 19:32:51 jlam Exp $
DISTNAME= cyrus-imapd-2.1.15
PKGREVISION= 3
@@ -59,24 +59,11 @@
CONFIGURE_ENV+= ac_cv_lib_${_var_}_db_create=no
.endfor
-# Global and legacy options
-.if defined(CYRUS_USE_INET6) || defined(CYRUS_DB_RECOMMENDED) || \
- defined(KERBEROS)
-. if !defined(PKG_OPTIONS.cyrus-imapd)
-. if defined(CYRUS_USE_INET6)
-PKG_OPTIONS.cyrus-imapd+= inet6
-. endif
-. if defined(CYRUS_DB_RECOMMENDED)
-PKG_OPTIONS.cyrus-imapd+= recommended-db
-. endif
-. if defined(KERBEROS)
-. if ${KERBEROS} == "4"
-PKG_OPTIONS.cyrus-imapd+= kerberos4
-. else
-PKG_OPTIONS.cyrus-imapd+= kerberos
-. endif
-. endif
-. endif
+.if defined(CYRUS_USE_INET6)
+PKG_DEFAULT_OPTIONS+= inet6
+.endif
+.if defined(CYRUS_DB_RECOMMENDED)
+PKG_DEFAULT_OPTIONS+= recommended-db
.endif
PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-imapd
diff -r 09708308b9d8 -r 65bdd2aeb822 mail/cyrus-imapd22/Makefile
--- a/mail/cyrus-imapd22/Makefile Sun Aug 22 19:10:26 2004 +0000
+++ b/mail/cyrus-imapd22/Makefile Sun Aug 22 19:32:51 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/08/11 22:09:04 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2004/08/22 19:32:51 jlam Exp $
DISTNAME= cyrus-imapd-2.2.8
PKGREVISION= 1
@@ -49,18 +49,6 @@
CONFIGURE_ARGS+= --without-zephyr
CONFIGURE_ARGS+= --without-ucdsnmp
-.if defined(KERBEROS)
-. if !defined(PKG_OPTIONS.cyrus-imapd)
-. if defined(KERBEROS)
-. if ${KERBEROS} == "4"
-PKG_OPTIONS.cyrus-imapd+= kerberos4
-. else
-PKG_OPTIONS.cyrus-imapd+= kerberos
-. endif
-. endif
-. endif
-.endif
-
PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-imapd
PKG_SUPPORTED_OPTIONS= gssapi kerberos kerberos4
.include "../../mk/bsd.options.mk"
diff -r 09708308b9d8 -r 65bdd2aeb822 mail/dovecot/options.mk
--- a/mail/dovecot/options.mk Sun Aug 22 19:10:26 2004 +0000
+++ b/mail/dovecot/options.mk Sun Aug 22 19:32:51 2004 +0000
@@ -1,29 +1,16 @@
-# $NetBSD: options.mk,v 1.3 2004/08/05 02:22:19 jlam Exp $
+# $NetBSD: options.mk,v 1.4 2004/08/22 19:32:51 jlam Exp $
-# Global and legacy options
-.if defined(DOVECOT_USE_GNUTLS) || defined(DOVECOT_USE_MYSQL) || \
- defined(DOVECOT_USE_PGSQL) || defined(USE_INET6) || \
- defined(USE_OPENLDAP) || defined(USE_SASL2)
-. if !defined(PKG_OPTIONS.dovecot)
-. if defined(DOVECOT_USE_GNUTLS) && !empty(DOVECOT_USE_GNUTLS:M[Yy][Ee][Ss])
-PKG_OPTIONS.dovecot+= gnutls
-. endif
-. if defined(DOVECOT_USE_MYSQL) && !empty(DOVECOT_USE_MYSQL:M[Yy][Ee][Ss])
-PKG_OPTIONS.dovecot+= mysql
-. endif
-. if defined(DOVECOT_USE_PGSQL) && !empty(DOVECOT_USE_PGSQL:M[Yy][Ee][Ss])
-PKG_OPTIONS.dovecot+= pgsql
-. endif
-. if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
-PKG_OPTIONS.dovecot+= inet6
-. endif
-. if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[Yy][Ee][Ss])
-PKG_OPTIONS.dovecot+= ldap
-. endif
-. if defined(USE_SASL2) && !empty(USE_SASL2:M[Yy][Ee][Ss])
-PKG_OPTIONS.dovecot+= sasl
-. endif
-. endif
+.if defined(DOVECOT_USE_GNUTLS) && !empty(DOVECOT_USE_GNUTLS:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+= gnutls
+.endif
+.if defined(DOVECOT_USE_MYSQL) && !empty(DOVECOT_USE_MYSQL:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+= mysql
+.endif
+.if defined(DOVECOT_USE_PGSQL) && !empty(DOVECOT_USE_PGSQL:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+= pgsql
+.endif
+.if defined(USE_INET6) && !empty(USE_INET6:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+= inet6
.endif
PKG_OPTIONS_VAR= PKG_OPTIONS.dovecot
diff -r 09708308b9d8 -r 65bdd2aeb822 mail/dspam/options.mk
--- a/mail/dspam/options.mk Sun Aug 22 19:10:26 2004 +0000
+++ b/mail/dspam/options.mk Sun Aug 22 19:32:51 2004 +0000
@@ -1,42 +1,32 @@
-# $NetBSD: options.mk,v 1.2 2004/08/09 07:02:59 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2004/08/22 19:32:51 jlam Exp $
-# Global and legacy options
-.if defined(DSPAM_HOMEDIR_DOTFILES) || defined(DSPAM_USE_WEBMAIL) || \
- defined(DSPAM_SIGNATURE_ATTACHMENTS) || \
- defined(DSPAM_SIGNATURE_HEADERS) || defined(DSPAM_LARGESCALE) || \
- defined(DSPAM_VIRTUAL_USERS) || defined(DSPAM_CGI_GRAPHS) || \
- defined(DSPAM_CLIENT_COMPRESSION)
-. if !defined(PKG_OPTIONS.dspam)
-. if defined(DSPAM_HOMEDIR_DOTFILES) && \
- !empty(DSPAM_HOMEDIR_DOTFILES:M[Yy][Ee][Ss])
-PKG_OPTIONS.dspam+= dotfiles
-. endif
-. if defined(DSPAM_USE_WEBMAIL) && !empty(DSPAM_USE_WEBMAIL:M[Yy][Ee][Ss])
-PKG_OPTIONS.dspam+= webmail
-. endif
-. if defined(DSPAM_SIGNATURE_ATTACHMENTS) && \
- !empty(DSPAM_SIGNATURE_ATTACHMENTS:M[Yy][Ee][Ss])
-PKG_OPTIONS.dspam+= sig-attachment
-. endif
-. if defined(DSPAM_SIGNATURE_HEADERS) && \
- !empty(DSPAM_SIGNATURE_HEADERS:M[Yy][Ee][Ss])
-PKG_OPTIONS.dspam+= sig-headers
-. endif
-. if defined(DSPAM_LARGESCALE) && !empty(DSPAM_LARGESCALE:M[Yy][Ee][Ss])
-PKG_OPTIONS.dspam+= largescale
-. endif
-. if defined(DSPAM_VIRTUAL_USERS) && \
- !empty(DSPAM_VIRTUAL_USERS:M[Yy][Ee][Ss])
-PKG_OPTIONS.dspam+= virtualusers
-. endif
-. if defined(DSPAM_CGI_GRAPHS) && !empty(DSPAM_CGI_GRAPHS:M[Yy][Ee][Ss])
-PKG_OPTIONS.dspam+= graphs
-. endif
-. if defined(DSPAM_CLIENT_COMPRESSION) && \
- !empty(DSPAM_CLIENT_COMPRESSION:M[Yy][Ee][Ss])
-PKG_OPTIONS.dspam+= compress
-. endif
-. endif
+.if defined(DSPAM_HOMEDIR_DOTFILES) && \
+ !empty(DSPAM_HOMEDIR_DOTFILES:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+= dotfiles
+.endif
+.if defined(DSPAM_USE_WEBMAIL) && !empty(DSPAM_USE_WEBMAIL:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+= webmail
+.endif
+.if defined(DSPAM_SIGNATURE_ATTACHMENTS) && \
+ !empty(DSPAM_SIGNATURE_ATTACHMENTS:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+= sig-attachment
+.endif
+.if defined(DSPAM_SIGNATURE_HEADERS) && \
+ !empty(DSPAM_SIGNATURE_HEADERS:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+= sig-headers
+.endif
+.if defined(DSPAM_LARGESCALE) && !empty(DSPAM_LARGESCALE:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+= largescale
+.endif
+.if defined(DSPAM_VIRTUAL_USERS) && !empty(DSPAM_VIRTUAL_USERS:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+= virtualusers
+.endif
+.if defined(DSPAM_CGI_GRAPHS) && !empty(DSPAM_CGI_GRAPHS:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+= graphs
+.endif
+.if defined(DSPAM_CLIENT_COMPRESSION) && \
+ !empty(DSPAM_CLIENT_COMPRESSION:M[Yy][Ee][Ss])
+PKG_DEFAULT_OPTIONS+= compress
.endif
.if defined(DSPAM_DELIVERY_AGENT) && !empty(DSPAM_DELIVERY_AGENT:Mcustom)
DSPAM_DELIVERY_AGENT:= ${DSPAM_DELIVERY_AGENT_ARGS}
diff -r 09708308b9d8 -r 65bdd2aeb822 mail/ezmlm-idx/options.mk
--- a/mail/ezmlm-idx/options.mk Sun Aug 22 19:10:26 2004 +0000
+++ b/mail/ezmlm-idx/options.mk Sun Aug 22 19:32:51 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2004/08/10 05:59:01 schmonz Exp $
+# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:51 jlam Exp $
Home |
Main Index |
Thread Index |
Old Index