diff options
author | jlam <jlam> | 2004-12-22 21:46:24 +0000 |
---|---|---|
committer | jlam <jlam> | 2004-12-22 21:46:24 +0000 |
commit | 1da23b108a02d9db4805cdf833b36936649a16db (patch) | |
tree | 2e64863d9b4daeb20990b193ef0a49af38da8c57 | |
parent | b9523c2d425a09fdda3ed85dbdbf7321f3f851cb (diff) | |
download | pkgsrc-1da23b108a02d9db4805cdf833b36936649a16db.tar.gz |
Remove support for some variables that are supposed to go away after
pkgsrc-2004Q4 is branched.
-rw-r--r-- | audio/musicpd/options.mk | 37 | ||||
-rw-r--r-- | devel/apr/options.mk | 16 | ||||
-rw-r--r-- | editors/xemacs-current/options.mk | 26 | ||||
-rw-r--r-- | editors/xemacs/options.mk | 21 | ||||
-rw-r--r-- | mail/teapop/options.mk | 19 | ||||
-rw-r--r-- | mk/defaults/mk.conf | 40 | ||||
-rw-r--r-- | security/openssh/options.mk | 18 | ||||
-rw-r--r-- | www/apache2/options.mk | 11 |
8 files changed, 8 insertions, 180 deletions
diff --git a/audio/musicpd/options.mk b/audio/musicpd/options.mk index 2d3043f77ce..23d01adba4e 100644 --- a/audio/musicpd/options.mk +++ b/audio/musicpd/options.mk @@ -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 --git a/devel/apr/options.mk b/devel/apr/options.mk index da16154f580..dd19c9a7d04 100644 --- a/devel/apr/options.mk +++ b/devel/apr/options.mk @@ -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 --git a/editors/xemacs-current/options.mk b/editors/xemacs-current/options.mk index 8c7a7e33eec..8d23ba7c6ab 100644 --- a/editors/xemacs-current/options.mk +++ b/editors/xemacs-current/options.mk @@ -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 --git a/editors/xemacs/options.mk b/editors/xemacs/options.mk index a5ba8d78666..22456d4a2d2 100644 --- a/editors/xemacs/options.mk +++ b/editors/xemacs/options.mk @@ -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 --git a/mail/teapop/options.mk b/mail/teapop/options.mk index 2855eb48445..c306d679d8e 100644 --- a/mail/teapop/options.mk +++ b/mail/teapop/options.mk @@ -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 @@ CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 .endif - diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 19a88482188..56289ba0ead 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -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 @@ APACHE_GROUP?= www # 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 @@ APACHE_SUEXEC_DOCROOT?= ${LOCALBASE}/share/httpd/htdocs # 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 @@ PKG_LANG?=english # '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 @@ TIN_USE_INN_SPOOL?= NO # 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 --git a/security/openssh/options.mk b/security/openssh/options.mk index 6b0bf53b12f..c03569c661f 100644 --- a/security/openssh/options.mk +++ b/security/openssh/options.mk @@ -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 --git a/www/apache2/options.mk b/www/apache2/options.mk index 01338b58a56..3730e8817d7 100644 --- a/www/apache2/options.mk +++ b/www/apache2/options.mk @@ -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 |