Update libpng to 1.0.2. Works with all dependent pkgs I have tested

(everything but ImageMagick, gs5, and xemacs20).  The API hasn't changed
much, say the install instructions, but it isn't binary compatible--bump
shlib version to 1.0.

4 files changed, 40 insertions, 46 deletions

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index d0a0f8bf306..83f668a9f46 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,15 +1,19 @@
-# $NetBSD: Makefile,v 1.8 1998/07/15 11:29:21 agc Exp $
+# $NetBSD: Makefile,v 1.9 1998/07/15 11:45:54 tv Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/07/17 15:12:44 max Exp
 #
 
-DISTNAME=       libpng-0.96
-PKGNAME=        png-0.96
+DISTNAME=       libpng-1.0.2
+PKGNAME=        png-1.0.2
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.uu.net/graphics/png/src/
-EXTRACT_SUFX=   .tgz
 
 MAINTAINER=     packages@netbsd.org
 
-MAKEFILE=       makefile
+BUILD_DEPENDS=	${PREFIX}/bin/libtool:../../devel/libtool
+
+CONFLICTS=	png-0.96
+
+MAKEFILE=       scripts/makefile.std
+MAKE_ENV=	LIBTOOL=${PREFIX}/bin/libtool
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/png/files/md5 b/graphics/png/files/md5
index 66b78d23b27..8b6d4d9080e 100644
--- a/graphics/png/files/md5
+++ b/graphics/png/files/md5
@@ -1 +1 @@
-MD5 (libpng-0.96.tgz) = 285eac49f334e8c82a7dad41c2850115
+MD5 (libpng-1.0.2.tar.gz) = a8b093154f07f7b82e5c9bb77c11a0c4
diff --git a/graphics/png/patches/patch-aa b/graphics/png/patches/patch-aa
index 7cfc549a467..24cafa95b1c 100644
--- a/graphics/png/patches/patch-aa
+++ b/graphics/png/patches/patch-aa
@@ -1,21 +1,15 @@
---- makefile.orig	Fri May 16 07:53:30 1997
-+++ makefile	Thu Oct  2 16:48:59 1997
-@@ -5,29 +5,41 @@
- # Where the zlib library and include files are located
- #ZLIBLIB=/usr/local/lib
- #ZLIBINC=/usr/local/include
--ZLIBLIB=../zlib
--ZLIBINC=../zlib
-+#ZLIBLIB=../zlib
-+#ZLIBINC=../zlib
+--- scripts/makefile.std.orig	Tue Jul 14 21:39:10 1998
++++ scripts/makefile.std	Tue Jul 14 21:49:54 1998
+@@ -8,41 +8,34 @@
+ ZLIBLIB=../zlib
+ ZLIBINC=../zlib
  
 -CC=cc
--CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=1
+-CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
 -LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
-+VER=0.96
-+#CC=cc
-+#CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=1
-+LDFLAGS=-L. -lpng -lz -lm -static
++CC=${LIBTOOL} --mode=compile cc
++CFLAGS=-O # -g -DPNG_DEBUG=5
++LDFLAGS=libpng.la -lz -lm
  
  #RANLIB=echo
  RANLIB=ranlib
@@ -29,39 +23,34 @@
  	pngwtran.o pngmem.o pngerror.o pngpread.o
  
 -all: libpng.a pngtest
-+.SUFFIXES: .c .so .o
-+
-+.c.so:
-+	${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
-+
-+all: libpng.a libpng.so.${VER}
++all: libpng.la pngtest
  
- libpng.a: $(OBJS)
- 	ar rc $@  $(OBJS)
- 	$(RANLIB) $@
+-libpng.a: $(OBJS)
+-	ar rc $@  $(OBJS)
+-	$(RANLIB) $@
++libpng.la: $(OBJS)
++	${LIBTOOL} --mode=link cc -o $@ ${OBJS:.o=.lo} -rpath ${PREFIX}/lib -version-info 1:0
  
-+libpng.so.${VER}: $(OBJS:S/o$/so/g)
-+	${LD} -x -Bshareable -o libpng.so.${VER} $(OBJS:S/o$/so/g)
-+
-+# XXX - agc - weird shared library load line
-+#	${CC} -shared -Wl,-x -Wl,-assert -Wl,pure-text -o $@ $(OBJS:S/o$/so/g) -lz
-+
- pngtest: pngtest.o libpng.a
- 	$(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS)
+-pngtest: pngtest.o libpng.a
+-	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
++pngtest: pngtest.o libpng.la
++	${LIBTOOL} --mode=link cc -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
  
-@@ -37,12 +49,9 @@
- install: libpng.a
- 	-@mkdir $(prefix)/include
- 	-@mkdir $(prefix)/lib
+ test: pngtest
+ 	./pngtest
+ 
+-install: libpng.a
+-	-@mkdir $(prefix)/include
+-	-@mkdir $(prefix)/lib
 -	cp png.h $(prefix)/include
 -	cp pngconf.h $(prefix)/include
 -	chmod 644 $(prefix)/include/png.h
 -	chmod 644 $(prefix)/include/pngconf.h
 -	cp libpng.a $(prefix)/lib
 -	chmod 644 $(prefix)/lib/libpng.a
++install: libpng.la
 +	${BSD_INSTALL_DATA} png.h pngconf.h $(prefix)/include
-+	${BSD_INSTALL_DATA} libpng.a libpng.so.${VER} $(prefix)/lib
-+	ranlib $(prefix)/lib/libpng.a
++	${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libpng.la $(prefix)/lib
  
  clean:
  	rm -f *.o libpng.a pngtest pngout.png
diff --git a/graphics/png/pkg/PLIST b/graphics/png/pkg/PLIST
index b4ae2285112..5a407e075eb 100644
--- a/graphics/png/pkg/PLIST
+++ b/graphics/png/pkg/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 1998/07/15 11:29:22 agc Exp $
+@comment $NetBSD: PLIST,v 1.7 1998/07/15 11:45:56 tv Exp $
 include/png.h
 include/pngconf.h
 lib/libpng.a
-lib/libpng.so.0.96
+lib/libpng.la
+lib/libpng.so.1.0