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

76 files changed, 319 insertions, 377 deletions

diff --git a/lang/python+ipv6/Makefile b/lang/python+ipv6/Makefile
index a232dfa82695..c37b0f305bd6 100644
--- a/lang/python+ipv6/Makefile
+++ b/lang/python+ipv6/Makefile
@@ -35,13 +35,13 @@ MAN1=		python.1
 #
 SETUP_FILE=	Setup
 
+.include <bsd.port.pre.mk>
+
 #
 # Support for Tk is compiled in by default only if X11 is installed.
 #
-.if exists(${X11BASE})
-WITH_TK?=	yes
-.endif
-.if defined(WITH_TK) && $(WITH_TK) == yes
+.if defined(WITH_TK) || (exists(${X11BASE}/lib/libX11.a) \
+    && !defined(WITHOUT_TK))
 TK_DEPENDS=	tk82.1:${PORTSDIR}/x11-toolkits/tk82
 SETUP_LOCAL=	Setup.tk
 PLIST_TK=	${PKGDIR}/PLIST.tk
@@ -54,11 +54,9 @@ PLIST_TK=	${PKGDIR}/PLIST.tk
 #
 # This option is enabled by default.
 #
-WITH_THREADS?=	yes
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
-.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
+.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-thread
-
 CFLAGS+=		-D_THREAD_SAFE
 CONFIGURE_ENV+=		LDFLAGS="-pthread ${LDFLAGS}"
 .endif
@@ -76,8 +74,7 @@ PLIST_GMP=	${PKGDIR}/PLIST.gmp
 # to a web tree checker, to a collection of simple scripts that are useful
 # while extending or managing Python.
 #
-WITH_TOOLS?=	yes
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 PLIST_TOOLS=	${PKGDIR}/PLIST.Tools
 .endif
 
@@ -90,8 +87,6 @@ post-configure:
 	${CAT} ${FILESDIR}/${file} >> ${WRKSRC}/Modules/Setup.local
 .endfor
 
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} >= 400014
 PLIST_V6=	${PKGDIR}/PLIST.v6
 CONFIGURE_ARGS+=--enable-ipv6
@@ -122,7 +117,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 	@cd ${WRKSRC}; tar cf - Tools | \
 		(cd ${PREFIX}/lib/python1.5; tar xf -)
 .endif
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 311e9a39b235..954c1d45a6ea 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -36,9 +36,8 @@ SETUP_FILE=	Setup
 #
 # This option is enabled by default.
 #
-WITH_THREADS?=	yes
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
-.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
+.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
 CONFIGURE_ENV+=		LDFLAGS="-pthread ${LDFLAGS}"
@@ -57,8 +56,7 @@ PLIST_GMP=	${PKGDIR}/PLIST.gmp
 # to a web tree checker, to a collection of simple scripts that are useful
 # while extending or managing Python.
 #
-WITH_TOOLS?=	yes
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 PLIST_TOOLS=	${PKGDIR}/PLIST.Tools
 .endif
 
@@ -99,7 +97,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 	@cd ${WRKSRC}; tar cf - Tools | \
 		(cd ${PREFIX}/lib/python1.5; tar xf -)
 .endif
diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index 311e9a39b235..954c1d45a6ea 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/Makefile
@@ -36,9 +36,8 @@ SETUP_FILE=	Setup
 #
 # This option is enabled by default.
 #
-WITH_THREADS?=	yes
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
-.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
+.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
 CONFIGURE_ENV+=		LDFLAGS="-pthread ${LDFLAGS}"
@@ -57,8 +56,7 @@ PLIST_GMP=	${PKGDIR}/PLIST.gmp
 # to a web tree checker, to a collection of simple scripts that are useful
 # while extending or managing Python.
 #
-WITH_TOOLS?=	yes
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 PLIST_TOOLS=	${PKGDIR}/PLIST.Tools
 .endif
 
@@ -99,7 +97,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 	@cd ${WRKSRC}; tar cf - Tools | \
 		(cd ${PREFIX}/lib/python1.5; tar xf -)
 .endif
diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index 311e9a39b235..954c1d45a6ea 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/Makefile
@@ -36,9 +36,8 @@ SETUP_FILE=	Setup
 #
 # This option is enabled by default.
 #
-WITH_THREADS?=	yes
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
-.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
+.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
 CONFIGURE_ENV+=		LDFLAGS="-pthread ${LDFLAGS}"
@@ -57,8 +56,7 @@ PLIST_GMP=	${PKGDIR}/PLIST.gmp
 # to a web tree checker, to a collection of simple scripts that are useful
 # while extending or managing Python.
 #
-WITH_TOOLS?=	yes
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 PLIST_TOOLS=	${PKGDIR}/PLIST.Tools
 .endif
 
@@ -99,7 +97,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 	@cd ${WRKSRC}; tar cf - Tools | \
 		(cd ${PREFIX}/lib/python1.5; tar xf -)
 .endif
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index 311e9a39b235..954c1d45a6ea 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -36,9 +36,8 @@ SETUP_FILE=	Setup
 #
 # This option is enabled by default.
 #
-WITH_THREADS?=	yes
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
-.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
+.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
 CONFIGURE_ENV+=		LDFLAGS="-pthread ${LDFLAGS}"
@@ -57,8 +56,7 @@ PLIST_GMP=	${PKGDIR}/PLIST.gmp
 # to a web tree checker, to a collection of simple scripts that are useful
 # while extending or managing Python.
 #
-WITH_TOOLS?=	yes
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 PLIST_TOOLS=	${PKGDIR}/PLIST.Tools
 .endif
 
@@ -99,7 +97,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 	@cd ${WRKSRC}; tar cf - Tools | \
 		(cd ${PREFIX}/lib/python1.5; tar xf -)
 .endif
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index 311e9a39b235..954c1d45a6ea 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -36,9 +36,8 @@ SETUP_FILE=	Setup
 #
 # This option is enabled by default.
 #
-WITH_THREADS?=	yes
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
-.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
+.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
 CONFIGURE_ENV+=		LDFLAGS="-pthread ${LDFLAGS}"
@@ -57,8 +56,7 @@ PLIST_GMP=	${PKGDIR}/PLIST.gmp
 # to a web tree checker, to a collection of simple scripts that are useful
 # while extending or managing Python.
 #
-WITH_TOOLS?=	yes
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 PLIST_TOOLS=	${PKGDIR}/PLIST.Tools
 .endif
 
@@ -99,7 +97,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 	@cd ${WRKSRC}; tar cf - Tools | \
 		(cd ${PREFIX}/lib/python1.5; tar xf -)
 .endif
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 311e9a39b235..954c1d45a6ea 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -36,9 +36,8 @@ SETUP_FILE=	Setup
 #
 # This option is enabled by default.
 #
-WITH_THREADS?=	yes
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
-.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
+.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
 CONFIGURE_ENV+=		LDFLAGS="-pthread ${LDFLAGS}"
@@ -57,8 +56,7 @@ PLIST_GMP=	${PKGDIR}/PLIST.gmp
 # to a web tree checker, to a collection of simple scripts that are useful
 # while extending or managing Python.
 #
-WITH_TOOLS?=	yes
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 PLIST_TOOLS=	${PKGDIR}/PLIST.Tools
 .endif
 
@@ -99,7 +97,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 	@cd ${WRKSRC}; tar cf - Tools | \
 		(cd ${PREFIX}/lib/python1.5; tar xf -)
 .endif
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 311e9a39b235..954c1d45a6ea 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -36,9 +36,8 @@ SETUP_FILE=	Setup
 #
 # This option is enabled by default.
 #
-WITH_THREADS?=	yes
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
-.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
+.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
 CONFIGURE_ENV+=		LDFLAGS="-pthread ${LDFLAGS}"
@@ -57,8 +56,7 @@ PLIST_GMP=	${PKGDIR}/PLIST.gmp
 # to a web tree checker, to a collection of simple scripts that are useful
 # while extending or managing Python.
 #
-WITH_TOOLS?=	yes
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 PLIST_TOOLS=	${PKGDIR}/PLIST.Tools
 .endif
 
@@ -99,7 +97,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 	@cd ${WRKSRC}; tar cf - Tools | \
 		(cd ${PREFIX}/lib/python1.5; tar xf -)
 .endif
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index 311e9a39b235..954c1d45a6ea 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -36,9 +36,8 @@ SETUP_FILE=	Setup
 #
 # This option is enabled by default.
 #
-WITH_THREADS?=	yes
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
-.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
+.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
 CONFIGURE_ENV+=		LDFLAGS="-pthread ${LDFLAGS}"
@@ -57,8 +56,7 @@ PLIST_GMP=	${PKGDIR}/PLIST.gmp
 # to a web tree checker, to a collection of simple scripts that are useful
 # while extending or managing Python.
 #
-WITH_TOOLS?=	yes
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 PLIST_TOOLS=	${PKGDIR}/PLIST.Tools
 .endif
 
@@ -99,7 +97,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 	@cd ${WRKSRC}; tar cf - Tools | \
 		(cd ${PREFIX}/lib/python1.5; tar xf -)
 .endif
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 311e9a39b235..954c1d45a6ea 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -36,9 +36,8 @@ SETUP_FILE=	Setup
 #
 # This option is enabled by default.
 #
-WITH_THREADS?=	yes
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
-.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
+.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
 CONFIGURE_ENV+=		LDFLAGS="-pthread ${LDFLAGS}"
@@ -57,8 +56,7 @@ PLIST_GMP=	${PKGDIR}/PLIST.gmp
 # to a web tree checker, to a collection of simple scripts that are useful
 # while extending or managing Python.
 #
