summaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorjlam <jlam>2004-12-22 21:46:24 +0000
committerjlam <jlam>2004-12-22 21:46:24 +0000
commitadc71416c58c1810357adfc630c01f21064043d8 (patch)
tree2e64863d9b4daeb20990b193ef0a49af38da8c57 /editors
parent01c3cc7fa52b88f1037e076b07e70b2cbd3056fc (diff)
downloadpkgsrc-adc71416c58c1810357adfc630c01f21064043d8.tar.gz
Remove support for some variables that are supposed to go away after
pkgsrc-2004Q4 is branched.
Diffstat (limited to 'editors')
-rw-r--r--editors/xemacs-current/options.mk26
-rw-r--r--editors/xemacs/options.mk21
2 files changed, 2 insertions, 45 deletions
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