pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Remove support for some variables that are supposed to...
details: https://anonhg.NetBSD.org/pkgsrc/rev/4c30f63b63a4
branches: trunk
changeset: 486103:4c30f63b63a4
user: jlam <jlam%pkgsrc.org@localhost>
date: Wed Dec 22 21:46:24 2004 +0000
description:
Remove support for some variables that are supposed to go away after
pkgsrc-2004Q4 is branched.
diffstat:
audio/musicpd/options.mk | 37 +-----------------------------------
devel/apr/options.mk | 16 +--------------
editors/xemacs-current/options.mk | 26 +------------------------
editors/xemacs/options.mk | 21 +-------------------
mail/teapop/options.mk | 19 +-----------------
mk/defaults/mk.conf | 40 +--------------------------------------
security/openssh/options.mk | 18 +----------------
www/apache2/options.mk | 11 +---------
8 files changed, 8 insertions(+), 180 deletions(-)
diffs (279 lines):
diff -r 83168dd81b24 -r 4c30f63b63a4 audio/musicpd/options.mk
--- a/audio/musicpd/options.mk Wed Dec 22 21:39:25 2004 +0000
+++ b/audio/musicpd/options.mk Wed Dec 22 21:46:24 2004 +0000
@@ -1,39 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2004/11/25 20:16:52 xtraeme Exp $
-#
-# XXX Support for the following variables will be removed after the
-# XXX pkgsrc-2004Q4 branch is released:
-# XXX
-# XXX MUSICPD_WITH_AAC
-# XXX MUSICPD_WITH_AUDIOFILE
-# XXX MUSICPD_WITH_FLAC
-# XXX MUSICPD_WITH_ICONV
-# XXX MUSICPD_WITH_ID3
-# XXX MUSICPD_WITH_OGG
-
-.if defined(MUSICPD_WITH_AAC) && !empty(MUSICPD_WITH_AAC:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= aac
-.endif
-
-.if defined(MUSICPD_WITH_AUDIOFILE) && \
- !empty(MUSICPD_WITH_AUDIOFILE:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= audiofile
-.endif
-
-.if defined(MUSICPD_WITH_FLAC) && !empty(MUSICPD_WITH_FLAC:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= flac
-.endif
-
-.if defined(MUSICPD_WITH_ICONV) && !empty(MUSICPD_WITH_ICONV:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= iconv
-.endif
-
-.if defined(MUSICPD_WITH_ID3) && !empty(MUSICPD_WITH_ID3:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= id3
-.endif
-
-.if defined(MUSICPD_WITH_OGG) && !empty(MUSICPD_WITH_OGG:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= ogg
-.endif
+# $NetBSD: options.mk,v 1.2 2004/12/22 21:46:24 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.musicpd
PKG_SUPPORTED_OPTIONS= aac audiofile flac iconv id3 ogg
diff -r 83168dd81b24 -r 4c30f63b63a4 devel/apr/options.mk
--- a/devel/apr/options.mk Wed Dec 22 21:39:25 2004 +0000
+++ b/devel/apr/options.mk Wed Dec 22 21:46:24 2004 +0000
@@ -1,18 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2004/11/21 07:57:38 jlam Exp $
-#
-# XXX Support for the following variables will be removed after the
-# XXX pkgsrc-2004Q4 branch is released:
-# XXX
-# XXX APR_USE_DB4
-# XXX APR_USE_OPENLDAP
-
-.if defined(APR_USE_DB4) && !empty(APR_USE_DB4:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= db4
-.endif
-
-.if defined(APR_USE_OPENLDAP) && !empty(APR_USE_OPENLDAP:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= ldap
-.endif
+# $NetBSD: options.mk,v 1.4 2004/12/22 21:46:25 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.apr
PKG_SUPPORTED_OPTIONS= db4 ldap
diff -r 83168dd81b24 -r 4c30f63b63a4 editors/xemacs-current/options.mk
--- a/editors/xemacs-current/options.mk Wed Dec 22 21:39:25 2004 +0000
+++ b/editors/xemacs-current/options.mk Wed Dec 22 21:46:24 2004 +0000
@@ -1,28 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2004/11/25 21:42:59 xtraeme Exp $
-#
-# XXX Support for the following variables will be removed after the
-# XXX pkgsrc-2004Q4 branch is released:
-# XXX
-# XXX USE_OPENLDAP
-# XXX USE_XFACE
-# XXX XEMACS_ESD
-# XXX XEMACS_USE_CANNA
-
-.if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= ldap
-.endif
-
-.if defined(USE_XFACE) && !empty(USE_XFACE:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= xfaces
-.endif
-
-.if defined(XEMACS_USE_CANNA) && !empty(XEMACS_USE_CANNA:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= canna
-.endif
-
-.if defined(XEMACS_ESD) && !empty(XEMACS_ESD:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= esoundd
-.endif
+# $NetBSD: options.mk,v 1.2 2004/12/22 21:46:25 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.xemacs
PKG_SUPPORTED_OPTIONS= esoundd ldap xface canna
diff -r 83168dd81b24 -r 4c30f63b63a4 editors/xemacs/options.mk
--- a/editors/xemacs/options.mk Wed Dec 22 21:39:25 2004 +0000
+++ b/editors/xemacs/options.mk Wed Dec 22 21:46:24 2004 +0000
@@ -1,23 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2004/11/25 21:34:59 xtraeme Exp $
-#
-# XXX Support for the following variables will be removed after the
-# XXX pkgsrc-2004Q4 branch is released:
-# XXX
-# XXX USE_OPENLDAP
-# XXX USE_XFACE
-# XXX XEMACS_USE_CANNA
-
-.if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= ldap
-.endif
-
-.if defined(USE_XFACE) && !empty(USE_XFACE:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= xfaces
-.endif
-
-.if defined(XEMACS_USE_CANNA) && !empty(XEMACS_USE_CANNA:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= canna
-.endif
+# $NetBSD: options.mk,v 1.2 2004/12/22 21:46:25 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.xemacs
PKG_SUPPORTED_OPTIONS= ldap xface canna
diff -r 83168dd81b24 -r 4c30f63b63a4 mail/teapop/options.mk
--- a/mail/teapop/options.mk Wed Dec 22 21:39:25 2004 +0000
+++ b/mail/teapop/options.mk Wed Dec 22 21:46:24 2004 +0000
@@ -1,20 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2004/11/25 20:49:30 xtraeme Exp $
-#
-# XXX Support for the following variables will be removed after the
-# XXX pkgsrc-2004Q4 branch is released:
-# XXX
-# XXX POP_WITH_DRAC
-# XXX TEAPOP_WITH_MYSQL
-# XXX TEAPOP_WITHOUT_APOP
-# XXX TEAPOP_WITHOUT_VPOP
-
-.if defined(POP_WITH_DRAC) && !empty(POP_WITH_DRAC:M[Yy][Ee][Ss])
-PKG_SUPPORTED_OPTIONS+= drac
-.endif
-
-.if defined(TEAPOP_WITH_MYSQL) && !empty(TEAPOP_WITH_MYSQL:M[Yy][Ee][Ss])
-PKG_SUPPORTED_OPTIONS+= mysql
-.endif
+# $NetBSD: options.mk,v 1.2 2004/12/22 21:46:25 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.teapop
PKG_SUPPORTED_OPTIONS= drac mysql apop vpop tcpd pgsql ldap inet6
@@ -71,4 +55,3 @@
.else
CONFIGURE_ARGS+= --disable-ipv6
.endif
-
diff -r 83168dd81b24 -r 4c30f63b63a4 mk/defaults/mk.conf
--- a/mk/defaults/mk.conf Wed Dec 22 21:39:25 2004 +0000
+++ b/mk/defaults/mk.conf Wed Dec 22 21:46:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.19 2004/12/21 00:19:40 schmonz Exp $
+# $NetBSD: mk.conf,v 1.20 2004/12/22 21:46:25 jlam Exp $
#
# A file providing defaults for pkgsrc and the packages collection.
@@ -675,12 +675,6 @@
# Possible: any group name
# Default: www
-#APACHE_SUEXEC= YES
-# Used in apache, apache2, and apache6 to enable Switch User For Exec
-# support. See http://www.apache.org/docs/suexec.html for more informations.
-# Possible: not defined, YES
-# Default: not defined
-
#APACHE_SUEXEC_CONFIGURE_ARGS= --suexec-uidmin=1000
# Used in apache, apache2, and apache6 to specify additional suexec options
# to be passed to the configure script.
@@ -693,17 +687,6 @@
# Possible: Any valid directory
# Default: ${LOCALBASE}/share/httpd/htdocs
-APR_USE_DB4?= NO
-# Used in apr to determine whether to use db4. If this is YES while
-# building apr and subversion-base, the latter will build the db4
-# back-end in addition to the native filesystem back-back.
-# Default: YES
-
-APR_USE_OPENLDAP?= NO
-# Used in apr to enable OpenLDAP support.
-# Possible: yes or no.
-# Default: no.
-
ARLA_CACHE?= ${LOCALBASE}/cache
# Used in arla to specify the location of the cache used by arla. Should
# be on a local disk.
@@ -1761,12 +1744,6 @@
# 'german' or 'portuguese_br'.
# Default: english
-#POP_WITH_DRAC=
-# Used in the following packages to enable the optional DRAC support:
-# teapop
-# Possible: defined, not defined
-# Default: not defined
-
#POPTOP_USE_MPPE=
# Used in poptop package to specify the use of the mppe-ppp package
# in preference to the standard ppp
@@ -1974,21 +1951,6 @@
# Possible: YES, or NO.
# Default: NO
-#TEAPOP_WITHOUT_VPOP=
-# Compile teapop without virtual domain support
-# Possible: defined, not defined
-# Default: not defined
-
-#TEAPOP_WITHOUT_APOP=
-# Compile teapop without apop support
-# Possible: defined, not defined
-# Default: not defined
-
-#TEAPOP_WITH_MYSQL= yes
-# Compile teapop with MySQL support.
-# Possible: defined, not defined
-# Default: not defined
-
#TEXMFSITE=
# Used in TeXfamily package which depends on teTeX package to specify
# site-local texmf configuration.
diff -r 83168dd81b24 -r 4c30f63b63a4 security/openssh/options.mk
--- a/security/openssh/options.mk Wed Dec 22 21:39:25 2004 +0000
+++ b/security/openssh/options.mk Wed Dec 22 21:46:24 2004 +0000
@@ -1,23 +1,7 @@
-# $NetBSD: options.mk,v 1.1 2004/11/25 19:25:28 xtraeme Exp $
-#
-# XXX Support for the following variables will be removed after the
-# XXX pkgsrc-2004Q4 branch is released:
-# XXX
-# XXX USE_KERBEROS
-# XXX USE_PÂM
+# $NetBSD: options.mk,v 1.2 2004/12/22 21:46:25 jlam Exp $
.include "../../mk/bsd.prefs.mk"
-.if !empty(OPSYS:MLinux)
-. if defined(USE_PAM) && !empty(USE_PAM:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= PAM
-. endif
-.endif
-
-.if defined(USE_KERBEROS) && !empty(USE_KERBEROS:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= kerberos
-.endif
-
PKG_OPTIONS_VAR= PKG_OPTIONS.openssh
PKG_SUPPORTED_OPTIONS= kerberos hpn-patch
diff -r 83168dd81b24 -r 4c30f63b63a4 www/apache2/options.mk
--- a/www/apache2/options.mk Wed Dec 22 21:39:25 2004 +0000
+++ b/www/apache2/options.mk Wed Dec 22 21:46:24 2004 +0000
@@ -1,13 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2004/11/22 20:25:26 jlam Exp $
-#
-# XXX Support for the following variables will be removed after the
-# XXX pkgsrc-2004Q4 branch is released:
-# XXX
-# XXX APACHE_SUEXEC
-
-.if defined(APACHE_SUEXEC) && !empty(APACHE_SUEXEC:M[Yy][Ee][Ss])
-PKG_DEFAULT_OPTIONS+= suexec
-.endif
+# $NetBSD: options.mk,v 1.2 2004/12/22 21:46:25 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.apache
PKG_SUPPORTED_OPTIONS= suexec
Home |
Main Index |
Thread Index |
Old Index