-WITH_TOOLS?=	yes
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 PLIST_TOOLS=	${PKGDIR}/PLIST.Tools
 .endif
 
@@ -99,7 +97,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 	@cd ${WRKSRC}; tar cf - Tools | \
 		(cd ${PREFIX}/lib/python1.5; tar xf -)
 .endif
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 311e9a39b235..954c1d45a6ea 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -36,9 +36,8 @@ SETUP_FILE=	Setup
 #
 # This option is enabled by default.
 #
-WITH_THREADS?=	yes
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
-.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
+.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
 CONFIGURE_ENV+=		LDFLAGS="-pthread ${LDFLAGS}"
@@ -57,8 +56,7 @@ PLIST_GMP=	${PKGDIR}/PLIST.gmp
 # to a web tree checker, to a collection of simple scripts that are useful
 # while extending or managing Python.
 #
-WITH_TOOLS?=	yes
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 PLIST_TOOLS=	${PKGDIR}/PLIST.Tools
 .endif
 
@@ -99,7 +97,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 	@cd ${WRKSRC}; tar cf - Tools | \
 		(cd ${PREFIX}/lib/python1.5; tar xf -)
 .endif
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index 311e9a39b235..954c1d45a6ea 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -36,9 +36,8 @@ SETUP_FILE=	Setup
 #
 # This option is enabled by default.
 #
-WITH_THREADS?=	yes
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
-.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
+.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
 CONFIGURE_ENV+=		LDFLAGS="-pthread ${LDFLAGS}"
@@ -57,8 +56,7 @@ PLIST_GMP=	${PKGDIR}/PLIST.gmp
 # to a web tree checker, to a collection of simple scripts that are useful
 # while extending or managing Python.
 #
-WITH_TOOLS?=	yes
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 PLIST_TOOLS=	${PKGDIR}/PLIST.Tools
 .endif
 
@@ -99,7 +97,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 	@cd ${WRKSRC}; tar cf - Tools | \
 		(cd ${PREFIX}/lib/python1.5; tar xf -)
 .endif
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 311e9a39b235..954c1d45a6ea 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -36,9 +36,8 @@ SETUP_FILE=	Setup
 #
 # This option is enabled by default.
 #
-WITH_THREADS?=	yes
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
-.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
+.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
 CONFIGURE_ENV+=		LDFLAGS="-pthread ${LDFLAGS}"
@@ -57,8 +56,7 @@ PLIST_GMP=	${PKGDIR}/PLIST.gmp
 # to a web tree checker, to a collection of simple scripts that are useful
 # while extending or managing Python.
 #
-WITH_TOOLS?=	yes
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 PLIST_TOOLS=	${PKGDIR}/PLIST.Tools
 .endif
 
@@ -99,7 +97,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 	@cd ${WRKSRC}; tar cf - Tools | \
 		(cd ${PREFIX}/lib/python1.5; tar xf -)
 .endif
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 311e9a39b235..954c1d45a6ea 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -36,9 +36,8 @@ SETUP_FILE=	Setup
 #
 # This option is enabled by default.
 #
-WITH_THREADS?=	yes
 LIBC_R!=	/sbin/ldconfig -r | grep c_r || true
-.if ${LIBC_R} != "" && defined(WITH_THREADS) && ${WITH_THREADS} == yes
+.if (${LIBC_R} != "") && !defined(WITHOUT_THREADS)
 CONFIGURE_ARGS+=	--with-thread
 CFLAGS+=		-D_THREAD_SAFE
 CONFIGURE_ENV+=		LDFLAGS="-pthread ${LDFLAGS}"
@@ -57,8 +56,7 @@ PLIST_GMP=	${PKGDIR}/PLIST.gmp
 # to a web tree checker, to a collection of simple scripts that are useful
 # while extending or managing Python.
 #
-WITH_TOOLS?=	yes
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 PLIST_TOOLS=	${PKGDIR}/PLIST.Tools
 .endif
 
@@ -99,7 +97,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/Misc/python-mode.el ${PREFIX}/share/emacs/site-lisp
 	${INSTALL_DATA} ${WRKSRC}/Misc/COPYRIGHT ${PREFIX}/share/doc/python
 	@${MKDIR} ${PREFIX}/lib/python1.5/site-packages
-.if defined(WITH_TOOLS) && ${WITH_TOOLS} == yes
+.if !defined(WITHOUT_TOOLS)
 	@cd ${WRKSRC}; tar cf - Tools | \
 		(cd ${PREFIX}/lib/python1.5; tar xf -)
 .endif
diff --git a/mail/exim-devel/Makefile b/mail/exim-devel/Makefile
index ef9b4ca581d7..d258fa5c2018 100644
--- a/mail/exim-devel/Makefile
+++ b/mail/exim-devel/Makefile
@@ -15,41 +15,43 @@ DISTFILES=	exim-3.13.tar.gz exim-texinfo-3.10.tar.gz
 
 MAINTAINER=	sheldonh@FreeBSD.org
 
-# If USE_XLIB is defined, the eximon monitor, which requires X, will be
-# built. Comment it out unless you have or want XFree86 installed!
-USE_XLIB=	YES
+# If WITHOUT_X11 is not defined, the eximon monitor, which requires X, will
+# be built. Comment it out unless you have or want XFree86 installed!
+.if !defined(WITHOUT_X11)
+USE_XLIB=	yes
+.endif
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAKE_ENV+=	OSTYPE=${OPSYS} ARCHTYPE=${MACHINE_ARCH}
 
-# Uncomment the USE_MYSQL and USE_PAM definitions to link against
+# Uncomment the WITH_MYSQL and WITH_PAM definitions to link against
 # libmysqlclient and libpam respectively.  The libpam linkage is
 # required for SMTP AUTH support.
-#USE_MYSQL=	YES
-#USE_PAM=	YES
+#WITH_MYSQL=	yes
+#WITH_PAM=	yes
 
-# If USE_PAM==YES then one or more of USE_CRAM_MD5 and USE_PLAINTEXT
+# If WITH_PAM==yes then one or more of PAM_CRAM_MD5 and PAM_PLAINTEXT
 # must be left uncommented.
-PAM_CRAM_MD5=	YES
-PAM_PLAINTEXT=	YES
+PAM_CRAM_MD5=	yes
+PAM_PLAINTEXT=	yes
 
 # Uncomment to compile support for non-standard mailbox formats.
-#USE_MAILDIR=	YES
-#USE_MAILSTORE=	YES
-#USE_MBX=	YES
+#WITH_MAILDIR=	yes
+#WITH_MAILSTORE=	yes
+#WITH_MBX=	yes
 
 # You should not need to fiddle with anything below this point.
 
 SEDLIST=	-e 's,XX_PREFIX_XX,${PREFIX},' \
 		-e 's,XX_BINOWN_XX,${BINOWN},'
-.if !defined(USE_XLIB) || ${USE_XLIB} != YES
+.if !defined(USE_XLIB)
 SEDLIST+=	-e 's/^EXIM_MONITOR/\#EXIM_MONITOR/'
 .endif
 
-# BROKEN: the USE_LDAP stuff will not work until the openldap port
+# BROKEN: the WITH_LDAP stuff will not work until the openldap port
 # builds a shared liblber.
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
+.if defined(WITH_LDAP)
 LIB_DEPENDS+=	lber.1:${PORTSDIR}/net/openldap
 SEDLIST+=	-e 's,XX_LDAP_LIBS_XX,-L${PREFIX}/lib -llber -lldap,' \
 		-e 's,XX_LDAP_INCLUDE_XX,-I${PREFIX}/include,' \
@@ -60,7 +62,7 @@ SEDLIST+=	-e 's,XX_LDAP_[^ ]*_XX,,' \
 		-e 's,^LDAP_LIB_TYPE,\#LDAP_LIB_TYPE,'
 .endif
 
-.if defined(USE_MYSQL) && ${USE_MYSQL} == YES
+.if defined(WITH_MYSQL)
 LIB_DEPENDS+=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
 SEDLIST+=	-e 's,XX_MYSQL_LIBS_XX,-L${PREFIX}/lib/mysql -lmysqlclient,' \
 		-e 's,XX_MYSQL_INCLUDE_XX,-I${PREFIX}/include/mysql,' \
@@ -69,35 +71,33 @@ SEDLIST+=	-e 's,XX_MYSQL_LIBS_XX,-L${PREFIX}/lib/mysql -lmysqlclient,' \
 SEDLIST+=	-e 's,XX_MYSQL_[^ ]*_XX,,'
 .endif
 
-.if ( !defined(USE_MYSQL) || ${USE_MYSQL} != YES )
+.if !defined(WITH_MYSQL)
 SEDLIST+=	-e 's/^LOOKUP_LIBS/\#LOOKUP_LIBS/' \
 		-e 's/^LOOKUP_INCLUDE/\#LOOKUP_INCLUDE/'
 .endif
 
-.if ( !defined(USE_PAM) || ${USE_PAM} != YES )
+.if !defined(WITH_PAM)
 SEDLIST+=	-e 's/^SUPPORT_PAM/\#SUPPORT_PAM/' \
 		-e 's/^PAM_LIBS/\#PAM_LIBS/'
 .endif
 
-.if ( !defined(USE_PAM) || ${USE_PAM} != YES ) || \
-    ( !defined(PAM_CRAM_MD5) || ${PAM_CRAM_MD5} != YES )
+.if !defined(WITH_PAM) || !defined(PAM_CRAM_MD5)
 SEDLIST+=	-e 's/^AUTH_CRAM_MD5/\#AUTH_CRAM_MD5/'
 .endif
 
