head 1.20; access; symbols pkgsrc-2016Q2:1.19.0.24 pkgsrc-2016Q2-base:1.19 pkgsrc-2016Q1:1.19.0.22 pkgsrc-2016Q1-base:1.19 pkgsrc-2015Q4:1.19.0.20 pkgsrc-2015Q4-base:1.19 pkgsrc-2015Q3:1.19.0.18 pkgsrc-2015Q3-base:1.19 pkgsrc-2015Q2:1.19.0.16 pkgsrc-2015Q2-base:1.19 pkgsrc-2015Q1:1.19.0.14 pkgsrc-2015Q1-base:1.19 pkgsrc-2014Q4:1.19.0.12 pkgsrc-2014Q4-base:1.19 pkgsrc-2014Q3:1.19.0.10 pkgsrc-2014Q3-base:1.19 pkgsrc-2014Q2:1.19.0.8 pkgsrc-2014Q2-base:1.19 pkgsrc-2014Q1:1.19.0.6 pkgsrc-2014Q1-base:1.19 pkgsrc-2013Q4:1.19.0.4 pkgsrc-2013Q4-base:1.19 pkgsrc-2013Q3:1.19.0.2 pkgsrc-2013Q3-base:1.19 pkgsrc-2013Q2:1.18.0.52 pkgsrc-2013Q2-base:1.18 pkgsrc-2013Q1:1.18.0.50 pkgsrc-2013Q1-base:1.18 pkgsrc-2012Q4:1.18.0.48 pkgsrc-2012Q4-base:1.18 pkgsrc-2012Q3:1.18.0.46 pkgsrc-2012Q3-base:1.18 pkgsrc-2012Q2:1.18.0.44 pkgsrc-2012Q2-base:1.18 pkgsrc-2012Q1:1.18.0.42 pkgsrc-2012Q1-base:1.18 pkgsrc-2011Q4:1.18.0.40 pkgsrc-2011Q4-base:1.18 pkgsrc-2011Q3:1.18.0.38 pkgsrc-2011Q3-base:1.18 pkgsrc-2011Q2:1.18.0.36 pkgsrc-2011Q2-base:1.18 TNF:1.1.1 pkgsrc-2011Q1:1.18.0.34 pkgsrc-2011Q1-base:1.18 pkgsrc-2010Q4:1.18.0.32 pkgsrc-2010Q4-base:1.18 pkgsrc-2010Q3:1.18.0.30 pkgsrc-2010Q3-base:1.18 pkgsrc-2010Q2:1.18.0.28 pkgsrc-2010Q2-base:1.18 pkgsrc-2010Q1:1.18.0.26 pkgsrc-2010Q1-base:1.18 pkgsrc-2009Q4:1.18.0.24 pkgsrc-2009Q4-base:1.18 pkgsrc-2009Q3:1.18.0.22 pkgsrc-2009Q3-base:1.18 pkgsrc-2009Q2:1.18.0.20 pkgsrc-2009Q2-base:1.18 pkgsrc-2009Q1:1.18.0.18 pkgsrc-2009Q1-base:1.18 pkgsrc-2008Q4:1.18.0.16 pkgsrc-2008Q4-base:1.18 pkgsrc-2008Q3:1.18.0.14 pkgsrc-2008Q3-base:1.18 cube-native-xorg:1.18.0.12 cube-native-xorg-base:1.18 pkgsrc-2008Q2:1.18.0.10 pkgsrc-2008Q2-base:1.18 cwrapper:1.18.0.8 pkgsrc-2008Q1:1.18.0.6 pkgsrc-2008Q1-base:1.18 pkgsrc-2007Q4:1.18.0.4 pkgsrc-2007Q4-base:1.18 pkgsrc-2007Q3:1.18.0.2 pkgsrc-2007Q3-base:1.18 pkgsrc-2007Q2:1.17.0.18 pkgsrc-2007Q2-base:1.17 pkgsrc-2007Q1:1.17.0.16 pkgsrc-2007Q1-base:1.17 pkgsrc-2006Q4:1.17.0.14 pkgsrc-2006Q4-base:1.17 pkgsrc-2006Q3:1.17.0.12 pkgsrc-2006Q3-base:1.17 pkgsrc-2006Q2:1.17.0.10 pkgsrc-2006Q2-base:1.17 pkgsrc-2006Q1:1.17.0.8 pkgsrc-2006Q1-base:1.17 pkgsrc-2005Q4:1.17.0.6 pkgsrc-2005Q4-base:1.17 pkgsrc-2005Q3:1.17.0.4 pkgsrc-2005Q3-base:1.17 pkgsrc-2005Q2:1.17.0.2 pkgsrc-2005Q2-base:1.17 pkgsrc-2005Q1:1.16.0.12 pkgsrc-2005Q1-base:1.16 pkgsrc-2004Q4:1.16.0.10 pkgsrc-2004Q4-base:1.16 pkgsrc-2004Q3:1.16.0.8 pkgsrc-2004Q3-base:1.16 pkgsrc-2004Q2:1.16.0.6 pkgsrc-2004Q2-base:1.16 pkgsrc-2004Q1:1.16.0.4 pkgsrc-2004Q1-base:1.16 pkgsrc-2003Q4:1.16.0.2 pkgsrc-2003Q4-base:1.16 netbsd-1-6-1:1.14.0.6 netbsd-1-6-1-base:1.14 netbsd-1-6:1.14.0.8 netbsd-1-6-RELEASE-base:1.14 pkgviews:1.14.0.4 pkgviews-base:1.14 buildlink2:1.14.0.2 buildlink2-base:1.14 netbsd-1-5-PATCH003:1.14 netbsd-1-5-PATCH001:1.12 netbsd-1-5-RELEASE:1.8 netbsd-1-4-PATCH003:1.8 netbsd-1-4-PATCH002:1.5 comdex-fall-1999:1.4 netbsd-1-4-PATCH001:1.3 netbsd-1-4-RELEASE:1.2 netbsd-1-3-PATCH003:1.2 netbsd-1-3-PATCH002:1.1.1.1 freebsd-current-07Mar1998:1.1.1.1; locks; strict; comment @# @; 1.20 date 2016.08.02.18.29.21; author adam; state dead; branches; next 1.19; commitid 8neXC4AuUQw3dLgz; 1.19 date 2013.09.02.21.17.42; author adam; state Exp; branches 1.19.24.1; next 1.18; commitid RTkiYLqzcPGanU3x; 1.18 date 2007.07.01.07.54.25; author adam; state Exp; branches; next 1.17; 1.17 date 2005.06.06.18.38.08; author minskim; state Exp; branches; next 1.16; 1.16 date 2003.06.23.09.53.12; author adam; state dead; branches; next 1.15; 1.15 date 2003.06.07.11.32.39; author cjep; state Exp; branches; next 1.14; 1.14 date 2002.01.21.16.29.26; author wiz; state Exp; branches; next 1.13; 1.13 date 2001.06.28.20.02.57; author jlam; state Exp; branches; next 1.12; 1.12 date 2001.03.04.09.32.43; author tron; state Exp; branches; next 1.11; 1.11 date 2001.01.09.17.55.21; author wiz; state Exp; branches; next 1.10; 1.10 date 2000.12.16.00.29.23; author wiz; state Exp; branches; next 1.9; 1.9 date 2000.12.11.05.49.49; author jlam; state Exp; branches; next 1.8; 1.8 date 2000.06.14.16.33.49; author he; state Exp; branches; next 1.7; 1.7 date 2000.03.17.23.16.18; author tron; state Exp; branches; next 1.6; 1.6 date 2000.03.17.21.05.20; author he; state Exp; branches; next 1.5; 1.5 date 99.11.01.03.29.30; author jlam; state Exp; branches; next 1.4; 1.4 date 99.08.26.15.26.28; author agc; state Exp; branches; next 1.3; 1.3 date 99.05.02.17.46.19; author tsarna; state Exp; branches; next 1.2; 1.2 date 98.08.07.10.40.46; author agc; state Exp; branches; next 1.1; 1.1 date 98.03.07.21.59.13; author explorer; state Exp; branches 1.1.1.1; next ; 1.19.24.1 date 2016.08.10.18.12.37; author bsiegert; state dead; branches; next ; commitid 52lC0pvQxqlHRMhz; 1.1.1.1 date 98.03.07.21.59.13; author explorer; state Exp; branches; next ; desc @@ 1.20 log @We welcome the 2.2.3 release around a month after 2.2.2 (we are getting consistent). Another important milestone in the GD 2.2 series. Security related fixes: This flaw is caused by loading data from external sources (file, custom ctx, etc) and are hard to validate before calling libgd APIs: * fix php bug 72339, Integer Overflow in _gd2GetHeader (CVE-2016-5766) * bug 247, A read out-of-bands was found in the parsing of TGA files (CVE-2016-6132) * also bug 247, Buffer over-read issue when parsing crafted TGA file (CVE-2016-6214) * bug 248, fix Out-Of-Bounds Read in read_image_tga Using application provided parameters, in these cases invalid data causes the issues: * Integer overflow error within _gdContributionsAlloc() (CVE-2016-6207) * fix php bug 72494, invalid color index not handled, can lead to crash ( CVE-2016-6128) * improve color check for CropThreshold Important update: * gdImageCopyResampled has been improved. Better handling of images with alpha channel, also brings libgd in sync with php's bundled gd. @ text @$NetBSD: patch-aa,v 1.19 2013/09/02 21:17:42 adam Exp $ --- src/entities.h.orig 2013-06-25 09:58:23.000000000 +0000 +++ src/entities.h @@@@ -14,7 +14,11 @@@@ extern "C" { static struct entities_s { char *name; int value; - } entities[] = { + }; + extern struct entities_s entities[]; + +#if 0 +struct entities_s entities[] = { {"AElig", 198}, {"Aacute", 193}, {"Acirc", 194}, @@@@ -268,6 +272,7 @@@@ extern "C" { {"zwj", 8205}, {"zwnj", 8204}, }; +#endif #define ENTITY_NAME_LENGTH_MAX 8 #define NR_OF_ENTITIES 252 @ 1.19 log @Changes 2.1.0: * gdColorMapLookup() answers the RGB values according to given color map * Added support of variable resolution * new filter gdImagePixelate() * merged improvements that PHP GD team had made to GD Graphics Library * bugfixes @ text @d1 1 a1 1 $NetBSD$ @ 1.19.24.1 log @Pullup ticket #5080 - requested by sevan graphics/gd: security fix Revisions pulled up: - graphics/gd/Makefile 1.111 - graphics/gd/buildlink3.mk 1.37 - graphics/gd/distinfo 1.41 - graphics/gd/options.mk 1.5 - graphics/gd/patches/patch-aa deleted - graphics/gd/patches/patch-ab deleted - graphics/gd/patches/patch-configure deleted - graphics/gd/patches/patch-configure.ac deleted - graphics/gd/patches/patch-src_gd__bmp.c deleted - graphics/gd/patches/patch-src_gd__crop.c deleted - graphics/gd/patches/patch-src_webpimg.c deleted --- Module Name: pkgsrc Committed By: adam Date: Tue Aug 2 18:29:21 UTC 2016 Modified Files: pkgsrc/graphics/gd: Makefile buildlink3.mk distinfo options.mk Removed Files: pkgsrc/graphics/gd/patches: patch-aa patch-ab patch-configure patch-configure.ac patch-src_gd__bmp.c patch-src_gd__crop.c patch-src_webpimg.c Log Message: We welcome the 2.2.3 release around a month after 2.2.2 (we are getting consistent). Another important milestone in the GD 2.2 series. Security related fixes: This flaw is caused by loading data from external sources (file, custom ctx, etc) and are hard to validate before calling libgd APIs: * fix php bug 72339, Integer Overflow in _gd2GetHeader (CVE-2016-5766) * bug 247, A read out-of-bands was found in the parsing of TGA files (CVE-2016-6132) * also bug 247, Buffer over-read issue when parsing crafted TGA file (CVE-2016-6214) * bug 248, fix Out-Of-Bounds Read in read_image_tga Using application provided parameters, in these cases invalid data causes the issues: * Integer overflow error within _gdContributionsAlloc() (CVE-2016-6207) * fix php bug 72494, invalid color index not handled, can lead to crash ( CVE-2016-6128) * improve color check for CropThreshold Important update: * gdImageCopyResampled has been improved. Better handling of images with alpha channel, also brings libgd in sync with php's bundled gd. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.19 2013/09/02 21:17:42 adam Exp $ @ 1.18 log @Changes 2.0.35: * Fix valgrind error in gdImageFillTiled * Add missing custom cmake macros * Avoid signature buffer copy in gd_gif_c * Race condition in gdImageStringFTEx * Reading GIF images is not thread safe (static usage in private functions) * GIF Local palette is read twice * GIF, Use local frame dimension when possible instead of the logical screen size * OpenVMS build support, see VMS/README.VMS for the details * GIF, do not try to use the global colmap if it does not exist * gdImageAALine draws axis lines with two pixels width * TTF usage doesn't work properly on Netware * gdImageArc CPU usage with large angles * gdImageFilledRectangle regression fixed when used with reversed edges * Possible infinite loop in libgd/gd_png.c, flaw found by Xavier Roche * Fixed segfault when an invalid color index is present in a GIF image data * Possible integer overflow in gdImageCreateTrueColor * gdImageCreateXbm can crash if gdImageCreate fails @ text @d3 9 a11 10 --- entities.h.orig 2007-03-31 19:24:42.000000000 +0200 +++ entities.h @@@@ -14,7 +14,12 @@@@ extern "C" { static struct entities_s { char *name; int value; -} entities[] = { +}; + +extern struct entities_s entities[]; d15 7 a21 7 {"AElig", 198}, {"Aacute", 193}, {"Acirc", 194}, @@@@ -268,6 +273,7 @@@@ static struct entities_s { {"zwj", 8205}, {"zwnj", 8204}, }; @ 1.17 log @Do not define a variable in a header file; move the definition into .c and leave the declraration only. This fixes the graphviz build problem reported by Adrian Portelli in PR pkg/28596. Bump PKGREVISION. @ text @d3 1 a3 1 --- entities.h.orig 2004-10-27 09:22:46.000000000 -0500 d6 1 a6 1 struct entities_s { d19 1 a19 1 @@@@ -268,6 +273,7 @@@@ struct entities_s { @ 1.16 log @Update gd to 2.0.15 What's new: * Support for truecolor images * Support for alpha channels * The specialized .gd and .gd2 file formats * Documentation fixes * Bug fixes @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.15 2003/06/07 11:32:39 cjep Exp $ d3 8 a10 128 --- Makefile.orig 2001-02-22 17:03:43.000000000 +0000 +++ Makefile @@@@ -3,7 +3,8 @@@@ #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 +INS=$(LIBTOOL) $(INSTALL) -c -m #If the ar command fails on your system, consult the ar manpage #for your system. @@@@ -12,12 +13,11 @@@@ AR=ar #If you don't have FreeType, libjpeg and/or Xpm installed, including the #header files, uncomment this (default). You really must install #libpng and zlib to get anywhere if you wish to create PNG images. -CFLAGS=-O -DHAVE_LIBPNG -DHAVE_LIBJPEG +#CFLAGS=-O -DHAVE_LIBPNG -DHAVE_LIBJPEG #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_LIBXPM -DHAVE_LIBPNG -DHAVE_LIBJPEG \ -# -DHAVE_LIBFREETYPE -DHAVE_LIBTTF +CFLAGS+=-DHAVE_LIBXPM -DHAVE_LIBPNG -DHAVE_LIBJPEG -DHAVE_LIBTTF #To use the old FreeType 1.x library, add this additional #define #to the line above @@@@ -30,13 +30,13 @@@@ CFLAGS=-O -DHAVE_LIBPNG -DHAVE_LIBJPEG #Some systems are very picky about link order. They don't all agree #on the right order, either. -LIBS=-lgd -lpng -lz -lm +#LIBS=-lgd -lpng -lz -lm #If you do have FreeType, JPEG 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=-lgd -lpng -lz -ljpeg -lfreetype -lm -lttf +LIBS=$(LIBGD) -lpng -lz -ljpeg -lm -lttf -lintl #Note: for Freetype 1.x, use DHAVE_LIBTTF and -lttf instead. @@@@ -45,7 +45,7 @@@@ LIBS=-lgd -lpng -lz -lm #ensure that the version of gd you are installing is used, and not an #older release in your directory tree somewhere. -INCLUDEDIRS=-I. -I/usr/include/freetype2 -I/usr/include/X11 -I/usr/X11R6/include/X11 -I/usr/local/include +INCLUDEDIRS=-I. ${CPPFLAGS} #Typical install locations for freetype, zlib, xpm and libpng libraries. #If yours are somewhere else, other than a standard location @@@@ -55,16 +55,16 @@@@ INCLUDEDIRS=-I. -I/usr/include/freetype2 #on your system can't cause conflicts while building a new one. #This line shouldn't hurt if you don't actually have some of the #optional libraries and directories. -LIBDIRS=-L. -L/usr/local/lib -L/usr/lib/X11 -L/usr/X11R6/lib +LIBDIRS=${LDFLAGS} #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 #Location where useful non-test programs should be installed by "make install". -INSTALL_BIN=/usr/local/bin +INSTALL_BIN=${PREFIX}/bin # # @@@@ -74,7 +74,7 @@@@ INSTALL_BIN=/usr/local/bin VERSION=1.8.4 -CC=$(COMPILER) $(INCLUDEDIRS) +CC=$(LIBTOOL) $(COMPILER) $(INCLUDEDIRS) LINK=$(CC) $(LIBDIRS) $(LIBS) PROGRAMS=$(BIN_PROGRAMS) $(TEST_PROGRAMS) @@@@ -82,75 +82,75 @@@@ PROGRAMS=$(BIN_PROGRAMS) $(TEST_PROGRAMS BIN_PROGRAMS=pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng TEST_PROGRAMS=gdtest gddemo gd2time gdtestft gdtestttf -all: libgd.a $(PROGRAMS) +LIBGD=libgd.la -install: libgd.a $(BIN_PROGRAMS) - sh ./install-item 644 libgd.a $(INSTALL_LIB)/libgd.a - sh ./install-item 755 pngtogd $(INSTALL_BIN)/pngtogd - sh ./install-item 755 pngtogd2 $(INSTALL_BIN)/pngtogd2 - sh ./install-item 755 gdtopng $(INSTALL_BIN)/gdtopng - sh ./install-item 755 gd2topng $(INSTALL_BIN)/gd2topng - sh ./install-item 755 gd2copypal $(INSTALL_BIN)/gd2copypal - sh ./install-item 755 gdparttopng $(INSTALL_BIN)/gdparttopng - sh ./install-item 755 webpng $(INSTALL_BIN)/webpng - sh ./install-item 755 bdftogd $(INSTALL_BIN)/bdftogd - sh ./install-item 644 gd.h $(INSTALL_INCLUDE)/gd.h - sh ./install-item 644 gdcache.h $(INSTALL_INCLUDE)/gdcache.h - sh ./install-item 644 gd_io.h $(INSTALL_INCLUDE)/gd_io.h - sh ./install-item 644 gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h - sh ./install-item 644 gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h - sh ./install-item 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h - sh ./install-item 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h - sh ./install-item 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h +all: $(LIBGD) $(PROGRAMS) -gddemo: gddemo.o libgd.a +install: $(LIBGD) $(BIN_PROGRAMS) + sh $(INS) 644 $(LIBGD) $(INSTALL_LIB) + sh $(INS) 755 pngtogd $(INSTALL_BIN)/pngtogd + sh $(INS) 755 pngtogd2 $(INSTALL_BIN)/pngtogd2 + sh $(INS) 755 gdtopng $(INSTALL_BIN)/gdtopng + sh $(INS) 755 gd2topng $(INSTALL_BIN)/gd2topng + sh $(INS) 755 gd2copypal $(INSTALL_BIN)/gd2copypal + sh $(INS) 755 gdparttopng $(INSTALL_BIN)/gdparttopng + sh $(INS) 755 webpng $(INSTALL_BIN)/webpng + sh $(INS) 755 bdftogd $(INSTALL_BIN)/bdftogd + sh $(INS) 644 gd.h $(INSTALL_INCLUDE)/gd.h + sh $(INS) 644 gdcache.h $(INSTALL_INCLUDE)/gdcache.h + sh $(INS) 644 gd_io.h $(INSTALL_INCLUDE)/gd_io.h + sh $(INS) 644 gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h + sh $(INS) 644 gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h + sh $(INS) 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h + sh $(INS) 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h + sh $(INS) 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h d12 1 a12 59 +gddemo: gddemo.o $(LIBGD) $(CC) gddemo.o -o gddemo $(LIBDIRS) $(LIBS) -pngtogd: pngtogd.o libgd.a +pngtogd: pngtogd.o $(LIBGD) $(CC) pngtogd.o -o pngtogd $(LIBDIRS) $(LIBS) -webpng: webpng.o libgd.a +webpng: webpng.o $(LIBGD) $(CC) webpng.o -o webpng $(LIBDIRS) $(LIBS) -pngtogd2: pngtogd2.o libgd.a +pngtogd2: pngtogd2.o $(LIBGD) $(CC) pngtogd2.o -o pngtogd2 $(LIBDIRS) $(LIBS) -gdtopng: gdtopng.o libgd.a +gdtopng: gdtopng.o $(LIBGD) $(CC) gdtopng.o -o gdtopng $(LIBDIRS) $(LIBS) -gd2topng: gd2topng.o libgd.a +gd2topng: gd2topng.o $(LIBGD) $(CC) gd2topng.o -o gd2topng $(LIBDIRS) $(LIBS) -gd2copypal: gd2copypal.o libgd.a +gd2copypal: gd2copypal.o $(LIBGD) $(CC) gd2copypal.o -o gd2copypal $(LIBDIRS) $(LIBS) -gdparttopng: gdparttopng.o libgd.a +gdparttopng: gdparttopng.o $(LIBGD) $(CC) gdparttopng.o -o gdparttopng $(LIBDIRS) $(LIBS) -gdtest: gdtest.o libgd.a +gdtest: gdtest.o $(LIBGD) $(CC) gdtest.o -o gdtest $(LIBDIRS) $(LIBS) -gd2time: gd2time.o libgd.a +gd2time: gd2time.o $(LIBGD) $(CC) gd2time.o -o gd2time $(LIBDIRS) $(LIBS) -gdtestft: gdtestft.o libgd.a +gdtestft: gdtestft.o $(LIBGD) $(CC) --verbose gdtestft.o -o gdtestft $(LIBDIRS) $(LIBS) -gdtestttf: gdtestttf.o libgd.a +gdtestttf: gdtestttf.o $(LIBGD) $(CC) --verbose gdtestttf.o -o gdtestttf $(LIBDIRS) $(LIBS) -libgd.a: gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \ +GD_OBJS= gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \ gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o \ gdfontg.o gdtables.o gdft.o gdttf.o gdcache.o gdkanji.o wbmp.o \ - gd_wbmp.o gdhelpers.o gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h \ - gdfontg.h gdhelpers.h - rm -f libgd.a - $(AR) rc libgd.a gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o \ - gd_io_file.o gd_ss.o gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o \ - gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o \ - gdtables.o gdft.o gdttf.o gdcache.o gdkanji.o wbmp.o \ gd_wbmp.o gdhelpers.o - -ranlib libgd.a d14 10 a23 9 +$(LIBGD): $(GD_OBJS) gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h \ + gdfontg.h gdhelpers.h + rm -f $(LIBGD) + $(CC) -o $(LIBGD) $(GD_OBJS:.o=.lo) -rpath ${PREFIX}/lib \ + -version-info $(GD_MAJOR):$(GD_MINOR) $(LIBDIRS) ${LIBS:C/${LIBGD}//g} clean: - rm -f *.o *.a ${PROGRAMS} test/gdtest.jpg test/gdtest.wbmp + $(LIBTOOL) rm -f *.o *.a ${PROGRAMS} test/gdtest.jpg test/gdtest.wbmp d25 2 @ 1.15 log @Use $(INSTALL) rather than "install". Fixes build on Solaris. @ text @d1 1 a1 1 $NetBSD$ @ 1.14 log @Update to 1.8.4: * Add support for FreeType2 (John Ellson ellson@@lucent.com) [not used in the package right now] * Add support for finding in fonts in a builtin DEFAULT_FONTPATH, or in a path from the GDFONTPATH environment variable. * remove some unused symbols to reduce compiler warnings * bugfix in size comparisons in gdImageCompare * REXX now mentioned * All memory allocation functions are now wrapped within the library; gdFree is exported and recommended for freeing memory returned by the gdImage(Something)Ptr family of functions. Based on a package sent to tech-pkg by Adam Ciarcinski. @ text @d3 1 a3 1 --- Makefile.orig Thu Feb 22 18:03:43 2001 d11 1 a11 1 +INSTALL=$(LIBTOOL) install -c -m d15 1 a15 1 @@@@ -12,12 +13,11 @@@@ d30 1 a30 1 @@@@ -30,13 +30,13 @@@@ d46 1 a46 1 @@@@ -45,7 +45,7 @@@@ d55 1 a55 1 @@@@ -55,16 +55,16 @@@@ d76 1 a76 1 @@@@ -74,7 +74,7 @@@@ d85 1 a85 1 @@@@ -82,75 +82,75 @@@@ d114 17 a130 17 + sh $(INSTALL) 644 $(LIBGD) $(INSTALL_LIB) + sh $(INSTALL) 755 pngtogd $(INSTALL_BIN)/pngtogd + sh $(INSTALL) 755 pngtogd2 $(INSTALL_BIN)/pngtogd2 + sh $(INSTALL) 755 gdtopng $(INSTALL_BIN)/gdtopng + sh $(INSTALL) 755 gd2topng $(INSTALL_BIN)/gd2topng + sh $(INSTALL) 755 gd2copypal $(INSTALL_BIN)/gd2copypal + sh $(INSTALL) 755 gdparttopng $(INSTALL_BIN)/gdparttopng + sh $(INSTALL) 755 webpng $(INSTALL_BIN)/webpng + sh $(INSTALL) 755 bdftogd $(INSTALL_BIN)/bdftogd + sh $(INSTALL) 644 gd.h $(INSTALL_INCLUDE)/gd.h + sh $(INSTALL) 644 gdcache.h $(INSTALL_INCLUDE)/gdcache.h + sh $(INSTALL) 644 gd_io.h $(INSTALL_INCLUDE)/gd_io.h + sh $(INSTALL) 644 gdfontg.h $(INSTALL_INCLUDE)/gdfontg.h + sh $(INSTALL) 644 gdfontl.h $(INSTALL_INCLUDE)/gdfontl.h + sh $(INSTALL) 644 gdfontmb.h $(INSTALL_INCLUDE)/gdfontmb.h + sh $(INSTALL) 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h + sh $(INSTALL) 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h @ 1.13 log @Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY. Also use REPLACE_PERL instead of patching to replace /usr/bin/perl. @ text @d3 1 a3 1 --- Makefile.orig Sat Jun 3 15:26:12 2000 d5 1 a5 1 @@@@ -3,7 +3,9 @@@@ a10 1 + d15 6 a20 1 @@@@ -11,10 +13,10 @@@@ a21 4 #If you don't have FreeType, libjpeg and/or Xpm installed, including the #header files, uncomment this (default). -CFLAGS=-O +#CFLAGS=-O d24 7 a30 6 -#CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF +CFLAGS+=-DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF #If you don't have FreeType and/or Xpm fully installed, uncomment this #(default). @@@@ -23,7 +25,7 @@@@ d34 2 a35 2 -LIBS=-lm -lgd -lpng -lz +#LIBS=-lm -lgd -lpng -lz d39 4 a42 3 @@@@ -33,14 +35,14 @@@@ #Some systems are very picky about link order. They don't all agree #on the right order, either. d44 1 a44 2 -#LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 +LIBS=$(LIBGD) -lm -lpng -lz -ljpeg -lttf -lXpm -lX11 -lintl d46 3 a48 4 #Typical install locations for freetype, zlib, xpm, libjpeg and libpng header files. #If yours are somewhere else, change this. #-I. is important to ensure that the version of gd you are installing #is used, and not an older release in your directory tree somewhere. d50 1 a50 1 -INCLUDEDIRS=-I. -I/usr/local/include -I/usr/include/X11 -I/usr/X11R6/include/X11 d55 1 a55 3 @@@@ -48,16 +50,16 @@@@ #-L. as this allows the gd library itself to be found. #Put -L. first so that old versions of the gd library elsewhere d57 2 d76 1 a76 3 @@@@ -65,9 +67,9 @@@@ # # d78 1 a78 2 -VERSION=1.8.1 +VERSION=1.8.3 d85 1 a85 1 @@@@ -75,71 +77,71 @@@@ d87 1 a87 1 TEST_PROGRAMS=gdtest gddemo gd2time gdtestttf a90 2 + +all: $(LIBGD) $(PROGRAMS) d110 3 d131 1 a131 2 -gddemo: gddemo.o libgd.a d171 3 d176 1 a176 1 $(CC) gdtestttf.o -o gdtestttf $(LIBDIRS) $(LIBS) d179 5 a183 3 - gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o \ - gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o wbmp.o gd_wbmp.o \ - gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h d188 2 a189 1 - gdtables.o gdttf.o gdcache.o gdkanji.o wbmp.o gd_wbmp.o d191 3 a193 6 +GD_OBJS= gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \ + gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o \ + gdfontl.o gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o wbmp.o \ + gd_wbmp.o + +$(LIBGD): $(GD_OBJS) gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h a199 1 - d201 1 @ 1.12 log @Use default compiler to avoid problem with new "libtool". @ text @d3 2 a4 2 --- Makefile.orig Sat Jun 3 21:26:12 2000 +++ Makefile Sun Mar 4 10:30:05 2001 d196 1 a196 1 + -version-info $(GD_MAJOR):$(GD_MINOR) -L${X11BASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -Wl,-R${LOCALBASE}/lib ${LIBS:C/${LIBGD}//g} @ 1.11 log @Remove -O from default CFLAGS, on request by Adam Ciarcinski. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.10 2000/12/16 00:29:23 wiz Exp $ d3 5 a7 3 --- Makefile.orig Sat Jun 3 15:26:12 2000 +++ Makefile @@@@ -5,16 +5,18 @@@@ d9 4 a12 1 COMPILER=gcc a13 2 +INSTALL=$(LIBTOOL) install -c -m + d16 1 a16 1 AR=ar @ 1.10 log @Fix libgd.so. Patch supplied by Hubert Feyrer. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.9 2000/12/11 05:49:49 jlam Exp $ d22 1 a22 1 +CFLAGS+=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF @ 1.9 log @Honor CFLAGS passed in from environment during build. @ text @d1 1 a1 1 $NetBSD$ d193 1 a193 1 + -version-info $(GD_MAJOR):$(GD_MINOR) @ 1.8 log @Upgrade this package from 1.8.1 to 1.8.3; the distribution file for 1.8.1 was replaced with 1.8.3. @ text @d3 2 a4 2 --- Makefile.orig Sat Jun 3 21:26:12 2000 +++ Makefile Wed Jun 14 17:43:30 2000 d22 1 a22 1 +CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF @ 1.7 log @We need to link executables with "libintl". @ text @d3 11 a13 8 --- Makefile.orig Mon Mar 13 19:25:57 2000 +++ Makefile Sat Mar 18 00:14:22 2000 @@@@ -11,27 +11,27 @@@@ #If the install command is not in your path, provide #an explicit path for it here, or install manually. -INSTALL=install +INSTALL=$(LIBTOOL) install -c d21 2 a22 2 -#CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF +CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF d26 4 d35 4 a38 1 #Xpm requires X11. See also CFLAGS above. d44 5 a48 2 -INCLUDEDIRS=-I/usr/local/include -I/usr/include/X11 -I/usr/X11R6/include/X11 +INCLUDEDIRS=${CPPFLAGS} d52 1 a52 1 @@@@ -39,16 +39,16 @@@@ d73 3 a75 1 @@@@ -58,7 +58,7 @@@@ d77 2 a78 1 VERSION=1.7 d85 1 a85 1 @@@@ -66,10 +66,12 @@@@ d91 2 d95 17 a111 3 - $(INSTALL) -m 644 libgd.a $(INSTALL_LIB)/libgd.a +all: $(LIBGD) $(PROGRAMS) + d113 17 a129 7 + $(INSTALL) -m 644 $(LIBGD) $(INSTALL_LIB) $(INSTALL) -m 755 pngtogd $(INSTALL_BIN)/pngtogd $(INSTALL) -m 755 pngtogd2 $(INSTALL_BIN)/pngtogd2 $(INSTALL) -m 755 gdtopng $(INSTALL_BIN)/gdtopng @@@@ -87,50 +89,47 @@@@ $(INSTALL) -m 644 gdfonts.h $(INSTALL_INCLUDE)/gdfonts.h $(INSTALL) -m 644 gdfontt.h $(INSTALL_INCLUDE)/gdfontt.h a135 1 - $(CC) pngtogd.o -o pngtogd $(LIBDIRS) $(LIBS) d137 1 a137 1 + $(CC) pngtogd.o -o pngtogd $(LIBDIRS) $(LIBS) d176 2 a177 3 +GD_OBJS= gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \ gd_io_ss.o gd_png.o gd_jpeg.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o \ - gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o \ d183 1 a183 1 - gdtables.o gdttf.o gdcache.o gdkanji.o d185 5 a189 4 + gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o -clean: - rm -f *.o *.a ${PROGRAMS} d195 4 a198 2 +clean: + $(LIBTOOL) rm -f *.o *.a ${PROGRAMS} @ 1.6 log @Update this package to version 1.8.1. The 1.7.3 distribution file now contains 1.8.1; lame. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 1999/11/01 03:29:30 jlam Exp $ d4 1 a4 1 +++ Makefile Fri Mar 17 21:44:01 2000 d30 1 a30 1 +LIBS=$(LIBGD) -lm -lpng -lz -ljpeg -lttf -lXpm -lX11 d94 1 d96 1 a96 1 $(CC) pngtogd.o -o pngtogd $(LIBDIRS) $(LIBS) @ 1.5 log @* Update to gd-1.7.3. Now depends on graphics/freetype and graphics/xpm. * Build process no longer uses configure. * Change DESCR to reflect that gd makes PNG, not GIF, files. * Version library at 1.7. Fixes PR#???? Changes from version 1.6.3: -------------------------- What's new in version 1.7.3? Another attempt at Makefile fixes to permit linking with all libraries required on platforms with order- dependent linkers. Perhaps it will work this time. What's new in version 1.7.2? An uninitialized-pointer bug in gdtestttf.c was corrected. This bug caused crashes at the end of each call to gdImageStringTTF on some platforms. Thanks to Wolfgang Haefelinger. Documentation fixes. Thanks to Dohn Arms. Makefile fixes to permit linking with all libraries required on platforms with order- dependent linkers. What's new in version 1.7.1? A minor buglet in the Makefile was corrected, as well as an inaccurate error message in gdtestttf.c. Thanks to Masahito Yamaga. What's new in version 1.7? Version 1.7 contains the following changes: * Japanese language support for the TrueType functions. Thanks to Masahito Yamaga. * autoconf and configure have been removed, in favor of a carefully designed Makefile which produces and properly installs the library and the binaries. System-dependent variables are at the top of the Makefile for easy modification. I'm sorry, folks, but autoconf generated _many, many confused email messages_ from people who didn't have things where autoconf expected to find them. I am not an autoconf/automake wizard, and gd is a simple, very compact library which does not need to be a shared library. I _did_ make many improvements over the old gd 1.3 Makefile, which were directly inspired by the autoconf version found in the 1.6 series (thanks to John Ellson). * Completely ANSI C compliant, according to the -pedantic-errors flag of gcc. Several pieces of not-quite-ANSI-C code were causing problems for those with non-gcc compilers. * gdttf.c patched to allow the use of Windows symbol fonts, when present (thanks to Joseph Peppin). * extern "C" wrappers added to gd.h and the font header files for the convenience of C++ programmers. bdftogd was also modified to automatically insert these wrappers into future font header files. Thanks to John Lindal. * Compiles correctly on platforms that don't define SEEK_SET. Thanks to Robert Bonomi. * Loads Xpm images via the gdImageCreateFromXpm function, if the Xpm library is available. Thanks to Caolan McNamara. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- Makefile.orig Wed Oct 13 17:20:11 1999 +++ Makefile Sat Oct 30 23:28:34 1999 d12 1 a12 1 #If you don't have FreeType and/or Xpm installed, including the d16 1 a16 1 #If you do have FreeType and/or Xpm fully installed, uncomment a d18 2 a19 2 -#CFLAGS=-O -DHAVE_XPM -DHAVE_LIBTTF +CFLAGS+=-O -DHAVE_XPM -DHAVE_LIBTTF d26 1 a26 1 #If you do have FreeType and/or Xpm fully installed, uncomment a d29 2 a30 2 -#LIBS=-lm -lgd -lpng -lz -lttf -lXpm -lX11 +LIBS=$(LIBGD) -lm -lpng -lz -lttf -lintl -lXpm -lX11 d32 1 a32 1 #Typical install locations for freetype, zlib, xpm and libpng header files. d135 1 a135 1 gd_io_ss.o gd_png.o gdxpm.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o \ d140 1 a140 1 - gd_io_file.o gd_ss.o gd_io_ss.o gd_png.o gdxpm.o \ @ 1.4 log @Update this package to version 1.6.3, thereby fixing PR 7969 from Jim Spath. Changes from previous version include: + Version 1.6.3 corrects a memory leak in gd_png.c. This leak caused a significant amount of memory to be allocated and not freed when writing a PNG image. + Version 1.6.2 from John Ellson adds two new functions: gdImageStringTTF gdImageColorResolve + Version 1.6.1 incorporates superior PNG reading and writing code from Greg Roelofs, with minor modifications by Tom Boutell. + Version 1.6 features the following changes: Support for 8-bit palette PNG images has been added. Support for GIF has been removed. This step was taken to completely avoid the legal controversy regarding the LZW compression algorithm used in GIF. Unisys holds a patent which is relevant to LZW compression. PNG is a superior image format in any case. Now that PNG is supported by both Microsoft Internet Explorer and Netscape (in their recent releases), we highly recommend that GD users upgrade in order to get well-compressed images in a format which is legally unemcumbered. + Version 1.5 featured the following changes: New GD2 format Re-arranged source files Extended I/O capabilities. Better support for Lincoln Stein's Perl Module Added functions + Version 1.4 features the following changes: Fixed polygon fill routine (again) Support for alternate data sources Support for alternate data destinations More tolerant when reading GIFs @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 1999/05/02 17:46:19 tsarna Exp $ d3 149 a151 17 Use NetBSD libtool --- configure 1999/08/26 15:11:27 1.1 +++ configure 1999/08/26 15:12:16 @@@@ -1366,6 +1366,7 @@@@ fi +if false; then # Check for any special flags to pass to ltconfig. libtool_flags="--cache-file=$cache_file" test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" @@@@ -1523,6 +1524,7 @@@@ # Redirect the config.log output again, so that the ltconfig log is not # clobbered by the next message. exec 5>>./config.log +fi d153 2 a154 2 # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @ 1.3 log @Changed to build shared libraries. Closes PR#7403 by Jarkko Torppa. @ text @d1 19 a19 6 $NetBSD$ --- Makefile.orig Tue Aug 8 15:28:27 1995 +++ Makefile Fri Apr 16 03:49:36 1999 @@@@ -7,28 +7,32 @@@@ #If the ar command fails on your system, consult the ar manpage #for your system. d21 2 a22 42 -CC=gcc -AR=ar -CFLAGS=-O -LIBS=-L./ -lgd -lm +CC=${LIBTOOL} cc +LIBS=libgd.la -lm +OBJS=gd.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o all: libgd.a gddemo giftogd webgif gddemo: gddemo.o libgd.a gd.h gdfonts.h gdfontl.h - $(CC) gddemo.o -o gddemo $(LIBS) + ${LIBTOOL} --mode=link cc gddemo.o -o gddemo $(LIBS) giftogd: giftogd.o libgd.a gd.h - $(CC) giftogd.o -o giftogd $(LIBS) + ${LIBTOOL} --mode=link cc giftogd.o -o giftogd $(LIBS) -libgd.a: gd.o gdfontt.o gdfonts.o gdfontmb.o gdfontl.o gdfontg.o \ - gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h - rm -f libgd.a - $(AR) rc libgd.a gd.o gdfontt.o gdfonts.o gdfontmb.o \ - gdfontl.o gdfontg.o +libgd.a: ${OBJS} gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h + ${LIBTOOL} --mode=link cc -o ${.TARGET:.a=.la} ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 0:0 webgif: webgif.o libgd.a gd.h - $(CC) webgif.o -o webgif $(LIBS) + ${LIBTOOL} --mode=link cc webgif.o -o webgif $(LIBS) clean: - rm -f *.o *.a gddemo giftogd + rm -f *.lo *.o *.a gddemo giftogd +install: + ${LIBTOOL} --mode=install install -cs -o bin -g bin gddemo giftogd webgif ${PREFIX}/bin + ${LIBTOOL} --mode=install install -c -o bin -g bin libgd.la ${PREFIX}/lib + install -c -o bin -g bin gd.h gdfonts.h ${PREFIX}/include/gd + install -c -o bin -g bin gdfontt.h gdfontmb.h ${PREFIX}/include/gd + install -c -o bin -g bin gdfontl.h gdfontg.h ${PREFIX}/include/gd + install -c -o bin -g bin index.html ${PREFIX}/share/examples/gd + install -c -o bin -g bin demoin.gif ${PREFIX}/share/examples/gd @ 1.2 log @Add NetBSD RCS Ids. @ text @d2 3 a4 4 --- Makefile.orig Tue Aug 8 14:28:27 1995 +++ Makefile Sat Jun 14 18:19:04 1997 @@@@ -7,9 +7,9 @@@@ d11 4 a14 4 +#CC=gcc +#AR=ar +#CFLAGS=-O LIBS=-L./ -lgd -lm d17 21 a37 1 @@@@ -32,3 +32,11 @@@@ d39 2 a40 1 rm -f *.o *.a gddemo giftogd d43 2 a44 2 + install -cs -o bin -g bin gddemo giftogd webgif ${PREFIX}/bin + install -c -o bin -g bin libgd.a ${PREFIX}/lib @ 1.1 log @Initial revision @ text @d1 2 @ 1.1.1.1 log @import the gd graphics generation library @ text @@