diff options
author | wiz <wiz> | 2007-10-16 21:32:59 +0000 |
---|---|---|
committer | wiz <wiz> | 2007-10-16 21:32:59 +0000 |
commit | 6bea42e07aa25208f72cc656a34471e1d8fa0260 (patch) | |
tree | ff0214e141e1a1c5b443196e07a6cb075db97b88 /editors | |
parent | 6890be67a1bc725ac4f2df6c7801bd733bbcb3e2 (diff) | |
download | pkgsrc-6bea42e07aa25208f72cc656a34471e1d8fa0260.tar.gz |
Remove some legacy support after branching 2007Q3.
Diffstat (limited to 'editors')
-rw-r--r-- | editors/emacs/options.mk | 12 | ||||
-rw-r--r-- | editors/emacs20/options.mk | 20 |
2 files changed, 2 insertions, 30 deletions
diff --git a/editors/emacs/options.mk b/editors/emacs/options.mk index 8558abfd2a3..ef92f84f5f7 100644 --- a/editors/emacs/options.mk +++ b/editors/emacs/options.mk @@ -1,8 +1,7 @@ -# $NetBSD: options.mk,v 1.4 2007/08/23 13:57:38 obache Exp $ +# $NetBSD: options.mk,v 1.5 2007/10/16 21:33:00 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.emacs PKG_SUPPORTED_OPTIONS= x11 -PKG_SUPPORTED_OPTIONS+= nox11 # OBSOLETE; remove after pkgsrc-2007Q4 PKG_OPTIONS_OPTIONAL_GROUPS= toolkit PKG_OPTIONS_GROUP.toolkit= gtk motif xaw PKG_SUGGESTED_OPTIONS= x11 @@ -10,15 +9,6 @@ PKG_SUGGESTED_OPTIONS= x11 .include "../../mk/bsd.options.mk" ### -### OBSOLETE section. Should be removed after pkgsrc-2007Q4. -### The "nox11" option implies removing all of the "x11"-related options. -### -.if !empty(PKG_OPTIONS:Mnox11) -PKG_OPTIONS:= ${PKG_OPTIONS:Nx11:Ngtk:Nmotif:Nxaw} -PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated option nox11 used, use option -x11 instead." -.endif - -### ### Any of the "toolkit" options implies "x11". ### .if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mmotif) || !empty(PKG_OPTIONS:Mxaw) diff --git a/editors/emacs20/options.mk b/editors/emacs20/options.mk index 44b6d5b66be..43c2cd4ee8a 100644 --- a/editors/emacs20/options.mk +++ b/editors/emacs20/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2007/08/13 12:40:58 jlam Exp $ +# $NetBSD: options.mk,v 1.2 2007/10/16 21:33:00 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.emacs PKG_SUPPORTED_OPTIONS= emacs-pop inet6 x11 @@ -6,24 +6,6 @@ PKG_OPTIONS_OPTIONAL_GROUPS= toolkit PKG_OPTIONS_GROUP.toolkit= motif xaw PKG_SUGGESTED_OPTIONS= emacs-pop inet6 -### -### OBSOLETE section. Should be removed after pkgsrc-2007Q4. -### - -PKG_OPTIONS_LEGACY_VARS+= EMACS_USE_POP:emacs-pop -PKG_OPTIONS_LEGACY_VARS+= EMACS_USE_X:x11 - -.if defined(EMACS_USE_X) && defined(EMACS_USE_X_TOOLKIT) -. if (${EMACS_USE_X_TOOLKIT} == "lucid") || \ - (${EMACS_USE_X_TOOLKIT} == "athena") -PKG_LEGACY_OPTIONS+= xaw -PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable EMACS_USE_X_TOOLKIT="${EMACS_USE_X_TOOLKIT:Q}" used, use PKG_DEFAULT_OPTIONS+=xaw instead." -. elif ${EMACS_USE_X_TOOLKIT} == "motif" -PKG_LEGACY_OPTIONS+= motif -PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable EMACS_USE_X_TOOLKIT="${EMACS_USE_X_TOOLKIT:Q}" used, use PKG_DEFAULT_OPTIONS+=motif instead." -. endif -.endif - .include "../../mk/bsd.options.mk" ### |