Standardize all user defined options to the booleans WITH_FOO and

WITHOUT_FOO.  Begin the process of reserving these prefixes for user defined
options.

No comment by:	ports

4 files changed, 13 insertions, 14 deletions

diff --git a/games/acm/Makefile b/games/acm/Makefile
index ddb5dca..8b6339b5 100644
--- a/games/acm/Makefile
+++ b/games/acm/Makefile
@@ -20,9 +20,8 @@ MAN6=		acm.6
 .include <bsd.port.pre.mk>
 
 # Include sound support (Use network audio server (nas))
-.if defined(USE_SOUND) && ${USE_SOUND} == YES || \
-    exists(${PREFIX}/lib/libaudio.a) && \
-    (!defined(USE_SOUND) || ${USE_SOUND} != NO)
+.if defined(WITH_SOUND) || (exists(${PREFIX}/lib/libaudio.a) \
+    && !defined(WITHOUT_SOUND))
 LIB_DEPENDS+=   audio.7:${PORTSDIR}/audio/nas
 .endif
 
diff --git a/games/freeciv-gtk2/Makefile b/games/freeciv-gtk2/Makefile
index d93cf11..bc8adb1 100644
--- a/games/freeciv-gtk2/Makefile
+++ b/games/freeciv-gtk2/Makefile
@@ -10,20 +10,20 @@ PORTVERSION=	1.10.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable_version/ \
 		ftp://ftp.pvv.ntnu.no/pub/freeciv/stable_version/
-.if defined(USE_GTK) && (${USE_GTK} == YES || ${USE_GTK} == yes)
+.if defined(WITH_GTK)
 PKGNAMESUFFIX=	-gtk
 .endif
 
 MAINTAINER=	sheldonh@freebsd.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-.if defined(USE_GTK)
+.if defined(WITH_GTK)
 LIB_DEPENDS+=	Imlib.5:${PORTSDIR}/graphics/imlib
 .endif
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-.if defined(USE_GTK) && (${USE_GTK} == YES || ${USE_GTK} == yes)
+.if defined(WITH_GTK)
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 .else
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index d93cf11..bc8adb1 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -10,20 +10,20 @@ PORTVERSION=	1.10.0
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable_version/ \
 		ftp://ftp.pvv.ntnu.no/pub/freeciv/stable_version/
-.if defined(USE_GTK) && (${USE_GTK} == YES || ${USE_GTK} == yes)
+.if defined(WITH_GTK)
 PKGNAMESUFFIX=	-gtk
 .endif
 
 MAINTAINER=	sheldonh@freebsd.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
-.if defined(USE_GTK)
+.if defined(WITH_GTK)
 LIB_DEPENDS+=	Imlib.5:${PORTSDIR}/graphics/imlib
 .endif
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-.if defined(USE_GTK) && (${USE_GTK} == YES || ${USE_GTK} == yes)
+.if defined(WITH_GTK)
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 .else
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 5b6d7de..75fca68 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	quakeforge
 
 MAINTAINER=	darius@dons.net.au
 
-.if defined(USE_GLX)
+.if defined(WITH_GLX)
 LIB_DEPENDS=	GL.1:${PORTSDIR}/graphics/glx
 .else
 CONFIGURE_ARGS+= --without-opengl
@@ -38,8 +38,8 @@ USE_XLIB=	yes
 PLIST=		${WRKDIR}/PLIST
 
 pre-fetch:
-.if !defined(USE_GLX)
-	@${ECHO_MSG} "Define USE_GLX to use GLX (otherwise it is explicitly disabled!)"
+.if !defined(WITH_GLX)
+	@${ECHO_MSG} "Define WITH_GLX to use GLX (otherwise it is explicitly disabled!)"
 .endif
 
 .if defined(BATCH)
@@ -125,14 +125,14 @@ do-extract:
 
 pre-configure:
 	@${CP} ${PKGDIR}/PLIST ${PLIST}
-.if defined(USE_GLX)
+.if defined(WITH_GLX)
 	${CAT} ${PKGDIR}/PLIST.glx >>${PLIST}
 .endif
 	cd ${WRKSRC}; \
 	autoheader;
 
 BINARIES=	quake-x11 qw-client-x11 qw-server
-.if defined(USE_GLX)
+.if defined(WITH_GLX)
 BINARIES+=	quake-gl qw-client-gl
 .endif