-.if ( !defined(USE_PAM) || ${USE_PAM} != YES ) || \
-    ( !defined(PAM_PLAINTEXT) || ${PAM_PLAINTEXT} != YES )
+.if !defined(WITH_PAM) || !defined(PAM_PLAINTEXT)
 SEDLIST+=	-e 's/^AUTH_PLAINTEXT/\#AUTH_PLAINTEXT/'
 .endif
 
-.if defined(USE_MAILDIR) && ${USE_MAILDIR} == YES
+.if defined(WITH_MAILDIR)
 SEDLIST+=	-e 's/^\# SUPPORT_MAILDIR/SUPPORT_MAILDIR/'
 .endif
 
-.if defined(USE_MAILSTORE) && ${USE_MAILSTORE} == YES
+.if defined(WITH_MAILSTORE)
 SEDLIST+=	-e 's/^\# SUPPORT_MAILSTORE/SUPPORT_MAILSTORE/'
 .endif
 
-.if defined(USE_MBX) && ${USE_MBX} == YES
+.if defined(WITH_MBX)
 SEDLIST+=	-e 's/^\# SUPPORT_MBX/SUPPORT_MBX/'
 .endif
 
diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile
index ef9b4ca581d7..d258fa5c2018 100644
--- a/mail/exim-old/Makefile
+++ b/mail/exim-old/Makefile
@@ -15,41 +15,43 @@ DISTFILES=	exim-3.13.tar.gz exim-texinfo-3.10.tar.gz
 
 MAINTAINER=	sheldonh@FreeBSD.org
 
-# If USE_XLIB is defined, the eximon monitor, which requires X, will be
-# built. Comment it out unless you have or want XFree86 installed!
-USE_XLIB=	YES
+# If WITHOUT_X11 is not defined, the eximon monitor, which requires X, will
+# be built. Comment it out unless you have or want XFree86 installed!
+.if !defined(WITHOUT_X11)
+USE_XLIB=	yes
+.endif
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAKE_ENV+=	OSTYPE=${OPSYS} ARCHTYPE=${MACHINE_ARCH}
 
-# Uncomment the USE_MYSQL and USE_PAM definitions to link against
+# Uncomment the WITH_MYSQL and WITH_PAM definitions to link against
 # libmysqlclient and libpam respectively.  The libpam linkage is
 # required for SMTP AUTH support.
-#USE_MYSQL=	YES
-#USE_PAM=	YES
+#WITH_MYSQL=	yes
+#WITH_PAM=	yes
 
-# If USE_PAM==YES then one or more of USE_CRAM_MD5 and USE_PLAINTEXT
+# If WITH_PAM==yes then one or more of PAM_CRAM_MD5 and PAM_PLAINTEXT
 # must be left uncommented.
-PAM_CRAM_MD5=	YES
-PAM_PLAINTEXT=	YES
+PAM_CRAM_MD5=	yes
+PAM_PLAINTEXT=	yes
 
 # Uncomment to compile support for non-standard mailbox formats.
-#USE_MAILDIR=	YES
-#USE_MAILSTORE=	YES
-#USE_MBX=	YES
+#WITH_MAILDIR=	yes
+#WITH_MAILSTORE=	yes
+#WITH_MBX=	yes
 
 # You should not need to fiddle with anything below this point.
 
 SEDLIST=	-e 's,XX_PREFIX_XX,${PREFIX},' \
 		-e 's,XX_BINOWN_XX,${BINOWN},'
-.if !defined(USE_XLIB) || ${USE_XLIB} != YES
+.if !defined(USE_XLIB)
 SEDLIST+=	-e 's/^EXIM_MONITOR/\#EXIM_MONITOR/'
 .endif
 
-# BROKEN: the USE_LDAP stuff will not work until the openldap port
+# BROKEN: the WITH_LDAP stuff will not work until the openldap port
 # builds a shared liblber.
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
+.if defined(WITH_LDAP)
 LIB_DEPENDS+=	lber.1:${PORTSDIR}/net/openldap
 SEDLIST+=	-e 's,XX_LDAP_LIBS_XX,-L${PREFIX}/lib -llber -lldap,' \
 		-e 's,XX_LDAP_INCLUDE_XX,-I${PREFIX}/include,' \
@@ -60,7 +62,7 @@ SEDLIST+=	-e 's,XX_LDAP_[^ ]*_XX,,' \
 		-e 's,^LDAP_LIB_TYPE,\#LDAP_LIB_TYPE,'
 .endif
 
-.if defined(USE_MYSQL) && ${USE_MYSQL} == YES
+.if defined(WITH_MYSQL)
 LIB_DEPENDS+=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
 SEDLIST+=	-e 's,XX_MYSQL_LIBS_XX,-L${PREFIX}/lib/mysql -lmysqlclient,' \
 		-e 's,XX_MYSQL_INCLUDE_XX,-I${PREFIX}/include/mysql,' \
@@ -69,35 +71,33 @@ SEDLIST+=	-e 's,XX_MYSQL_LIBS_XX,-L${PREFIX}/lib/mysql -lmysqlclient,' \
 SEDLIST+=	-e 's,XX_MYSQL_[^ ]*_XX,,'
 .endif
 
-.if ( !defined(USE_MYSQL) || ${USE_MYSQL} != YES )
+.if !defined(WITH_MYSQL)
 SEDLIST+=	-e 's/^LOOKUP_LIBS/\#LOOKUP_LIBS/' \
 		-e 's/^LOOKUP_INCLUDE/\#LOOKUP_INCLUDE/'
 .endif
 
-.if ( !defined(USE_PAM) || ${USE_PAM} != YES )
+.if !defined(WITH_PAM)
 SEDLIST+=	-e 's/^SUPPORT_PAM/\#SUPPORT_PAM/' \
 		-e 's/^PAM_LIBS/\#PAM_LIBS/'
 .endif
 
-.if ( !defined(USE_PAM) || ${USE_PAM} != YES ) || \
-    ( !defined(PAM_CRAM_MD5) || ${PAM_CRAM_MD5} != YES )
+.if !defined(WITH_PAM) || !defined(PAM_CRAM_MD5)
 SEDLIST+=	-e 's/^AUTH_CRAM_MD5/\#AUTH_CRAM_MD5/'
 .endif
 
-.if ( !defined(USE_PAM) || ${USE_PAM} != YES ) || \
-    ( !defined(PAM_PLAINTEXT) || ${PAM_PLAINTEXT} != YES )
+.if !defined(WITH_PAM) || !defined(PAM_PLAINTEXT)
 SEDLIST+=	-e 's/^AUTH_PLAINTEXT/\#AUTH_PLAINTEXT/'
 .endif
 
-.if defined(USE_MAILDIR) && ${USE_MAILDIR} == YES
+.if defined(WITH_MAILDIR)
 SEDLIST+=	-e 's/^\# SUPPORT_MAILDIR/SUPPORT_MAILDIR/'
 .endif
 
-.if defined(USE_MAILSTORE) && ${USE_MAILSTORE} == YES
+.if defined(WITH_MAILSTORE)
 SEDLIST+=	-e 's/^\# SUPPORT_MAILSTORE/SUPPORT_MAILSTORE/'
 .endif
 
-.if defined(USE_MBX) && ${USE_MBX} == YES
+.if defined(WITH_MBX)
 SEDLIST+=	-e 's/^\# SUPPORT_MBX/SUPPORT_MBX/'
 .endif
 
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index ef9b4ca581d7..d258fa5c2018 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -15,41 +15,43 @@ DISTFILES=	exim-3.13.tar.gz exim-texinfo-3.10.tar.gz
 
 MAINTAINER=	sheldonh@FreeBSD.org
 
-# If USE_XLIB is defined, the eximon monitor, which requires X, will be
-# built. Comment it out unless you have or want XFree86 installed!
-USE_XLIB=	YES
+# If WITHOUT_X11 is not defined, the eximon monitor, which requires X, will
+# be built. Comment it out unless you have or want XFree86 installed!
+.if !defined(WITHOUT_X11)
+USE_XLIB=	yes
+.endif
 
-USE_PERL5=	YES
+USE_PERL5=	yes
 
 MAKE_ENV+=	OSTYPE=${OPSYS} ARCHTYPE=${MACHINE_ARCH}
 
-# Uncomment the USE_MYSQL and USE_PAM definitions to link against
+# Uncomment the WITH_MYSQL and WITH_PAM definitions to link against
 # libmysqlclient and libpam respectively.  The libpam linkage is
 # required for SMTP AUTH support.
-#USE_MYSQL=	YES
-#USE_PAM=	YES
+#WITH_MYSQL=	yes
+#WITH_PAM=	yes
 
-# If USE_PAM==YES then one or more of USE_CRAM_MD5 and USE_PLAINTEXT
+# If WITH_PAM==yes then one or more of PAM_CRAM_MD5 and PAM_PLAINTEXT
 # must be left uncommented.
-PAM_CRAM_MD5=	YES
-PAM_PLAINTEXT=	YES
+PAM_CRAM_MD5=	yes
+PAM_PLAINTEXT=	yes
 
 # Uncomment to compile support for non-standard mailbox formats.
-#USE_MAILDIR=	YES
-#USE_MAILSTORE=	YES
-#USE_MBX=	YES
+#WITH_MAILDIR=	yes
+#WITH_MAILSTORE=	yes
+#WITH_MBX=	yes
 
 # You should not need to fiddle with anything below this point.
 
 SEDLIST=	-e 's,XX_PREFIX_XX,${PREFIX},' \
 		-e 's,XX_BINOWN_XX,${BINOWN},'
