[pkgsrc/trunk]: pkgsrc/x11/xlockmore Replace XLOCK_DISABLE_ALLOW_ROOT and XLO...

[hubertf <hubertf%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a0df9e7289e3
branches:  trunk
changeset: 499156:a0df9e7289e3
user:      hubertf <hubertf%pkgsrc.org@localhost>
date:      Sun Sep 11 16:55:38 2005 +0000

description:
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:

 x11/xlockmore/Makefile.common |  15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r 878a8e95dd42 -r a0df9e7289e3 x11/xlockmore/Makefile.common
--- a/x11/xlockmore/Makefile.common     Sun Sep 11 16:31:03 2005 +0000
+++ b/x11/xlockmore/Makefile.common     Sun Sep 11 16:55:38 2005 +0000
@@ -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 @@
 
 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 @@
 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