The people who release gd think that removing old versions of gd

and replacing them with symlinks to the latest is smart, so we'll
upgrade now.

patches/patch-ac changed and was regenerated with -u1 so when the authors
make more gratuitious changes to the Makefile it will break less deltas.

3 files changed, 49 insertions, 71 deletions

diff --git a/graphics/gd1/Makefile b/graphics/gd1/Makefile
index 18cfb2063204..b7c5ce1c2ce7 100644
--- a/graphics/gd1/Makefile
+++ b/graphics/gd1/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=       gd
-PORTVERSION=	1.8.1
+PORTVERSION=	1.8.2
 CATEGORIES=	graphics
 MASTER_SITES=   http://www.boutell.com/gd/http/ \
 		ftp://ftp.boutell.com/pub/boutell/gd/
diff --git a/graphics/gd1/distinfo b/graphics/gd1/distinfo
index 8325406d27c9..7cd70fe502d6 100644
--- a/graphics/gd1/distinfo
+++ b/graphics/gd1/distinfo
@@ -1 +1 @@
-MD5 (gd-1.8.1.tar.gz) = 7d3890e728ee5bbde165ef75448d5a3f
+MD5 (gd-1.8.2.tar.gz) = 92d69d3d70d9b29da74dd79f9c7e10ff
diff --git a/graphics/gd1/files/patch-ac b/graphics/gd1/files/patch-ac
index 451bf86d46b3..824f82b59254 100644
--- a/graphics/gd1/files/patch-ac
+++ b/graphics/gd1/files/patch-ac
@@ -1,61 +1,49 @@
---- Makefile.orig	Mon Mar 13 13:25:57 2000
-+++ Makefile	Mon Mar 13 15:33:49 2000
-@@ -3,35 +3,44 @@
- #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
+--- Makefile.orig	Thu May 18 13:39:18 2000
++++ Makefile	Sun May 21 00:55:38 2000
+@@ -5,3 +5,3 @@
  #compiler; get gcc if you are still using it). 
 -COMPILER=gcc
 +COMPILER=${CC}
  
- #If the ar command fails on your system, consult the ar manpage
+@@ -9,3 +9,3 @@
  #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, libjpeg and/or Xpm installed, including the
+@@ -13,6 +13,10 @@
  #header files, uncomment this (default).
 -CFLAGS=-O
 +#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
 +.if defined(WITH_X11)
 +CFLAGS+=-DHAVE_XPM -DHAVE_JPEG -DHAVE_LIBTTF
 +.else
 +CFLAGS+=-DHAVE_JPEG
 +.endif
  
- #If you don't have FreeType and/or Xpm fully installed, uncomment this
- #(default).
+@@ -25,3 +29,3 @@
+ 
 -LIBS=-lm -lgd -lpng -lz
 +LIBS=-lm -lgd -lpng -lz -ljpeg
  
- #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.
+@@ -35,3 +39,5 @@
+ 
 -#LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11
 +.if defined(WITH_X11)
-+LIBS=-lm -lgd -lpng -lz -ljpeg -lttf -lXpm -lX11
++LIBS+= -lttf -lXpm -lX11
 +.endif
  
- #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
-+CFLAGS+=-I$(LOCALBASE)/include
+@@ -42,3 +48,6 @@
+ 
+-INCLUDEDIRS=-I. -I/usr/local/include -I/usr/include/X11 -I/usr/X11R6/include/X11
++INCLUDEDIRS=-I. -I${LOCALBASE}/include
 +.if defined(WITH_X11)
-+CFLAGS+=-I$(LOCALBASE)/include/freetype -I$(X11BASE)/include -I$(X11BASE)/include/X11
++INCLUDEDIRS+=-I{LOCALBASE}/include/freetype -I${X11BASE}/include/X11 -I${X11BASE}/include
 +.endif
  
- #Typical install locations for freetype, zlib, xpm and libpng libraries.
- #If yours are somewhere else, other than a standard location
-@@ -39,16 +48,19 @@
- #-L. as this allows the gd library itself to be found.
- #Put -L. first so that old versions of the gd library elsewhere
+@@ -50,12 +59,15 @@
  #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
@@ -75,21 +63,17 @@
 -INSTALL_BIN=/usr/local/bin
 +INSTALL_BIN=$(PREFIX)/bin
  
- #
- #
-@@ -58,34 +70,41 @@
+@@ -67,6 +79,6 @@
  
- VERSION=1.7
+-VERSION=1.8.1
++VERSION=1.8.2
  
 -CC=$(COMPILER) $(INCLUDEDIRS)
 -LINK=$(CC) $(LIBDIRS) $(LIBS)
-+#CC=$(COMPILER) $(INCLUDEDIRS)
++CC+= $(INCLUDEDIRS)
 +#LINK=$(CC) $(LIBDIRS) $(LIBS)
  
- PROGRAMS=$(BIN_PROGRAMS) $(TEST_PROGRAMS)
- 
- BIN_PROGRAMS=pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng
- TEST_PROGRAMS=gdtest gddemo gd2time gdtestttf
+@@ -77,22 +89,29 @@
  
 -all: libgd.a $(PROGRAMS)
 +.SUFFIXES: .c .so .o
@@ -100,27 +84,27 @@
 +all: libgd.a libgd.so.0 $(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
+-	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) -c -m 644 libgd.a $(INSTALL_LIB)/libgd.a
++	$(INSTALL) -c -m 755 pngtogd $(INSTALL_BIN)/pngtogd
 +	$(INSTALL) -c -m 755 libgd.so.0 $(INSTALL_LIB)/libgd.so.0
 +	ln -sf libgd.so.0 $(INSTALL_LIB)/libgd.so
-+	$(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
@@ -137,32 +121,26 @@
 +	$(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)
-@@ -120,16 +139,19 @@
- gdtestttf: gdtestttf.o libgd.a
- 	$(CC) gdtestttf.o -o gdtestttf	$(LIBDIRS) $(LIBS)
+@@ -131,12 +150,15 @@
  
 -libgd.a: gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \
-+OBJS= gd.o gd_gd.o gd_gd2.o gd_io.o gd_io_dp.o gd_io_file.o gd_ss.o \
++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 \
+-	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
-+	gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o
-+INCS=	gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h
++	gdfontg.o gdtables.o gdttf.o gdcache.o gdkanji.o  wbmp.o gd_wbmp.o
++INCS= 	gd.h gdfontt.h gdfonts.h gdfontmb.h gdfontl.h gdfontg.h
 +
 +libgd.a:	$(INCS) $(OBJS)
  	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
 +	$(AR) rc libgd.a $(OBJS)
  	-ranlib libgd.a
 +
-+libgd.so.0:	$(INCS) $(OBJS:S/o$/so/g)
++libgd.so.0:   $(INCS) $(OBJS:S/o$/so/g)
 +	$(CC) -shared -Wl,-x -Wl,-assert -Wl,pure-text -Wl,-soname,$@ -o $@ $(OBJS:S/o$/so/g) $(LIBDIRS) $(LIBS)
 +	ln -sf libgd.so.0 libgd.so
  
- clean:
- 	rm -f *.o *.a ${PROGRAMS}