-.if !defined(USE_XLIB) || ${USE_XLIB} != YES
+.if !defined(USE_XLIB)
 SEDLIST+=	-e 's/^EXIM_MONITOR/\#EXIM_MONITOR/'
 .endif
 
-# BROKEN: the USE_LDAP stuff will not work until the openldap port
+# BROKEN: the WITH_LDAP stuff will not work until the openldap port
 # builds a shared liblber.
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
+.if defined(WITH_LDAP)
 LIB_DEPENDS+=	lber.1:${PORTSDIR}/net/openldap
 SEDLIST+=	-e 's,XX_LDAP_LIBS_XX,-L${PREFIX}/lib -llber -lldap,' \
 		-e 's,XX_LDAP_INCLUDE_XX,-I${PREFIX}/include,' \
@@ -60,7 +62,7 @@ SEDLIST+=	-e 's,XX_LDAP_[^ ]*_XX,,' \
 		-e 's,^LDAP_LIB_TYPE,\#LDAP_LIB_TYPE,'
 .endif
 
-.if defined(USE_MYSQL) && ${USE_MYSQL} == YES
+.if defined(WITH_MYSQL)
 LIB_DEPENDS+=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
 SEDLIST+=	-e 's,XX_MYSQL_LIBS_XX,-L${PREFIX}/lib/mysql -lmysqlclient,' \
 		-e 's,XX_MYSQL_INCLUDE_XX,-I${PREFIX}/include/mysql,' \
@@ -69,35 +71,33 @@ SEDLIST+=	-e 's,XX_MYSQL_LIBS_XX,-L${PREFIX}/lib/mysql -lmysqlclient,' \
 SEDLIST+=	-e 's,XX_MYSQL_[^ ]*_XX,,'
 .endif
 
-.if ( !defined(USE_MYSQL) || ${USE_MYSQL} != YES )
+.if !defined(WITH_MYSQL)
 SEDLIST+=	-e 's/^LOOKUP_LIBS/\#LOOKUP_LIBS/' \
 		-e 's/^LOOKUP_INCLUDE/\#LOOKUP_INCLUDE/'
 .endif
 
-.if ( !defined(USE_PAM) || ${USE_PAM} != YES )
+.if !defined(WITH_PAM)
 SEDLIST+=	-e 's/^SUPPORT_PAM/\#SUPPORT_PAM/' \
 		-e 's/^PAM_LIBS/\#PAM_LIBS/'
 .endif
 
-.if ( !defined(USE_PAM) || ${USE_PAM} != YES ) || \
-    ( !defined(PAM_CRAM_MD5) || ${PAM_CRAM_MD5} != YES )
+.if !defined(WITH_PAM) || !defined(PAM_CRAM_MD5)
 SEDLIST+=	-e 's/^AUTH_CRAM_MD5/\#AUTH_CRAM_MD5/'
 .endif
 
-.if ( !defined(USE_PAM) || ${USE_PAM} != YES ) || \
-    ( !defined(PAM_PLAINTEXT) || ${PAM_PLAINTEXT} != YES )
+.if !defined(WITH_PAM) || !defined(PAM_PLAINTEXT)
 SEDLIST+=	-e 's/^AUTH_PLAINTEXT/\#AUTH_PLAINTEXT/'
 .endif
 
-.if defined(USE_MAILDIR) && ${USE_MAILDIR} == YES
+.if defined(WITH_MAILDIR)
 SEDLIST+=	-e 's/^\# SUPPORT_MAILDIR/SUPPORT_MAILDIR/'
 .endif
 
-.if defined(USE_MAILSTORE) && ${USE_MAILSTORE} == YES
+.if defined(WITH_MAILSTORE)
 SEDLIST+=	-e 's/^\# SUPPORT_MAILSTORE/SUPPORT_MAILSTORE/'
 .endif
 
-.if defined(USE_MBX) && ${USE_MBX} == YES
+.if defined(WITH_MBX)
 SEDLIST+=	-e 's/^\# SUPPORT_MBX/SUPPORT_MBX/'
 .endif
 
diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index c7c18df3f9e8..936630376283 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -29,7 +29,7 @@ TCLSH=		tclsh8.2
 .if defined(JAPANESE_EXMH)
 RUN_DEPENDS+=	repl:${PORTSDIR}/japanese/mh
 .else
-.if defined(USE_MH)
+.if defined(WITH_MH)
 RUN_DEPENDS+=	repl:${PORTSDIR}/mail/mh
 .else
 RUN_DEPENDS+=	repl:${PORTSDIR}/mail/nmh
diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index ea0d5c90efdf..4d56203ef446 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -33,8 +33,8 @@ LANGUAGE?=	en_US
 
 RUN_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
 
-# If USE_MYSQL is defined, build with MySQL extensions
-.if defined(USE_MYSQL)
+# If WITH_MYSQL is defined, build with MySQL extensions
+.if defined(WITH_MYSQL)
 ALL_TARGET=	it ${LANGUAGE} mysql
 LIB_DEPENDS+=	mysqlclient.6:${PORTSDIR}/databases/mysql322-client
 .else
@@ -81,7 +81,7 @@ post-patch:
 	@${ECHO} ${QMAIL_DIR} > ${WRKSRC}/conf-qmail
 	@${ECHO} ${PREFIX} > ${WRKDIR}/.PPREFIX
 	@${ECHO} ${QMAIL_DIR} >> ${WRKDIR}/.PPREFIX
-	@${ECHO} ${NOPORTDOCS} ${USE_MYSQL} >> ${WRKDIR}/.PPREFIX
+	@${ECHO} ${NOPORTDOCS} ${WITH_MYSQL} >> ${WRKDIR}/.PPREFIX
 	@${MV} ${WRKSRC}/idx.h ${WRKSRC}/idx.h.orig
 	@${SED} -e 's#/etc/ezmlm/#'${PREFIX}'/etc/ezmlm/#' \
 		< ${WRKSRC}/idx.h.orig > ${WRKSRC}/idx.h
@@ -93,7 +93,7 @@ post-patch:
 pre-install:
 	@${ECHO} ${PREFIX} > ${WRKDIR}/.IPREFIX
 	@${ECHO} ${QMAIL_DIR} >> ${WRKDIR}/.IPREFIX
-	@${ECHO} ${NOPORTDOCS} ${USE_MYSQL} >> ${WRKDIR}/.IPREFIX
+	@${ECHO} ${NOPORTDOCS} ${WITH_MYSQL} >> ${WRKDIR}/.IPREFIX
 	@diff ${WRKDIR}/.[PI]PREFIX || (${ECHO} ${DIFF_MSG} && exit 1)
 
 do-install:
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 8015b1a9ce49..07a0392e0eb0 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -38,9 +38,9 @@ BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
 .endif
 RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
-.elif defined(USE_NCURSES_PORT)
+.elif defined(WITH_NCURSES_PORT)
 LIB_DEPENDS=	ncurses.4:${PORTSDIR}/devel/ncurses
-.elif defined(USE_SLANG)
+.elif defined(WITH_SLANG)
 LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
 .endif
 .if defined(PACKAGE_BUILDING)
@@ -53,9 +53,9 @@ CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl  \
 		--with-sharedir=${PREFIX}/share/mutt \
 		--with-docdir=${PREFIX}/share/doc/mutt
-.if defined(BATCH) || defined(USE_SLANG)
+.if defined(BATCH) || defined(WITH_SLANG)
 CONFIGURE_ARGS+=	--with-slang=${PREFIX}
-.elif defined(USE_NCURSES_PORT)
+.elif defined(WITH_NCURSES_PORT)
 CONFIGURE_ARGS+=	--with-curses=${PREFIX}
 .endif
 WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 8015b1a9ce49..07a0392e0eb0 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -38,9 +38,9 @@ BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
 .endif
 RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
-.elif defined(USE_NCURSES_PORT)
+.elif defined(WITH_NCURSES_PORT)
 LIB_DEPENDS=	ncurses.4:${PORTSDIR}/devel/ncurses
-.elif defined(USE_SLANG)
+.elif defined(WITH_SLANG)
 LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
 .endif
 .if defined(PACKAGE_BUILDING)
@@ -53,9 +53,9 @@ CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl  \
 		--with-sharedir=${PREFIX}/share/mutt \
 		--with-docdir=${PREFIX}/share/doc/mutt
-.if defined(BATCH) || defined(USE_SLANG)
+.if defined(BATCH) || defined(WITH_SLANG)
 CONFIGURE_ARGS+=	--with-slang=${PREFIX}
-.elif defined(USE_NCURSES_PORT)
+.elif defined(WITH_NCURSES_PORT)
 CONFIGURE_ARGS+=	--with-curses=${PREFIX}
 .endif
 WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index 8015b1a9ce49..07a0392e0eb0 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -38,9 +38,9 @@ BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
 .endif
 RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
-.elif defined(USE_NCURSES_PORT)
+.elif defined(WITH_NCURSES_PORT)
 LIB_DEPENDS=	ncurses.4:${PORTSDIR}/devel/ncurses
-.elif defined(USE_SLANG)
+.elif defined(WITH_SLANG)
 LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
 .endif
 .if defined(PACKAGE_BUILDING)
@@ -53,9 +53,9 @@ CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl  \
 		--with-sharedir=${PREFIX}/share/mutt \
 		--with-docdir=${PREFIX}/share/doc/mutt
-.if defined(BATCH) || defined(USE_SLANG)
+.if defined(BATCH) || defined(WITH_SLANG)
 CONFIGURE_ARGS+=	--with-slang=${PREFIX}
