4 files changed, 23 insertions, 41 deletions

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 4bea61503166..fedf559d99ea 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    PNG images library
-# Version required:     0.81
+# Version required:     0.88
 # Date created:         5 Dec 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.2 1995/12/05 02:57:05 ache Exp $
+# $Id: Makefile,v 1.3 1996/01/25 05:48:01 ache Exp $
 #
 
-DISTNAME=       libpng-0.81
-PKGNAME=        png-0.81
+DISTNAME=       libpng-0.88
+PKGNAME=        png-0.88
 CATEGORIES+=    graphics
 MASTER_SITES=   ftp://ftp.uu.net/graphics/png/src/
-LIB_DEPENDS=    z\\.0\\.95:${PORTSDIR}/devel/libz
+LIB_DEPENDS=    z\\.1\\.:${PORTSDIR}/devel/libz
 MAKEFILE=       makefile
 
 MAINTAINER=     ache@FreeBSD.org
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index 4e626ed3c936..67660e2ec488 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1 +1 @@
-MD5 (libpng-0.81.tar.gz) = e3487938a4f84d0993c7df416ccd45bb
+MD5 (libpng-0.88.tar.gz) = 555d709c329aaf9eae837c8f74c9a1da
diff --git a/graphics/png/files/patch-aa b/graphics/png/files/patch-aa
index a81a6cbf20dd..972448c476d9 100644
--- a/graphics/png/files/patch-aa
+++ b/graphics/png/files/patch-aa
@@ -1,5 +1,5 @@
-*** makefile.old	Fri Aug 25 08:09:40 1995
---- makefile	Tue Dec  5 05:26:18 1995
+*** makefile.orig	Fri Jan 26 10:38:44 1996
+--- makefile	Tue Feb 20 00:55:17 1996
 ***************
 *** 2,27 ****
   # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
@@ -10,14 +10,14 @@
 ! LDFLAGS=-L. -L../zlib/ -lpng -lz -lm
   
   #RANLIB=ranlib
-- RANLIB=echo
+! RANLIB=echo
   
   # where make install puts libpng.a and png.h
 ! prefix=/usr/local
   
   OBJS = png.o pngrcb.o pngrutil.o pngtrans.o pngwutil.o \
   	pngread.o pngio.o pngwrite.o pngrtran.o pngwtran.o \
-     pngmem.o pngerror.o
+     pngmem.o pngerror.o pngpread.o
   
 ! all: libpng.a pngtest
   
@@ -28,35 +28,37 @@
   pngtest: pngtest.o libpng.a
   	$(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS)
   
---- 2,34 ----
+--- 2,36 ----
   # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
   # For conditions of distribution and use, see copyright notice in png.h
   
+! VER=0.88
 ! #CC=cc
 ! CFLAGS+=-I/usr/local/include
 ! LDFLAGS=-L. -L/usr/local/lib -lpng -lz -lm -static
   
   #RANLIB=ranlib
+! #RANLIB=echo
   
   # where make install puts libpng.a and png.h
 ! prefix=${PREFIX}
   
   OBJS = png.o pngrcb.o pngrutil.o pngtrans.o pngwutil.o \
   	pngread.o pngio.o pngwrite.o pngrtran.o pngwtran.o \
-     pngmem.o pngerror.o
+     pngmem.o pngerror.o pngpread.o
   
 ! .SUFFIXES: .c .so .o
-! 
-! .c.so:
-! 	${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
-! 
-! all: libpng.a libpng.so.0.81
   
++ .c.so:
++ 	${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
++ 
++ all: libpng.a libpng.so.${VER}
++   
   libpng.a: $(OBJS)
   	ar rc $@  $(OBJS)
   	$(RANLIB) $@
   
-+ libpng.so.0.81: $(OBJS:S/o$/so/g)
++ libpng.so.${VER}: $(OBJS:S/o$/so/g)
 + 	ld -Bshareable -o $@ $(OBJS:S/o$/so/g)
 + 
   pngtest: pngtest.o libpng.a
@@ -76,33 +78,13 @@
   
   clean:
   	rm -f *.o libpng.a pngtest pngout.png
---- 38,46 ----
+--- 40,48 ----
   install: libpng.a
   	-@mkdir $(prefix)/include
   	-@mkdir $(prefix)/lib
 ! 	${INSTALL} -c -m 644 -o ${BINOWN} -g ${BINGRP} png.h pngconf.h $(prefix)/include
-! 	${INSTALL} -c -m 644 -o ${BINOWN} -g ${BINGRP} libpng.a libpng.so.0.81 $(prefix)/lib
+! 	${INSTALL} -c -m 644 -o ${BINOWN} -g ${BINGRP} libpng.a libpng.so.${VER} $(prefix)/lib
 ! 	ranlib $(prefix)/lib/libpng.a
   
   clean:
   	rm -f *.o libpng.a pngtest pngout.png
-***************
-*** 56,58 ****
---- 60,76 ----
-  pngwrite.o: png.h pngconf.h
-  pngwtran.o: png.h pngconf.h
-  pngwutil.o: png.h pngconf.h
-+ 
-+ png.so: png.h pngconf.h
-+ pngerror.so: png.h pngconf.h
-+ pngio.so: png.h pngconf.h
-+ pngmem.so: png.h pngconf.h
-+ pngrcb.so: png.h pngconf.h
-+ pngread.so: png.h pngconf.h
-+ pngrtran.so: png.h pngconf.h
-+ pngrutil.so: png.h pngconf.h
-+ pngtest.so: png.h pngconf.h
-+ pngtrans.so: png.h pngconf.h
-+ pngwrite.so: png.h pngconf.h
-+ pngwtran.so: png.h pngconf.h
-+ pngwutil.so: png.h pngconf.h
diff --git a/graphics/png/pkg-plist b/graphics/png/pkg-plist
index 4f4ffb2798f1..d656660c9d4f 100644
--- a/graphics/png/pkg-plist
+++ b/graphics/png/pkg-plist
@@ -3,5 +3,5 @@ include/png.h
 include/pngconf.h
 lib/libpng.a
 @exec ranlib %D/%F
-lib/libpng.so.0.81
+lib/libpng.so.0.88
 @exec /sbin/ldconfig -m %B