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

6 files changed, 15 insertions, 17 deletions

diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index 565efb227d19..4bd8f8ebc066 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -26,8 +26,7 @@ DOCS=		COPYRIGHT README Themes
 
 # You should aware that GKrellM must be setuid root to obtain
 # temperatures.  If your motherboard doesn't support LM78/79 feature,
-# you may not want this.
-USE_SENSOR?=	YES
+# you may not want this build WITHOUT_SENSOR=yes
 
 .include <bsd.port.pre.mk>
 
@@ -38,7 +37,7 @@ ALL_TARGET=	freebsd3
 .endif
 
 BINGRP=		kmem
-.if defined(USE_SENSOR) && ${USE_SENSOR} == YES
+.if !defined(WITHOUT_SENSOR)
 BINOWN=		root
 BINMODE=	4111
 .else
@@ -62,7 +61,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gkrellm
 .endfor
 .endif
-.if defined(USE_SENSOR) && ${USE_SENSOR} == YES
+.if !defined(WITHOUT_SENSOR)
 	@${CAT} ${PKGDIR}/MESSAGE
 .endif
 
diff --git a/sysutils/gkrellm/pkg-message b/sysutils/gkrellm/pkg-message
index 72124eabba22..70c1f568cdd0 100644
--- a/sysutils/gkrellm/pkg-message
+++ b/sysutils/gkrellm/pkg-message
@@ -3,7 +3,7 @@
   You should aware that GKrellM must be setuid root to obtain
   temperatures.  If your motherboard doesn't support LM78/79 feature,
   you may not want this.  You can disable it by typing
-  `make install USE_SENSOR=NO' at the "${PORTSDIR}/sysutils/gkrellm"
+  `make install WITHOUT_SENSOR=yes' at the "${PORTSDIR}/sysutils/gkrellm"
   directory to re-make this package.
 
 ****************************************************************************
diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile
index 565efb227d19..4bd8f8ebc066 100644
--- a/sysutils/gkrellm2/Makefile
+++ b/sysutils/gkrellm2/Makefile
@@ -26,8 +26,7 @@ DOCS=		COPYRIGHT README Themes
 
 # You should aware that GKrellM must be setuid root to obtain
 # temperatures.  If your motherboard doesn't support LM78/79 feature,
-# you may not want this.
-USE_SENSOR?=	YES
+# you may not want this build WITHOUT_SENSOR=yes
 
 .include <bsd.port.pre.mk>
 
@@ -38,7 +37,7 @@ ALL_TARGET=	freebsd3
 .endif
 
 BINGRP=		kmem
-.if defined(USE_SENSOR) && ${USE_SENSOR} == YES
+.if !defined(WITHOUT_SENSOR)
 BINOWN=		root
 BINMODE=	4111
 .else
@@ -62,7 +61,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gkrellm
 .endfor
 .endif
-.if defined(USE_SENSOR) && ${USE_SENSOR} == YES
+.if !defined(WITHOUT_SENSOR)
 	@${CAT} ${PKGDIR}/MESSAGE
 .endif
 
diff --git a/sysutils/gkrellm2/pkg-message b/sysutils/gkrellm2/pkg-message
index 72124eabba22..70c1f568cdd0 100644
--- a/sysutils/gkrellm2/pkg-message
+++ b/sysutils/gkrellm2/pkg-message
@@ -3,7 +3,7 @@
   You should aware that GKrellM must be setuid root to obtain
   temperatures.  If your motherboard doesn't support LM78/79 feature,
   you may not want this.  You can disable it by typing
-  `make install USE_SENSOR=NO' at the "${PORTSDIR}/sysutils/gkrellm"
+  `make install WITHOUT_SENSOR=yes' at the "${PORTSDIR}/sysutils/gkrellm"
   directory to re-make this package.
 
 ****************************************************************************
diff --git a/sysutils/ipsc/Makefile b/sysutils/ipsc/Makefile
index 2107ae993894..646f9c702b2e 100644
--- a/sysutils/ipsc/Makefile
+++ b/sysutils/ipsc/Makefile
@@ -14,12 +14,12 @@ DISTNAME=	${PKGNAME}-src
 MAINTAINER=	jeremy@external.org
 
 BUILD_DEPENDS=	${WRKDIRPREFIX}${PORTSDIR}/sysutils/prips/work/prips/prips.o:${PORTSDIR}/sysutils/prips:build
-.if defined(USE_GNOME)
+.if defined(WITH_GNOME)
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		gnome.3:${PORTSDIR}/x11/gnomelibs
 .endif
 
-.if defined(USE_GNOME)
+.if defined(WITH_GNOME)
 USE_XLIB=	YES
 .endif
 WRKSRC=		${WRKDIR}/ipsc/src
@@ -29,7 +29,7 @@ post-extract:
 		${WRKDIR}/prips
 
 pre-build:
-.if defined(USE_GNOME)
+.if defined(WITH_GNOME)
 PLIST=		${PKGDIR}/PLIST.gnome
 ALL_TARGET=     all
 .else
@@ -37,15 +37,15 @@ ALL_TARGET=	ipsc
 .endif
 
 post-build:
-.if defined(USE_GNOME)
+.if defined(WITH_GNOME)
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Don't forget to define USE_GNOME when installing"
+	@${ECHO_MSG} "Don't forget to define WITH_GNOME when installing"
 	@${ECHO_MSG} ""
 .endif
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/ipsc ${PREFIX}/bin
-.if defined(USE_GNOME)
+.if defined(WITH_GNOME)
 	@${INSTALL_PROGRAM} ${WRKSRC}/gipsc ${PREFIX}/bin
 .endif
 
diff --git a/sysutils/xbattbar/Makefile b/sysutils/xbattbar/Makefile
index c3dd379a6ce9..8b4feaf475b6 100644
--- a/sysutils/xbattbar/Makefile
+++ b/sysutils/xbattbar/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	sumikawa@FreeBSD.org
 
 USE_IMAKE=      yes
-USE_X11_PREFIX=	yes
+USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/xbattbar
 MAN1=		xbattbar.1