4 files changed, 36 insertions, 29 deletions

diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 377baac40ce7..4fc60de81734 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,15 +1,16 @@
 # New ports collection makefile for:    PNG images library
-# Version required:     0.89c
+# Version required:     0.96
 # Date created:         5 Dec 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.7 1996/08/19 10:30:59 asami Exp $
+# $Id: Makefile,v 1.8 1996/11/18 11:29:00 asami Exp $
 #
 
-DISTNAME=       libpng-0.89c
-PKGNAME=        png-0.89c
+DISTNAME=       libpng-0.96
+PKGNAME=        png-0.96
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.uu.net/graphics/png/src/
+EXTRACT_SUFX=   .tgz
 
 MAINTAINER=     ache@FreeBSD.org
 
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index 08dcb7ea022b..66b78d23b270 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1 +1 @@
-MD5 (libpng-0.89c.tar.gz) = 4c5fb3df9c8dfc0fd70732e4ce914122
+MD5 (libpng-0.96.tgz) = 285eac49f334e8c82a7dad41c2850115
diff --git a/graphics/png/files/patch-aa b/graphics/png/files/patch-aa
index 8984f4850203..07440787845f 100644
--- a/graphics/png/files/patch-aa
+++ b/graphics/png/files/patch-aa
@@ -1,21 +1,24 @@
-*** makefile.orig	Fri Jun  7 04:49:32 1996
---- makefile	Wed Jul 17 23:54:39 1996
+*** makefile.orig	Fri May 16 10:53:30 1997
+--- makefile	Tue Jun 24 16:53:47 1997
 ***************
-*** 2,27 ****
-  # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-  # For conditions of distribution and use, see copyright notice in png.h
+*** 5,33 ****
+  # Where the zlib library and include files are located
+  #ZLIBLIB=/usr/local/lib
+  #ZLIBINC=/usr/local/include
+! ZLIBLIB=../zlib
+! ZLIBINC=../zlib
   
 ! CC=cc
-! CFLAGS=-I../zlib -O
-! LDFLAGS=-L. -L../zlib/ -lpng -lz -lm
+! CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=1
+! LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
   
-! #RANLIB=ranlib
-! RANLIB=echo
+  #RANLIB=echo
+  RANLIB=ranlib
   
   # where make install puts libpng.a and png.h
 ! prefix=/usr/local
   
-  OBJS = png.o pngrcb.o pngrutil.o pngtrans.o pngwutil.o \
+  OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
   	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
   	pngwtran.o pngmem.o pngerror.o pngpread.o
   
@@ -28,27 +31,30 @@
   pngtest: pngtest.o libpng.a
   	$(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS)
   
---- 2,36 ----
-  # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-  # For conditions of distribution and use, see copyright notice in png.h
+--- 5,42 ----
+  # Where the zlib library and include files are located
+  #ZLIBLIB=/usr/local/lib
+  #ZLIBINC=/usr/local/include
+! #ZLIBLIB=../zlib
+! #ZLIBINC=../zlib
   
-! VER=0.89
+! VER=0.96
 ! #CC=cc
-! CFLAGS+=-I/usr/local/include
-! LDFLAGS=-L. -L/usr/local/lib -lpng -lz -lm -static
+! #CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=1
+! LDFLAGS=-L. -lpng -lz -lm -static
   
-! RANLIB=ranlib
-! #RANLIB=echo
+  #RANLIB=echo
+  RANLIB=ranlib
   
   # where make install puts libpng.a and png.h
 ! prefix=${PREFIX}
   
-  OBJS = png.o pngrcb.o pngrutil.o pngtrans.o pngwutil.o \
+  OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
   	pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
   	pngwtran.o pngmem.o pngerror.o pngpread.o
   
 ! .SUFFIXES: .c .so .o
-!   
+! 
 ! .c.so:
 ! 	${CC} -fpic -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
 ! 
@@ -59,13 +65,13 @@
   	$(RANLIB) $@
   
 + libpng.so.${VER}: $(OBJS:S/o$/so/g)
-+ 	ld -Bshareable -o $@ $(OBJS:S/o$/so/g)
++ 	${CC} -shared -Wl,-x -Wl,-assert -Wl,pure-text -o $@ $(OBJS:S/o$/so/g)
 + 
   pngtest: pngtest.o libpng.a
   	$(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS)
   
 ***************
-*** 31,42 ****
+*** 37,48 ****
   install: libpng.a
   	-@mkdir $(prefix)/include
   	-@mkdir $(prefix)/lib
@@ -78,7 +84,7 @@
   
   clean:
   	rm -f *.o libpng.a pngtest pngout.png
---- 40,48 ----
+--- 46,54 ----
   install: libpng.a
   	-@mkdir $(prefix)/include
   	-@mkdir $(prefix)/lib
diff --git a/graphics/png/pkg-plist b/graphics/png/pkg-plist
index 793252c1245f..b3759270e48a 100644
--- a/graphics/png/pkg-plist
+++ b/graphics/png/pkg-plist
@@ -2,5 +2,5 @@ include/png.h
 include/pngconf.h
 lib/libpng.a
 @exec ranlib %D/%F
-lib/libpng.so.0.89
+lib/libpng.so.0.96
 @exec /sbin/ldconfig -m %B