diff options
33 files changed, 249 insertions, 450 deletions
diff --git a/databases/openldap/options.mk b/databases/openldap/options.mk index 79e87470e15..4aada900454 100644 --- a/databases/openldap/options.mk +++ b/databases/openldap/options.mk @@ -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 --git a/devel/rt3/Makefile.options b/devel/rt3/Makefile.options index 6b1be87bead..b04a8ef1922 100644 --- a/devel/rt3/Makefile.options +++ b/devel/rt3/Makefile.options @@ -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 --git a/emulators/vice/Makefile b/emulators/vice/Makefile index f81f04f508d..dc31614ea17 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -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 @@ INFO_FILES= vice.info .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 --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile index efd3f517b7b..f4eb6c235fb 100644 --- a/graphics/freetype2/Makefile +++ b/graphics/freetype2/Makefile @@ -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 @@ PKGCONFIG_OVERRIDE= builds/unix/freetype2.in .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 --git a/mail/clamav/Makefile b/mail/clamav/Makefile index 402b18ca1cb..12247c2270a 100644 --- a/mail/clamav/Makefile +++ b/mail/clamav/Makefile @@ -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 @@ CONF_FILES_PERMS+= ${EGDIR}/${_file_} ${VIRUSDBDIR}/${_file_} \ 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 --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile index 03e0b13adec..8cca2bf7e10 100644 --- a/mail/cyrus-imapd21/Makefile +++ b/mail/cyrus-imapd21/Makefile @@ -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_ARGS+= --with-bdb-incdir=${BUILDLINK_PREFIX.db3}/include/db3 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 --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile index 76976f2aebf..3c85f140707 100644 --- a/mail/cyrus-imapd22/Makefile +++ b/mail/cyrus-imapd22/Makefile @@ -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+= --enable-nntp 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 --git a/mail/dovecot/options.mk b/mail/dovecot/options.mk index 6f22de2fbb0..d44d89ea689 100644 --- a/mail/dovecot/options.mk +++ b/mail/dovecot/options.mk @@ -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 --git a/mail/dspam/options.mk b/mail/dspam/options.mk index e0364d20384..af3fa1658b4 100644 --- a/mail/dspam/options.mk +++ b/mail/dspam/options.mk @@ -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 --git a/mail/ezmlm-idx/options.mk b/mail/ezmlm-idx/options.mk index 1baee735cfb..94a9e6cd278 100644 --- a/mail/ezmlm-idx/options.mk +++ b/mail/ezmlm-idx/options.mk @@ -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 $ # Legacy options # @@ -7,13 +7,11 @@ # XXX # XXX EZMLM_IDX_USE_MYSQL EZMLM_IDX_USE_PGSQL # -.if !defined(PKG_OPTIONS.ezmlm-idx) -. if defined(EZMLM_IDX_USE_MYSQL) && !empty(EZMLM_IDX_USE_MYSQL:M[yY][eE][sS]) -PKG_OPTIONS.ezmlm-idx+= mysql -. endif -. if defined(EZMLM_IDX_USE_PGSQL) && !empty(EZMLM_IDX_USE_PGSQL:M[yY][eE][sS]) -PKG_OPTIONS.ezmlm-idx+= pgsql -. endif +.if defined(EZMLM_IDX_USE_MYSQL) && !empty(EZMLM_IDX_USE_MYSQL:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= mysql +.endif +.if defined(EZMLM_IDX_USE_PGSQL) && !empty(EZMLM_IDX_USE_PGSQL:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= pgsql .endif PKG_OPTIONS_VAR= PKG_OPTIONS.ezmlm-idx diff --git a/mail/fetchmail/options.mk b/mail/fetchmail/options.mk index 924c6f119a2..38173c72f00 100644 --- a/mail/fetchmail/options.mk +++ b/mail/fetchmail/options.mk @@ -1,23 +1,22 @@ -# $NetBSD: options.mk,v 1.2 2004/08/05 03:30:16 jlam Exp $ +# $NetBSD: options.mk,v 1.3 2004/08/22 19:32:51 jlam Exp $ -# Global and legacy options -.if defined(KERBEROS) && defined(USE_INET6) || defined(FETCHMAIL_USE_SSL) -. if !defined(PKG_OPTIONS.fetchmail) -. if defined(KERBEROS) -PKG_OPTIONS.fetchmail+= kerberos4 -. endif -. if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS]) -PKG_OPTIONS.fetchmail+= inet6 -. endif -. if defined(FETCHMAIL_USE_SSL) && !empty(FETCHMAIL_USE_SSL:M[yY][eE][sS]) -PKG_OPTIONS.fetchmail+= ssl -. endif -. endif +.if defined(KERBEROS) +PKG_DEFAULT_OPTIONS+= kerberos4 +.endif +.if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= inet6 +.endif +.if defined(FETCHMAIL_USE_SSL) && !empty(FETCHMAIL_USE_SSL:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= ssl .endif PKG_OPTIONS_VAR= PKG_OPTIONS.fetchmail -PKG_OPTIONS.fetchmail?= inet6 ssl PKG_SUPPORTED_OPTIONS= inet6 kerberos4 ssl + +.if !defined(PKG_OPTIONS.fetchmail) +PKG_DEFAULT_OPTIONS+= inet6 ssl +.endif + .include "../../mk/bsd.options.mk" ### diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk index 5c63ad4c046..67901c15642 100644 --- a/mail/mutt-devel/options.mk +++ b/mail/mutt-devel/options.mk @@ -1,27 +1,26 @@ -# $NetBSD: options.mk,v 1.2 2004/08/05 03:30:16 jlam Exp $ +# $NetBSD: options.mk,v 1.3 2004/08/22 19:32:51 jlam Exp $ # Global and legacy options -.if defined(MUTT_USE_SLANG) || defined(MUTT_USE_NCURSES) || \ - defined(MUTT_USE_SSL) || defined(MUTT_USE_SASL) -. if !defined(PKG_OPTIONS.mutt) -. if defined(MUTT_USE_SLANG) && !empty(MUTT_USE_SLANG:M[yY][eE][sS]) -PKG_OPTIONS.mutt+= slang -. endif -. if defined(MUTT_USE_NCURSES) && !empty(MUTT_USE_NCURSES:M[yY][eE][sS]) -PKG_OPTIONS.mutt+= ncurses -. endif -. if defined(MUTT_USE_SSL) && !empty(MUTT_USE_SSL:M[yY][eE][sS]) -PKG_OPTIONS.mutt+= ssl -. endif -. if defined(MUTT_USE_SASL) && !empty(MUTT_USE_SASL:M[yY][eE][sS]) -PKG_OPTIONS.mutt+= sasl -. endif -. endif +.if defined(MUTT_USE_SLANG) && !empty(MUTT_USE_SLANG:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= slang +.endif +.if defined(MUTT_USE_NCURSES) && !empty(MUTT_USE_NCURSES:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= ncurses +.endif +.if defined(MUTT_USE_SSL) && !empty(MUTT_USE_SSL:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= ssl +.endif +.if defined(MUTT_USE_SASL) && !empty(MUTT_USE_SASL:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= sasl .endif PKG_OPTIONS_VAR= PKG_OPTIONS.mutt -PKG_OPTIONS.mutt?= ssl PKG_SUPPORTED_OPTIONS= slang ncurses ssl sasl + +.if !defined(PKG_OPTIONS.mutt) +PKG_DEFAULT_OPTIONS+= ssl +.endif + .include "../../mk/bsd.options.mk" ### diff --git a/mail/mutt/options.mk b/mail/mutt/options.mk index f0b073f8d58..3d5f7ebef1c 100644 --- a/mail/mutt/options.mk +++ b/mail/mutt/options.mk @@ -1,27 +1,26 @@ -# $NetBSD: options.mk,v 1.1 2004/08/05 07:19:25 jlam Exp $ +# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:52 jlam Exp $ # Global and legacy options -.if defined(MUTT_USE_SLANG) || defined(MUTT_USE_NCURSES) || \ - defined(MUTT_USE_SSL) || defined(MUTT_USE_SASL) -. if !defined(PKG_OPTIONS.mutt) -. if defined(MUTT_USE_SLANG) && !empty(MUTT_USE_SLANG:M[yY][eE][sS]) -PKG_OPTIONS.mutt+= slang -. endif -. if defined(MUTT_USE_NCURSES) && !empty(MUTT_USE_NCURSES:M[yY][eE][sS]) -PKG_OPTIONS.mutt+= ncurses -. endif -. if defined(MUTT_USE_SSL) && !empty(MUTT_USE_SSL:M[yY][eE][sS]) -PKG_OPTIONS.mutt+= ssl -. endif -. if defined(MUTT_USE_SASL) && !empty(MUTT_USE_SASL:M[yY][eE][sS]) -PKG_OPTIONS.mutt+= sasl -. endif -. endif +.if defined(MUTT_USE_SLANG) && !empty(MUTT_USE_SLANG:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= slang +.endif +.if defined(MUTT_USE_NCURSES) && !empty(MUTT_USE_NCURSES:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= ncurses +.endif +.if defined(MUTT_USE_SSL) && !empty(MUTT_USE_SSL:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= ssl +.endif +.if defined(MUTT_USE_SASL) && !empty(MUTT_USE_SASL:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= sasl .endif PKG_OPTIONS_VAR= PKG_OPTIONS.mutt -PKG_OPTIONS.mutt?= ssl PKG_SUPPORTED_OPTIONS= slang ncurses ssl sasl + +.if !defined(PKG_OPTIONS.mutt) +PKG_DEFAULT_OPTIONS+= ssl +.endif + .include "../../mk/bsd.options.mk" ### diff --git a/mail/postfix-current/options.mk b/mail/postfix-current/options.mk index 34ac11c0556..b75d656f186 100644 --- a/mail/postfix-current/options.mk +++ b/mail/postfix-current/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2004/08/07 17:08:26 jlam Exp $ +# $NetBSD: options.mk,v 1.4 2004/08/22 19:32:52 jlam Exp $ # Global and legacy options # @@ -10,43 +10,26 @@ # XXX POSTFIX_USE_PGSQL POSTFIX_OPTIONS # XXX POSTFIX_USE_SASL_AUTH # -.if defined(USE_SASL) || defined(USE_SASL2) || defined(USE_OPENLDAP) || \ - defined(POSTFIX_USE_INET6) || defined(POSTFIX_USE_TLS) || \ - defined(POSTFIX_USE_PCRE) || defined(POSTFIX_USE_MYSQL) || \ - defined(POSTFIX_USE_PGSQL) || defined(POSTFIX_USE_SASL_AUTH) || \ - defined(POSTFIX_OPTIONS) -. if !defined(PKG_OPTIONS.postfix) -. if defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= sasl -. endif -. if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= sasl -. endif -. if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= ldap -. endif -. if defined(POSTFIX_USE_INET6) && !empty(POSTFIX_USE_INET6:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= inet6 -. endif -. if defined(POSTFIX_USE_TLS) && !empty(POSTFIX_USE_TLS:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= tls -. endif -. if defined(POSTFIX_USE_PCRE) && !empty(POSTFIX_USE_PCRE:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= pcre -. endif -. if defined(POSTFIX_USE_MYSQL) && !empty(POSTFIX_USE_MYSQL:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= mysql -. endif -. if defined(POSTFIX_USE_PGSQL) && !empty(POSTFIX_USE_PGSQL:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= pgsql -. endif -. if defined(POSTFIX_USE_SASL_AUTH) && defined(POSTFIX_USE_SASL_AUTH) -PKG_OPTIONS.postfix+= sasl -. endif -. if defined(POSTFIX_OPTIONS) -PKG_OPTIONS.postfix= ${POSTFIX_OPTIONS} -. endif -. endif +.if defined(POSTFIX_USE_INET6) && !empty(POSTFIX_USE_INET6:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= inet6 +.endif +.if defined(POSTFIX_USE_TLS) && !empty(POSTFIX_USE_TLS:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= tls +.endif +.if defined(POSTFIX_USE_PCRE) && !empty(POSTFIX_USE_PCRE:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= pcre +.endif +.if defined(POSTFIX_USE_MYSQL) && !empty(POSTFIX_USE_MYSQL:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= mysql +.endif +.if defined(POSTFIX_USE_PGSQL) && !empty(POSTFIX_USE_PGSQL:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= pgsql +.endif +.if defined(POSTFIX_USE_SASL_AUTH) && defined(POSTFIX_USE_SASL_AUTH) +PKG_DEFAULT_OPTIONS+= sasl +.endif +.if defined(POSTFIX_OPTIONS) +PKG_DEFAULT_OPTIONS= ${POSTFIX_OPTIONS} .endif PKG_OPTIONS_VAR= PKG_OPTIONS.postfix diff --git a/mail/postfix/options.mk b/mail/postfix/options.mk index 738f27fa444..ba5b2e0f8b3 100644 --- a/mail/postfix/options.mk +++ b/mail/postfix/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2004/08/11 06:51:31 jlam Exp $ +# $NetBSD: options.mk,v 1.7 2004/08/22 19:32:52 jlam Exp $ # Global and legacy options # @@ -10,43 +10,26 @@ # XXX POSTFIX_USE_PGSQL POSTFIX_OPTIONS # XXX POSTFIX_USE_SASL_AUTH # -.if defined(USE_SASL) || defined(USE_SASL2) || defined(USE_OPENLDAP) || \ - defined(POSTFIX_USE_INET6) || defined(POSTFIX_USE_TLS) || \ - defined(POSTFIX_USE_PCRE) || defined(POSTFIX_USE_MYSQL) || \ - defined(POSTFIX_USE_PGSQL) || defined(POSTFIX_USE_SASL_AUTH) || \ - defined(POSTFIX_OPTIONS) -. if !defined(PKG_OPTIONS.postfix) -. if defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= sasl -. endif -. if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= sasl -. endif -. if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= ldap -. endif -. if defined(POSTFIX_USE_INET6) && !empty(POSTFIX_USE_INET6:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= inet6 -. endif -. if defined(POSTFIX_USE_TLS) && !empty(POSTFIX_USE_TLS:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= tls -. endif -. if defined(POSTFIX_USE_PCRE) && !empty(POSTFIX_USE_PCRE:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= pcre -. endif -. if defined(POSTFIX_USE_MYSQL) && !empty(POSTFIX_USE_MYSQL:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= mysql -. endif -. if defined(POSTFIX_USE_PGSQL) && !empty(POSTFIX_USE_PGSQL:M[yY][eE][sS]) -PKG_OPTIONS.postfix+= pgsql -. endif -. if defined(POSTFIX_USE_SASL_AUTH) && defined(POSTFIX_USE_SASL_AUTH) -PKG_OPTIONS.postfix+= sasl -. endif -. if defined(POSTFIX_OPTIONS) -PKG_OPTIONS.postfix= ${POSTFIX_OPTIONS} -. endif -. endif +.if defined(POSTFIX_USE_INET6) && !empty(POSTFIX_USE_INET6:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= inet6 +.endif +.if defined(POSTFIX_USE_TLS) && !empty(POSTFIX_USE_TLS:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= tls +.endif +.if defined(POSTFIX_USE_PCRE) && !empty(POSTFIX_USE_PCRE:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= pcre +.endif +.if defined(POSTFIX_USE_MYSQL) && !empty(POSTFIX_USE_MYSQL:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= mysql +.endif +.if defined(POSTFIX_USE_PGSQL) && !empty(POSTFIX_USE_PGSQL:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= pgsql +.endif +.if defined(POSTFIX_USE_SASL_AUTH) && defined(POSTFIX_USE_SASL_AUTH) +PKG_DEFAULT_OPTIONS+= sasl +.endif +.if defined(POSTFIX_OPTIONS) +PKG_DEFAULT_OPTIONS= ${POSTFIX_OPTIONS} .endif PKG_OPTIONS_VAR= PKG_OPTIONS.postfix diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk index c5674a1bc22..b57285a5ff0 100644 --- a/mail/qmail/options.mk +++ b/mail/qmail/options.mk @@ -1,9 +1,11 @@ +# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:52 jlam Exp $ + .if ${OPSYS} == "Darwin" -PKG_OPTIONS.qmail+= darwin +PKG_DEFAULT_OPTIONS+= darwin .endif .if ${OPSYS} == "Linux" -PKG_OPTIONS.qmail+= netqmail # for the errno patches +PKG_DEFAULT_OPTIONS+= netqmail # for the errno patches .endif PKG_OPTIONS_VAR= PKG_OPTIONS.qmail diff --git a/mk/bsd.options.mk b/mk/bsd.options.mk index 7eacd9f33e1..7fe6e367530 100644 --- a/mk/bsd.options.mk +++ b/mk/bsd.options.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.options.mk,v 1.6 2004/08/10 05:33:05 schmonz Exp $ +# $NetBSD: bsd.options.mk,v 1.7 2004/08/22 19:32:52 jlam Exp $ # # This Makefile fragment provides boilerplate code for standard naming # conventions for handling per-package build options. @@ -60,19 +60,21 @@ # # -------------8<-------------8<-------------8<-------------8<------------- # # Global and legacy options -# .if defined(USE_OPENLDAP) || defined(USE_SASL2) -# . if !defined(PKG_OPTIONS.wibble) -# . if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS]) -# PKG_OPTIONS.wibble+= ldap -# . endif -# . if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS]) -# PKG_OPTIONS.wibble+= sasl -# . endif -# . endif +# .if defined(WIBBLE_USE_OPENLDAP) && !empty(WIBBLE_USE_OPENLDAP:M[yY][eE][sS]) +# PKG_DEFAULT_OPTIONS+= ldap +# .endif +# .if defined(WIBBLE_USE_SASL2) && !empty(WIBBLE_USE_SASL2:M[yY][eE][sS]) +# PKG_DEFAULT_OPTIONS+= sasl # .endif # # PKG_OPTIONS_VAR= PKG_OPTIONS.wibble # PKG_SUPPORTED_OPTIONS= ldap sasl +# +# # Default options for ``wibble'' package. +# .if !defined(PKG_OPTIONS.wibble) +# PKG_DEFAULT_OPTIONS+= sasl +# endif +# # .include "../../mk/bsd.options.mk" # # # Package-specific option-handling diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile index fec3e3ee40b..a642560fe92 100644 --- a/net/flow-tools/Makefile +++ b/net/flow-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/08/09 22:37:34 seb Exp $ +# $NetBSD: Makefile,v 1.9 2004/08/22 19:32:52 jlam Exp $ DISTNAME= flow-tools-0.67 CATEGORIES= net @@ -27,12 +27,13 @@ SUPPORT_FILES+= ${EGDIR}/sym/${_f_} ${PKG_SYSCONFDIR}/sym/${_f_} .endfor MESSAGE_SUBST+= EGDIR=${EGDIR} -# legacy options -.if defined(FLOW_TOOLS_USE_MYSQL) && !empty(FLOW_TOOLS_USE_MYSQL:M[yY][eE][sS]) -PKG_OPTIONS.flow-tools+= mysql +.if defined(FLOW_TOOLS_USE_MYSQL) && \ + !empty(FLOW_TOOLS_USE_MYSQL:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= mysql .endif -.if defined(FLOW_TOOLS_USE_POSTGRESQL) && !empty(FLOW_TOOLS_USE_POSTGRESQL:M[yY][eE][sS]) -PKG_OPTIONS.flow-tools+= postgresql +.if defined(FLOW_TOOLS_USE_POSTGRESQL) && \ + !empty(FLOW_TOOLS_USE_POSTGRESQL:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= postgresql .endif PKG_OPTIONS_VAR= PKG_OPTIONS.flow-tools diff --git a/net/samba/options.mk b/net/samba/options.mk index 318c28c4994..dd0d87bb015 100644 --- a/net/samba/options.mk +++ b/net/samba/options.mk @@ -1,30 +1,21 @@ -# $NetBSD: options.mk,v 1.1 2004/08/05 03:04:34 jlam Exp $ +# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:52 jlam Exp $ # Global and legacy options -.if defined(USE_CUPS) || defined(USE_PAM) || defined(USE_OPENLDAP) || \ - defined(SAMBA_WITH_ADS) || defined(SAMBA_USE_LDAP) || \ - defined(SAMBA_USE_LDAP_COMPAT) -. if !defined(PKG_OPTIONS.samba) -. if defined(USE_CUPS) && !empty(USE_CUPS:M[yY][eE][sS]) -PKG_OPTIONS.samba+= cups -. endif -. if defined(USE_PAM) -PKG_OPTIONS.samba+= PAM -. endif -. if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS]) -PKG_OPTIONS.samba+= ldap -. endif -. if defined(SAMBA_WITH_ADS) && !empty(SAMBA_WITH_ADS:M[yY][eE][sS]) -PKG_OPTIONS.samba+= ads -. endif -. if defined(SAMBA_USE_LDAP) -PKG_OPTIONS.samba+= ldap -. endif -. if defined(SAMBA_USE_LDAP_COMPAT) && \ - !empty(SAMBA_USE_LDAP_COMPAT:M[yY][eE][sS]) -PKG_OPTIONS.samba+= ldap-compat -. endif -. endif +.if defined(USE_CUPS) && !empty(USE_CUPS:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= cups +.endif +.if defined(USE_PAM) +PKG_DEFAULT_OPTIONS+= PAM +.endif +.if defined(SAMBA_WITH_ADS) && !empty(SAMBA_WITH_ADS:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= ads +.endif +.if defined(SAMBA_USE_LDAP) +PKG_DEFAULT_OPTIONS+= ldap +.endif +.if defined(SAMBA_USE_LDAP_COMPAT) && \ + !empty(SAMBA_USE_LDAP_COMPAT:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= ldap-compat .endif PKG_OPTIONS_VAR= PKG_OPTIONS.samba 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 diff --git a/security/PAM/Makefile b/security/PAM/Makefile index 9c14611446c..1caab4e0c34 100644 --- a/security/PAM/Makefile +++ b/security/PAM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2004/08/05 02:42:12 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2004/08/22 19:32:52 jlam Exp $ # DISTNAME= Linux-PAM-0.77 @@ -38,13 +38,8 @@ MESSAGE_SUBST+= PAM_MODULEDIR=${PAM_MODULEDIR} .include "../../mk/bsd.prefs.mk" -# Global and legacy options -.if defined(USE_LIBCRACK) -. if !defined(PKG_OPTIONS.PAM) -. if defined(USE_LIBCRACK) && !empty(USE_LIBCRACK:M[yY][eE][sS]) -PKG_OPTIONS.PAM+= libcrack -. endif -. endif +.if defined(USE_LIBCRACK) && !empty(USE_LIBCRACK:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= libcrack .endif PKG_OPTIONS_VAR= PKG_OPTIONS.PAM diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index 463dc881336..45728057eb5 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/08/06 15:05:54 jlam Exp $ +# $NetBSD: Makefile,v 1.2 2004/08/22 19:32:52 jlam Exp $ DISTNAME= amavisd-new-${VERSION}${PATCHLEVEL} PKGNAME= amavisd-new-${VERSION}${PATCHLEVEL:S/-//} @@ -59,13 +59,8 @@ PKG_USERS= ${AMAVIS_USER}:${AMAVIS_GROUP}::Virus\\ Scanning\\ Account:${AMAVIS_D RCD_SCRIPTS= amavisd CONF_FILES= ${EGDIR}/amavisd.conf-minimal ${PKG_SYSCONFDIR}/amavisd.conf -# Global and legacy options -.if defined(USE_MILTER) -. if !defined(PKG_OPTIONS.amavisd-new) -. if defined(USE_MILTER) && !empty(USE_MILTER:M[Yy][Es][Ss]) -PKG_OPTIONS.amavisd-new+= milter -. endif -. endif +.if defined(USE_MILTER) && !empty(USE_MILTER:M[Yy][Es][Ss]) +PKG_DEFAULT_OPTIONS+= milter .endif PKG_OPTIONS_VAR= PKG_OPTIONS.amavisd-new diff --git a/security/cy2-sql/Makefile b/security/cy2-sql/Makefile index ac464dc9555..53c321b07da 100644 --- a/security/cy2-sql/Makefile +++ b/security/cy2-sql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2004/08/13 07:11:36 jlam Exp $ +# $NetBSD: Makefile,v 1.3 2004/08/22 19:32:52 jlam Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-sql/} COMMENT= Cyrus SASL SQL authentication plugin @@ -7,8 +7,12 @@ SASL_PLUGIN= yes .include "../cyrus-sasl2/Makefile.common" PKG_OPTIONS_VAR= PKG_OPTIONS.cy2-sql -PKG_OPTIONS.cy2-sql?= mysql PKG_SUPPORTED_OPTIONS= mysql pgsql sqlite + +.if !defined(PKG_OPTIONS.cy2-sql) +PKG_DEFAULT_OPTIONS+= mysql +.endif + .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mmysql) diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile index 05df812292b..17415cc17b7 100644 --- a/security/cyrus-sasl/Makefile +++ b/security/cyrus-sasl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2004/07/30 21:05:41 jlam Exp $ +# $NetBSD: Makefile,v 1.45 2004/08/22 19:32:52 jlam Exp $ .include "Makefile.common" @@ -14,19 +14,8 @@ CONFIGURE_ARGS+= --enable-digest # DIGEST-MD5 CONFIGURE_ARGS+= --with-rc4=${SSLBASE} .include "../../security/openssl/buildlink3.mk" -# Global and legacy options -.if defined(KERBEROS) || defined(USE_PAM) || defined(SASL_USE_GSSAPI) -. if !defined(PKG_OPTIONS.cyrus-sasl) -. if defined(KERBEROS) -PKG_OPTIONS.cyrus-sasl+= kerberos -. endif -. if defined(USE_PAM) && !empty(USE_PAM:M[yY][eE][sS]) -PKG_OPTIONS.cyrus-sasl+= PAM -. endif -. if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS]) -PKG_OPTIONS.cyrus-sasl+= gssapi -. endif -. endif +.if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= gssapi .endif PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-sasl diff --git a/security/cyrus-saslauthd/options.mk b/security/cyrus-saslauthd/options.mk index 85991bed451..8cd8d370760 100644 --- a/security/cyrus-saslauthd/options.mk +++ b/security/cyrus-saslauthd/options.mk @@ -1,22 +1,7 @@ -# $NetBSD: options.mk,v 1.1 2004/08/05 03:04:34 jlam Exp $ +# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:52 jlam Exp $ -# Global and legacy options -.if defined(KERBEROS) || defined(USE_PAM) || defined(USE_OPENLDAP) || \ - defined(SASL_USE_GSSAPI) -. if !defined(PKG_OPTIONS.cyrus-saslauthd) -. if defined(KERBEROS) -PKG_OPTIONS.cyrus-saslauthd+= kerberos -. endif -. if defined(USE_PAM) && !empty(USE_PAM:M[yY][eE][sS]) -PKG_OPTIONS.cyrus-saslauthd+= PAM -. endif -. if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS]) -PKG_OPTIONS.cyrus-saslauthd+= ldap -. endif -. if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS]) -PKG_OPTIONS.cyrus-saslauthd+= gssapi -. endif -. endif +.if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= gssapi .endif PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-saslauthd diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index df8f17255aa..812e5ebf222 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2004/08/05 16:28:45 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2004/08/22 19:32:52 jlam Exp $ DISTNAME= heimdal-0.6.1 PKGREVISION= 1 @@ -37,16 +37,8 @@ LIBS.SunOS= -ltermcap CONFIGURE_ARGS+= --with-openssl=${SSLBASE} .include "../../security/openssl/buildlink3.mk" -# Global and legacy options -.if defined(USE_DB4) || defined(KERBEROS_PREFIX_CMDS) -. if !defined(PKG_OPTIONS.heimdal) -. if defined(USE_DB4) && !empty(USE_DB4:M[yY][eE][sS]) -PKG_OPTIONS.heimdal+= db4 -. endif -. if defined(KERBEROS_PREFIX_CMDS) && !empty(KERBEROS_PREFIX_CMDS:M[yY][eE][sS]) -PKG_OPTIONS.heimdal+= prefix-cmds -. endif -. endif +.if defined(KERBEROS_PREFIX_CMDS) && !empty(KERBEROS_PREFIX_CMDS:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= prefix-cmds .endif PKG_OPTIONS_VAR= PKG_OPTIONS.heimdal diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile index 14b8f91c400..15162f0acba 100644 --- a/security/mit-krb5/Makefile +++ b/security/mit-krb5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/07/30 21:05:42 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2004/08/22 19:32:52 jlam Exp $ DISTNAME= krb5-1.3.4 PKGNAME= mit-${DISTNAME} @@ -54,13 +54,8 @@ CONFIGURE_ARGS+= --without-krb4 CONFIGURE_ARGS+= --without-tcl MAKE_ENV+= ROOT_USER=${ROOT_USER} -# Global and legacy options -.if defined(KERBEROS_PREFIX_CMDS) -. if !defined(PKG_OPTIONS.mit-krb5) -. if defined(KERBEROS_PREFIX_CMDS) && !empty(KERBEROS_PREFIX_CMDS:M[yY][eE][sS]) -PKG_OPTIONS.mit-krb5+= prefix-cmds -. endif -. endif +.if defined(KERBEROS_PREFIX_CMDS) && !empty(KERBEROS_PREFIX_CMDS:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= prefix-cmds .endif PKG_OPTIONS_VAR= PKG_OPTIONS.mit-krb5 diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 61293d0df62..9001267b879 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.94 2004/08/05 02:45:28 jlam Exp $ +# $NetBSD: Makefile,v 1.95 2004/08/22 19:32:52 jlam Exp $ DISTNAME= openssl-0.9.6m SVR4_PKGNAME= ossl @@ -35,12 +35,8 @@ CONFIGURE_ARGS+= shared CONFIGURE_ARGS+= no-idea no-rc5 no-mdc2 # Global and legacy options -.if defined(USE_RSAREF2) -. if !defined(PKG_OPTIONS.openssl) -. if defined(USE_RSAREF2) && !empty(USE_RSAREF2:M[yY][eE][sS]) -PKG_OPTIONS.openssl+= rsaref -. endif -. endif +.if defined(USE_RSAREF2) && !empty(USE_RSAREF2:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= rsaref .endif PKG_OPTIONS_VAR= PKG_OPTIONS.openssl diff --git a/security/sudo/Makefile b/security/sudo/Makefile index e66d4f85b10..2e0638ec933 100644 --- a/security/sudo/Makefile +++ b/security/sudo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2004/07/30 21:05:42 jlam Exp $ +# $NetBSD: Makefile,v 1.65 2004/08/22 19:32:52 jlam Exp $ # DISTNAME= sudo-1.6.7p5 @@ -32,13 +32,6 @@ CONFIGURE_ARGS+= --with-skey CONFIGURE_ARGS+= --without-skey .endif -# Global and legacy options -.if defined(KERBEROS) -. if !defined(PKG_OPTIONS.sudo) -PKG_OPTIONS.sudo+= kerberos -. endif -.endif - PKG_OPTIONS_VAR= PKG_OPTIONS.sudo PKG_SUPPORTED_OPTIONS= kerberos .include "../../mk/bsd.options.mk" diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile index b91daf8f413..42322fa31c3 100644 --- a/shells/bash2/Makefile +++ b/shells/bash2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2004/08/07 21:03:59 minskim Exp $ +# $NetBSD: Makefile,v 1.56 2004/08/22 19:32:52 jlam Exp $ # DISTNAME= bash-2.05b @@ -30,13 +30,8 @@ PKG_SHELL= ${PREFIX}/bin/bash .include "../../mk/bsd.prefs.mk" -# Global and legacy options -.if defined(BASH_STATIC) -. if !defined(PKG_OPTIONS.bash) -. if defined(BASH_STATIC) && !empty(BASH_STATIC:M[yY][eE][sS]) -PKG_OPTIONS.bash+= static -. endif -. endif +.if defined(BASH_STATIC) && !empty(BASH_STATIC:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= static .endif PKG_OPTIONS_VAR= PKG_OPTIONS.bash diff --git a/www/apache/Makefile b/www/apache/Makefile index aed50b86b2c..df5a2bbd541 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.149 2004/08/02 19:54:17 abs Exp $ +# $NetBSD: Makefile,v 1.150 2004/08/22 19:32:52 jlam Exp $ # # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of # code hooks that allow mod_ssl to be compiled separately later, if desired). @@ -60,16 +60,11 @@ BUILD_DEFS+= APACHE_USER APACHE_GROUP CONFIGURE_ARGS+= --server-uid=${APACHE_USER} CONFIGURE_ARGS+= --server-gid=${APACHE_GROUP} -# Global and legacy options -.if defined(APACHE_PERF_TUNING) || defined(APACHE_SUEXEC) -. if !defined(PKG_OPTIONS.apache) -. if defined(APACHE_PERF_TUNING) && !empty(APACHE_PERF_TUNING:M[yY][eE][sS]) -PKG_OPTIONS.apache+= perf-tuning -. endif -. if defined(APACHE_SUEXEC) && !empty(APACHE_SUEXEC:M[yY][eE][sS]) -PKG_OPTIONS.apache+= suexec -. endif -. endif +.if defined(APACHE_PERF_TUNING) && !empty(APACHE_PERF_TUNING:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= perf-tuning +.endif +.if defined(APACHE_SUEXEC) && !empty(APACHE_SUEXEC:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= suexec .endif PKG_OPTIONS_VAR= PKG_OPTIONS.apache diff --git a/www/lynx/options.mk b/www/lynx/options.mk index 21dde3d76d2..2da1436b9f1 100644 --- a/www/lynx/options.mk +++ b/www/lynx/options.mk @@ -1,27 +1,16 @@ -# $NetBSD: options.mk,v 1.1 2004/08/05 03:04:34 jlam Exp $ +# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:52 jlam Exp $ -# Global and legacy options -.if defined(LYNX_SCREEN_LIB) || defined(USE_SOCKS) || defined(USE_INET6) -. if !defined(PKG_OPTIONS.lynx) -. if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mslang) -PKG_OPTIONS.lynx+= slang -. endif -. if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mncurses) -PKG_OPTIONS.lynx+= ncurses -. endif -. if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mcurses) -PKG_OPTIONS.lynx+= curses -. endif -. if defined(USE_SOCKS) && (${USE_SOCKS} == 4) -PKG_OPTIONS.lynx+= socks4 -. endif -. if defined(USE_SOCKS) && (${USE_SOCKS} == 5) -PKG_OPTIONS.lynx+= socks5 -. endif -. if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS]) -PKG_OPTIONS.lynx+= inet6 -. endif -. endif +.if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mslang) +PKG_DEFAULT_OPTIONS+= slang +.endif +.if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mncurses) +PKG_DEFAULT_OPTIONS+= ncurses +.endif +.if defined(LYNX_SCREEN_LIB) && !empty(LYNX_SCREEN_LIB:Mcurses) +PKG_DEFAULT_OPTIONS+= curses +.endif +.if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= inet6 .endif PKG_OPTIONS_VAR= PKG_OPTIONS.lynx diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php index 058a92e64c7..ecf3c55cbc2 100644 --- a/www/php4/Makefile.php +++ b/www/php4/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.16 2004/07/30 21:05:43 jlam Exp $ +# $NetBSD: Makefile.php,v 1.17 2004/08/22 19:32:52 jlam Exp $ .include "../../www/php4/Makefile.common" @@ -6,7 +6,7 @@ PKGREVISION= # empty DISTINFO_FILE= ${.CURDIR}/../../www/php4/distinfo -PATCHDIR= ${.CURDIR}/../../www/php4/patches +PATCHDIR= ${.CURDIR}/../../www/php4/patches USE_LIBTOOL= YES GNU_CONFIGURE= YES @@ -42,17 +42,12 @@ CONFIGURE_ARGS+= ${PHP4_CONFIGURE_ARGS} CONFIGURE_ENV+= ac_cv_lib_pam_pam_start=no CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}" -PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[^-]*$//} - # Global and legacy options -.if defined(USE_SSL) -. if !defined(${PKG_OPTIONS_VAR}) -. if defined(USE_SSL) && !empty(USE_SSL:M[Yy][Ee][Ss]) -${PKG_OPTIONS_VAR}+= ssl -. endif -. endif +.if defined(USE_SSL) && !empty(USE_SSL:M[Yy][Ee][Ss]) +PKG_DEFAULT_OPTIONS+= ssl .endif +PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[^-]*$//} PKG_SUPPORTED_OPTIONS+= ssl .include "../../mk/bsd.options.mk" |