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, 20 insertions, 18 deletions

diff --git a/www/netscape3/Makefile b/www/netscape3/Makefile
index 15d8a225f11b..0f36d87c16af 100644
--- a/www/netscape3/Makefile
+++ b/www/netscape3/Makefile
@@ -8,11 +8,13 @@
 PORTNAME?=	netscape
 PORTVERSION?= 	3.04
 CATEGORIES=	www
-MASTER_SITES?=   ftp://archive:oldies@archive.netscape.com/archive/navigator/3.04/shipping/english/unix/bsdi11/navigator_complete/
+MASTER_SITES?=	ftp://archive:oldies@archive.netscape.com/archive/navigator/3.04/shipping/english/unix/bsdi11/navigator_complete/
 DISTFILES=      netscape-v304-export.x86-unknown-bsd.tar.gz
 
 MAINTAINER=	sada@FreeBSD.org
 
+RUN_DEPENDS=	${X11BASE}/lib/aout/libX11.so.6.1:${PORTSDIR}/x11/XFree86-aoutlibs
+
 Y2K=		http://home.netscape.com/products/year2000/faq/client.html
 
 ONLY_FOR_ARCHS=	i386
@@ -22,7 +24,7 @@ NO_LATEST_LINK=	yes
 NO_WRKSUBDIR=	yes
 PKGREQ=		${PORTSDIR}/www/netscape4-communicator/pkg/REQ.aout
 
-.if defined(USE_128BIT)
+.if defined(WITH_128BIT)
 MASTER_SITES+=	ftp://ftp.fortify.net/pub/Fortify/ \
 		ftp://ftp.za.freebsd.org/pub/Fortify/
 DISTFILES+=	${FORTIFY}.tar.gz
@@ -31,9 +33,9 @@ RESTRICTED=     "Contains strong cryptography"
 
 FORTIFY=	Fortify-1.4.6-unix-x86
 
-.if !defined(USE_128BIT)
+.if !defined(WITH_128BIT)
 pre-extract:
-		@${ECHO} "You can make Netscape use 128-bit encryption by defining USE_128BIT"
+		@${ECHO} "You can make Netscape use 128-bit encryption by defining WITH_128BIT"
 		@${ECHO} "and defining USA_RESIDENT to NO"
 .endif
 
@@ -41,7 +43,7 @@ pre-install:
 	PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL
 
 post-install:
-.if defined(USE_128BIT)
+.if defined(WITH_128BIT)
 	cd ${WRKDIR}/${FORTIFY} \
 	&& (${ECHO}; ${ECHO} yes; ${ECHO} no; ${ECHO} no) \
 	| ./Fortify.sh ${PREFIX}/lib/netscape/netscape.bin
diff --git a/www/netscape4-communicator/Makefile b/www/netscape4-communicator/Makefile
index 3b46e97a9100..f1e5e3c12e3c 100644
--- a/www/netscape4-communicator/Makefile
+++ b/www/netscape4-communicator/Makefile
@@ -46,7 +46,7 @@ PLIST_SUB=	BROWSER=${BROWSER_ARC} BROWSER_VER=${BROWSER_VER} \
 DISTFILES+=	${AUTOADMIN}
 .endif
 
-.if defined(USE_128BIT) && !defined(NO_FORTIFY)
+.if defined(WITH_128BIT) && !defined(NO_FORTIFY)
 MASTER_SITES+=	ftp://ftp.fortify.net/pub/Fortify/ \
 		ftp://ftp.za.freebsd.org/pub/Fortify/
 DISTFILES+=	${FORTIFY}.tar.gz
@@ -65,9 +65,9 @@ RUN_DEPENDS=	${X11BASE}/lib/aout/libX11.so.6.1:${PORTSDIR}/x11/XFree86-aoutlibs
 
 .SILENT:
 
-.if !defined(USE_128BIT) && !defined(NO_FORTIFY)
+.if !defined(WITH_128BIT) && !defined(NO_FORTIFY)
 pre-extract:
-	${ECHO} "You can make Netscape use 128-bit encryption by defining USE_128BIT"
+	${ECHO} "You can make Netscape use 128-bit encryption by defining WITH_128BIT"
 .endif
 
 post-configure:
@@ -103,7 +103,7 @@ do-install:
 .if (${BROWSER} == "communicator") && !defined(NO_AUTOADMIN)
 	tar zxf ${DISTDIR}/${AUTOADMIN} -C ${NDIR}
 .endif
