[pkgsrc/trunk]: pkgsrc/x11/xlockmore Convert USE_OSS to oss option.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c40c7997bf94
branches:  trunk
changeset: 503899:c40c7997bf94
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Dec 01 19:17:54 2005 +0000

description:
Convert USE_OSS to oss option.

diffstat:

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

diffs (47 lines):

diff -r 4d8f7b2cb802 -r c40c7997bf94 x11/xlockmore/Makefile.common
--- a/x11/xlockmore/Makefile.common     Thu Dec 01 19:11:20 2005 +0000
+++ b/x11/xlockmore/Makefile.common     Thu Dec 01 19:17:54 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2005/11/09 02:40:22 hubertf Exp $
+# $NetBSD: Makefile.common,v 1.37 2005/12/01 19:17:54 wiz Exp $
 #
 # This Makefile.common is included by:
 #
@@ -27,19 +27,23 @@
 
 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
+.include "../../mk/bsd.prefs.mk"
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.xlockmore
+PKG_SUPPORTED_OPTIONS= xlockmore-allow-root xlockmore-dpms
+.if ${OPSYS} == "NetBSD"
+PKG_SUPPORTED_OPTIONS+=        oss
+.endif
+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_TOOLS+=            xmkmf
 USE_X11BASE=           YES
 
-.include "../../mk/bsd.prefs.mk"
-
 XLOCK_SOUNDDIR=                ${PREFIX}/lib/X11/xlock/sounds
 XLOCK_MODULEDIR=       ${PREFIX}/lib/X11/xlock/modules
 
@@ -56,7 +60,7 @@
 CONFIGURE_ARGS+=        --without-gtk
 
 .if ${OPSYS} == "NetBSD"
-.  if defined(USE_OSS)
+.if !empty(PKG_OPTIONS:Moss)
 .    include "../../audio/oss/buildlink3.mk"
 XLOCK_AUDIOPLAY?=      ${BUILDLINK_PREFIX.oss}/bin/ossplay
 .  else