summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2005-12-01 19:17:54 +0000
committerwiz <wiz@pkgsrc.org>2005-12-01 19:17:54 +0000
commitf63ba8662ef40f95cea98b7eb7d4f73eb271ef37 (patch)
treeba6a7a6accb855934e7a6a5f8118170bc39a29ff /x11
parentc79f85ac70c8e80406019301d48a2586f1e38ac1 (diff)
downloadpkgsrc-f63ba8662ef40f95cea98b7eb7d4f73eb271ef37.tar.gz
Convert USE_OSS to oss option.
Diffstat (limited to 'x11')
-rw-r--r--x11/xlockmore/Makefile.common18
1 files changed, 11 insertions, 7 deletions
diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common
index f782d9c2695..5c4eb581cc0 100644
--- a/x11/xlockmore/Makefile.common
+++ b/x11/xlockmore/Makefile.common
@@ -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 @@ 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
+.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-nas
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