pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Remove obsolete variables. You'll want to use:
details: https://anonhg.NetBSD.org/pkgsrc/rev/022983519f2d
branches: trunk
changeset: 483711:022983519f2d
user: xtraeme <xtraeme%pkgsrc.org@localhost>
date: Wed Nov 17 19:56:49 2004 +0000
description:
Remove obsolete variables. You'll want to use:
PKG_OPTIONS.<pkg>+= foo blah
diffstat:
chat/xchat2/options.mk | 13 +------------
mail/balsa2/options.mk | 6 +-----
mail/dovecot/options.mk | 15 +--------------
mail/ezmlm-idx/options.mk | 16 +---------------
mail/fetchmail/options.mk | 12 +-----------
mail/msmtp/options.mk | 18 +-----------------
mail/mutt-devel/options.mk | 14 +-------------
mail/mutt/options.mk | 16 +---------------
mail/sendmail/options.mk | 26 +-------------------------
mail/spamassassin/options.mk | 16 +---------------
net/djbdns/options.mk | 2 ++
net/pure-ftpd/options.mk | 16 +---------------
net/samba/options.mk | 18 +-----------------
security/cyrus-saslauthd/options.mk | 6 +-----
www/lynx/options.mk | 15 +--------------
15 files changed, 16 insertions(+), 193 deletions(-)
diffs (truncated from 320 to 300 lines):
diff -r ac056549b922 -r 022983519f2d chat/xchat2/options.mk
--- a/chat/xchat2/options.mk Wed Nov 17 19:40:35 2004 +0000
+++ b/chat/xchat2/options.mk Wed Nov 17 19:56:49 2004 +0000
@@ -1,15 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2004/10/30 18:28:00 minskim Exp $
-
-# Global and legacy options
-.if defined(USE_SOCKS) && !empty(USE_SOCKS:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= socks
-.endif
-.if defined(XCHAT_USE_SSL) && !empty(XCHAT_USE_SSL:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= ssl
-.endif
-.if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+= inet6
-.endif
+# $NetBSD: options.mk,v 1.2 2004/11/17 19:56:49 xtraeme Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.xchat2
PKG_SUPPORTED_OPTIONS= inet6 ssl socks
diff -r ac056549b922 -r 022983519f2d mail/balsa2/options.mk
--- a/mail/balsa2/options.mk Wed Nov 17 19:40:35 2004 +0000
+++ b/mail/balsa2/options.mk Wed Nov 17 19:56:49 2004 +0000
@@ -1,10 +1,6 @@
-# $NetBSD: options.mk,v 1.1 2004/11/14 17:02:03 jmmv Exp $
+# $NetBSD: options.mk,v 1.2 2004/11/17 19:56:49 xtraeme Exp $
#
-.if defined(USE_OPENLDAP) && ${USE_OPENLDAP} == YES
-PKG_DEFAULT_OPTIONS+= openldap
-.endif
-
PKG_OPTIONS_VAR= PKG_OPTIONS.balsa2
PKG_SUPPORTED_OPTIONS= openldap ssl
diff -r ac056549b922 -r 022983519f2d mail/dovecot/options.mk
--- a/mail/dovecot/options.mk Wed Nov 17 19:40:35 2004 +0000
+++ b/mail/dovecot/options.mk Wed Nov 17 19:56:49 2004 +0000
@@ -1,17 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2004/08/22 19:32:51 jlam Exp $
-
-.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
+# $NetBSD: options.mk,v 1.5 2004/11/17 19:56:49 xtraeme Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.dovecot
PKG_SUPPORTED_OPTIONS= gnutls inet6 ldap mysql pgsql sasl
diff -r ac056549b922 -r 022983519f2d mail/ezmlm-idx/options.mk
--- a/mail/ezmlm-idx/options.mk Wed Nov 17 19:40:35 2004 +0000
+++ b/mail/ezmlm-idx/options.mk Wed Nov 17 19:56:49 2004 +0000
@@ -1,18 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2004/10/29 07:07:44 xtraeme Exp $
-
-# Legacy options
-#
-# XXX Support for the following variables will be removed after the
-# XXX pkgsrc-2004Q3 branch is released:
-# XXX
-# XXX EZMLM_IDX_USE_MYSQL EZMLM_IDX_USE_PGSQL
-#
-.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
+# $NetBSD: options.mk,v 1.4 2004/11/17 19:56:49 xtraeme Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ezmlm-idx
PKG_SUPPORTED_OPTIONS= mysql pgsql
diff -r ac056549b922 -r 022983519f2d mail/fetchmail/options.mk
--- a/mail/fetchmail/options.mk Wed Nov 17 19:40:35 2004 +0000
+++ b/mail/fetchmail/options.mk Wed Nov 17 19:56:49 2004 +0000
@@ -1,14 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2004/08/22 19:32:51 jlam Exp $
-
-.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
+# $NetBSD: options.mk,v 1.4 2004/11/17 19:56:49 xtraeme Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.fetchmail
PKG_SUPPORTED_OPTIONS= inet6 kerberos4 ssl
diff -r ac056549b922 -r 022983519f2d mail/msmtp/options.mk
--- a/mail/msmtp/options.mk Wed Nov 17 19:40:35 2004 +0000
+++ b/mail/msmtp/options.mk Wed Nov 17 19:56:49 2004 +0000
@@ -1,20 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2004/09/19 13:02:55 wiz Exp $
-
-.if defined(MSMTP_USE_GNUTLS) && !empty(MSMTP_USE_GNUTLS:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+= gnutls
-.endif
-.if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+= inet6
-.endif
-.if defined(MSMTP_USE_OPENSSL) && !empty(MSMTP_USE_OPENSSL:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+= ssl
-.endif
-.if defined(MSMTP_USE_GSASL) && !empty(MSMTP_USE_GSASL:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+= gsasl
-.endif
-.if defined(MSMTP_NO_SSL) && !empty(MSMTP_NO_SSL:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+= nossl
-.endif
+# $NetBSD: options.mk,v 1.3 2004/11/17 19:56:49 xtraeme Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.msmtp
PKG_SUPPORTED_OPTIONS= gnutls inet6 ssl gsasl nossl
diff -r ac056549b922 -r 022983519f2d mail/mutt-devel/options.mk
--- a/mail/mutt-devel/options.mk Wed Nov 17 19:40:35 2004 +0000
+++ b/mail/mutt-devel/options.mk Wed Nov 17 19:56:49 2004 +0000
@@ -1,18 +1,6 @@
-# $NetBSD: options.mk,v 1.3 2004/08/22 19:32:51 jlam Exp $
+# $NetBSD: options.mk,v 1.4 2004/11/17 19:56:49 xtraeme Exp $
# Global and legacy options
-.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_SUPPORTED_OPTIONS= slang ncurses ssl sasl
diff -r ac056549b922 -r 022983519f2d mail/mutt/options.mk
--- a/mail/mutt/options.mk Wed Nov 17 19:40:35 2004 +0000
+++ b/mail/mutt/options.mk Wed Nov 17 19:56:49 2004 +0000
@@ -1,18 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2004/09/12 04:33:12 jlam Exp $
-
-# Global and legacy options
-.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+= sasl1
-.endif
+# $NetBSD: options.mk,v 1.4 2004/11/17 19:56:49 xtraeme Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mutt
PKG_SUPPORTED_OPTIONS= slang ncurses ssl sasl1
diff -r ac056549b922 -r 022983519f2d mail/sendmail/options.mk
--- a/mail/sendmail/options.mk Wed Nov 17 19:40:35 2004 +0000
+++ b/mail/sendmail/options.mk Wed Nov 17 19:56:49 2004 +0000
@@ -1,28 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2004/09/02 21:09:17 adrianp Exp $
-
-# Global and legacy options
-.if defined(USE_DB2) && !empty(USE_DB2:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+= db2
-. elif defined(USE_DB4) && !empty(USE_DB4:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+= db4
-.endif
-.if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+= ldap
-.endif
-.if defined(USE_SASL) && !empty(USE_SASL:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+= sasl
-. elif defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+= sasl2
-.endif
-.if defined(USE_TCPWRAPPERS) && !empty(USE_TCPWRAPPERS:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+= tcpwrappers
-.endif
-.if defined(USE_INET6) && !empty(USE_INET6:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+= inet6
-.endif
-.if defined(USE_STARTTLS) && !empty(USE_STARTTLS:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+= starttls
-.endif
+# $NetBSD: options.mk,v 1.3 2004/11/17 19:56:49 xtraeme Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.sendmail
PKG_SUPPORTED_OPTIONS= inet6 db2 db4 ldap sasl sasl2 starttls tcpwrappers \
diff -r ac056549b922 -r 022983519f2d mail/spamassassin/options.mk
--- a/mail/spamassassin/options.mk Wed Nov 17 19:40:35 2004 +0000
+++ b/mail/spamassassin/options.mk Wed Nov 17 19:56:49 2004 +0000
@@ -1,18 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2004/10/12 00:11:10 heinz Exp $
-
-# Global and legacy options
-.if defined(SPAMASSASSIN_USE_SSL) && !empty(SPAMASSASSIN_USE_SSL:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+= ssl
-.endif
-.if defined(SPAMASSASSIN_RAZOR_TESTS) && !empty(SPAMASSASSIN_RAZOR_TESTS:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+= net-tests
-.endif
-.if defined(SPAMASSASSIN_PERL_WARNINGS) && !empty(SPAMASSASSIN_PERL_WARNINGS:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+= perl-warnings
-.endif
-.if defined(SPAMASSASSIN_PERL_TAINT_CHECKS) && !empty(SPAMASSASSIN_PERL_TAINT_CHECKS:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+= perl-taint-checks
-.endif
+# $NetBSD: options.mk,v 1.2 2004/11/17 19:56:49 xtraeme Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.spamassassin
PKG_SUPPORTED_OPTIONS= ssl net-tests perl-warnings perl-taint-checks \
diff -r ac056549b922 -r 022983519f2d net/djbdns/options.mk
--- a/net/djbdns/options.mk Wed Nov 17 19:40:35 2004 +0000
+++ b/net/djbdns/options.mk Wed Nov 17 19:56:49 2004 +0000
@@ -1,3 +1,5 @@
+# $NetBSD: options.mk,v 1.2 2004/11/17 19:56:49 xtraeme Exp $
+
PKG_OPTIONS_VAR= PKG_OPTIONS.djbdns
PKG_SUPPORTED_OPTIONS= inet6 ignoreip2
.include "../../mk/bsd.options.mk"
diff -r ac056549b922 -r 022983519f2d net/pure-ftpd/options.mk
--- a/net/pure-ftpd/options.mk Wed Nov 17 19:40:35 2004 +0000
+++ b/net/pure-ftpd/options.mk Wed Nov 17 19:56:49 2004 +0000
@@ -1,18 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2004/10/29 07:07:44 xtraeme Exp $
-
-# Legacy options
-.if !empty(PURE_FTPD_USE_MYSQL:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= mysql
-.endif
-.if !empty(PURE_FTPD_USE_PGSQL:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= pgsql
-.endif
-.if !empty(PURE_FTPD_USE_TLS:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= ssl
-.endif
-.if !empty(PURE_FTPD_USE_VIRTUAL_CHROOT:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= virtualchroot
-.endif
+# $NetBSD: options.mk,v 1.3 2004/11/17 19:56:49 xtraeme Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.pureftpd
PKG_SUPPORTED_OPTIONS= ldap mysql pgsql ssl virtualchroot
diff -r ac056549b922 -r 022983519f2d net/samba/options.mk
--- a/net/samba/options.mk Wed Nov 17 19:40:35 2004 +0000
+++ b/net/samba/options.mk Wed Nov 17 19:56:49 2004 +0000
@@ -1,22 +1,6 @@
-# $NetBSD: options.mk,v 1.4 2004/11/06 11:07:17 jmmv Exp $
+# $NetBSD: options.mk,v 1.5 2004/11/17 19:56:49 xtraeme Exp $
# Global and legacy options
-.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
PKG_SUPPORTED_OPTIONS= PAM ads cups ldap ldap-compat
diff -r ac056549b922 -r 022983519f2d security/cyrus-saslauthd/options.mk
--- a/security/cyrus-saslauthd/options.mk Wed Nov 17 19:40:35 2004 +0000
+++ b/security/cyrus-saslauthd/options.mk Wed Nov 17 19:56:49 2004 +0000
@@ -1,8 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2004/08/22 19:32:52 jlam Exp $
-
-.if defined(SASL_USE_GSSAPI) && !empty(SASL_USE_GSSAPI:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+= gssapi
-.endif
+# $NetBSD: options.mk,v 1.3 2004/11/17 19:56:49 xtraeme Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-saslauthd
PKG_SUPPORTED_OPTIONS= PAM kerberos ldap gssapi
diff -r ac056549b922 -r 022983519f2d www/lynx/options.mk
--- a/www/lynx/options.mk Wed Nov 17 19:40:35 2004 +0000
Home |
Main Index |
Thread Index |
Old Index