7 files changed, 22 insertions, 28 deletions

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"