diff options
41 files changed, 44 insertions, 135 deletions
diff --git a/audio/gqmpeg-devel/options.mk b/audio/gqmpeg-devel/options.mk index b22cfe00dbe..fec94b08020 100644 --- a/audio/gqmpeg-devel/options.mk +++ b/audio/gqmpeg-devel/options.mk @@ -1,9 +1,8 @@ -# $NetBSD: options.mk,v 1.1 2005/05/31 15:13:57 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2005/10/05 13:29:49 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gqmpeg PKG_SUPPORTED_OPTIONS= gqmpeg-japanese gqmpeg-russian PKG_SUGGESTED_OPTIONS= gqmpeg-japanese gqmpeg-russian -PKG_OPTIONS_LEGACY_VARS+= GQMPEG_NO_JAPANESE:-gqmpeg-japanese GQMPEG_NO_RUSSIAN:-gqmpeg-russian .include "../../mk/bsd.options.mk" diff --git a/audio/gqmpeg/options.mk b/audio/gqmpeg/options.mk index d4485e0b46f..fec94b08020 100644 --- a/audio/gqmpeg/options.mk +++ b/audio/gqmpeg/options.mk @@ -1,9 +1,8 @@ -# $NetBSD: options.mk,v 1.1 2005/05/31 12:20:11 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2005/10/05 13:29:49 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gqmpeg PKG_SUPPORTED_OPTIONS= gqmpeg-japanese gqmpeg-russian PKG_SUGGESTED_OPTIONS= gqmpeg-japanese gqmpeg-russian -PKG_OPTIONS_LEGACY_VARS+= GQMPEG_NO_JAPANESE:-gqmpeg-japanese GQMPEG_NO_RUSSIAN:-gqmpeg-russian .include "../../mk/bsd.options.mk" diff --git a/audio/lame/options.mk b/audio/lame/options.mk index 9f6733d7b97..0fcaef3df5a 100644 --- a/audio/lame/options.mk +++ b/audio/lame/options.mk @@ -1,8 +1,7 @@ -# $NetBSD: options.mk,v 1.1 2005/05/31 16:04:28 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2005/10/05 13:29:49 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.lame PKG_SUPPORTED_OPTIONS= gtk -PKG_OPTIONS_LEGACY_VARS+= LAME_USE_GTK:gtk .include "../../mk/bsd.options.mk" diff --git a/chat/bitchx/options.mk b/chat/bitchx/options.mk index cec6570f7de..946f88bbcf0 100644 --- a/chat/bitchx/options.mk +++ b/chat/bitchx/options.mk @@ -1,8 +1,7 @@ -# $NetBSD: options.mk,v 1.1 2005/05/31 16:36:40 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2005/10/05 13:29:49 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.bitchx PKG_SUPPORTED_OPTIONS= gtk -PKG_OPTIONS_LEGACY_VARS+= BITCHX_WITH_GTK:gtk .include "../../mk/bsd.options.mk" diff --git a/chat/irssi/options.mk b/chat/irssi/options.mk index 08c96afdf0c..a5efaef6bee 100644 --- a/chat/irssi/options.mk +++ b/chat/irssi/options.mk @@ -1,8 +1,7 @@ -# $NetBSD: options.mk,v 1.3 2005/08/06 06:19:04 jlam Exp $ +# $NetBSD: options.mk,v 1.4 2005/10/05 13:29:50 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.irssi PKG_SUPPORTED_OPTIONS= inet6 irssi-perl ssl -PKG_OPTIONS_LEGACY_VARS+= IRSSI_USE_PERL:irssi-perl IRSSI_USE_SSL:ssl .include "../../mk/bsd.options.mk" diff --git a/chat/xchat/options.mk b/chat/xchat/options.mk index d9768e3e379..43209ca37de 100644 --- a/chat/xchat/options.mk +++ b/chat/xchat/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2005/06/19 01:46:35 salo Exp $ +# $NetBSD: options.mk,v 1.7 2005/10/05 13:29:50 wiz Exp $ .include "../../mk/bsd.prefs.mk" @@ -6,12 +6,6 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.xchat PKG_SUPPORTED_OPTIONS= inet6 ssl socks5 PKG_SUGGESTED_OPTIONS= ssl -PKG_OPTIONS_LEGACY_OPTS+= socks:socks5 - -.if defined(PKG_OPTIONS.xchat2) -PKG_LEGACY_OPTIONS+= ${PKG_OPTIONS.xchat2} -PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable PKG_OPTIONS.xchat2 used, use "${PKG_OPTIONS_VAR:Q}" instead." -.endif .include "../../mk/bsd.options.mk" diff --git a/databases/db4/options.mk b/databases/db4/options.mk index 9c6b5656831..d0fb3a7a347 100644 --- a/databases/db4/options.mk +++ b/databases/db4/options.mk @@ -1,8 +1,7 @@ -# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:36 dillo Exp $ +# $NetBSD: options.mk,v 1.3 2005/10/05 13:29:49 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.db4 PKG_SUPPORTED_OPTIONS= java -PKG_OPTIONS_LEGACY_VARS+= WITH_JAVA:java .include "../../mk/bsd.options.mk" diff --git a/databases/postgresql80/options.mk b/databases/postgresql80/options.mk index c4cbb5518f7..698a5096144 100644 --- a/databases/postgresql80/options.mk +++ b/databases/postgresql80/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.1 2005/08/05 19:43:45 jlam Exp $ +# $NetBSD: options.mk,v 1.2 2005/10/05 13:29:50 wiz Exp $ PKG_SUPPORTED_OPTIONS+= pgsql-hier-query -PKG_OPTIONS_LEGACY_VARS+= PGSQL_USE_HIER:pgsql-hier-query + .include "../../mk/bsd.options.mk" ### diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile index 0ff30e61d03..25cb2891936 100644 --- a/devel/monotone/Makefile +++ b/devel/monotone/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/09/30 13:18:24 jmmv Exp $ +# $NetBSD: Makefile,v 1.16 2005/10/05 13:29:51 wiz Exp $ # DISTNAME= monotone-0.23 @@ -22,7 +22,6 @@ CONFIGURE_ARGS+= BOOST_SUFFIX=-mt PKG_OPTIONS_VAR= PKG_OPTIONS.monotone PKG_SUPPORTED_OPTIONS= inet6 -PKG_OPTIONS_LEGACY_OPTS+= ipv6:inet6 .include "../../mk/bsd.options.mk" diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 2ef85be2b5f..18e9d8d5711 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.86 2005/06/08 14:39:40 markd Exp $ +# $NetBSD: Makefile,v 1.87 2005/10/05 13:29:49 wiz Exp $ DISTNAME= emacs-${EMACSVERSION}a PKGREVISION= 1 @@ -28,7 +28,6 @@ CONFIGURE_ARGS+= --with-png PKG_OPTIONS_VAR= PKG_OPTIONS.emacs PKG_SUPPORTED_OPTIONS= emacs-xaw3d -PKG_OPTIONS_LEGACY_VARS+= EMACS_USE_XAW3D:emacs-xaw3d .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Memacs-xaw3d) diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index 5b3f60142e1..d289cc8c8f9 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2005/06/01 18:02:48 jlam Exp $ +# $NetBSD: Makefile,v 1.58 2005/10/05 13:29:49 wiz Exp $ # DISTNAME= vice-1.16 @@ -32,7 +32,6 @@ INFO_FILES= vice.info PKG_OPTIONS_VAR= PKG_OPTIONS.vice PKG_SUPPORTED_OPTIONS= esound ffmpeg gnome -PKG_OPTIONS_LEGACY_VARS+=VICE_USE_FFMPEG:ffmpeg .include "../../mk/bsd.options.mk" diff --git a/games/battleball/options.mk b/games/battleball/options.mk index 91561f556cd..b40d50c5cfa 100644 --- a/games/battleball/options.mk +++ b/games/battleball/options.mk @@ -1,8 +1,7 @@ -# $NetBSD: options.mk,v 1.2 2005/06/10 18:11:57 dillo Exp $ +# $NetBSD: options.mk,v 1.3 2005/10/05 13:29:50 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.battleball PKG_SUPPORTED_OPTIONS= opengl -PKG_OPTIONS_LEGACY_VARS+= BATTLEBALL_USE_MESA:opengl .include "../../mk/bsd.options.mk" diff --git a/graphics/blender/options.mk b/graphics/blender/options.mk index 53044268694..47f61edfa6e 100644 --- a/graphics/blender/options.mk +++ b/graphics/blender/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2005/06/02 14:14:43 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2005/10/05 13:29:49 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.blender PKG_SUPPORTED_OPTIONS= @@ -6,10 +6,6 @@ PKG_SUPPORTED_OPTIONS= .if 0 PKG_SUPPORTED_OPTIONS+= blender-exppython ogg openal vorbis .endif -PKG_OPTIONS_LEGACY_VARS+= BLENDER_USE_EXPPYTHON:blender-exppython -PKG_OPTIONS_LEGACY_VARS+= BLENDER_USE_OGG:ogg -PKG_OPTIONS_LEGACY_VARS+= BLENDER_USE_OPENAL:openal -PKG_OPTIONS_LEGACY_VARS+= BLENDER_USE_VORBIS:vorbis .include "../../mk/bsd.options.mk" diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile index 3f59dd9e7e4..c90a7f35c1e 100644 --- a/graphics/freetype2/Makefile +++ b/graphics/freetype2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2005/06/30 13:01:28 adam Exp $ +# $NetBSD: Makefile,v 1.45 2005/10/05 13:29:50 wiz Exp $ DISTNAME= freetype-2.1.10 PKGNAME= freetype2-2.1.10 @@ -31,7 +31,6 @@ PKGCONFIG_OVERRIDE= builds/unix/freetype2.in PKG_OPTIONS_VAR+= PKG_OPTIONS.freetype2 PKG_SUPPORTED_OPTIONS= truetype -PKG_OPTIONS_LEGACY_VARS+= MKTTINTERP:truetype .include "../../mk/bsd.options.mk" diff --git a/graphics/gimp1-base/options.mk b/graphics/gimp1-base/options.mk index 5982eec1334..caf63e00efe 100644 --- a/graphics/gimp1-base/options.mk +++ b/graphics/gimp1-base/options.mk @@ -1,8 +1,7 @@ -# $NetBSD: options.mk,v 1.1 2005/05/31 22:26:10 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2005/10/05 13:29:49 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gimp-base PKG_SUPPORTED_OPTIONS= gimp1-helpbrowser -PKG_OPTIONS_LEGACY_VARS+= GIMP_WITH_HELPBROWSER:gimp1-helpbrowser .include "../../mk/bsd.options.mk" diff --git a/inputmethod/anthy/Makefile b/inputmethod/anthy/Makefile index 3eed0cb7f74..be6673ee587 100644 --- a/inputmethod/anthy/Makefile +++ b/inputmethod/anthy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/09/05 15:00:09 taya Exp $ +# $NetBSD: Makefile,v 1.9 2005/10/05 13:29:50 wiz Exp $ .include "../../inputmethod/anthy/Makefile.common" @@ -18,8 +18,6 @@ PKGCONFIG_OVERRIDE+= anthy.pc.in PKG_OPTIONS_VAR= PKG_OPTIONS.anthy PKG_SUPPORTED_OPTIONS= 2ch_dict okinawa_dict -PKG_OPTIONS_LEGACY_VARS+= USE_2CH_DICT:2ch_dict -PKG_OPTIONS_LEGACY_VARS+= USE_OKINAWA_DICT:okinawa_dict .include "../../mk/bsd.options.mk" diff --git a/inputmethod/uim/options.mk b/inputmethod/uim/options.mk index c58193ae7bc..a1c591e17d9 100644 --- a/inputmethod/uim/options.mk +++ b/inputmethod/uim/options.mk @@ -1,12 +1,8 @@ -# $NetBSD: options.mk,v 1.7 2005/09/30 12:43:35 wiz Exp $ +# $NetBSD: options.mk,v 1.8 2005/10/05 13:29:51 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.uim PKG_SUPPORTED_OPTIONS= anthy canna eb gtk qt PKG_SUGGESTED_OPTIONS= anthy canna gtk -PKG_OPTIONS_LEGACY_VARS+= UIM_USE_ANTHY:anthy -PKG_OPTIONS_LEGACY_VARS+= UIM_USE_CANNA:canna -PKG_OPTIONS_LEGACY_VARS+= UIM_USE_EB:eb -PKG_OPTIONS_LEGACY_VARS+= UIM_USE_QT:qt .include "../../mk/bsd.options.mk" diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile index fd6c849023c..b0ca6a8e4bc 100644 --- a/lang/perl5/Makefile +++ b/lang/perl5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.102 2005/08/22 17:40:20 reed Exp $ +# $NetBSD: Makefile,v 1.103 2005/10/05 13:29:50 wiz Exp $ # The following two variables should have empty values unless we're # building a perl snapshot or release candidate. @@ -230,7 +230,6 @@ PKG_SUPPORTED_OPTIONS= threads .if !empty(PERL5_BUILD_THREADS_SUPPORT:M[yY][eE][sS]) PKG_SUGGESTED_OPTIONS= threads .endif -PKG_OPTIONS_LEGACY_VARS+= PERL5_USE_THREADS:threads .include "../../mk/bsd.options.mk" diff --git a/mail/cue/Makefile b/mail/cue/Makefile index b478a0924cb..4af82d9fdc6 100644 --- a/mail/cue/Makefile +++ b/mail/cue/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2005/06/16 06:58:02 jlam Exp $ +# $NetBSD: Makefile,v 1.48 2005/10/05 13:29:50 wiz Exp $ DISTNAME= cue-snap-20050131 PKGNAME= cue-20050131 @@ -14,7 +14,6 @@ GNU_CONFIGURE= yes PKG_OPTIONS_VAR= PKG_OPTIONS.cue PKG_SUPPORTED_OPTIONS= canna idea inet6 -PKG_OPTIONS_LEGACY_VARS+= CUE_USE_CANNA:canna .include "../../mk/bsd.options.mk" diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile index 4cb83486893..491b24dd0fa 100644 --- a/mail/cyrus-imapd21/Makefile +++ b/mail/cyrus-imapd21/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2005/08/08 16:50:59 jlam Exp $ +# $NetBSD: Makefile,v 1.35 2005/10/05 13:29:50 wiz Exp $ DISTNAME= cyrus-imapd-2.1.18 SVR4_PKGNAME= cimap @@ -59,8 +59,6 @@ CONFIGURE_ENV+= ac_cv_lib_${_var_}_db_create=no PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-imapd PKG_SUPPORTED_OPTIONS= gssapi inet6 kerberos kerberos4 recommended-db -PKG_OPTIONS_LEGACY_VARS+= CYRUS_USE_INET6:inet6 -PKG_OPTIONS_LEGACY_VARS+= CYRUS_DB_RECOMMEND:recommend-db .include "../../mk/bsd.options.mk" diff --git a/mail/deliver/Makefile b/mail/deliver/Makefile index 6caa8ddd18b..1f12053fdd0 100644 --- a/mail/deliver/Makefile +++ b/mail/deliver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/06/01 14:45:01 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2005/10/05 13:29:49 wiz Exp $ DISTNAME= deliver-2.1.14 PKGREVISION= 1 @@ -13,7 +13,6 @@ PKG_SYSCONFSUBDIR= deliver PKG_OPTIONS_VAR= PKG_OPTIONS.deliver PKG_SUPPORTED_OPTIONS= deliver-suid -PKG_OPTIONS_LEGACY_VARS+= DELIVER_SUID:deliver-suid .include "../../mk/bsd.options.mk" diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index 37e5592c365..7b08b2ad480 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.90 2005/08/24 10:59:12 adrianp Exp $ +# $NetBSD: Makefile,v 1.91 2005/10/05 13:29:50 wiz Exp $ DISTNAME= evolution-2.2.3 PKGREVISION= 1 @@ -15,7 +15,6 @@ BUILD_USES_MSGFMT= YES PKG_OPTIONS_VAR= PKG_OPTIONS.evolution PKG_SUPPORTED_OPTIONS= inet6 krb4 krb5 ssl -PKG_OPTIONS_LEGACY_OPTS+= ipv6:inet6 .include "../../mk/bsd.options.mk" diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile index cc8da4dfa2d..10fb9c65cb0 100644 --- a/mail/imap-uw/Makefile +++ b/mail/imap-uw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.100 2005/10/02 20:26:24 minskim Exp $ +# $NetBSD: Makefile,v 1.101 2005/10/05 13:29:51 wiz Exp $ # # ATTENTION: # The Kerberos support in this software is known to be problematic. If you @@ -42,18 +42,15 @@ BUILD_TARGET= osf .else BUILD_TARGET= neb +PKG_OPTIONS_VAR= PKG_OPTIONS.imap-uw +PKG_SUPPORTED_OPTIONS+= inet6 # Kerberos is explicitly not enabled on NetBSD 1.x due to interoperability # issues with later versions of OpenSSL (e.g. 0.9.7) . if empty(MACHINE_PLATFORM:MNetBSD-1.*) PKG_SUPPORTED_OPTIONS+= kerberos - -PKG_OPTIONS_LEGACY_VARS+= USE_KERBEROS:kerberos . endif .endif -PKG_OPTIONS_VAR= PKG_OPTIONS.imap-uw -PKG_SUPPORTED_OPTIONS+= inet6 - .include "../../mk/bsd.options.mk" .if empty(PKG_OPTIONS:Minet6) diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile index 2bb299eeccf..62e7c2805d4 100644 --- a/mail/mail-notification/Makefile +++ b/mail/mail-notification/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/08/10 20:56:19 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/10/05 13:29:50 wiz Exp $ # DISTNAME= mail-notification-1.0 @@ -26,7 +26,6 @@ CONF_FILES= ${EGDIR}/sound/events/mail-notification.soundlist \ PKG_OPTIONS_VAR= PKG_OPTIONS.mail-notification PKG_SUPPORTED_OPTIONS= inet6 sasl ssl -PKG_OPTIONS_LEGACY_OPTS+= ipv6:inet6 .include "../../mk/bsd.prefs.mk" .include "../../mk/bsd.options.mk" diff --git a/mail/nmh/options.mk b/mail/nmh/options.mk index 1d379ad1090..9a39eb5b8a8 100644 --- a/mail/nmh/options.mk +++ b/mail/nmh/options.mk @@ -1,8 +1,7 @@ -# $NetBSD: options.mk,v 1.1 2005/09/22 22:00:42 jlam Exp $ +# $NetBSD: options.mk,v 1.2 2005/10/05 13:29:51 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.nmh PKG_SUPPORTED_OPTIONS= nmh-backup-hash -PKG_OPTIONS_LEGACY_VARS+= NMH_HASH_BACKUP:nmh-backup-hash .include "../../mk/bsd.options.mk" diff --git a/mail/sendmail/options.mk b/mail/sendmail/options.mk index d1e41596fe4..a93072db004 100644 --- a/mail/sendmail/options.mk +++ b/mail/sendmail/options.mk @@ -1,12 +1,9 @@ -# $NetBSD: options.mk,v 1.10 2005/08/01 15:27:00 wiz Exp $ +# $NetBSD: options.mk,v 1.11 2005/10/05 13:29:50 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.sendmail PKG_SUPPORTED_OPTIONS= inet6 db2 db4 ldap sasl tls tcpwrappers sendmail-socketmap PKG_SUGGESTED_OPTIONS= tcpwrappers -PKG_OPTIONS_LEGACY_OPTS+= starttls:tls -PKG_OPTIONS_LEGACY_OPTS+= socketmap:sendmail-socketmap - .include "../../mk/bsd.options.mk" ### diff --git a/mail/sendmail812/options.mk b/mail/sendmail812/options.mk index def9295581c..3cb6ea45035 100644 --- a/mail/sendmail812/options.mk +++ b/mail/sendmail812/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2005/08/01 15:27:00 wiz Exp $ +# $NetBSD: options.mk,v 1.3 2005/10/05 13:29:50 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.sendmail PKG_OPTIONS_OPTIONAL_GROUPS= database @@ -6,11 +6,6 @@ PKG_OPTIONS_GROUP.database= db2 db4 PKG_SUPPORTED_OPTIONS= inet6 ldap sasl tls tcpwrappers sendmail-socketmap PKG_SUGGESTED_OPTIONS= tcpwrappers -PKG_OPTIONS_LEGACY_OPTS+= starttls:tls -PKG_OPTIONS_LEGACY_OPTS+= socketmap:sendmail-socketmap -PKG_OPTIONS_LEGACY_VARS+= USE_STARTTLS:ssl -PKG_OPTIONS_LEGACY_VARS+= USE_TCPWRAPPERS:tcpwrappers - .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile index 000bf2d2b7f..cf67949a192 100644 --- a/misc/pinfo/Makefile +++ b/misc/pinfo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/06/02 18:30:17 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2005/10/05 13:29:49 wiz Exp $ # DISTNAME= pinfo-0.6.1 @@ -30,7 +30,6 @@ post-install: PKG_OPTIONS_VAR= PKG_OPTIONS.pinfo PKG_SUPPORTED_OPTIONS= pinfo-native-curses -PKG_OPTIONS_LEGACY_VARS+= PINFO_USE_NATIVE_CURSES:pinfo-native-curses .include "../../mk/bsd.options.mk" diff --git a/multimedia/mplayer-share/options.mk b/multimedia/mplayer-share/options.mk index d4112fc19ad..771e98883f6 100644 --- a/multimedia/mplayer-share/options.mk +++ b/multimedia/mplayer-share/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2005/07/21 15:20:47 wiz Exp $ +# $NetBSD: options.mk,v 1.8 2005/10/05 13:29:50 wiz Exp $ .if defined(PKGNAME) && empty(PKGNAME:Mmplayer-share*) @@ -55,24 +55,6 @@ PKG_SUGGESTED_OPTIONS+= ${_o_} .endfor # ------------------------------------------------------------------------- -# Define PKG_SUGGESTED_OPTIONS based on deprecated variables. -# ------------------------------------------------------------------------- - -.for d in ${MPLAYER_DISABLE_DRIVERS} -PKG_LEGACY_OPTIONS+=-${d:S/esd/esound/} -PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable MPLAYER_DISABLE_DRIVERS="${d:Q}" used; use "${PKG_OPTIONS_VAR:Q}"+=-"${d:S/esd/esound/:Q}" instead." -.endfor - -.if ${MACHINE_ARCH} == "i386" -PKG_OPTIONS_LEGACY_VARS+= \ - MPLAYER_ENABLE_RUNTIME_CPU_DETECTION:mplayer-runtime-cpudetection -.endif - -.if ${OPSYS} == "SunOS" -PKG_OPTIONS_LEGACY_VARS+= MPLAYER_USE_MEDIALIB:mlib -.endif - -# ------------------------------------------------------------------------- # Handle chosen options. # ------------------------------------------------------------------------- diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile index c0f3d2eaa81..163e32e44cb 100644 --- a/net/flow-tools/Makefile +++ b/net/flow-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/08/29 13:36:37 tv Exp $ +# $NetBSD: Makefile,v 1.19 2005/10/05 13:29:50 wiz Exp $ DISTNAME= flow-tools-0.68 PKGREVISION= 1 @@ -29,8 +29,6 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.flow-tools PKG_OPTIONS_OPTIONAL_GROUPS= database PKG_SUPPORTED_OPTIONS= python PKG_OPTIONS_GROUP.database= mysql pgsql -PKG_OPTIONS_LEGACY_VARS+= FLOW_TOOLS_USE_MYSQL:mysql -PKG_OPTIONS_LEGACY_VARS+= FLOW_TOOLS_USE_POSTGRESQL:pgsql .include "../../mk/bsd.options.mk" diff --git a/net/wget/options.mk b/net/wget/options.mk index 0594a9eaa3f..179c679bc16 100644 --- a/net/wget/options.mk +++ b/net/wget/options.mk @@ -1,9 +1,8 @@ -# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:39 dillo Exp $ +# $NetBSD: options.mk,v 1.3 2005/10/05 13:29:49 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.wget PKG_SUPPORTED_OPTIONS= inet6 ssl PKG_SUGGESTED_OPTIONS= ssl -PKG_OPTIONS_LEGACY_VARS+= WGET_USE_SSL:ssl .include "../../mk/bsd.options.mk" diff --git a/print/LPRng-core/options.mk b/print/LPRng-core/options.mk index 96b8899e85e..fd4fa1f898b 100644 --- a/print/LPRng-core/options.mk +++ b/print/LPRng-core/options.mk @@ -1,10 +1,8 @@ -# $NetBSD: options.mk,v 1.1 2005/06/01 18:51:57 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2005/10/05 13:29:49 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.LPRng-core PKG_SUPPORTED_OPTIONS= lprng-priv-ports lprng-suid PKG_SUGGESTED_OPTIONS= lprng-suid -PKG_OPTIONS_LEGACY_VARS+= LPRNG_PRIV_PORTS:lprng-priv-ports -PKG_OPTIONS_LEGACY_VARS+= LPRNG_SUID:lprng-suid .include "../../mk/bsd.options.mk" diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index 000b88e6a17..8fd19489ecd 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/08/23 14:07:25 reed Exp $ +# $NetBSD: Makefile,v 1.43 2005/10/05 13:29:50 wiz Exp $ DISTNAME= heimdal-0.6.5 PKGREVISION= 2 @@ -44,8 +44,6 @@ USE_OLD_DES_API= yes PKG_OPTIONS_VAR= PKG_OPTIONS.heimdal PKG_SUPPORTED_OPTIONS= db4 ldap kerberos-prefix-cmds -PKG_OPTIONS_LEGACY_VARS+= KERBEROS_PREFIX_CMDS:kerberos-prefix-cmds -PKG_OPTIONS_LEGACY_OPTS+= prefix-cmds:kerberos-prefix-cmds .include "../../mk/bsd.options.mk" diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile index b0ec052e6c7..c47301bf2be 100644 --- a/security/mit-krb5/Makefile +++ b/security/mit-krb5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/09/22 19:45:42 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/10/05 13:29:51 wiz Exp $ DISTNAME= krb5-1.4.2 PKGNAME= mit-${DISTNAME:S/-signed$//} @@ -42,8 +42,6 @@ MAKE_ENV+= ROOT_USER=${ROOT_USER} PKG_OPTIONS_VAR= PKG_OPTIONS.mit-krb5 PKG_SUPPORTED_OPTIONS= kerberos-prefix-cmds -PKG_OPTIONS_LEGACY_VARS+= KERBEROS_PREFIX_CMDS:kerberos-prefix-cmds -PKG_OPTIONS_LEGACY_OPTS+= prefix-cmds:kerberos-prefix-cmds .include "../../mk/bsd.options.mk" diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 4bc55e0c5ae..1ed276eac47 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/09/20 04:23:48 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/10/05 13:29:50 wiz Exp $ DISTNAME= bash-3.0 PKGNAME= bash-3.0pl16 @@ -53,7 +53,6 @@ CONFIGURE_ARGS+= --enable-array-variables PKG_OPTIONS_VAR= PKG_OPTIONS.bash PKG_SUPPORTED_OPTIONS= multibyte static PKG_SUGGESTED_OPTIONS= multibyte -PKG_OPTIONS_LEGACY_VARS+= BASH_STATIC:static .include "../../mk/bsd.options.mk" diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile index e7750282633..f0166cb981a 100644 --- a/shells/bash2/Makefile +++ b/shells/bash2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2005/09/20 04:23:48 jlam Exp $ +# $NetBSD: Makefile,v 1.67 2005/10/05 13:29:50 wiz Exp $ # DISTNAME= bash-2.05b @@ -36,7 +36,6 @@ CFLAGS.Interix+= -DUSE_POSIX_GLOB_LIBRARY PKG_OPTIONS_VAR= PKG_OPTIONS.bash PKG_SUPPORTED_OPTIONS= multibyte static PKG_SUGGESTED_OPTIONS= multibyte -PKG_OPTIONS_LEGACY_VARS+= BASH_STATIC:static .include "../../mk/bsd.options.mk" diff --git a/wm/golem/Makefile b/wm/golem/Makefile index b9bc28cb77f..7ee3b84ca4c 100644 --- a/wm/golem/Makefile +++ b/wm/golem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/06/02 18:10:33 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2005/10/05 13:29:49 wiz Exp $ # DISTNAME= golem-0.0.5 @@ -22,7 +22,6 @@ CONFIGURE_ARGS+= --enable-xinerama PKG_OPTIONS_VAR= PKG_OPTIONS.golem PKG_SUPPORTED_OPTIONS= esound -PKG_OPTIONS_LEGACY_VARS+= GOLEM_WITH_SOUND:esound .include "../../mk/bsd.options.mk" diff --git a/www/apache/Makefile b/www/apache/Makefile index 20cfeee6ae5..6dfe0b6b1ab 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.171 2005/09/16 13:53:56 salo Exp $ +# $NetBSD: Makefile,v 1.172 2005/10/05 13:29:50 wiz Exp $ # # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of # code hooks that allow mod_ssl to be compiled separately later, if desired). @@ -66,8 +66,6 @@ CONFIGURE_ARGS+= --server-gid=${APACHE_GROUP} PKG_OPTIONS_VAR= PKG_OPTIONS.apache PKG_SUPPORTED_OPTIONS= perf-tuning suexec -PKG_OPTIONS_LEGACY_VARS+= APACHE_PERF_TUNING:perf-tuning -PKG_OPTIONS_LEGACY_VARS+= APACHE_SUEXEC:suexec .include "../../mk/bsd.options.mk" diff --git a/www/w3m/options.mk b/www/w3m/options.mk index 0a1de678075..4923c8baf9f 100644 --- a/www/w3m/options.mk +++ b/www/w3m/options.mk @@ -1,11 +1,8 @@ -# $NetBSD: options.mk,v 1.3 2005/06/03 14:26:30 uebayasi Exp $ +# $NetBSD: options.mk,v 1.4 2005/10/05 13:29:49 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.w3m PKG_SUPPORTED_OPTIONS= w3m-lynx-key w3m-m17n w3m-unicode PKG_SUGGESTED_OPTIONS= w3m-m17n -PKG_OPTIONS_LEGACY_VARS+= W3M_USE_LYNX_KEY:w3m-lynx-key -PKG_OPTIONS_LEGACY_VARS+= W3M_USE_M17N:w3m-m17n -PKG_OPTIONS_LEGACY_VARS+= W3M_USE_UNICODE:w3m-unicode .if ${_W3M_USE_IMAGE} == "YES" PKG_OPTIONS_OPTIONAL_GROUPS= imagelib diff --git a/x11/aterm/options.mk b/x11/aterm/options.mk index 52cf7c7a16d..e29f2aecadb 100644 --- a/x11/aterm/options.mk +++ b/x11/aterm/options.mk @@ -1,11 +1,7 @@ -# $NetBSD: options.mk,v 1.1 2005/06/01 19:39:36 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2005/10/05 13:29:49 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.aterm PKG_SUPPORTED_OPTIONS= aterm-big5 aterm-greek aterm-kanji aterm-xterm-scroll -PKG_OPTIONS_LEGACY_VARS+= ATERM_USE_KANJI:aterm-kanji -PKG_OPTIONS_LEGACY_VARS+= ATERM_USE_XTERM_SCROLL:aterm-xterm-scroll -PKG_OPTIONS_LEGACY_VARS+= ATERM_USE_BIG5:aterm-big5 -PKG_OPTIONS_LEGACY_VARS+= ATERM_USE_GREEK:aterm-greek .include "../../mk/bsd.options.mk" diff --git a/x11/multi-aterm/options.mk b/x11/multi-aterm/options.mk index c7572fe09d2..e29f2aecadb 100644 --- a/x11/multi-aterm/options.mk +++ b/x11/multi-aterm/options.mk @@ -1,11 +1,7 @@ -# $NetBSD: options.mk,v 1.1 2005/06/01 19:50:26 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2005/10/05 13:29:49 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.aterm PKG_SUPPORTED_OPTIONS= aterm-big5 aterm-greek aterm-kanji aterm-xterm-scroll -PKG_OPTIONS_LEGACY_VARS+= ATERM_USE_KANJI:aterm-kanji -PKG_OPTIONS_LEGACY_VARS+= ATERM_USE_XTERM_SCROLL:aterm-xterm-scroll -PKG_OPTIONS_LEGACY_VARS+= ATERM_USE_BIG5:aterm-big5 -PKG_OPTIONS_LEGACY_VARS+= ATERM_USE_GREEK:aterm-greek .include "../../mk/bsd.options.mk" |