summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam>2004-11-17 23:28:12 +0000
committerjlam <jlam>2004-11-17 23:28:12 +0000
commit9edba317c6e514149ee4d045c6985e89cc40e573 (patch)
treeb1256624ddaea6d9856e545397c1b67a0d26e475
parent9795e6f1129999805fd7d77d3a314c13712515ec (diff)
downloadpkgsrc-9edba317c6e514149ee4d045c6985e89cc40e573.tar.gz
Remove some obsolete/deprecated variables that have been in this file
for over two years. They're officially dead now for the upcoming branch and beyond.
-rw-r--r--mk/defaults/obsolete.mk44
1 files changed, 1 insertions, 43 deletions
diff --git a/mk/defaults/obsolete.mk b/mk/defaults/obsolete.mk
index b6cc21dd4fb..bda76ba6655 100644
--- a/mk/defaults/obsolete.mk
+++ b/mk/defaults/obsolete.mk
@@ -1,51 +1,9 @@
-# $NetBSD: obsolete.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
+# $NetBSD: obsolete.mk,v 1.2 2004/11/17 23:28:12 jlam Exp $
#
# This file holds make(1) logic to allow obsolete or deprecated variables
# still to be used. These may eventually disappear over time as the contents
# are, by definition, obsolete and deprecated.
-.if defined(APACHE_SUEXEC_USER)
-APACHE_USER?= ${APACHE_SUEXEC_USER}
-.endif
-
-.if defined(APACHE_SYSCONFDIR)
-PKG_SYSCONFDIR.ap-ssl?= ${APACHE_SYSCONFDIR}
-PKG_SYSCONFDIR.apache?= ${APACHE_SYSCONFDIR}
-PKG_SYSCONFDIR.apache6?= ${APACHE_SYSCONFDIR}
-PKG_SYSCONFDIR.apc-gui?= ${APACHE_SYSCONFDIR}
-PKG_SYSCONFDIR.cvsweb?= ${APACHE_SYSCONFDIR}
-PKG_SYSCONFDIR.imp?= ${APACHE_SYSCONFDIR}
-PKG_SYSCONFDIR.horde?= ${APACHE_SYSCONFDIR}
-PKG_SYSCONFDIR.p5-HTTPD-User-Manage?= ${APACHE_SYSCONFDIR}
-PKG_SYSCONFDIR.squirrelmail?= ${APACHE_SYSCONFDIR}
-PKG_SYSCONFDIR.stripes?= ${APACHE_SYSCONFDIR}
-.endif
-
-.if defined(PHP_CONFDIR)
-PKG_SYSCONFDIR.php?= ${PHP_CONFDIR}
-.endif
-
-.if defined(SSH_CONF_DIR)
-PKG_SYSCONFDIR.openssh?= ${SSH_CONF_DIR}
-PKG_SYSCONFDIR.ssh?= ${SSH_CONF_DIR}
-.endif
-
-.if defined(VTUN_SYSCONFDIR)
-PKG_SYSCONFDIR.vtun?= ${VTUN_SYSCONFDIR}
-.endif
-
-.if defined(SAMBA_WITH_CUPS)
-USE_CUPS= YES
-.endif
-
-.if defined(SQUID_SYSCONFDIR)
-PKG_SYSCONFDIR.squid?= ${SQUID_SYSCONFDIR}
-.endif
-
-.if defined(ELK_USE_X11)
-ELK_GUI= xaw
-.endif
-
.if defined(PRIV_CONF_DIR)
PKG_SYSCONFDIR.priv?= ${PRIV_CONF_DIR}
.endif