diff options
| -rw-r--r-- | audio/easytag/options.mk | 4 | ||||
| -rw-r--r-- | editors/emacs/options.mk | 12 | ||||
| -rw-r--r-- | editors/emacs20/options.mk | 20 | ||||
| -rw-r--r-- | mk/misc/show.mk | 5 |
4 files changed, 4 insertions, 37 deletions
diff --git a/audio/easytag/options.mk b/audio/easytag/options.mk index 962ccf9f788..d55ec15d77f 100644 --- a/audio/easytag/options.mk +++ b/audio/easytag/options.mk @@ -1,8 +1,6 @@ -# $NetBSD: options.mk,v 1.2 2007/07/07 02:18:12 wiz Exp $ +# $NetBSD: options.mk,v 1.3 2007/10/16 21:32:59 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.easytag -# remove after 2007Q3 -PKG_LEGACY_OPTIONS= ${PKG_OPTIONS.easytag-gtk2} PKG_SUPPORTED_OPTIONS= flac mpeg4ip ogg PKG_SUGGESTED_OPTIONS= flac mpeg4ip ogg 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" ### diff --git a/mk/misc/show.mk b/mk/misc/show.mk index f99d14de193..17688897f46 100644 --- a/mk/misc/show.mk +++ b/mk/misc/show.mk @@ -1,4 +1,4 @@ -# $NetBSD: show.mk,v 1.7 2007/09/12 10:08:38 rillig Exp $ +# $NetBSD: show.mk,v 1.8 2007/10/16 21:33:00 wiz Exp $ # # This file contains some targets that print information gathered from # variables. They do not modify any variables. @@ -63,9 +63,6 @@ show-build-defs: .PHONY @${ECHO} "==========================================================================" .endif -# @deprecated -- remove after 2007Q1 -build-defs-message: show-build-defs .PHONY - # show-all: # Prints a list of (hopefully) all pkgsrc variables that are visible # to the user or the package developer. It is intended to give |