-.elif defined(USE_NCURSES_PORT)
+.elif defined(WITH_NCURSES_PORT)
 CONFIGURE_ARGS+=	--with-curses=${PREFIX}
 .endif
 WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index fbb48fc5a8e8..b834e674f8b0 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -21,7 +21,7 @@ MAINTAINER=	torstenb@FreeBSD.org
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_MYSQL) && ${USE_MYSQL} == YES
+.if defined(WITH_MYSQL)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
@@ -29,7 +29,7 @@ POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
+.if defined(WITH_LDAP)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index fbb48fc5a8e8..b834e674f8b0 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -21,7 +21,7 @@ MAINTAINER=	torstenb@FreeBSD.org
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_MYSQL) && ${USE_MYSQL} == YES
+.if defined(WITH_MYSQL)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
@@ -29,7 +29,7 @@ POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
+.if defined(WITH_LDAP)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile
index fbb48fc5a8e8..b834e674f8b0 100644
--- a/mail/postfix1/Makefile
+++ b/mail/postfix1/Makefile
@@ -21,7 +21,7 @@ MAINTAINER=	torstenb@FreeBSD.org
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_MYSQL) && ${USE_MYSQL} == YES
+.if defined(WITH_MYSQL)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
@@ -29,7 +29,7 @@ POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
+.if defined(WITH_LDAP)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile
index fbb48fc5a8e8..b834e674f8b0 100644
--- a/mail/postfix20/Makefile
+++ b/mail/postfix20/Makefile
@@ -21,7 +21,7 @@ MAINTAINER=	torstenb@FreeBSD.org
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_MYSQL) && ${USE_MYSQL} == YES
+.if defined(WITH_MYSQL)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
@@ -29,7 +29,7 @@ POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
+.if defined(WITH_LDAP)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile
index fbb48fc5a8e8..b834e674f8b0 100644
--- a/mail/postfix21/Makefile
+++ b/mail/postfix21/Makefile
@@ -21,7 +21,7 @@ MAINTAINER=	torstenb@FreeBSD.org
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_MYSQL) && ${USE_MYSQL} == YES
+.if defined(WITH_MYSQL)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
@@ -29,7 +29,7 @@ POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
+.if defined(WITH_LDAP)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile
index fbb48fc5a8e8..b834e674f8b0 100644
--- a/mail/postfix22/Makefile
+++ b/mail/postfix22/Makefile
@@ -21,7 +21,7 @@ MAINTAINER=	torstenb@FreeBSD.org
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_MYSQL) && ${USE_MYSQL} == YES
+.if defined(WITH_MYSQL)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
@@ -29,7 +29,7 @@ POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
+.if defined(WITH_LDAP)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile
index fbb48fc5a8e8..b834e674f8b0 100644
--- a/mail/postfix23/Makefile
+++ b/mail/postfix23/Makefile
@@ -21,7 +21,7 @@ MAINTAINER=	torstenb@FreeBSD.org
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_MYSQL) && ${USE_MYSQL} == YES
+.if defined(WITH_MYSQL)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
@@ -29,7 +29,7 @@ POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
+.if defined(WITH_LDAP)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile
index fbb48fc5a8e8..b834e674f8b0 100644
--- a/mail/postfix24/Makefile
+++ b/mail/postfix24/Makefile
@@ -21,7 +21,7 @@ MAINTAINER=	torstenb@FreeBSD.org
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_MYSQL) && ${USE_MYSQL} == YES
+.if defined(WITH_MYSQL)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
@@ -29,7 +29,7 @@ POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
+.if defined(WITH_LDAP)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile
index fbb48fc5a8e8..b834e674f8b0 100644
--- a/mail/postfix25/Makefile
+++ b/mail/postfix25/Makefile
@@ -21,7 +21,7 @@ MAINTAINER=	torstenb@FreeBSD.org
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_MYSQL) && ${USE_MYSQL} == YES
+.if defined(WITH_MYSQL)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
@@ -29,7 +29,7 @@ POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
+.if defined(WITH_LDAP)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile
index fbb48fc5a8e8..b834e674f8b0 100644
--- a/mail/postfix26/Makefile
+++ b/mail/postfix26/Makefile
@@ -21,7 +21,7 @@ MAINTAINER=	torstenb@FreeBSD.org
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_MYSQL) && ${USE_MYSQL} == YES
+.if defined(WITH_MYSQL)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
@@ -29,7 +29,7 @@ POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
+.if defined(WITH_LDAP)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index fbb48fc5a8e8..b834e674f8b0 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -21,7 +21,7 @@ MAINTAINER=	torstenb@FreeBSD.org
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_MYSQL) && ${USE_MYSQL} == YES
+.if defined(WITH_MYSQL)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
@@ -29,7 +29,7 @@ POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
+.if defined(WITH_LDAP)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index fbb48fc5a8e8..b834e674f8b0 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -21,7 +21,7 @@ MAINTAINER=	torstenb@FreeBSD.org
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_MYSQL) && ${USE_MYSQL} == YES
+.if defined(WITH_MYSQL)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/mysql/libmysqlclient.a:${PORTSDIR}/databases/mysql322-client
 POSTFIX_CCARGS+=	-DHAS_MYSQL -I${LOCALBASE}/include/mysql
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
@@ -29,7 +29,7 @@ POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/mysql/libmysqlclient.a -lm
 
 # WARNING: this is based on a patch submitted by a user and has not been
 # tested. Use it at your own risk !
-.if defined(USE_LDAP) && ${USE_LDAP} == YES
+.if defined(WITH_LDAP)
 BUILD_DEPENDS+=		${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
 POSTFIX_CCARGS+=	-DHAS_LDAP -I${LOCALBASE}/include
 POSTFIX_AUXLIBS+=	${LOCALBASE}/lib/libldap.a ${PREFIX}/lib/liblber.a
diff --git a/mail/zmailer/Makefile b/mail/zmailer/Makefile
index dd3f8abb2efc..735e4ac1f67d 100644
--- a/mail/zmailer/Makefile
+++ b/mail/zmailer/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	veers@disturbed.net
 
 GNU_CONFIGURE=	yes
 
-.if defined(USE_SSL)
+.if defined(WITH_SSL)
 USE_OPENSSL=	RSA
 CONFIGURE_ARGS= --with-openssl
 .else
diff --git a/math/gnuplot+/Makefile b/math/gnuplot+/Makefile
index 195a66e200c1..07c1feb11b8f 100644
--- a/math/gnuplot+/Makefile
+++ b/math/gnuplot+/Makefile
@@ -20,7 +20,7 @@ MAINTAINER=	nakaji@tutrp.tut.ac.jp
 
 LIB_DEPENDS=    png.3:${PORTSDIR}/graphics/png \
 		VFlib2.24:${PORTSDIR}/japanese/vflib
-.if defined(USE_JP)
+.if defined(WITH_JP)
 BUILD_DEPENDS=	${LOCALBASE}/lib/libgd.a:${PORTSDIR}/japanese/gd \
 		${LOCALBASE}/lib/libttf.a:${PORTSDIR}/print/freetype
 .else
@@ -59,10 +59,10 @@ GP_DOCS=	${WRKSRC}/Copyright.plus \
 		${WRKSRC}/gp+/plus.tex
 
 pre-fetch:
-.ifndef USE_JP
-	@echo "*********************************************************"
-	@echo "If you want handle Japanese TrueType font, define USE_JP."
-	@echo "*********************************************************"
+.ifndef WITH_JP
+	@echo "**********************************************************"
+	@echo "If you want handle Japanese TrueType font, define WITH_JP."
+	@echo "**********************************************************"
 .endif
 
 post-extract:
diff --git a/math/vtk/Makefile b/math/vtk/Makefile
index e5dc22545d37..0f97c57db41b 100644
--- a/math/vtk/Makefile
+++ b/math/vtk/Makefile
@@ -22,24 +22,21 @@ WRKSRC=		$(WRKDIR)/vtk31
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --with-mesa --with-shared --with-tcl --with-bsdmake
 CONFIGURE_ARGS+=	--with-contrib --with-tkwidget
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS}"
 
 # Support for Python is compiled in by default.
-WITH_PYTHON?=	yes
-.if defined(WITH_PYTHON) && $(WITH_PYTHON) == yes
+.if !defined(WITHOUT_PYTHON)
 CONFIGURE_ARGS+=	--with-python
 BUILD_DEPENDS+=	python:${PORTSDIR}/lang/python
 RUN_DEPENDS+=	python:${PORTSDIR}/lang/python
 .endif
 
-WITH_PATENTED?=	no
-.if defined(WITH_PATENTED) && $(WITH_PATENTED) == yes
+.if defined(WITH_PATENTED)
 CONFIGURE_ARGS+=	--with-patented
 PLIST=		${PKGDIR}/PLIST.with_patented
 .endif
 
 post-install:
-.if defined(WITH_PYTHON) && $(WITH_PYTHON) == yes
+.if !defined(WITHOUT_PYTHON)
 	${PREFIX}/bin/python  -c "import compileall; compileall.compile_dir( '${PREFIX}/lib/vtk/python' );"
 	${PREFIX}/bin/python -Oc "import compileall; compileall.compile_dir( '${PREFIX}/lib/vtk/python' );"
 .endif
diff --git a/math/vtk43/Makefile b/math/vtk43/Makefile
index e5dc22545d37..0f97c57db41b 100644
--- a/math/vtk43/Makefile
+++ b/math/vtk43/Makefile
@@ -22,24 +22,21 @@ WRKSRC=		$(WRKDIR)/vtk31
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --with-mesa --with-shared --with-tcl --with-bsdmake
 CONFIGURE_ARGS+=	--with-contrib --with-tkwidget
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS}"
 
 # Support for Python is compiled in by default.