-.if defined(USE_128BIT) && !defined(NO_FORTIFY)
+.if defined(WITH_128BIT) && !defined(NO_FORTIFY)
 	cd ${WRKDIR}/${FORTIFY} \
 	&& (${ECHO}; ${ECHO} yes; ${ECHO} no; ${ECHO} no) \
 	| ./Fortify.sh ${NDIR}/${BROWSER_ARC}-${BROWSER_VER}.bin
diff --git a/www/netscape48-communicator/Makefile b/www/netscape48-communicator/Makefile
index 3b46e97a9100..f1e5e3c12e3c 100644
--- a/www/netscape48-communicator/Makefile
+++ b/www/netscape48-communicator/Makefile
@@ -46,7 +46,7 @@ PLIST_SUB=	BROWSER=${BROWSER_ARC} BROWSER_VER=${BROWSER_VER} \
 DISTFILES+=	${AUTOADMIN}
 .endif
 
-.if defined(USE_128BIT) && !defined(NO_FORTIFY)
+.if defined(WITH_128BIT) && !defined(NO_FORTIFY)
 MASTER_SITES+=	ftp://ftp.fortify.net/pub/Fortify/ \
 		ftp://ftp.za.freebsd.org/pub/Fortify/
 DISTFILES+=	${FORTIFY}.tar.gz
@@ -65,9 +65,9 @@ RUN_DEPENDS=	${X11BASE}/lib/aout/libX11.so.6.1:${PORTSDIR}/x11/XFree86-aoutlibs
 
 .SILENT:
 
-.if !defined(USE_128BIT) && !defined(NO_FORTIFY)
+.if !defined(WITH_128BIT) && !defined(NO_FORTIFY)
 pre-extract:
-	${ECHO} "You can make Netscape use 128-bit encryption by defining USE_128BIT"
+	${ECHO} "You can make Netscape use 128-bit encryption by defining WITH_128BIT"
 .endif
 
 post-configure:
@@ -103,7 +103,7 @@ do-install:
 .if (${BROWSER} == "communicator") && !defined(NO_AUTOADMIN)
 	tar zxf ${DISTDIR}/${AUTOADMIN} -C ${NDIR}
 .endif
-.if defined(USE_128BIT) && !defined(NO_FORTIFY)
+.if defined(WITH_128BIT) && !defined(NO_FORTIFY)
 	cd ${WRKDIR}/${FORTIFY} \
 	&& (${ECHO}; ${ECHO} yes; ${ECHO} no; ${ECHO} no) \
 	| ./Fortify.sh ${NDIR}/${BROWSER_ARC}-${BROWSER_VER}.bin
diff --git a/www/udmsearch/Makefile b/www/udmsearch/Makefile
index 0dc877642d7f..a8a5bb1036a2 100644
--- a/www/udmsearch/Makefile
+++ b/www/udmsearch/Makefile
@@ -22,11 +22,11 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--bindir=${PREFIX}/bin/udmsearch \
 		--sysconfdir=${PREFIX}/etc/udmsearch
 
-.if defined(USE_POSTGRESQL)
+.if defined(WITH_POSTGRESQL)
 LIB_DEPENDS=		pq.2:${PORTSDIR}/databases/postgresql
 CONFIGURE_ARGS+=	--with-pgsql
 
-.elif defined(USE_MSQL)
+.elif defined(WITH_MSQL)
 BUILD_DEPENDS=		${PREFIX}/lib/libmsql.a:${PORTSDIR}/databases/msql
 CONFIGURE_ARGS+=	--with-msql
 
@@ -36,14 +36,14 @@ CONFIGURE_ARGS+=	--with-msql
 LIB_DEPENDS=		mysqlclient.6:${PORTSDIR}/databases/mysql322-client
 CONFIGURE_ARGS+=	--with-mysql
 
-.if !defined(USE_MYSQL)
+.if !defined(WITH_MYSQL)
 pre-fetch:
 	@${ECHO}
 	@${ECHO} "Defaulting to udmsearch with mysql support."
 	@${ECHO}
 	@${ECHO} "You may alternately build udmsearch with either msql or"
-	@${ECHO} "postgresql support by invoking make with USE_MSQL=yes or"
-	@${ECHO} "USE_POSTGRESQL=yes respectively."
+	@${ECHO} "postgresql support by invoking make with WITH_MSQL=yes or"
+	@${ECHO} "WITH_POSTGRESQL=yes respectively."
 	@${ECHO}
 .endif