Remove support for some variables that are supposed to go away after

pkgsrc-2004Q4 is branched.

1 files changed, 1 insertions, 39 deletions

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.