-WITH_PYTHON?=	yes
-.if defined(WITH_PYTHON) && $(WITH_PYTHON) == yes
+.if !defined(WITHOUT_PYTHON)
 CONFIGURE_ARGS+=	--with-python
 BUILD_DEPENDS+=	python:${PORTSDIR}/lang/python
 RUN_DEPENDS+=	python:${PORTSDIR}/lang/python
 .endif
 
-WITH_PATENTED?=	no
-.if defined(WITH_PATENTED) && $(WITH_PATENTED) == yes
+.if defined(WITH_PATENTED)
 CONFIGURE_ARGS+=	--with-patented
 PLIST=		${PKGDIR}/PLIST.with_patented
 .endif
 
 post-install:
-.if defined(WITH_PYTHON) && $(WITH_PYTHON) == yes
+.if !defined(WITHOUT_PYTHON)
 	${PREFIX}/bin/python  -c "import compileall; compileall.compile_dir( '${PREFIX}/lib/vtk/python' );"
 	${PREFIX}/bin/python -Oc "import compileall; compileall.compile_dir( '${PREFIX}/lib/vtk/python' );"
 .endif
diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile
index e5dc22545d37..0f97c57db41b 100644
--- a/math/vtk5/Makefile
+++ b/math/vtk5/Makefile
@@ -22,24 +22,21 @@ WRKSRC=		$(WRKDIR)/vtk31
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --with-mesa --with-shared --with-tcl --with-bsdmake
 CONFIGURE_ARGS+=	--with-contrib --with-tkwidget
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS}"
 
 # Support for Python is compiled in by default.
-WITH_PYTHON?=	yes
-.if defined(WITH_PYTHON) && $(WITH_PYTHON) == yes
+.if !defined(WITHOUT_PYTHON)
 CONFIGURE_ARGS+=	--with-python
 BUILD_DEPENDS+=	python:${PORTSDIR}/lang/python
 RUN_DEPENDS+=	python:${PORTSDIR}/lang/python
 .endif
 
-WITH_PATENTED?=	no
-.if defined(WITH_PATENTED) && $(WITH_PATENTED) == yes
+.if defined(WITH_PATENTED)
 CONFIGURE_ARGS+=	--with-patented
 PLIST=		${PKGDIR}/PLIST.with_patented
 .endif
 
 post-install:
-.if defined(WITH_PYTHON) && $(WITH_PYTHON) == yes
+.if !defined(WITHOUT_PYTHON)
 	${PREFIX}/bin/python  -c "import compileall; compileall.compile_dir( '${PREFIX}/lib/vtk/python' );"
 	${PREFIX}/bin/python -Oc "import compileall; compileall.compile_dir( '${PREFIX}/lib/vtk/python' );"
 .endif
diff --git a/misc/gone/Makefile b/misc/gone/Makefile
index 254c518c74c9..4eb6e6537497 100644
--- a/misc/gone/Makefile
+++ b/misc/gone/Makefile
@@ -20,10 +20,10 @@ GNU_CONFIGURE=  yes
 # override this with WITH_SETUID=yes in your environment.
 # Be aware that setting gone to suid MAY be a security hole.
 #
-WITH_SETUID?=	no
-.if ${WITH_SETUID} == yes
-CONFIGURE_ENV=        with_setuid=yes
+.if defined(WITH_SETUID)
+CONFIGURE_ENV=	with_setuid=yes
 .else
-CONFIGURE_ENV=		with_setuid=no
+CONFIGURE_ENV=	with_setuid=no
 .endif
+
 .include <bsd.port.mk>
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index d9e4a35b272b..659a59bf3953 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	reg@FreeBSD.org
 
 LIB_DEPENDS=	glib12.3:${PORTSDIR}/devel/glib12 \
 		intl.1:${PORTSDIR}/devel/gettext
-.if defined(USE_NCURSES_PORT)
+.if defined(WITH_NCURSES_PORT)
 LIB_DEPENDS+=	ncurses.4:${PORTSDIR}/devel/ncurses
 .elif defined(WITH_SLANG)
 LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile
index 16dad6f63c35..4c13df085276 100644
--- a/net/cvsup/Makefile
+++ b/net/cvsup/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/development/CVSup/sources/ \
 
 MAINTAINER=	jdp@FreeBSD.org
 
-.ifdef NO_X11
+.ifdef WITHOUT_X11
 M3FLAGS+=	-DNOGUI
 BUILD_DEPENDS=	${L1}libm3tcp${L2}:${PORTSDIR}/lang/pm3-net
 RUN_DEPENDS=	${L1}libm3tcp${L2}:${PORTSDIR}/lang/pm3-net
@@ -65,9 +65,9 @@ pre-fetch:
 	@${ECHO_MSG} "Cannot determine M3 target for this architecture"
 	@${FALSE}
 .endif
-.ifndef NO_X11
+.ifndef WITHOUT_X11
 	@${ECHO_MSG} -n "To build this port without X11 (and without the GUI),"
-	@${ECHO_MSG} " define \"NO_X11\"."
+	@${ECHO_MSG} " define \"WITHOUT_X11\"."
 .endif
 	@${TRUE}
 
diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index 1bfff6fa1a44..0795419d5ddd 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -22,19 +22,16 @@ CONFIGURE_ARGS=	-cflags="${CFLAGS}" -prefix=${PREFIX}/mpich
 
 .include <bsd.port.pre.mk>
 
-# Include support for ssh client
-USE_SSH?=       YES
+# To disable ssh client support, build with WITHOUT_SSH set.
 # Use ssh instead of rsh
-.if ${OSVERSION} >= 400016 && \
-    exists(/usr/bin/ssh) && \
-    (!defined(USE_SSH) || ${USE_SSH} != NO)
+.if !defined(WITHOUT_SSH)
+.if ${OSVERSION} >= 400016 && exists(/usr/bin/ssh)
 CONFIGURE_ARGS+= -rsh="/usr/bin/ssh"
-.elif defined(USE_SSH) && ${USE_SSH} == YES || \
-    exists(${LOCALBASE}/bin/ssh) && \
-    (!defined(USE_SSH) || ${USE_SSH} != NO)
+.elif defined(WITH_SSH) || exists(${LOCALBASE}/bin/ssh)
 RUN_DEPENDS+=   ssh:${PORTSDIR}/security/ssh
 CONFIGURE_ARGS+= -rsh="${LOCALBASE}/bin/ssh"
 .endif
+.endif
 
 ALL_TARGET=
 MANPREFIX=	${PREFIX}/mpich
diff --git a/net/mpich2/Makefile b/net/mpich2/Makefile
index 1bfff6fa1a44..0795419d5ddd 100644
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -22,19 +22,16 @@ CONFIGURE_ARGS=	-cflags="${CFLAGS}" -prefix=${PREFIX}/mpich
 
 .include <bsd.port.pre.mk>
 
-# Include support for ssh client
-USE_SSH?=       YES
+# To disable ssh client support, build with WITHOUT_SSH set.
 # Use ssh instead of rsh
-.if ${OSVERSION} >= 400016 && \
-    exists(/usr/bin/ssh) && \
-    (!defined(USE_SSH) || ${USE_SSH} != NO)
+.if !defined(WITHOUT_SSH)
+.if ${OSVERSION} >= 400016 && exists(/usr/bin/ssh)
 CONFIGURE_ARGS+= -rsh="/usr/bin/ssh"
-.elif defined(USE_SSH) && ${USE_SSH} == YES || \
-    exists(${LOCALBASE}/bin/ssh) && \
-    (!defined(USE_SSH) || ${USE_SSH} != NO)
+.elif defined(WITH_SSH) || exists(${LOCALBASE}/bin/ssh)
 RUN_DEPENDS+=   ssh:${PORTSDIR}/security/ssh
 CONFIGURE_ARGS+= -rsh="${LOCALBASE}/bin/ssh"
 .endif
+.endif
 
 ALL_TARGET=
 MANPREFIX=	${PREFIX}/mpich
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index cd7dd20a3c1e..25b872761e11 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -31,10 +31,10 @@ CONFIGURE_ARGS+=--disable-ipv6
 #.endif
 
 pre-patch:
-.if !defined(USE_GTK)
+.if !defined(WITH_GTK)
 	@${ECHO} ""
 	@${ECHO} "If you want to compile with GTK support,"
-	@${ECHO} "hit Ctrl-C right now and use \"make USE_GTK=yes\" "
+	@${ECHO} "hit Ctrl-C right now and use \"make WITH_GTK=yes\" "
 	@${ECHO} ""
 CONFIGURE_ARGS+=--with-gtk-prefix=/nopath
 .else
diff --git a/net/netatalk-asun/Makefile b/net/netatalk-asun/Makefile
index a1aae501854e..d720db054881 100644
--- a/net/netatalk-asun/Makefile
+++ b/net/netatalk-asun/Makefile
@@ -22,11 +22,11 @@ MAKE_ARGS=	INSTALL="${INSTALL} ${COPY}"
 
 .include <bsd.port.pre.mk>
 
-.if defined(USE_SENDFILE) && ${OSVERSION} >= 310000
+.if defined(WITH_SENDFILE) && ${OSVERSION} >= 310000
 MAKE_ARGS+=	-DUSE_SENDFILE
 .endif
 
