diff options
author | hubertf <hubertf> | 2005-09-11 16:55:38 +0000 |
---|---|---|
committer | hubertf <hubertf> | 2005-09-11 16:55:38 +0000 |
commit | bf567300a56c190b3007cc314521c33b587dc5c4 (patch) | |
tree | 3dfe0cdf085c69b8147231d78ec0fa4b520f50d7 /x11/xlockmore | |
parent | e006fcf92a69e36b905551ee2fcdda6d962963f5 (diff) | |
download | pkgsrc-bf567300a56c190b3007cc314521c33b587dc5c4.tar.gz |
Replace XLOCK_DISABLE_ALLOW_ROOT and XLOCK_NO_DPMS
by options 'xlockmore-allow-root' and 'xlockmore-dpms'
which are on by default - disable them to get the effect
of the two variables.
Suggested & reviewed by wiz.
Diffstat (limited to 'x11/xlockmore')
-rw-r--r-- | x11/xlockmore/Makefile.common | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common index 5921d0ede03..c9adf8c9600 100644 --- a/x11/xlockmore/Makefile.common +++ b/x11/xlockmore/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.31 2005/09/04 17:49:57 hubertf Exp $ +# $NetBSD: Makefile.common,v 1.32 2005/09/11 16:55:38 hubertf Exp $ # # This Makefile.common is included by: # @@ -9,7 +9,7 @@ # in those Makefiles. DISTNAME= xlockmore-5.19 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \ ftp://ibiblio.org/pub/Linux/X11/screensavers/ \ @@ -27,6 +27,13 @@ PLIST_SRC?= ${.CURDIR}/../xlockmore/PLIST PKG_INSTALLATION_TYPES= overwrite pkgviews +PKG_OPTIONS_VAR= PKG_OPTIONS.xlockmore +PKG_SUPPORTED_OPTIONS= xlockmore-allow-root xlockmore-dpms +PKG_SUGGESTED_OPTIONS= xlockmore-allow-root xlockmore-dpms +PKG_OPTIONS_LEGACY_VARS+=XLOCK_DISABLE_ALLOW_ROOT:-xlockmore-allow-root +PKG_OPTIONS_LEGACY_VARS+=XLOCK_NO_DPMS:-xlockmore-dpms +.include "../../mk/bsd.options.mk" + USE_LANGUAGES= c c++ USE_X11BASE= YES @@ -57,11 +64,11 @@ XLOCK_AUDIOPLAY?= /usr/bin/audioplay CONFIGURE_ARGS+= --enable-def-play="${XLOCK_AUDIOPLAY}" .endif -.if defined(XLOCK_NO_DPMS) && !empty(XLOCK_NO_DPMS:M[yY][eE][sS]) +.if empty(PKG_OPTIONS:Mxlockmore-dpms) CONFIGURE_ARGS+= --without-dpms .endif -.if defined(XLOCK_DISABLE_ALLOW_ROOT) +.if empty(PKG_OPTIONS:Mxlockmore-allow-root) CONFIGURE_ARGS+= --disable-allow-root .endif |