From 8b766534122d71052c9f8e5a0752944edf0450f8 Mon Sep 17 00:00:00 2001
From: reg <reg@FreeBSD.org>
Date: Mon, 17 Apr 2000 00:18:05 +0000
Subject: 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
---
 graphics/gd/Makefile       | 6 +++---
 graphics/gd/files/patch-ac | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'graphics/gd')

diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 71ae522dc0c8..18cfb2063204 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	billf@FreeBSD.org
 
 LIB_DEPENDS=	png.3:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
-.if defined(WANT_X11)
+.if defined(WITH_X11)
 LIB_DEPENDS+=	ttf.4:${PORTSDIR}/print/freetype \
 		Xpm.4:${PORTSDIR}/graphics/xpm
 
@@ -23,9 +23,9 @@ USE_XLIB=	YES
 .endif
 
 pre-fetch:
-.if !defined(WANT_X11)
+.if !defined(WITH_X11)
 	@${ECHO} -n "If you want to compile in X support use "
-	@${ECHO} "'make -DWANT_X11' instead"
+	@${ECHO} "'make -DWITH_X11' instead"
 .endif
 
 pre-install:
diff --git a/graphics/gd/files/patch-ac b/graphics/gd/files/patch-ac
index de989ae7c0e6..451bf86d46b3 100644
--- a/graphics/gd/files/patch-ac
+++ b/graphics/gd/files/patch-ac
@@ -24,7 +24,7 @@
  #If you do have FreeType, libjpeg and/or Xpm fully installed, uncomment a
  #variation of this and comment out the line above. See also LIBS below.
 -#CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF
-+.if defined(WANT_X11)
++.if defined(WITH_X11)
 +CFLAGS+=-DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF
 +.else
 +CFLAGS+=-DHAVE_JPEG
@@ -39,7 +39,7 @@
  #variation of this and comment out the line above. Note that
  #Xpm requires X11. See also CFLAGS above.
 -#LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11
-+.if defined(WANT_X11)
++.if defined(WITH_X11)
 +LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11
 +.endif
  
@@ -47,7 +47,7 @@
  #If yours are somewhere else, change this. 
 -INCLUDEDIRS=-I/usr/local/include -I/usr/include/X11 -I/usr/X11R6/include/X11
 +CFLAGS+=-I$(LOCALBASE)/include
-+.if defined(WANT_X11)
++.if defined(WITH_X11)
 +CFLAGS+=-I$(LOCALBASE)/include/freetype -I$(X11BASE)/include -I$(X11BASE)/include/X11
 +.endif
  
@@ -59,7 +59,7 @@
  #on your system can't cause conflicts while building a new one.
 -LIBDIRS=-L. -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib
 +LIBDIRS=-L. -L$(LOCALBASE)/lib
-+.if defined(WANT_X11)
++.if defined(WITH_X11)
 +LIBDIRS+=-L$(X11BASE)/lib
 +.endif
  
-- 
cgit