-.if defined(USE_CNID)
+.if defined(WITH_CNID)
 ## Support for fixed DirIDs; probably broken.
 BUILD_DEPENDS=	${PREFIX}/lib/libdb.a:${PORTSDIR}/databases/db
 MAKE_ARGS+=	-DUSE_CNID
@@ -35,16 +35,16 @@ MAKE_ARGS+=	-DUSE_CNID
 pre-build:
 ## sendfile(2) support seems to be broken in this version, but go ahead an try
 ## to fix it!
-.if defined(USE_SENDFILE) && ${OSVERSION} < 310000
+.if defined(WITH_SENDFILE) && ${OSVERSION} < 310000
 	@${ECHO_MSG} "***   sendfile(2) support is available only with FreeBSD 3.1-RELEASE"
 	@${ECHO_MSG} "      or newer.  This port probably won't compile."
 .endif
 .if ${OSVERSION} >= 310000
-.if defined(USE_SENDFILE)
+.if defined(WITH_SENDFILE)
 	@${ECHO_MSG} "***   sendfile(2) support is experimental and will likely cause"
 	@${ECHO_MSG} "      undesired behaviour!"
 .else
-#	@${ECHO_MSG} "***   Use -DUSE_SENDFILE to enable the experimental sendfile(2) support."
+#	@${ECHO_MSG} "***   Use -DWITH_SENDFILE to enable the experimental sendfile(2) support."
 .endif
 .endif
 
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index a0357e9b894f..98f68e448529 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -39,7 +39,7 @@ pre-configure:
 	@${PERL} -pi.orig -e 's:/etc/:${PREFIX}/etc/:g' ${WRKSRC}/rsync.h
 	@${PERL} -pi.orig -e 's:/etc/:${PREFIX}/etc/:g' ${WRKSRC}/rsync.1
 	@${PERL} -pi.orig -e 's:/etc/:${PREFIX}/etc/:g' ${WRKSRC}/rsyncd.conf.5
-.if defined(WITH_SSH) || defined(USE_SSH)
+.if defined(WITH_SSH)
 	@${PERL} -pi.orig-rsh -e 's/"rsh"/"ssh"/g' ${WRKSRC}/rsync.h
 .endif
 
diff --git a/net/xisp/Makefile b/net/xisp/Makefile
index 19e06858c331..668e5ff52f2b 100644
--- a/net/xisp/Makefile
+++ b/net/xisp/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	xforms:${PORTSDIR}/x11-toolkits/xforms \
 WRKSRC=         ${WRKDIR}/xisp-2.6
 MAN1=		xisp.1
 HAS_CONFIGURE=	yes
-.if defined(USE_DES)
+.if defined(WITH_DES)
 CONFIGURE_ENV=	USE_DESLIB="yes"
 .else
 CONFIGURE_ENV=	USE_DESLIB="no"
diff --git a/security/crack/Makefile b/security/crack/Makefile
index f2d3d169fe54..6181d5a2400e 100644
--- a/security/crack/Makefile
+++ b/security/crack/Makefile
@@ -22,7 +22,7 @@ RESTRICTED=	"contains crypto (libdes)"
 WRKSRC=		${WRKDIR}/c50a
 
 pre-configure:
-.if !defined(USE_DES)
+.if !defined(WITH_DES)
 	@${MV} -f ${WRKSRC}/src/libdes ${WRKSRC}/src/libdes.notused
 	@${MV} -f ${WRKSRC}/src/util/elcid.c ${WRKSRC}/src/util/elcid.c.orig
 	@${CP} -p ${WRKSRC}/src/util/elcid.c,bsd ${WRKSRC}/src/util/elcid.c
@@ -38,7 +38,7 @@ pre-build:
 do-build:
 	cd ${WRKSRC} ; ./Crack -makeonly
 	cd ${WRKSRC} ; ./Crack -makedict
-.if !defined(USE_DES)
+.if !defined(WITH_DES)
 	@#(cd ${WRKSRC} ; ./Crack -fgnd -fmt bsd ${FILESDIR}/pw-md5.test)
 .endif
 
diff --git a/security/fwtk/Makefile b/security/fwtk/Makefile
index d0384b21e89a..5cda928d70f9 100644
--- a/security/fwtk/Makefile
+++ b/security/fwtk/Makefile
@@ -31,7 +31,7 @@ SBIN_BINS=	authdump authload authmgr
 LIBEXEC_BINS=	authsrv ftp-gw http-gw netacl plug-gw rlogin-gw smap smapd \
 		tn-gw
 
-.if !defined(NO_X11)
+.if !defined(WITHOUT_X11)
 LIBEXEC_BINS+=	x-gw
 MAN8+=		x-gw.8
 .endif
diff --git a/security/fwtk/files/patch-az b/security/fwtk/files/patch-az
index 300906fb48ac..c2ff156b76cb 100644
--- a/security/fwtk/files/patch-az
+++ b/security/fwtk/files/patch-az
@@ -7,7 +7,7 @@
 -DIRS=	smap smapd netacl plug-gw ftp-gw tn-gw rlogin-gw http-gw x-gw
 +DIRS=	smap smapd netacl plug-gw ftp-gw tn-gw rlogin-gw http-gw
 +
-+.if !defined(NO_X11)
++.if !defined(WITHOUT_X11)
 +DIRS+=	x-gw
 +.endif
  
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 9dc19c2b30f2..99c50d56a4fa 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -35,11 +35,8 @@ CONFIGURE_ARGS=		--prefix=${PREFIX} --enable-shared
 PREFIX=                        ${HEIMDAL_HOME}
 .endif
 
-.if exists(${X11BASE}/lib/libX11.a) && !defined(NO_X11)
+.if exists(${X11BASE}/lib/libX11.a) && !defined(WITHOUT_X11)
 USE_XLIB=		yes
-.endif
-
-.if defined(USE_XLIB)
 MAN1+=			kx.1 rxtelnet.1 rxterm.1 tenletxr.1
 MAN8+=			kxd.8
 CONFIGURE_ARGS+=	--with-x
@@ -47,13 +44,9 @@ CONFIGURE_ARGS+=	--with-x
 CONFIGURE_ARGS+=	--without-x
 .endif
 
-.if exists(/usr/lib/libkrb.a) && !defined(NO_KRB4)
-WITH_KRB4=		yes
-.endif
-
-.if defined(WITH_KRB4)
+.if exists(/usr/lib/libkrb.a) && !defined(WITHOUT_KRB4)
 CONFIGURE_ARGS+=	--with-krb4
-.elif !defined(KRB5_KRB4_COMPAT) || ${KRB5_KRB4_COMPAT} == "NO"
+.elif !defined(KRB5_KRB4_COMPAT)
 CONFIGURE_ARGS+=	--without-krb4
 .endif
 
@@ -61,7 +54,7 @@ PLIST:=			${WRKDIR}/PLIST
 
 pre-install:
 	@${CP} ${PKGDIR}/PLIST ${PLIST}
-.if defined(WITH_KRB4)
+.if exists(/usr/lib/libkrb.a) && !defined(WITHOUT_KRB4)
 	@${CAT} ${PKGDIR}/PLIST.KRB4 >> ${PLIST}
 .endif
 .if defined(USE_XLIB)
diff --git a/security/p5-PGP-Sign/Makefile b/security/p5-PGP-Sign/Makefile
index a633181f45f0..3c2c1e5ab61d 100644
--- a/security/p5-PGP-Sign/Makefile
+++ b/security/p5-PGP-Sign/Makefile
@@ -20,22 +20,22 @@ MAN3=		PGP::Sign.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 # You can either define one of these on the command line or accept the
-# default (USE_PGP2).  You can also predefine the values for PGP (or
+# default (WITH_PGP2).  You can also predefine the values for PGP (or
 # PGPS and PGPV) and PGPSTYLE if you don't like what this makefile
 # would assign.
-# USE_PGP2 - use PGP 2.6.* or a reasonable facsimile thereof
-# USE_PGP5 - use PGP 5 or a work-alike
-# USE_GPG  - use Gnu Privacy Guard
+# WITH_PGP2 - use PGP 2.6.* or a reasonable facsimile thereof
+# WITH_PGP5 - use PGP 5 or a work-alike
+# WITH_GPG  - use Gnu Privacy Guard
 
-.if !defined(USE_PGP5) && !defined(USE_GPG)
-USE_PGP2?=	yes
+.if !defined(WITH_PGP5) && !defined(WITH_GPG)
+WITH_PGP2?=	yes
 RUN_DEPENDS=	pgp:${PORTSDIR}/security/pgp
 .ifndef PGP
 PGP!=	which pgp || ${ECHO} ${PREFIX}/bin/pgp
 .endif
 PGPSTYLE?=	PGP2
 .else
-.ifdef USE_PGP5
+.ifdef WITH_PGP5
 RUN_DEPENDS=	pgps:${PORTSDIR}/security/pgp5
 .ifndef PGPS
 PGPS!=	which pgps || ${ECHO} ${PREFIX}/bin/pgps
@@ -45,7 +45,7 @@ PGPV!=	which pgpv || ${ECHO} ${PREFIX}/bin/pgpv
 .endif
 PGPSTYLE?=	PGP5
 .endif
-.ifdef USE_GPG
+.ifdef WITH_GPG
 RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 .ifndef PGP
 PGP!=	which gpg || ${ECHO} ${PREFIX}/bin/gpg
