diff options
author | he <he> | 2000-06-14 16:33:46 +0000 |
---|---|---|
committer | he <he> | 2000-06-14 16:33:46 +0000 |
commit | be675ff85592efa7044c42e8b1db37bf1ee63598 (patch) | |
tree | 54e134c461b047d72f560ab74fc3457cd3beccdc /graphics | |
parent | 682dd009e060d7bf29ba2238851c3a8859cdf886 (diff) | |
download | pkgsrc-be675ff85592efa7044c42e8b1db37bf1ee63598.tar.gz |
Upgrade this package from 1.8.1 to 1.8.3; the distribution file
for 1.8.1 was replaced with 1.8.3.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/gd/Makefile | 6 | ||||
-rw-r--r-- | graphics/gd/files/md5 | 4 | ||||
-rw-r--r-- | graphics/gd/files/patch-sum | 6 | ||||
-rw-r--r-- | graphics/gd/patches/patch-aa | 121 | ||||
-rw-r--r-- | graphics/gd/patches/patch-ab | 6 | ||||
-rw-r--r-- | graphics/gd/pkg/PLIST | 4 |
6 files changed, 95 insertions, 52 deletions
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index 6ff97c678e9..934f1f22ac7 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2000/06/01 11:23:27 rh Exp $ +# $NetBSD: Makefile,v 1.17 2000/06/14 16:33:46 he Exp $ # FreeBSD Id: Makefile,v 1.2 1997/02/14 07:55:45 asami Exp # -DISTNAME= gd-1.8.1 +DISTNAME= gd-1.8.3 CATEGORIES= graphics MASTER_SITES= http://www.boutell.com/gd/http/ @@ -31,7 +31,7 @@ CPPFLAGS+= -I${LOCALBASE}/include # zlib.h # bump the MINOR when a new version comes out. # GD_MAJOR= 1 -GD_MINOR= 8 +GD_MINOR= 9 MAKE_ENV+= GD_MAJOR="${GD_MAJOR}" GD_MINOR="${GD_MINOR}" MAKE_ENV+= CPPFLAGS="${CPPFLAGS}" diff --git a/graphics/gd/files/md5 b/graphics/gd/files/md5 index e8a35ac7464..433599a062c 100644 --- a/graphics/gd/files/md5 +++ b/graphics/gd/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.7 2000/03/17 21:05:19 he Exp $ +$NetBSD: md5,v 1.8 2000/06/14 16:33:47 he Exp $ -MD5 (gd-1.8.1.tar.gz) = 7d3890e728ee5bbde165ef75448d5a3f +MD5 (gd-1.8.3.tar.gz) = ad0e7dd1dda2812dbaeaa9706c4be536 diff --git a/graphics/gd/files/patch-sum b/graphics/gd/files/patch-sum index f6d8cc7a4c1..c8cb2d6743e 100644 --- a/graphics/gd/files/patch-sum +++ b/graphics/gd/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.6 2000/03/21 11:10:39 he Exp $ +$NetBSD: patch-sum,v 1.7 2000/06/14 16:33:48 he Exp $ -MD5 (patch-aa) = ffc3d01724e7ff7daeae1197c9d1c4db -MD5 (patch-ab) = 75dd2c81df4d1969ebc38468e0535e96 +MD5 (patch-aa) = 68aadc5249c6fca3223120ed5d30ddf5 +MD5 (patch-ab) = 029abede0aa46de40b4485257131511e diff --git a/graphics/gd/patches/patch-aa b/graphics/gd/patches/patch-aa index 93918563841..3e6ea67beab 100644 --- a/graphics/gd/patches/patch-aa +++ b/graphics/gd/patches/patch-aa @@ -1,13 +1,16 @@ -$NetBSD: patch-aa,v 1.7 2000/03/17 23:16:18 tron Exp $ +$NetBSD: patch-aa,v 1.8 2000/06/14 16:33:49 he Exp $ ---- Makefile.orig Mon Mar 13 19:25:57 2000 -+++ Makefile Sat Mar 18 00:14:22 2000 -@@ -11,27 +11,27 @@ +--- Makefile.orig Sat Jun 3 21:26:12 2000 ++++ Makefile Wed Jun 14 17:43:30 2000 +@@ -5,16 +5,18 @@ + #compiler; get gcc if you are still using it). + COMPILER=gcc - #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 ++INSTALL=$(LIBTOOL) install -c -m ++ + #If the ar command fails on your system, consult the ar manpage + #for your system. + AR=ar #If you don't have FreeType, libjpeg and/or Xpm installed, including the #header files, uncomment this (default). @@ -15,28 +18,38 @@ $NetBSD: patch-aa,v 1.7 2000/03/17 23:16:18 tron Exp $ +#CFLAGS=-O #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 -+CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF +-#CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF ++CFLAGS=-O -DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF #If you don't have FreeType and/or Xpm fully installed, uncomment this #(default). +@@ -23,7 +25,7 @@ + #Some systems are very picky about link order. They don't all agree + #on the right order, either. + -LIBS=-lm -lgd -lpng -lz +#LIBS=-lm -lgd -lpng -lz #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. +@@ -33,14 +35,14 @@ + #Some systems are very picky about link order. They don't all agree + #on the right order, either. + -#LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11 +LIBS=$(LIBGD) -lm -lpng -lz -ljpeg -lttf -lXpm -lX11 -lintl #Typical install locations for freetype, zlib, xpm, libjpeg 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 -+INCLUDEDIRS=${CPPFLAGS} + #-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. + +-INCLUDEDIRS=-I. -I/usr/local/include -I/usr/include/X11 -I/usr/X11R6/include/X11 ++INCLUDEDIRS=-I. ${CPPFLAGS} #Typical install locations for freetype, zlib, xpm and libpng libraries. #If yours are somewhere else, other than a standard location -@@ -39,16 +39,16 @@ +@@ -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 #on your system can't cause conflicts while building a new one. @@ -57,43 +70,71 @@ $NetBSD: patch-aa,v 1.7 2000/03/17 23:16:18 tron Exp $ # # -@@ -58,7 +58,7 @@ +@@ -65,9 +67,9 @@ + # + # - VERSION=1.7 +-VERSION=1.8.1 ++VERSION=1.8.3 -CC=$(COMPILER) $(INCLUDEDIRS) +CC=$(LIBTOOL) $(COMPILER) $(INCLUDEDIRS) LINK=$(CC) $(LIBDIRS) $(LIBS) PROGRAMS=$(BIN_PROGRAMS) $(TEST_PROGRAMS) -@@ -66,10 +66,12 @@ +@@ -75,71 +77,71 @@ BIN_PROGRAMS=pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng TEST_PROGRAMS=gdtest gddemo gd2time gdtestttf -all: libgd.a $(PROGRAMS) +LIBGD=libgd.la ++ ++all: $(LIBGD) $(PROGRAMS) -install: libgd.a $(BIN_PROGRAMS) -- $(INSTALL) -m 644 libgd.a $(INSTALL_LIB)/libgd.a -+all: $(LIBGD) $(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 +install: $(LIBGD) $(BIN_PROGRAMS) -+ $(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 ++ 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 -gddemo: gddemo.o libgd.a +gddemo: gddemo.o $(LIBGD) $(CC) gddemo.o -o gddemo $(LIBDIRS) $(LIBS) -pngtogd: pngtogd.o libgd.a -- $(CC) pngtogd.o -o pngtogd $(LIBDIRS) $(LIBS) +pngtogd: pngtogd.o $(LIBGD) -+ $(CC) pngtogd.o -o pngtogd $(LIBDIRS) $(LIBS) + $(CC) pngtogd.o -o pngtogd $(LIBDIRS) $(LIBS) -webpng: webpng.o libgd.a +webpng: webpng.o $(LIBGD) @@ -132,24 +173,26 @@ $NetBSD: patch-aa,v 1.7 2000/03/17 23:16:18 tron Exp $ $(CC) 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 gdttf.o gdcache.o gdkanji.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 \ - gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.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 gdttf.o gdcache.o gdkanji.o +- gdtables.o gdttf.o gdcache.o gdkanji.o wbmp.o gd_wbmp.o - -ranlib libgd.a -+ gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o - --clean: -- rm -f *.o *.a ${PROGRAMS} ++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 + rm -f $(LIBGD) + $(CC) -o $(LIBGD) $(GD_OBJS:.o=.lo) -rpath ${PREFIX}/lib \ + -version-info $(GD_MAJOR):$(GD_MINOR) -+clean: -+ $(LIBTOOL) rm -f *.o *.a ${PROGRAMS} + clean: +- rm -f *.o *.a ${PROGRAMS} test/gdtest.jpg test/gdtest.wbmp +- ++ $(LIBTOOL) rm -f *.o *.a ${PROGRAMS} test/gdtest.jpg test/gdtest.wbmp diff --git a/graphics/gd/patches/patch-ab b/graphics/gd/patches/patch-ab index 028e062c1fd..9e8e439f61c 100644 --- a/graphics/gd/patches/patch-ab +++ b/graphics/gd/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.3 2000/03/21 11:10:39 he Exp $ +$NetBSD: patch-ab,v 1.4 2000/06/14 16:33:49 he Exp $ ---- gd.h.dist Mon Mar 13 19:25:57 2000 -+++ gd.h Tue Mar 21 11:32:30 2000 +--- gd.h.orig Wed Jun 14 17:45:03 2000 ++++ gd.h Wed Jun 14 17:45:01 2000 @@ -114,6 +114,7 @@ gdImagePtr gdImageCreateFromGd2PartCtx(gdIOCtxPtr in, int srcx, int srcy, int w, int h); diff --git a/graphics/gd/pkg/PLIST b/graphics/gd/pkg/PLIST index 81fb654bb5b..01e78296417 100644 --- a/graphics/gd/pkg/PLIST +++ b/graphics/gd/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2000/03/17 21:05:20 he Exp $ +@comment $NetBSD: PLIST,v 1.7 2000/06/14 16:33:50 he Exp $ bin/pngtogd bin/pngtogd2 bin/gdtopng @@ -16,4 +16,4 @@ include/gdfontmb.h include/gdfonts.h include/gdfontt.h lib/libgd.a -lib/libgd.so.1.8 +lib/libgd.so.1.9 |