diff options
| author | dillo <dillo@pkgsrc.org> | 2005-05-31 10:01:36 +0000 |
|---|---|---|
| committer | dillo <dillo@pkgsrc.org> | 2005-05-31 10:01:36 +0000 |
| commit | 9c435d97cc677d79b74e5e372fd22ec4b57a0a65 (patch) | |
| tree | 54f5cc64fe8b06d4695748b3d5b9967e8c030117 /emulators | |
| parent | 6dd27214ac3a362082f3cc1b2ef37b2add1db468 (diff) | |
| download | pkgsrc-9c435d97cc677d79b74e5e372fd22ec4b57a0a65.tar.gz | |
Packages have no business modifying PKG_DEFAULT_OPTIONS -- it's a
user settable variable. Set PKG_SUGGESTED_OPTIONS instead. Also,
make use of PKG_OPTIONS_LEGACY_VARS.
Reviewed by wiz.
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/atari800/options.mk | 4 | ||||
| -rw-r--r-- | emulators/gxemul/Makefile | 10 | ||||
| -rw-r--r-- | emulators/vice/Makefile | 7 |
3 files changed, 10 insertions, 11 deletions
diff --git a/emulators/atari800/options.mk b/emulators/atari800/options.mk index c2838164165..7a2d9ae3c16 100644 --- a/emulators/atari800/options.mk +++ b/emulators/atari800/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.2 2005/05/17 15:08:57 adam Exp $ +# $NetBSD: options.mk,v 1.3 2005/05/31 10:01:36 dillo Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.atari800 -PKG_DEFAULT_OPTIONS= sdl PKG_SUPPORTED_OPTIONS= sdl x11 +PKG_SUGGESTED_OPTIONS= sdl .include "../../mk/bsd.options.mk" diff --git a/emulators/gxemul/Makefile b/emulators/gxemul/Makefile index dd104aab9c3..f6436211c4b 100644 --- a/emulators/gxemul/Makefile +++ b/emulators/gxemul/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/04/29 00:59:00 xtraeme Exp $ +# $NetBSD: Makefile,v 1.5 2005/05/31 10:01:36 dillo Exp $ # DISTNAME= gxemul-0.3.2 @@ -27,11 +27,13 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/doc/*.c ${PREFIX}/share/doc/${PKGBASE} PKG_OPTIONS_VAR= PKG_OPTIONS.gxemul -PKG_SUPPORTED_OPTIONS= X11 -PKG_DEFAULT_OPTIONS?= X11 +# X11 for legacy purposes. can be removed after 2005Q2 +PKG_SUPPORTED_OPTIONS= X11 x11 +PKG_SUGGESTED_OPTIONS= x11 + .include "../../mk/bsd.options.mk" -.if !empty(PKG_OPTIONS:MX11) +.if !empty(PKG_OPTIONS:Mx11) || !empty(PKG_OPTIONS:MX11) USE_X11= yes GLOBAL_LDFLAGS= -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib SUBST_CLASSES= x11 diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index 0bc063d49d2..69f4c68cb5d 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2005/05/22 20:07:58 jlam Exp $ +# $NetBSD: Makefile,v 1.56 2005/05/31 10:01:36 dillo Exp $ # DISTNAME= vice-1.16 @@ -31,12 +31,9 @@ INFO_FILES= vice.info .include "../../mk/bsd.prefs.mk" -.if !empty(VICE_USE_FFMPEG:M[Yy][Ee][Ss]) -PKG_DEFAULT_OPTIONS+= ffmpeg -.endif - 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" |