diff --git a/security/pidentd/Makefile b/security/pidentd/Makefile
index 712fe03d07bd..23f3da8ddadc 100644
--- a/security/pidentd/Makefile
+++ b/security/pidentd/Makefile
@@ -30,13 +30,13 @@ ADD_GDEFS+=	-DINET6 -D__ss_family=ss_family -D__ss_len=ss_len
 # Uncomment to activate the use of verifiable "cookies".  The idea is to be
 # able to detect fake "logs" intended to get your innocent users in trouble.
 # Naturally, since it uses libdes, you must have the "secure" dist installed.
-# USE_DES=	true
+#WITH_DES=	yes
 
-.if defined(USE_DES)
+.if defined(WITH_DES)
 ADD_GDEFS+=	-DINCLUDE_CRYPT
 ADD_GLIBS=	-ldes
 .endif
-.if defined(USE_DES) || ${OSVERSION} >= 400014
+.if defined(WITH_DES) || ${OSVERSION} >= 400014
 MAKE_ENV+=	ADD_GDEFS="${ADD_GDEFS}" ADD_GLIBS="${ADD_GLIBS}"
 .endif
 
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index e49d4ddb39df..efc3a4e0d1df 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 # Maximal ssh package requires YES values for
-# USE_PERL, USE_TCPWRAP
+# WITH_PERL, WITH_TCPWRAP
 #
 
 PORTNAME=	ssh
@@ -56,21 +56,17 @@ CONFIGURE_ARGS+=--with-kerberos5=${KRB5_HOME} --enable-kerberos-tgt-passing \
 
 # Include support for the SecureID card
 # Warning: untested !
-.if defined(USE_SECUREID) && ${USE_SECUREID} == YES
+.if defined(WITH_SECUREID)
 CONFIGURE_ARGS+= --with-secureid
 .endif
 
 # Don't use IDEA. IDEA can be freely used for non-commercial use. However,
 # commercial use may require a licence in a number of countries
 # Warning: untested !
-.if defined(DONT_USE_IDEA) && ${DONT_USE_IDEA} == YES
+.if defined(WITHOUT_IDEA)
 CONFIGURE_ARGS+= --without-idea
 .endif
 
-.if !exists(${X11BASE}/bin/xauth)
-CONFIGURE_ARGS+= --without-x
-.endif
-
 MAN1=		scp1.1 ssh-add1.1 ssh-agent1.1 ssh-keygen1.1 ssh1.1 \
 		make-ssh-known-hosts1.1
 MAN8=		sshd1.8
@@ -115,8 +111,7 @@ post-install:
 
 .include <bsd.port.pre.mk>
 
-.if defined(USE_PERL) && ${USE_PERL} == YES || \
-    exists(${PERL5}) && (!defined(USE_PERL) || ${USE_PERL} != NO)
+.if defined(WITH_PERL) || (exists(${PERL5}) && (!defined(WITHOUT_PERL))
 USE_PERL5=	yes
 CONFIGURE_ENV+= PERL=${PERL5}
 .else
@@ -127,9 +122,8 @@ CONFIGURE_ENV+= PERL=/replace_it_with_PERL_path
 .if exists(/usr/include/tcpd.h)
 CONFIGURE_ARGS+= --with-libwrap
 .else
-.if defined(USE_TCPWRAP) && ${USE_TCPWRAP} == YES || \
-    exists(${PREFIX}/lib/libwrap.a) && \
-    (!defined(USE_TCPWRAP) || ${USE_TCPWRAP} != NO)
+.if defined(WITH_TCPWRAP) || (exists(${PREFIX}/lib/libwrap.a) \
+    && !defined(WITHOUT_TCPWRAP))
 CONFIGURE_ENV+= LDFLAGS=-L${PREFIX}/lib CFLAGS="${CFLAGS} -I${PREFIX}/include"
 CONFIGURE_ARGS+= --with-libwrap
 LIB_DEPENDS+=   wrap.7:${PORTSDIR}/security/tcp_wrapper
@@ -138,25 +132,29 @@ LIB_DEPENDS+=   wrap.7:${PORTSDIR}/security/tcp_wrapper
 
 # Original IPv6 patches were obtained from ftp://ftp.kyoto.wide.ad.jp/IPv6/ssh/
 # ssh-1.2.27-IPv6-1.5-patch.gz
-# We still use USE_INET6 here and try to support pre 4.0 machines with kame
+# We still use WITH_INET6 here and try to support pre 4.0 machines with kame
 # IPv6 stack
-.if ${OSVERSION} >= 400014 || ( ${OSVERSION} < 400014 && defined(USE_INET6) )
+.if ${OSVERSION} >= 400014 || ( ${OSVERSION} < 400014 && defined(WITH_INET6) )
 CONFIGURE_ARGS+=	--enable-ipv6
 .else
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 # Include SOCKS firewall support
-.if defined(USE_SOCKS) && ${USE_SOCKS} == YES
+.if defined(WITH_SOCKS)
 CONFIGURE_ARGS+= --with-socks="-L${PREFIX}/lib -lsocks5" --with-socks5
 .endif
 
 # Include extra files if X11 is installed
-.if exists(${X11BASE}/lib/libX11.a)
+.if defined(WITH_X11) || (exists(${X11BASE}/lib/libX11.a) \
+    && !defined(WITHOUT_X11))
+USE_XLIB=	yes
 PLIST:=         ${WRKDIR}/PLIST
 pre-install:
 	@${CAT} ${PKGDIR}/PLIST.X11 > ${PLIST}
 	@${CAT} ${PKGDIR}/PLIST >> ${PLIST}
+.else
+CONFIGURE_ARGS+= --without-x
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index 8d447d6c6f2c..7c8a9b6e7865 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 # Maximal ssh2 package requires YES values for
-# USE_SSH1, USE_TCPWRAP
+# WITH_SSH1, WITH_TCPWRAP
 
 PORTNAME=	ssh2
 PORTVERSION= 	2.0.13
@@ -32,35 +32,33 @@ CONFIGURE_ARGS= --with-etcdir=${PREFIX}/etc --enable-debug
 
 .include <bsd.port.pre.mk>
 
-# Include support for ssh1 client backward compatibility
-USE_SSH1?=	YES
+# Don't support for ssh1 client backward compatibility
+#WITHOUT_SSH1=	yes
 # Include tcp_wrappers support (automaticlly YES if /usr/include/tcpd.h exists)
-USE_TCPWRAP?=	NO
-# Warning: untested !
+#WITH_TCPWRAP=	yes
+# Warning: untested!
 # Include support for the TIS authentication server
-USE_TIS?=	NO
+#WITH_TIS=	yes
 # Include support for the SecureID card
-USE_SECUREID?=	NO
+#WITH_SECUREID=	yes
 
-.if ${OSVERSION} < 400016 && defined(USE_SSH1) && ${USE_SSH1} == YES
+.if ${OSVERSION} < 400016 && !defined(WITHOUT_SSH1)
 BUILD_DEPENDS+=	ssh1:${PORTSDIR}/security/ssh
 RUN_DEPENDS+=	ssh1:${PORTSDIR}/security/ssh
 .endif
 
-.if defined(USE_SECUREID) && ${USE_SECUREID} == YES
+.if defined(WITH_SECUREID)
 CONFIGURE_ARGS+= --with-secureid
 .endif
-.if defined(USE_TIS) && ${USE_TIS} == YES
+.if defined(WITH_TIS)
 CONFIGURE_ARGS+= --with-tis
 .endif
-.if exists(/usr/include/tcpd.h)
+.if exists(/usr/include/tcpd.h) && !defined(WITHOUT_TCPWRAP)
 CONFIGURE_ARGS+= --with-libwrap
-.else
-.if defined(USE_TCPWRAP) && ${USE_TCPWRAP} == YES
+.elif defined(WITH_TCPWRAP)
 CONFIGURE_ARGS+= --with-libwrap="-L ${PREFIX}/lib -lwrap"
 LIB_DEPENDS+=   wrap.7:${PORTSDIR}/security/tcp_wrapper
 .endif
-.endif
 
 MAN1=	ssh2.1 ssh-keygen2.1 ssh-add2.1 ssh-agent2.1 \
 	scp2.1 sftp2.1
@@ -75,7 +73,7 @@ MLINKS=	ssh2.1 ssh.1 \
 	sshd2.8 sshd.8
 
 PORTDOCS=	CHANGES LICENSING README
-.if !defined(USE_SSH1) || (defined(USE_SSH1) && ${USE_SSH1} != YES)
+.if defined(WITHOUT_SSH1)
 PLIST=		${PKGDIR}/PLIST.ssh2_only
 .endif
 
@@ -85,7 +83,7 @@ post-patch:
 .endif
 
 post-install:
-.if defined(USE_SSH1) && ${USE_SSH1} == YES
+.if !defined(WITHOUT_SSH1)
 .for i in ssh ssh-keygen ssh-add ssh-agent scp
 	${MV} -f ${PREFIX}/man/man1/${i}.1${MAN_SUFX} ${PREFIX}/man/man1/${i}.old.1${MAN_SUFX}
 .endfor
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
 
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
 
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:
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index d1fbb84238bd..d052c24c4c31 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -36,14 +36,14 @@ MAN1=	wdm.1 wdmLogin.1
 
 DAEMONPIC=	daemon1-HQ-1280x960.jpg
 
-.if defined(USE_PAM)
+.if defined(WITH_PAM)
 CONFIGURE_ARGS+=	--enable-pam
 LIBPAM=		-lpam
 .endif
 
 pre-fetch:
-.if !defined(USE_PAM)
-	@${ECHO_MSG} "To build this port with PAM support, define \"USE_PAM\"."
+.if !defined(WITH_PAM)
+	@${ECHO_MSG} "To build this port with PAM support, define \"WITH_PAM\"."
 .endif
 
 post-extract: