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

21 files changed, 120 insertions, 120 deletions

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