diff options
-rw-r--r-- | graphics/gd/Makefile | 13 | ||||
-rw-r--r-- | graphics/gd/distinfo | 2 | ||||
-rw-r--r-- | graphics/gd/files/patch-ac | 108 | ||||
-rw-r--r-- | graphics/gd/pkg-comment | 2 | ||||
-rw-r--r-- | graphics/gd/pkg-descr | 25 | ||||
-rw-r--r-- | graphics/gd/pkg-plist | 6 | ||||
-rw-r--r-- | graphics/gd1/Makefile | 13 | ||||
-rw-r--r-- | graphics/gd1/distinfo | 2 | ||||
-rw-r--r-- | graphics/gd1/files/patch-ac | 108 | ||||
-rw-r--r-- | graphics/gd1/pkg-comment | 2 | ||||
-rw-r--r-- | graphics/gd1/pkg-descr | 25 | ||||
-rw-r--r-- | graphics/gd1/pkg-plist | 6 | ||||
-rw-r--r-- | graphics/gd2/Makefile | 13 | ||||
-rw-r--r-- | graphics/gd2/distinfo | 2 | ||||
-rw-r--r-- | graphics/gd2/files/patch-ac | 108 | ||||
-rw-r--r-- | graphics/gd2/pkg-comment | 2 | ||||
-rw-r--r-- | graphics/gd2/pkg-descr | 25 | ||||
-rw-r--r-- | graphics/gd2/pkg-plist | 6 |
18 files changed, 381 insertions, 87 deletions
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 731e7283a03e..72da6ffc7b60 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -1,26 +1,21 @@ # New ports collection makefile for: gd -# Version required: 1.6.3 +# Version required: 1.7.3 # Date created: 27 Mar 1998 # Whom: jeff@cetlink.net # # $FreeBSD$ # -DISTNAME= gd-1.6.3 +DISTNAME= gd-1.7.3 CATEGORIES= graphics MASTER_SITES= http://www.boutell.com/gd/http/ \ ftp://ftp.boutell.com/pub/boutell/gd/ -LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png +MAINTAINER= ports@FreeBSD.org -FETCH_BEFORE_ARGS= -b -USE_LIBTOOL= yes -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" -CONFIGURE_ARGS+= --includedir=${PREFIX}/include/gd \ - --libdir=${PREFIX}/lib +LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png pre-install: ${MKDIR} ${PREFIX}/include/gd - ${MKDIR} ${PREFIX}/share/examples/gd .include <bsd.port.mk> diff --git a/graphics/gd/distinfo b/graphics/gd/distinfo index ebe9d8fe9104..f7c74e8d71d7 100644 --- a/graphics/gd/distinfo +++ b/graphics/gd/distinfo @@ -1 +1 @@ -MD5 (gd-1.6.3.tar.gz) = 519bfbb55e3b315dd3d5a37ab56c2d84 +MD5 (gd-1.7.3.tar.gz) = c3690ae8c2cc0710e1777c697b876297 diff --git a/graphics/gd/files/patch-ac b/graphics/gd/files/patch-ac new file mode 100644 index 000000000000..522766f1de33 --- /dev/null +++ b/graphics/gd/files/patch-ac @@ -0,0 +1,108 @@ +--- Makefile.orig Wed Oct 13 16:20:11 1999 ++++ Makefile Mon Oct 25 10:43:21 1999 +@@ -3,19 +3,19 @@ + #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). +-COMPILER=gcc ++#COMPILER=gcc + + #If the ar command fails on your system, consult the ar manpage + #for your system. +-AR=ar ++#AR=ar + + #If the install command is not in your path, provide + #an explicit path for it here, or install manually. +-INSTALL=install ++#INSTALL=install + + #If you don't have FreeType and/or Xpm installed, including the + #header files, uncomment this (default). +-CFLAGS=-O ++#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 @@ + + #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 + + #Typical install locations for freetype, zlib, xpm and libpng libraries. + #If yours are somewhere else, other than a standard location +@@ -39,16 +39,16 @@ + #-L. as this allows the gd library itself to be found. + #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 + + #Location where libgd.a should be installed by "make install". +-INSTALL_LIB=/usr/local/lib ++INSTALL_LIB=$(PREFIX)/lib + + #Location where .h files should be installed by "make install". +-INSTALL_INCLUDE=/usr/local/include ++INSTALL_INCLUDE=$(PREFIX)/include/gd + + #Location where useful non-test programs should be installed by "make install". +-INSTALL_BIN=/usr/local/bin ++INSTALL_BIN=$(PREFIX)/bin + + # + # +@@ -58,8 +58,8 @@ + + VERSION=1.7 + +-CC=$(COMPILER) $(INCLUDEDIRS) +-LINK=$(CC) $(LIBDIRS) $(LIBS) ++#CC=$(COMPILER) $(INCLUDEDIRS) ++#LINK=$(CC) $(LIBDIRS) $(LIBS) + + PROGRAMS=$(BIN_PROGRAMS) $(TEST_PROGRAMS) + +@@ -69,23 +69,23 @@ + all: libgd.a $(PROGRAMS) + + install: libgd.a $(BIN_PROGRAMS) +- $(INSTALL) -m 644 libgd.a $(INSTALL_LIB)/libgd.a +- $(INSTALL) -m 755 pngtogd $(INSTALL_BIN)/pngtogd +- $(INSTALL) -m 755 pngtogd2 $(INSTALL_BIN)/pngtogd2 +- $(INSTALL) -m 755 gdtopng $(INSTALL_BIN)/gdtopng +- $(INSTALL) -m 755 gd2topng $(INSTALL_BIN)/gd2topng +- $(INSTALL) -m 755 gd2copypal $(INSTALL_BIN)/gd2copypal +- $(INSTALL) -m 755 gdparttopng $(INSTALL_BIN)/gdparttopng +- $(INSTALL) -m 755 webpng $(INSTALL_BIN)/webpng +- $(INSTALL) -m 755 bdftogd $(INSTALL_BIN)/bdftogd +- $(INSTALL) -m 644 gd.h $(INSTALL_INCLUDE)/gd.h +- $(INSTALL) -m 644 gdcache.h $(INSTALL_INCLUDE)/gdcache.h +- $(INSTALL) -m 644 gd_io.h $(INSTALL_INCLUDE)/gd_io.h +- $(INSTALL) -m 644 gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h +- $(INSTALL) -m 644 gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h +- $(INSTALL) -m 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h +- $(INSTALL) -m 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h +- $(INSTALL) -m 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h ++ $(INSTALL) -c -m 644 libgd.a $(INSTALL_LIB)/libgd.a ++ $(INSTALL) -c -m 755 pngtogd $(INSTALL_BIN)/pngtogd ++ $(INSTALL) -c -m 755 pngtogd2 $(INSTALL_BIN)/pngtogd2 ++ $(INSTALL) -c -m 755 gdtopng $(INSTALL_BIN)/gdtopng ++ $(INSTALL) -c -m 755 gd2topng $(INSTALL_BIN)/gd2topng ++ $(INSTALL) -c -m 755 gd2copypal $(INSTALL_BIN)/gd2copypal ++ $(INSTALL) -c -m 755 gdparttopng $(INSTALL_BIN)/gdparttopng ++ $(INSTALL) -c -m 755 webpng $(INSTALL_BIN)/webpng ++ $(INSTALL) -c -m 755 bdftogd $(INSTALL_BIN)/bdftogd ++ $(INSTALL) -c -m 644 gd.h $(INSTALL_INCLUDE)/gd.h ++ $(INSTALL) -c -m 644 gdcache.h $(INSTALL_INCLUDE)/gdcache.h ++ $(INSTALL) -c -m 644 gd_io.h $(INSTALL_INCLUDE)/gd_io.h ++ $(INSTALL) -c -m 644 gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h ++ $(INSTALL) -c -m 644 gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h ++ $(INSTALL) -c -m 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h ++ $(INSTALL) -c -m 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h ++ $(INSTALL) -c -m 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h + + gddemo: gddemo.o libgd.a + $(CC) gddemo.o -o gddemo $(LIBDIRS) $(LIBS) diff --git a/graphics/gd/pkg-comment b/graphics/gd/pkg-comment index c3e4e57602ef..e59d31d35dcd 100644 --- a/graphics/gd/pkg-comment +++ b/graphics/gd/pkg-comment @@ -1 +1 @@ -A graphics library for fast GIF creation +A graphics library for fast PNG creation diff --git a/graphics/gd/pkg-descr b/graphics/gd/pkg-descr index 3a8cb67444d2..f6ec333a65c6 100644 --- a/graphics/gd/pkg-descr +++ b/graphics/gd/pkg-descr @@ -2,25 +2,22 @@ DESCRIPTION gd is a graphics library. It allows your code to quickly draw images complete with lines, arcs, text, multiple colors, cut and paste from - other images, and flood fills, and write out the result as a .GIF file. - This is particularly useful in World Wide Web applications, where .GIF + other images, and flood fills, and write out the result as a .PNG file. + This is particularly useful in World Wide Web applications, where .PNG is the format used for inline images. - gd is not a paint program. If you are looking for a paint program, try - xpaint by David Koblas, available by anonymous FTP from ftp.netcom.com - in pub/ko/koblas. (That package is for the X Window System; for the Mac - and the PC, paint programs are considerably easier to find.) + gd is not a paint program. If you are looking for a paint program, you + are looking in the wrong place. If you are not a programmer, you are + looking in the wrong place. - gd does not provide for every possible desirable graphics operation. It - is not necessary or desirable for gd to become a kitchen-sink graphics - package, but version 1.3 incorporates most of the commonly requested - features for an 8-bit 2D package. Support for scalable fonts, and - truecolor images, JPEG and PNG is planned for version 2.0. Version 1.3 - was released to correct longstanding bugs and provide an LZW-free GIF - compression routine. + gd does not provide for every possible desirable graphics operation. + It is not necessary or desirable for gd to become a kitchen-sink + graphics package, but version 1.7.3 incorporates most of the commonly + requested features for an 8-bit 2D package. Support for truecolor + images, JPEG and truecolor PNG is planned for version 2.0. AUTHOR - gd 1.2 was written by Thomas Boutell and is currently distributed by + gd was written by Thomas Boutell and is currently distributed by boutell.com, Inc. WWW: http://www.boutell.com/gd/ diff --git a/graphics/gd/pkg-plist b/graphics/gd/pkg-plist index 4fee7f4df3d7..16438b063528 100644 --- a/graphics/gd/pkg-plist +++ b/graphics/gd/pkg-plist @@ -1,3 +1,4 @@ +bin/bdftogd bin/pngtogd bin/pngtogd2 bin/gdtopng @@ -7,14 +8,11 @@ bin/gdparttopng bin/webpng include/gd/gd.h include/gd/gd_io.h +include/gd/gdcache.h include/gd/gdfontg.h include/gd/gdfontl.h include/gd/gdfontmb.h include/gd/gdfonts.h include/gd/gdfontt.h lib/libgd.a -lib/libgd.so -lib/libgd.so.0 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @dirrm include/gd diff --git a/graphics/gd1/Makefile b/graphics/gd1/Makefile index 731e7283a03e..72da6ffc7b60 100644 --- a/graphics/gd1/Makefile +++ b/graphics/gd1/Makefile @@ -1,26 +1,21 @@ # New ports collection makefile for: gd -# Version required: 1.6.3 +# Version required: 1.7.3 # Date created: 27 Mar 1998 # Whom: jeff@cetlink.net # # $FreeBSD$ # -DISTNAME= gd-1.6.3 +DISTNAME= gd-1.7.3 CATEGORIES= graphics MASTER_SITES= http://www.boutell.com/gd/http/ \ ftp://ftp.boutell.com/pub/boutell/gd/ -LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png +MAINTAINER= ports@FreeBSD.org -FETCH_BEFORE_ARGS= -b -USE_LIBTOOL= yes -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" -CONFIGURE_ARGS+= --includedir=${PREFIX}/include/gd \ - --libdir=${PREFIX}/lib +LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png pre-install: ${MKDIR} ${PREFIX}/include/gd - ${MKDIR} ${PREFIX}/share/examples/gd .include <bsd.port.mk> diff --git a/graphics/gd1/distinfo b/graphics/gd1/distinfo index ebe9d8fe9104..f7c74e8d71d7 100644 --- a/graphics/gd1/distinfo +++ b/graphics/gd1/distinfo @@ -1 +1 @@ -MD5 (gd-1.6.3.tar.gz) = 519bfbb55e3b315dd3d5a37ab56c2d84 +MD5 (gd-1.7.3.tar.gz) = c3690ae8c2cc0710e1777c697b876297 diff --git a/graphics/gd1/files/patch-ac b/graphics/gd1/files/patch-ac new file mode 100644 index 000000000000..522766f1de33 --- /dev/null +++ b/graphics/gd1/files/patch-ac @@ -0,0 +1,108 @@ +--- Makefile.orig Wed Oct 13 16:20:11 1999 ++++ Makefile Mon Oct 25 10:43:21 1999 +@@ -3,19 +3,19 @@ + #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). +-COMPILER=gcc ++#COMPILER=gcc + + #If the ar command fails on your system, consult the ar manpage + #for your system. +-AR=ar ++#AR=ar + + #If the install command is not in your path, provide + #an explicit path for it here, or install manually. +-INSTALL=install ++#INSTALL=install + + #If you don't have FreeType and/or Xpm installed, including the + #header files, uncomment this (default). +-CFLAGS=-O ++#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 @@ + + #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 + + #Typical install locations for freetype, zlib, xpm and libpng libraries. + #If yours are somewhere else, other than a standard location +@@ -39,16 +39,16 @@ + #-L. as this allows the gd library itself to be found. + #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 + + #Location where libgd.a should be installed by "make install". +-INSTALL_LIB=/usr/local/lib ++INSTALL_LIB=$(PREFIX)/lib + + #Location where .h files should be installed by "make install". +-INSTALL_INCLUDE=/usr/local/include ++INSTALL_INCLUDE=$(PREFIX)/include/gd + + #Location where useful non-test programs should be installed by "make install". +-INSTALL_BIN=/usr/local/bin ++INSTALL_BIN=$(PREFIX)/bin + + # + # +@@ -58,8 +58,8 @@ + + VERSION=1.7 + +-CC=$(COMPILER) $(INCLUDEDIRS) +-LINK=$(CC) $(LIBDIRS) $(LIBS) ++#CC=$(COMPILER) $(INCLUDEDIRS) ++#LINK=$(CC) $(LIBDIRS) $(LIBS) + + PROGRAMS=$(BIN_PROGRAMS) $(TEST_PROGRAMS) + +@@ -69,23 +69,23 @@ + all: libgd.a $(PROGRAMS) + + install: libgd.a $(BIN_PROGRAMS) +- $(INSTALL) -m 644 libgd.a $(INSTALL_LIB)/libgd.a +- $(INSTALL) -m 755 pngtogd $(INSTALL_BIN)/pngtogd +- $(INSTALL) -m 755 pngtogd2 $(INSTALL_BIN)/pngtogd2 +- $(INSTALL) -m 755 gdtopng $(INSTALL_BIN)/gdtopng +- $(INSTALL) -m 755 gd2topng $(INSTALL_BIN)/gd2topng +- $(INSTALL) -m 755 gd2copypal $(INSTALL_BIN)/gd2copypal +- $(INSTALL) -m 755 gdparttopng $(INSTALL_BIN)/gdparttopng +- $(INSTALL) -m 755 webpng $(INSTALL_BIN)/webpng +- $(INSTALL) -m 755 bdftogd $(INSTALL_BIN)/bdftogd +- $(INSTALL) -m 644 gd.h $(INSTALL_INCLUDE)/gd.h +- $(INSTALL) -m 644 gdcache.h $(INSTALL_INCLUDE)/gdcache.h +- $(INSTALL) -m 644 gd_io.h $(INSTALL_INCLUDE)/gd_io.h +- $(INSTALL) -m 644 gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h +- $(INSTALL) -m 644 gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h +- $(INSTALL) -m 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h +- $(INSTALL) -m 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h +- $(INSTALL) -m 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h ++ $(INSTALL) -c -m 644 libgd.a $(INSTALL_LIB)/libgd.a ++ $(INSTALL) -c -m 755 pngtogd $(INSTALL_BIN)/pngtogd ++ $(INSTALL) -c -m 755 pngtogd2 $(INSTALL_BIN)/pngtogd2 ++ $(INSTALL) -c -m 755 gdtopng $(INSTALL_BIN)/gdtopng ++ $(INSTALL) -c -m 755 gd2topng $(INSTALL_BIN)/gd2topng ++ $(INSTALL) -c -m 755 gd2copypal $(INSTALL_BIN)/gd2copypal ++ $(INSTALL) -c -m 755 gdparttopng $(INSTALL_BIN)/gdparttopng ++ $(INSTALL) -c -m 755 webpng $(INSTALL_BIN)/webpng ++ $(INSTALL) -c -m 755 bdftogd $(INSTALL_BIN)/bdftogd ++ $(INSTALL) -c -m 644 gd.h $(INSTALL_INCLUDE)/gd.h ++ $(INSTALL) -c -m 644 gdcache.h $(INSTALL_INCLUDE)/gdcache.h ++ $(INSTALL) -c -m 644 gd_io.h $(INSTALL_INCLUDE)/gd_io.h ++ $(INSTALL) -c -m 644 gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h ++ $(INSTALL) -c -m 644 gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h ++ $(INSTALL) -c -m 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h ++ $(INSTALL) -c -m 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h ++ $(INSTALL) -c -m 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h + + gddemo: gddemo.o libgd.a + $(CC) gddemo.o -o gddemo $(LIBDIRS) $(LIBS) diff --git a/graphics/gd1/pkg-comment b/graphics/gd1/pkg-comment index c3e4e57602ef..e59d31d35dcd 100644 --- a/graphics/gd1/pkg-comment +++ b/graphics/gd1/pkg-comment @@ -1 +1 @@ -A graphics library for fast GIF creation +A graphics library for fast PNG creation diff --git a/graphics/gd1/pkg-descr b/graphics/gd1/pkg-descr index 3a8cb67444d2..f6ec333a65c6 100644 --- a/graphics/gd1/pkg-descr +++ b/graphics/gd1/pkg-descr @@ -2,25 +2,22 @@ DESCRIPTION gd is a graphics library. It allows your code to quickly draw images complete with lines, arcs, text, multiple colors, cut and paste from - other images, and flood fills, and write out the result as a .GIF file. - This is particularly useful in World Wide Web applications, where .GIF + other images, and flood fills, and write out the result as a .PNG file. + This is particularly useful in World Wide Web applications, where .PNG is the format used for inline images. - gd is not a paint program. If you are looking for a paint program, try - xpaint by David Koblas, available by anonymous FTP from ftp.netcom.com - in pub/ko/koblas. (That package is for the X Window System; for the Mac - and the PC, paint programs are considerably easier to find.) + gd is not a paint program. If you are looking for a paint program, you + are looking in the wrong place. If you are not a programmer, you are + looking in the wrong place. - gd does not provide for every possible desirable graphics operation. It - is not necessary or desirable for gd to become a kitchen-sink graphics - package, but version 1.3 incorporates most of the commonly requested - features for an 8-bit 2D package. Support for scalable fonts, and - truecolor images, JPEG and PNG is planned for version 2.0. Version 1.3 - was released to correct longstanding bugs and provide an LZW-free GIF - compression routine. + gd does not provide for every possible desirable graphics operation. + It is not necessary or desirable for gd to become a kitchen-sink + graphics package, but version 1.7.3 incorporates most of the commonly + requested features for an 8-bit 2D package. Support for truecolor + images, JPEG and truecolor PNG is planned for version 2.0. AUTHOR - gd 1.2 was written by Thomas Boutell and is currently distributed by + gd was written by Thomas Boutell and is currently distributed by boutell.com, Inc. WWW: http://www.boutell.com/gd/ diff --git a/graphics/gd1/pkg-plist b/graphics/gd1/pkg-plist index 4fee7f4df3d7..16438b063528 100644 --- a/graphics/gd1/pkg-plist +++ b/graphics/gd1/pkg-plist @@ -1,3 +1,4 @@ +bin/bdftogd bin/pngtogd bin/pngtogd2 bin/gdtopng @@ -7,14 +8,11 @@ bin/gdparttopng bin/webpng include/gd/gd.h include/gd/gd_io.h +include/gd/gdcache.h include/gd/gdfontg.h include/gd/gdfontl.h include/gd/gdfontmb.h include/gd/gdfonts.h include/gd/gdfontt.h lib/libgd.a -lib/libgd.so -lib/libgd.so.0 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @dirrm include/gd diff --git a/graphics/gd2/Makefile b/graphics/gd2/Makefile index 731e7283a03e..72da6ffc7b60 100644 --- a/graphics/gd2/Makefile +++ b/graphics/gd2/Makefile @@ -1,26 +1,21 @@ # New ports collection makefile for: gd -# Version required: 1.6.3 +# Version required: 1.7.3 # Date created: 27 Mar 1998 # Whom: jeff@cetlink.net # # $FreeBSD$ # -DISTNAME= gd-1.6.3 +DISTNAME= gd-1.7.3 CATEGORIES= graphics MASTER_SITES= http://www.boutell.com/gd/http/ \ ftp://ftp.boutell.com/pub/boutell/gd/ -LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png +MAINTAINER= ports@FreeBSD.org -FETCH_BEFORE_ARGS= -b -USE_LIBTOOL= yes -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" -CONFIGURE_ARGS+= --includedir=${PREFIX}/include/gd \ - --libdir=${PREFIX}/lib +LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png pre-install: ${MKDIR} ${PREFIX}/include/gd - ${MKDIR} ${PREFIX}/share/examples/gd .include <bsd.port.mk> diff --git a/graphics/gd2/distinfo b/graphics/gd2/distinfo index ebe9d8fe9104..f7c74e8d71d7 100644 --- a/graphics/gd2/distinfo +++ b/graphics/gd2/distinfo @@ -1 +1 @@ -MD5 (gd-1.6.3.tar.gz) = 519bfbb55e3b315dd3d5a37ab56c2d84 +MD5 (gd-1.7.3.tar.gz) = c3690ae8c2cc0710e1777c697b876297 diff --git a/graphics/gd2/files/patch-ac b/graphics/gd2/files/patch-ac new file mode 100644 index 000000000000..522766f1de33 --- /dev/null +++ b/graphics/gd2/files/patch-ac @@ -0,0 +1,108 @@ +--- Makefile.orig Wed Oct 13 16:20:11 1999 ++++ Makefile Mon Oct 25 10:43:21 1999 +@@ -3,19 +3,19 @@ + #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). +-COMPILER=gcc ++#COMPILER=gcc + + #If the ar command fails on your system, consult the ar manpage + #for your system. +-AR=ar ++#AR=ar + + #If the install command is not in your path, provide + #an explicit path for it here, or install manually. +-INSTALL=install ++#INSTALL=install + + #If you don't have FreeType and/or Xpm installed, including the + #header files, uncomment this (default). +-CFLAGS=-O ++#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 @@ + + #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 + + #Typical install locations for freetype, zlib, xpm and libpng libraries. + #If yours are somewhere else, other than a standard location +@@ -39,16 +39,16 @@ + #-L. as this allows the gd library itself to be found. + #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 + + #Location where libgd.a should be installed by "make install". +-INSTALL_LIB=/usr/local/lib ++INSTALL_LIB=$(PREFIX)/lib + + #Location where .h files should be installed by "make install". +-INSTALL_INCLUDE=/usr/local/include ++INSTALL_INCLUDE=$(PREFIX)/include/gd + + #Location where useful non-test programs should be installed by "make install". +-INSTALL_BIN=/usr/local/bin ++INSTALL_BIN=$(PREFIX)/bin + + # + # +@@ -58,8 +58,8 @@ + + VERSION=1.7 + +-CC=$(COMPILER) $(INCLUDEDIRS) +-LINK=$(CC) $(LIBDIRS) $(LIBS) ++#CC=$(COMPILER) $(INCLUDEDIRS) ++#LINK=$(CC) $(LIBDIRS) $(LIBS) + + PROGRAMS=$(BIN_PROGRAMS) $(TEST_PROGRAMS) + +@@ -69,23 +69,23 @@ + all: libgd.a $(PROGRAMS) + + install: libgd.a $(BIN_PROGRAMS) +- $(INSTALL) -m 644 libgd.a $(INSTALL_LIB)/libgd.a +- $(INSTALL) -m 755 pngtogd $(INSTALL_BIN)/pngtogd +- $(INSTALL) -m 755 pngtogd2 $(INSTALL_BIN)/pngtogd2 +- $(INSTALL) -m 755 gdtopng $(INSTALL_BIN)/gdtopng +- $(INSTALL) -m 755 gd2topng $(INSTALL_BIN)/gd2topng +- $(INSTALL) -m 755 gd2copypal $(INSTALL_BIN)/gd2copypal +- $(INSTALL) -m 755 gdparttopng $(INSTALL_BIN)/gdparttopng +- $(INSTALL) -m 755 webpng $(INSTALL_BIN)/webpng +- $(INSTALL) -m 755 bdftogd $(INSTALL_BIN)/bdftogd +- $(INSTALL) -m 644 gd.h $(INSTALL_INCLUDE)/gd.h +- $(INSTALL) -m 644 gdcache.h $(INSTALL_INCLUDE)/gdcache.h +- $(INSTALL) -m 644 gd_io.h $(INSTALL_INCLUDE)/gd_io.h +- $(INSTALL) -m 644 gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h +- $(INSTALL) -m 644 gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h +- $(INSTALL) -m 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h +- $(INSTALL) -m 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h +- $(INSTALL) -m 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h ++ $(INSTALL) -c -m 644 libgd.a $(INSTALL_LIB)/libgd.a ++ $(INSTALL) -c -m 755 pngtogd $(INSTALL_BIN)/pngtogd ++ $(INSTALL) -c -m 755 pngtogd2 $(INSTALL_BIN)/pngtogd2 ++ $(INSTALL) -c -m 755 gdtopng $(INSTALL_BIN)/gdtopng ++ $(INSTALL) -c -m 755 gd2topng $(INSTALL_BIN)/gd2topng ++ $(INSTALL) -c -m 755 gd2copypal $(INSTALL_BIN)/gd2copypal ++ $(INSTALL) -c -m 755 gdparttopng $(INSTALL_BIN)/gdparttopng ++ $(INSTALL) -c -m 755 webpng $(INSTALL_BIN)/webpng ++ $(INSTALL) -c -m 755 bdftogd $(INSTALL_BIN)/bdftogd ++ $(INSTALL) -c -m 644 gd.h $(INSTALL_INCLUDE)/gd.h ++ $(INSTALL) -c -m 644 gdcache.h $(INSTALL_INCLUDE)/gdcache.h ++ $(INSTALL) -c -m 644 gd_io.h $(INSTALL_INCLUDE)/gd_io.h ++ $(INSTALL) -c -m 644 gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h ++ $(INSTALL) -c -m 644 gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h ++ $(INSTALL) -c -m 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h ++ $(INSTALL) -c -m 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h ++ $(INSTALL) -c -m 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h + + gddemo: gddemo.o libgd.a + $(CC) gddemo.o -o gddemo $(LIBDIRS) $(LIBS) diff --git a/graphics/gd2/pkg-comment b/graphics/gd2/pkg-comment index c3e4e57602ef..e59d31d35dcd 100644 --- a/graphics/gd2/pkg-comment +++ b/graphics/gd2/pkg-comment @@ -1 +1 @@ -A graphics library for fast GIF creation +A graphics library for fast PNG creation diff --git a/graphics/gd2/pkg-descr b/graphics/gd2/pkg-descr index 3a8cb67444d2..f6ec333a65c6 100644 --- a/graphics/gd2/pkg-descr +++ b/graphics/gd2/pkg-descr @@ -2,25 +2,22 @@ DESCRIPTION gd is a graphics library. It allows your code to quickly draw images complete with lines, arcs, text, multiple colors, cut and paste from - other images, and flood fills, and write out the result as a .GIF file. - This is particularly useful in World Wide Web applications, where .GIF + other images, and flood fills, and write out the result as a .PNG file. + This is particularly useful in World Wide Web applications, where .PNG is the format used for inline images. - gd is not a paint program. If you are looking for a paint program, try - xpaint by David Koblas, available by anonymous FTP from ftp.netcom.com - in pub/ko/koblas. (That package is for the X Window System; for the Mac - and the PC, paint programs are considerably easier to find.) + gd is not a paint program. If you are looking for a paint program, you + are looking in the wrong place. If you are not a programmer, you are + looking in the wrong place. - gd does not provide for every possible desirable graphics operation. It - is not necessary or desirable for gd to become a kitchen-sink graphics - package, but version 1.3 incorporates most of the commonly requested - features for an 8-bit 2D package. Support for scalable fonts, and - truecolor images, JPEG and PNG is planned for version 2.0. Version 1.3 - was released to correct longstanding bugs and provide an LZW-free GIF - compression routine. + gd does not provide for every possible desirable graphics operation. + It is not necessary or desirable for gd to become a kitchen-sink + graphics package, but version 1.7.3 incorporates most of the commonly + requested features for an 8-bit 2D package. Support for truecolor + images, JPEG and truecolor PNG is planned for version 2.0. AUTHOR - gd 1.2 was written by Thomas Boutell and is currently distributed by + gd was written by Thomas Boutell and is currently distributed by boutell.com, Inc. WWW: http://www.boutell.com/gd/ diff --git a/graphics/gd2/pkg-plist b/graphics/gd2/pkg-plist index 4fee7f4df3d7..16438b063528 100644 --- a/graphics/gd2/pkg-plist +++ b/graphics/gd2/pkg-plist @@ -1,3 +1,4 @@ +bin/bdftogd bin/pngtogd bin/pngtogd2 bin/gdtopng @@ -7,14 +8,11 @@ bin/gdparttopng bin/webpng include/gd/gd.h include/gd/gd_io.h +include/gd/gdcache.h include/gd/gdfontg.h include/gd/gdfontl.h include/gd/gdfontmb.h include/gd/gdfonts.h include/gd/gdfontt.h lib/libgd.a -lib/libgd.so -lib/libgd.so.0 -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @dirrm include/gd |