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

9 files changed, 27 insertions, 28 deletions

diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index 2abb47892014..82bb991fb860 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -29,15 +29,15 @@ CONFIGURE_ARGS=	--with-png-includes="${LOCALBASE}/include" \
 		--with-jpeg-libs="${LOCALBASE}/lib" \
 		--with-helpcommand="xterm -e man"
 
-.if defined(USE_I18N)
+.if defined(WITH_I18N)
 CONFIGURE_ARGS+=	--enable-i18n
 .endif
 
-.if defined(DIFFERENT_LOOKNFEELS)
+.if defined(WITH_DIFFERENT_LOOKNFEELS)
 CONFIGURE_ARGS+=	--enable-different-looknfeels
 .endif
 
-.if !defined(USE_SAVEWINDOWS)
+.if !defined(WITH_SAVEWINDOWS)
 CONFIGURE_ARGS+=	--disable-savewindows
 .endif
 
@@ -47,7 +47,7 @@ MAN1=	Animate.1x Audio.1x Banner.1x Cascade.1x Clean.1x Form.1x Gnome.1x \
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/monitor_bsd.xpm ${PREFIX}/share/afterstep/desktop/icons/common/
-.if defined(DIFFERENT_LOOKNFEELS)
+.if defined(WITH_DIFFERENT_LOOKNFEELS)
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "===>  The WinList module is broken with different-looknfeels.  Don't use it."
 	@${ECHO_MSG} ""
diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index fbf2cbf3ec3f..ea4abc7ad7f0 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@@ -44,12 +44,12 @@ post-install:
 		@ ${MKDIR} ${PREFIX}/lib/X11/afterstep/sounds/
 		${INSTALL_DATA} ${WRKSRC}/sounds/* ${PREFIX}/lib/X11/afterstep/sounds/
 		@ ${MKDIR} ${PREFIX}/include/X11/pixmaps/
-.if defined(USE_HICOLOR_ICONS)
+.if defined(WITH_HICOLOR_ICONS)
 		${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${PREFIX}/include/X11/pixmaps/
 .else
 .if !defined(BATCH)
 		@${ECHO_MSG} "===>  Note: to use the hi-color icons,"
-		@${ECHO_MSG} "      reinstall this port with -DUSE_HICOLOR_ICONS"
+		@${ECHO_MSG} "      reinstall this port with -DWITH_HICOLOR_ICONS"
 		@${ECHO_MSG} "      defined"
 .endif
 		@for file in AFstep.xpm penguin.xpm monitor_bsd.xpm; do \
diff --git a/x11-wm/blackbox/Makefile b/x11-wm/blackbox/Makefile
index 1c5d2ff14812..5a5eaa73a045 100644
--- a/x11-wm/blackbox/Makefile
+++ b/x11-wm/blackbox/Makefile
@@ -17,11 +17,11 @@ USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 
-.if !defined(USE_KDE)
+.if !defined(WITH_KDE)
 pre-configure:
 	@ ${ECHO_MSG}
 	@ ${ECHO_MSG} If you would like build Blackbox with KDE support
-	@ ${ECHO_MSG} you must set the variable USE_KDE
+	@ ${ECHO_MSG} you must set the variable WITH_KDE
 	@ ${ECHO_MSG}
 .else
 pre-configure:
diff --git a/x11-wm/fvwm2-i18n/Makefile b/x11-wm/fvwm2-i18n/Makefile
index b1ee0ff28ed5..13d1fa64d654 100644
--- a/x11-wm/fvwm2-i18n/Makefile
+++ b/x11-wm/fvwm2-i18n/Makefile
@@ -16,7 +16,7 @@ PATCHFILES=	fvwm-${PORTVERSION}-I18N_MB-${FVWM_PATCHVER}.patch
 
 MAINTAINER=	matusita@jp.freebsd.org
 
-.if !defined(USE_XPM) || ${USE_XPM} != NO
+.if !defined(WITHOUT_XPM)
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 .endif
 
@@ -61,9 +61,8 @@ post-install:
 
 .include <bsd.port.pre.mk>
 
-.if defined(USE_RPLAY) && ${USE_RPLAY} == YES || \
-    exists(${LOCALBASE}/lib/librplay.a) && \
-    (!defined(USE_RPLAY) || ${USE_RPLAY} != NO)
+.if defined(WITH_RPLAY) || (exists(${LOCALBASE}/lib/librplay.a) && \
+    !defined(WITHOUT_RPLAY))
 BUILD_DEPENDS=  rplay:${PORTSDIR}/audio/rplay
 .endif
 
diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile
index f08d33ffbeba..2bcbdf4a0742 100644
--- a/x11-wm/fvwm95-i18n/Makefile
+++ b/x11-wm/fvwm95-i18n/Makefile
@@ -50,12 +50,12 @@ post-extract:
 	${CP} ${WRKDIR}/apmpatch/freebsd-menu.xpm ${WRKSRC}/mini-icons
 
 pre-patch:
-.if !defined(BATCH) && !defined(FOR_CDROM) && !defined(USE_APM)
+.if !defined(BATCH) && !defined(FOR_CDROM) && !defined(WITH_APM)
 	@${ECHO} -n "Are you going to use APM handling? (y/n) ==> "
 	@(read ans; \
 	  case x"$$ans" in \
 	    xy*|xY*) \
-		${ECHO} "Okay, please rerun make like as \"make USE_APM=yes\"."; \
+		${ECHO} "Okay, please rerun make like as \"make WITH_APM=yes\"."; \
 		${ECHO} "(Don't worry about the following \"*** Error code 1\"s)"; \
 		return 1; \
 		;; \
@@ -65,7 +65,7 @@ pre-patch:
 	  esac)
 .endif
 post-patch:
-.if defined(USE_APM)
+.if defined(WITH_APM)
 	@${CAT} ${WRKDIR}/apmpatch/fvwm95-2.0.43a-Autoconf.I18N.apmpatch \
 	| ${PATCH} -d ${WRKSRC}
 .endif
diff --git a/x11-wm/hackedbox/Makefile b/x11-wm/hackedbox/Makefile
index 1c5d2ff14812..5a5eaa73a045 100644
--- a/x11-wm/hackedbox/Makefile
+++ b/x11-wm/hackedbox/Makefile
@@ -17,11 +17,11 @@ USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 
-.if !defined(USE_KDE)
+.if !defined(WITH_KDE)
 pre-configure:
 	@ ${ECHO_MSG}
 	@ ${ECHO_MSG} If you would like build Blackbox with KDE support
-	@ ${ECHO_MSG} you must set the variable USE_KDE
+	@ ${ECHO_MSG} you must set the variable WITH_KDE
 	@ ${ECHO_MSG}
 .else
 pre-configure:
diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile
index 1c5d2ff14812..5a5eaa73a045 100644
--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@@ -17,11 +17,11 @@ USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 
-.if !defined(USE_KDE)
+.if !defined(WITH_KDE)
 pre-configure:
 	@ ${ECHO_MSG}
 	@ ${ECHO_MSG} If you would like build Blackbox with KDE support
-	@ ${ECHO_MSG} you must set the variable USE_KDE
+	@ ${ECHO_MSG} you must set the variable WITH_KDE
 	@ ${ECHO_MSG}
 .else
 pre-configure:
diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index 3a47174f7890..15bab8fe7f38 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -49,17 +49,17 @@ MASTER_SITES+=	ftp://muse.brain.riken.go.jp/pub/ja.po/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${JA_CATALOGFILE}${EXTRACT_SUFX}
 .endif
 
-.if defined(USE_GNOME)
+.if defined(WITH_GNOME)
 CONFIGURE_ARGS+=	--enable-gnome
 .endif
-.if defined(USE_KDE)
+.if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde
 .endif
 
 .SILENT:
-.if !defined(USE_KDE) && !defined(USE_GNOME)
+.if !defined(WITH_KDE) && !defined(WITH_GNOME)
 pre-extract:
-	${ECHO} "You can add hooks for Gnome and KDE by defining USE_GNOME and/or USE_KDE"
+	${ECHO} "You can add hooks for Gnome and KDE by defining WITH_GNOME and/or WITH_KDE"
 .endif
 
 post-extract:
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 348b5d4d82d2..4cd82fa04b25 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -40,23 +40,23 @@ MAN1=	geticonset.1x getstyle.1x seticons.1x setstyle.1x \
 
 DATAFILES=	WindowMaker-extra-0.1.tar.bz2
 
-.if defined(USE_GNOME)
+.if defined(WITH_GNOME)
 CONFIGURE_ARGS+=	--enable-gnome
 .endif
 
-.if defined(USE_KDE)
+.if defined(WITH_KDE)
 CONFIGURE_ARGS+=	--enable-kde
 .endif
 
-.if defined(USE_SINGLE_ICON)
+.if defined(WITH_SINGLE_ICON)
 CONFIGURE_ARGS+=	--enable-single-icon
 .endif
 
 .SILENT:
 
-.if !defined(USE_KDE) && !defined(USE_GNOME)
+.if !defined(WITH_KDE) && !defined(WITH_GNOME)
 pre-extract:
-	${ECHO} "You can add hooks for Gnome and KDE by defining USE_GNOME and/or USE_KDE"
+	${ECHO} "You can add hooks for Gnome and KDE by defining WITH_GNOME and/or WITH_KDE"
 .endif
 
 post-extract: