diff options
| author | reg <reg@FreeBSD.org> | 2000-04-17 00:18:05 +0000 |
|---|---|---|
| committer | reg <reg@FreeBSD.org> | 2000-04-17 00:18:05 +0000 |
| commit | 8b766534122d71052c9f8e5a0752944edf0450f8 (patch) | |
| tree | 255862bd3b0c32802317a9ddc3193fd714753916 /graphics/gd2 | |
| parent | e0c8ef49d897de0719277097a1e6578f291f493e (diff) | |
| download | FreeBSD-ports-8b766534122d71052c9f8e5a0752944edf0450f8.zip FreeBSD-ports-8b766534122d71052c9f8e5a0752944edf0450f8.tar.gz | |
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
Diffstat (limited to 'graphics/gd2')
| -rw-r--r-- | graphics/gd2/Makefile | 6 | ||||
| -rw-r--r-- | graphics/gd2/files/patch-ac | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/graphics/gd2/Makefile b/graphics/gd2/Makefile index 71ae522..18cfb20 100644 --- a/graphics/gd2/Makefile +++ b/graphics/gd2/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/gd2/files/patch-ac b/graphics/gd2/files/patch-ac index de989ae..451bf86 100644 --- a/graphics/gd2/files/patch-ac +++ b/graphics/gd2/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 |
