Standardize all user defined options to the booleans WITH_FOO and

WITHOUT_FOO.  Begin the process of reserving these prefixes for user defined
options.

No comment by:	ports

4 files changed, 14 insertions, 23 deletions

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