Standartise the way used to disable X11 support in various ports. From now

on WITHOUT_X11 is the Only True Way[tm].

17 files changed, 51 insertions, 51 deletions

diff --git a/audio/snd/Makefile b/audio/snd/Makefile
index db0beb60deff..00b86199df79 100644
--- a/audio/snd/Makefile
+++ b/audio/snd/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=		trevor@FreeBSD.org
 
 LIB_DEPENDS=		intl.1:${PORTSDIR}/devel/gettext
 
-.if defined(WITHOUT_X)
+.if defined(WITHOUT_X11)
 WITHOUT_GTKEXTRA=	yes
 .endif
 .if !defined(WITHOUT_GTKEXTRA)
@@ -25,7 +25,7 @@ LIB_DEPENDS+=		gtkextra.14:${PORTSDIR}/x11-toolkits/gtkextra
 .endif
 .if !defined(WITHOUT_GUILE)
 LIB_DEPENDS+=		guile.9:${PORTSDIR}/lang/guile
-.if !defined(WITHOUT_X)
+.if !defined(WITHOUT_X11)
 LIB_DEPENDS+=		guilegtk-1.2:${PORTSDIR}/x11-toolkits/guile-gtk
 .endif
 .endif
@@ -33,7 +33,7 @@ LIB_DEPENDS+=		guilegtk-1.2:${PORTSDIR}/x11-toolkits/guile-gtk
 ALL_TARGET=		audinfo snd sndinfo sndplay sndrecord sndsine
 CONFIGURE_ARGS=		--with-float-samples \
 			--with-multifile
-.if !defined(WITHOUT_X)
+.if !defined(WITHOUT_X11)
 CONFIGURE_ARGS+=	--with-gtk \
 			--with-gtkrc-colors \
 			--with-float-samples
@@ -44,7 +44,7 @@ CONFIGURE_ARGS+=	--without-guile
 .if !defined(WITHOUT_GTKEXTRA)
 CONFIGURE_ARGS+=	--with-gtk-extra
 .endif
-.if defined(WITHOUT_X)
+.if defined(WITHOUT_X11)
 CONFIGURE_ARGS+=	--without-gui
 .endif
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -53,7 +53,7 @@ GNU_CONFIGURE=	yes
 MAKEFILE=	makefile
 PLIST=		${WRKDIR}/pkg-plist
 PREFIX=		/
-.if !defined(WITHOUT_X)
+.if !defined(WITHOUT_X11)
 USE_GLIB=	yes
 USE_GTK=	yes
 USE_XLIB=	yes
@@ -67,7 +67,7 @@ do-install:
 .for i in audinfo snd-info sndplay sndrecord sndsine
 	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${LOCALBASE}/bin
 .endfor
-.if !defined(WITHOUT_X)
+.if !defined(WITHOUT_X11)
 	${INSTALL_PROGRAM} ${WRKSRC}/snd ${X11BASE}/bin
 	${INSTALL_DATA} ${WRKSRC}/Snd.ad ${X11BASE}/lib/X11/app-defaults/
 .else
@@ -94,7 +94,7 @@ pre-build:
 .if !defined(WITHOUT_GUILE)
 	${CAT} ${PKGDIR}/pkg-plist-guile >> ${PLIST}
 .endif
-.if !defined(WITHOUT_X)
+.if !defined(WITHOUT_X11)
 	${ECHO} "%%X11BASE%%/bin/snd" >> ${PLIST}
 	${ECHO} "%%X11BASE%%/lib/X11/app-defaults/Snd.ad" >> ${PLIST}
 .else
diff --git a/devel/t1lib/Makefile b/devel/t1lib/Makefile
index 7955bbfbcbcb..3b73679618d8 100644
--- a/devel/t1lib/Makefile
+++ b/devel/t1lib/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	ijliao@FreeBSD.org
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 
-.if !defined(WITHOUT_X)
+.if !defined(WITHOUT_X11)
 USE_XLIB=	yes
 CONFIGURE_ARGS+=	--with-x
 .else
diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile
index 700c3509cae9..93adc15f3132 100644
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@@ -19,7 +19,7 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	jmz@FreeBSD.org
 
 GNU_CONFIGURE=	yes
-.if !defined(NO_X)
+.if !defined(WITHOUT_X11)
 USE_XLIB=	yes
 CONFIGURE_ARGS=	--enable-xdf --enable-floppyd
 PLIST_SUB=	WITH_X11=""
@@ -36,7 +36,7 @@ MAN1=		mattrib.1 mbadblocks.1 mcat.1 mcd.1 mcopy.1 mdel.1 mdeltree.1 \
 		mtoolstest.1 mtools.1 mtype.1 mzip.1
 MAN5=		mtools.5
 
