diff options
| -rw-r--r-- | graphics/gd/Makefile | 6 | ||||
| -rw-r--r-- | graphics/gd/files/patch-ac | 25 | ||||
| -rw-r--r-- | graphics/gd1/Makefile | 6 | ||||
| -rw-r--r-- | graphics/gd1/files/patch-ac | 25 | ||||
| -rw-r--r-- | graphics/gd2/Makefile | 6 | ||||
| -rw-r--r-- | graphics/gd2/files/patch-ac | 25 |
6 files changed, 69 insertions, 24 deletions
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 72da6ffc7b60..89260397c911 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -13,7 +13,11 @@ MASTER_SITES= http://www.boutell.com/gd/http/ \ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png +LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ + ttf.4:${PORTSDIR}/print/freetype \ + Xpm.4:${PORTSDIR}/graphics/xpm + +USE_XLIB= YES pre-install: ${MKDIR} ${PREFIX}/include/gd diff --git a/graphics/gd/files/patch-ac b/graphics/gd/files/patch-ac index 522766f1de33..e7708da82910 100644 --- a/graphics/gd/files/patch-ac +++ b/graphics/gd/files/patch-ac @@ -1,6 +1,6 @@ ---- Makefile.orig Wed Oct 13 16:20:11 1999 -+++ Makefile Mon Oct 25 10:43:21 1999 -@@ -3,19 +3,19 @@ +--- Makefile.orig Thu Oct 14 01:20:11 1999 ++++ Makefile Sat Dec 11 19:01:31 1999 +@@ -3,35 +3,35 @@ #If you do not have gcc, change the setting for COMPILER, but you must #use an ANSI standard C compiler (NOT the old SunOS 4.1.3 cc #compiler; get gcc if you are still using it). @@ -23,13 +23,24 @@ +#CFLAGS=-O #If you do have FreeType 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_LIBTTF -@@ -31,7 +31,7 @@ +-#CFLAGS=-O -DHAVE_XPM -DHAVE_LIBTTF ++CFLAGS+=-DHAVE_XPM -DHAVE_LIBTTF + + #If you don't have FreeType and/or Xpm fully installed, uncomment this + #(default). +-LIBS=-lm -lgd -lpng -lz ++#LIBS=-lm -lgd -lpng -lz + + #If you do have FreeType and/or Xpm fully installed, uncomment a + #variation of this and comment out the line above. Note that + #Xpm requires X11. See also CFLAGS above. +-#LIBS=-lm -lgd -lpng -lz -lttf -lXpm -lX11 ++LIBS=-lm -lgd -lpng -lz -lttf -lXpm -lX11 #Typical install locations for freetype, zlib, xpm and libpng header files. #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 ++CFLAGS+=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype -I$(X11BASE)/include -I$(X11BASE)/include/X11 #Typical install locations for freetype, zlib, xpm and libpng libraries. #If yours are somewhere else, other than a standard location @@ -38,7 +49,7 @@ #Put -L. first so that old versions of the gd library elsewhere #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 ++LIBDIRS=-L. -L$(LOCALBASE)/lib -L$(X11BASE)/lib #Location where libgd.a should be installed by "make install". -INSTALL_LIB=/usr/local/lib diff --git a/graphics/gd1/Makefile b/graphics/gd1/Makefile index 72da6ffc7b60..89260397c911 100644 --- a/graphics/gd1/Makefile +++ b/graphics/gd1/Makefile @@ -13,7 +13,11 @@ MASTER_SITES= http://www.boutell.com/gd/http/ \ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png +LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ + ttf.4:${PORTSDIR}/print/freetype \ + Xpm.4:${PORTSDIR}/graphics/xpm + +USE_XLIB= YES pre-install: ${MKDIR} ${PREFIX}/include/gd diff --git a/graphics/gd1/files/patch-ac b/graphics/gd1/files/patch-ac index 522766f1de33..e7708da82910 100644 --- a/graphics/gd1/files/patch-ac +++ b/graphics/gd1/files/patch-ac @@ -1,6 +1,6 @@ ---- Makefile.orig Wed Oct 13 16:20:11 1999 -+++ Makefile Mon Oct 25 10:43:21 1999 -@@ -3,19 +3,19 @@ +--- Makefile.orig Thu Oct 14 01:20:11 1999 ++++ Makefile Sat Dec 11 19:01:31 1999 +@@ -3,35 +3,35 @@ #If you do not have gcc, change the setting for COMPILER, but you must #use an ANSI standard C compiler (NOT the old SunOS 4.1.3 cc #compiler; get gcc if you are still using it). @@ -23,13 +23,24 @@ +#CFLAGS=-O #If you do have FreeType 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_LIBTTF -@@ -31,7 +31,7 @@ +-#CFLAGS=-O -DHAVE_XPM -DHAVE_LIBTTF ++CFLAGS+=-DHAVE_XPM -DHAVE_LIBTTF + + #If you don't have FreeType and/or Xpm fully installed, uncomment this + #(default). +-LIBS=-lm -lgd -lpng -lz ++#LIBS=-lm -lgd -lpng -lz + + #If you do have FreeType and/or Xpm fully installed, uncomment a + #variation of this and comment out the line above. Note that + #Xpm requires X11. See also CFLAGS above. +-#LIBS=-lm -lgd -lpng -lz -lttf -lXpm -lX11 ++LIBS=-lm -lgd -lpng -lz -lttf -lXpm -lX11 #Typical install locations for freetype, zlib, xpm and libpng header files. #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 ++CFLAGS+=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype -I$(X11BASE)/include -I$(X11BASE)/include/X11 #Typical install locations for freetype, zlib, xpm and libpng libraries. #If yours are somewhere else, other than a standard location @@ -38,7 +49,7 @@ #Put -L. first so that old versions of the gd library elsewhere #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 ++LIBDIRS=-L. -L$(LOCALBASE)/lib -L$(X11BASE)/lib #Location where libgd.a should be installed by "make install". -INSTALL_LIB=/usr/local/lib diff --git a/graphics/gd2/Makefile b/graphics/gd2/Makefile index 72da6ffc7b60..89260397c911 100644 --- a/graphics/gd2/Makefile +++ b/graphics/gd2/Makefile @@ -13,7 +13,11 @@ MASTER_SITES= http://www.boutell.com/gd/http/ \ MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png +LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ + ttf.4:${PORTSDIR}/print/freetype \ + Xpm.4:${PORTSDIR}/graphics/xpm + +USE_XLIB= YES pre-install: ${MKDIR} ${PREFIX}/include/gd diff --git a/graphics/gd2/files/patch-ac b/graphics/gd2/files/patch-ac index 522766f1de33..e7708da82910 100644 --- a/graphics/gd2/files/patch-ac +++ b/graphics/gd2/files/patch-ac @@ -1,6 +1,6 @@ ---- Makefile.orig Wed Oct 13 16:20:11 1999 -+++ Makefile Mon Oct 25 10:43:21 1999 -@@ -3,19 +3,19 @@ +--- Makefile.orig Thu Oct 14 01:20:11 1999 ++++ Makefile Sat Dec 11 19:01:31 1999 +@@ -3,35 +3,35 @@ #If you do not have gcc, change the setting for COMPILER, but you must #use an ANSI standard C compiler (NOT the old SunOS 4.1.3 cc #compiler; get gcc if you are still using it). @@ -23,13 +23,24 @@ +#CFLAGS=-O #If you do have FreeType 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_LIBTTF -@@ -31,7 +31,7 @@ +-#CFLAGS=-O -DHAVE_XPM -DHAVE_LIBTTF ++CFLAGS+=-DHAVE_XPM -DHAVE_LIBTTF + + #If you don't have FreeType and/or Xpm fully installed, uncomment this + #(default). +-LIBS=-lm -lgd -lpng -lz ++#LIBS=-lm -lgd -lpng -lz + + #If you do have FreeType and/or Xpm fully installed, uncomment a + #variation of this and comment out the line above. Note that + #Xpm requires X11. See also CFLAGS above. +-#LIBS=-lm -lgd -lpng -lz -lttf -lXpm -lX11 ++LIBS=-lm -lgd -lpng -lz -lttf -lXpm -lX11 #Typical install locations for freetype, zlib, xpm and libpng header files. #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 ++CFLAGS+=-I$(LOCALBASE)/include -I$(LOCALBASE)/include/freetype -I$(X11BASE)/include -I$(X11BASE)/include/X11 #Typical install locations for freetype, zlib, xpm and libpng libraries. #If yours are somewhere else, other than a standard location @@ -38,7 +49,7 @@ #Put -L. first so that old versions of the gd library elsewhere #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 ++LIBDIRS=-L. -L$(LOCALBASE)/lib -L$(X11BASE)/lib #Location where libgd.a should be installed by "make install". -INSTALL_LIB=/usr/local/lib |