-.if !defined(NO_X)
+.if !defined(WITHOUT_X11)
 MAN1+=		floppyd.1 floppyd_installtest.1
 .endif
 
diff --git a/games/qix/Makefile b/games/qix/Makefile
index fb81f2ef7e61..b533bdc19f16 100644
--- a/games/qix/Makefile
+++ b/games/qix/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	jmz
 
 MAINTAINER=	jmz@FreeBSD.org
 
-.if defined(NO_X)
+.if defined(WITHOUT_X11)
 MAKE_ARGS=	NO_X11=yes
 .include <bsd.port.pre.mk>
 .else
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 443b357ab362..9806fc438dcc 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -70,7 +70,7 @@ PLIST_SUB+=	MODULES=''
 PLIST_SUB+=	MODULES='@comment '
 .endif
 
-.if defined(NO_X)
+.if defined(WITHOUT_X11)
 PKGNAMESUFFIX=	-nox11
 BUILD_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript6-nox11
 RUN_DEPENDS+=	gs:${PORTSDIR}/print/ghostscript6-nox11
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 43bf30654f57..7c98e393ff06 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -17,7 +17,7 @@ INSTALLS_SHLIB=	yes
 
 USE_LIBTOOL=	yes
 
-.ifdef (NO_X)
+.ifdef (WITHOUT_X11)
 PLIST_SUB+=	X11='@comment '
 CONFIGURE_ARGS+=--with-x=no
 PKGNAMESUFFIX=	-nox11
diff --git a/graphics/libungif/Makefile b/graphics/libungif/Makefile
index 43bf30654f57..7c98e393ff06 100644
--- a/graphics/libungif/Makefile
+++ b/graphics/libungif/Makefile
@@ -17,7 +17,7 @@ INSTALLS_SHLIB=	yes
 
 USE_LIBTOOL=	yes
 
-.ifdef (NO_X)
+.ifdef (WITHOUT_X11)
 PLIST_SUB+=	X11='@comment '
 CONFIGURE_ARGS+=--with-x=no
 PKGNAMESUFFIX=	-nox11
diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile
index 0958ce62d12b..5143e9356215 100644
--- a/lang/tclX/Makefile
+++ b/lang/tclX/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	tclX8.2.0
 
 MAINTAINER=	mi@aldan.algebra.com
 
-.ifdef NO_X
+.ifdef WITHOUT_X11
 LIB_DEPENDS=	tcl${TCL_DVER}.1:${PORTSDIR}/lang/tcl${TCL_DVER}
 PKGNAMESUFFIX=	-nox11
 .else
@@ -33,7 +33,7 @@ CONFIGURE_ARGS= --enable-shared \
 		--with-tk="${LOCALBASE}/lib/tk${TCL_VER}"
 PLIST_SUB=	TCLX_LONG_VER=8.2 TCLX_SHORT_VER=82
 
-.ifdef NO_X
+.ifdef WITHOUT_X11
 CONFIGURE_ARGS+=--enable-tk=NO
 PLIST_SUB+=	X11='@comment '
 .else
diff --git a/lang/tclX82/Makefile b/lang/tclX82/Makefile
index 0958ce62d12b..5143e9356215 100644
--- a/lang/tclX82/Makefile
+++ b/lang/tclX82/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	tclX8.2.0
 
 MAINTAINER=	mi@aldan.algebra.com
 
-.ifdef NO_X
+.ifdef WITHOUT_X11
 LIB_DEPENDS=	tcl${TCL_DVER}.1:${PORTSDIR}/lang/tcl${TCL_DVER}
 PKGNAMESUFFIX=	-nox11
 .else
@@ -33,7 +33,7 @@ CONFIGURE_ARGS= --enable-shared \
 		--with-tk="${LOCALBASE}/lib/tk${TCL_VER}"
 PLIST_SUB=	TCLX_LONG_VER=8.2 TCLX_SHORT_VER=82
 
-.ifdef NO_X
+.ifdef WITHOUT_X11
 CONFIGURE_ARGS+=--enable-tk=NO
 PLIST_SUB+=	X11='@comment '
 .else
diff --git a/net-mgmt/scotty3/Makefile b/net-mgmt/scotty3/Makefile
index bb9ae82aa85c..8bfe4e067db1 100644
--- a/net-mgmt/scotty3/Makefile
+++ b/net-mgmt/scotty3/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}-00-02-21
 
 MAINTAINER=	ozz@FreeBSD.org.ru
 
-.ifdef (NO_X)
+.ifdef (WITHOUT_X11)
 PKGNAMESUFFIX=	-nox11
 LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
 .else
@@ -24,7 +24,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl=${PREFIX}/lib/tcl8.3 \
 		--enable-multicast
 
-.ifdef (NO_X)
+.ifdef (WITHOUT_X11)
 CONFIGURE_ARGS+=--with-tk=no
 .else
 CONFIGURE_ARGS+=--with-tk=${PREFIX}/lib/tk8.3
@@ -43,7 +43,7 @@ PLIST_SUB=	SCOTTY_VERSION=3.0.0 TKINED_VERSION=1.5.0
 MAKE_ARGS+=	-j2	# better than -j1 on all machines...
 INSTALL_TARGET=	tnm-install sinstall
 
-.if !defined(NO_X)
+.if !defined(WITHOUT_X11)
 MAN1+=		tkined.1
 MANN+=		ined.n
 PLIST_SUB+=	X11=''
@@ -59,7 +59,7 @@ post-patch:
 post-install:
 	${RM} -f ${PREFIX}/bin/scotty ${PREFIX}/bin/tkined
 	${LN} -s scotty3.0.0 ${PREFIX}/bin/scotty
-.ifndef NO_X
+.ifndef WITHOUT_X11
 	${LN} -s tkined1.5.0 ${PREFIX}/bin/tkined
 .endif
 
diff --git a/net/scotty3/Makefile b/net/scotty3/Makefile
index bb9ae82aa85c..8bfe4e067db1 100644
--- a/net/scotty3/Makefile
+++ b/net/scotty3/Makefile
@@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}-00-02-21
 
 MAINTAINER=	ozz@FreeBSD.org.ru
 
-.ifdef (NO_X)
+.ifdef (WITHOUT_X11)
 PKGNAMESUFFIX=	-nox11
 LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83
 .else
@@ -24,7 +24,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl=${PREFIX}/lib/tcl8.3 \
 		--enable-multicast
 
-.ifdef (NO_X)
+.ifdef (WITHOUT_X11)
 CONFIGURE_ARGS+=--with-tk=no
 .else
 CONFIGURE_ARGS+=--with-tk=${PREFIX}/lib/tk8.3
@@ -43,7 +43,7 @@ PLIST_SUB=	SCOTTY_VERSION=3.0.0 TKINED_VERSION=1.5.0
 MAKE_ARGS+=	-j2	# better than -j1 on all machines...
 INSTALL_TARGET=	tnm-install sinstall
 
-.if !defined(NO_X)
+.if !defined(WITHOUT_X11)
 MAN1+=		tkined.1
 MANN+=		ined.n
 PLIST_SUB+=	X11=''
@@ -59,7 +59,7 @@ post-patch:
 post-install:
 	${RM} -f ${PREFIX}/bin/scotty ${PREFIX}/bin/tkined
 	${LN} -s scotty3.0.0 ${PREFIX}/bin/scotty
-.ifndef NO_X
+.ifndef WITHOUT_X11
 	${LN} -s tkined1.5.0 ${PREFIX}/bin/tkined
 .endif
 
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 1662055b3d6c..03b0ca834174 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -18,10 +18,10 @@ MAINTAINER=	andreas@FreeBSD.org
 NO_X=		yes
 .endif
 
-.if defined(NO_X)
-# XXX Hack.  If you've done something like "-DNO_X" on the command line
-# (instead of NO_X=true, or similar) gmake won't pick it up.  So make sure
-# that NO_X is defined *and* has a value.
+.if defined(WITHOUT_X11)
+# XXX Hack.  If you've done something like "-DWITHOUT_X11" on the command line
+# (instead of WITHOUT_X11=true, or similar) gmake won't pick it up.  So make
+# sure that NO_X is defined *and* has a value.
 MAKE_ENV+=      NO_X=true
 .endif
 
@@ -30,7 +30,7 @@ MAKE_ENV+=      NO_X=true
 # - <default>		build and install most important filter utilities
 #			that don't require X
 # - APSFILTER_ALL	build and install all supported filter utilities
-# - NO_X		toggles not to build tools that need X11, even if
+# - WITHOUT_X11		toggles not to build tools that need X11, even if
 #			APSFILTER_ALL is set
 #
 .if defined(BATCH) && defined(APSFILTER_ALL)
@@ -38,7 +38,7 @@ MAKE_ENV+=      NO_X=true
 # Build and install all filter apsfilter knows about (rather expensive)
 #
 # ps emulator
-.if defined(NO_X)
+.if defined(WITHOUT_X11)
 RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript6-nox11
 .else
 RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript6
@@ -49,7 +49,7 @@ RUN_DEPENDS+=	melt:${PORTSDIR}/archivers/freeze
 # all needed "xxx to ps" filter utilities
 RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-letter
 RUN_DEPENDS+=	psnup:${PORTSDIR}/print/psutils-letter
-.if !defined(NO_X)
+.if !defined(WITHOUT_X11)
 # "xxx to ps" filter utilities that require X
 RUN_DEPENDS+=	acroread4:${PORTSDIR}/print/acroread4
 RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
@@ -70,7 +70,7 @@ RUN_DEPENDS+=	smbclient:${PORTSDIR}/net/samba
 # since apsfilter should fit easily on installation CD 1...
 #
 # ps emulator
-.if defined(NO_X)
+.if defined(WITHOUT_X11)
 RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript6-nox11
 .else
 RUN_DEPENDS=	gs:${PORTSDIR}/print/ghostscript6
diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index 02ce82b3ff95..04c44f5ceb5b 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -40,12 +40,12 @@ LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
 ALL_TARGET=	all pcl3opts escputil
 
-.if !defined(NO_X)
+.if !defined(WITHOUT_X11)
 USE_XLIB=	yes
 .else
-# XXX Hack.  If you've done something like "-DNO_X" on the command line
-# (instead of NO_X=true, or similar) gmake won't pick it up.  So make sure
-# that NO_X is defined *and* has a value.
+# XXX Hack.  If you've done something like "-DWITHOUT_X11" on the command line
+# (instead of WITHOUT_X11=true, or similar) gmake won't pick it up.  So make
+# sure that NO_X is defined *and* has a value.
 MAKE_ENV+=	NO_X=true
 .endif
 
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 02ce82b3ff95..04c44f5ceb5b 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -40,12 +40,12 @@ LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
 ALL_TARGET=	all pcl3opts escputil
 
-.if !defined(NO_X)
+.if !defined(WITHOUT_X11)
 USE_XLIB=	yes
 .else
-# XXX Hack.  If you've done something like "-DNO_X" on the command line
-# (instead of NO_X=true, or similar) gmake won't pick it up.  So make sure
-# that NO_X is defined *and* has a value.
+# XXX Hack.  If you've done something like "-DWITHOUT_X11" on the command line
+# (instead of WITHOUT_X11=true, or similar) gmake won't pick it up.  So make
+# sure that NO_X is defined *and* has a value.
 MAKE_ENV+=	NO_X=true
 .endif
 
diff --git a/print/ghostscript6-nox11/Makefile b/print/ghostscript6-nox11/Makefile
index 9275d95e2181..232bfc8137dc 100644
--- a/print/ghostscript6-nox11/Makefile
+++ b/print/ghostscript6-nox11/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX=	-nox11
 
 MAINTAINER=	nik@freebsd.org
 
-NO_X=		yes
+WITHOUT_X11=	yes
 
 MASTERDIR=	${.CURDIR}/../ghostscript6
 
diff --git a/print/ghostscript6/Makefile b/print/ghostscript6/Makefile
index 02ce82b3ff95..04c44f5ceb5b 100644
--- a/print/ghostscript6/Makefile
+++ b/print/ghostscript6/Makefile
@@ -40,12 +40,12 @@ LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
 ALL_TARGET=	all pcl3opts escputil
 
-.if !defined(NO_X)
+.if !defined(WITHOUT_X11)
 USE_XLIB=	yes
 .else
-# XXX Hack.  If you've done something like "-DNO_X" on the command line
-# (instead of NO_X=true, or similar) gmake won't pick it up.  So make sure
-# that NO_X is defined *and* has a value.
+# XXX Hack.  If you've done something like "-DWITHOUT_X11" on the command line
+# (instead of WITHOUT_X11=true, or similar) gmake won't pick it up.  So make
+# sure that NO_X is defined *and* has a value.
 MAKE_ENV+=	NO_X=true
 .endif
 
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 02ce82b3ff95..04c44f5ceb5b 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -40,12 +40,12 @@ LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
 ALL_TARGET=	all pcl3opts escputil
 
-.if !defined(NO_X)
+.if !defined(WITHOUT_X11)
 USE_XLIB=	yes
 .else
-# XXX Hack.  If you've done something like "-DNO_X" on the command line
-# (instead of NO_X=true, or similar) gmake won't pick it up.  So make sure
-# that NO_X is defined *and* has a value.
+# XXX Hack.  If you've done something like "-DWITHOUT_X11" on the command line
+# (instead of WITHOUT_X11=true, or similar) gmake won't pick it up.  So make
+# sure that NO_X is defined *and* has a value.
 MAKE_ENV+=	NO_X=true
 .endif