Index: head/graphics/png/Makefile
===================================================================
--- head/graphics/png/Makefile	(revision 10342)
+++ head/graphics/png/Makefile	(revision 10343)
@@ -1,23 +1,25 @@
 # New ports collection makefile for:    PNG images library
-# Version required:     0.99e
+# Version required:     1.0.1
 # Date created:         5 Dec 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.10 1997/07/17 15:12:44 max Exp $
+# $Id: Makefile,v 1.11 1998/03/02 19:43:11 ache Exp $
 #
 
-DISTNAME=       libpng-0.99e
-PKGNAME=        png-0.99e
+DISTNAME=       libpng-1.0.1
+PKGNAME=        png-1.0.1
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.uu.net/graphics/png/src/
 
 MAINTAINER=     ache@FreeBSD.org
 
-MAKEFILE=       makefile.std
 MAN3=           libpng.3 libpngpf.3
 MAN5=           png.5
+
+do-configure:
+	cd ${WRKSRC} && cp scripts/makefile.std Makefile
 
 post-install:
 	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>

Property changes on: head/graphics/png/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.11
\ No newline at end of property
+1.12
\ No newline at end of property
Index: head/graphics/png/distinfo
===================================================================
--- head/graphics/png/distinfo	(revision 10342)
+++ head/graphics/png/distinfo	(revision 10343)
@@ -1 +1 @@
-MD5 (libpng-0.99e.tar.gz) = 3737c79321c35778b0ff373be33dadbe
+MD5 (libpng-1.0.1.tar.gz) = 7dd031b93f0a9b99bd5fdccb38e270cb

Property changes on: head/graphics/png/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/graphics/png/files/patch-aa
===================================================================
--- head/graphics/png/files/patch-aa	(revision 10342)
+++ head/graphics/png/files/patch-aa	(revision 10343)
@@ -1,98 +1,98 @@
-*** makefile.std.orig	Sat Feb 28 16:00:24 1998
---- makefile.std	Mon Mar  2 22:20:36 1998
+*** scripts/makefile.std.orig	Sat Mar  7 23:12:04 1998
+--- scripts/makefile.std	Sat Mar 28 16:39:42 1998
 ***************
 *** 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$(ZLIBINC) -O # -g -DPNG_DEBUG=1
 ! LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
   
   #RANLIB=echo
   RANLIB=ranlib
   
   # where make install puts libpng.a and png.h
 ! prefix=/usr/local
   
   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
   
 ! all: libpng.a pngtest
   
   libpng.a: $(OBJS)
   	ar rc $@  $(OBJS)
   	$(RANLIB) $@
   
   pngtest: pngtest.o libpng.a
-  	$(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS)
+  	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
   
 --- 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.99
+! VER=2.1
 ! #CC=cc
 ! #CFLAGS=-I$(ZLIBINC) -O # -g -DPNG_DEBUG=1
 ! LDFLAGS=-L. -lpng -lz -lm -static
   
   #RANLIB=echo
   RANLIB=ranlib
   
   # where make install puts libpng.a and png.h
 ! prefix=${PREFIX}
   
   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}
 ! 
 ! all: libpng.a libpng.so.${VER}
   
   libpng.a: $(OBJS)
   	ar rc $@  $(OBJS)
   	$(RANLIB) $@
   
 + libpng.so.${VER}: $(OBJS:S/o$/so/g)
 + 	${CC} -shared -Wl,-x -Wl,-assert -Wl,pure-text -o $@ $(OBJS:S/o$/so/g) -lz -lm
 + 
   pngtest: pngtest.o libpng.a
-  	$(CC) -o pngtest $(CCFLAGS) pngtest.o $(LDFLAGS)
+  	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
   
 ***************
 *** 37,48 ****
   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
   
   clean:
   	rm -f *.o libpng.a pngtest pngout.png
 --- 46,56 ----
   install: libpng.a
   	-@mkdir $(prefix)/include
   	-@mkdir $(prefix)/lib
 ! 	${INSTALL} -c -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} png.h pngconf.h $(prefix)/include
 ! 	${INSTALL} -c -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} libpng.a libpng.so.${VER} $(prefix)/lib
 ! 	ranlib $(prefix)/lib/libpng.a
 ! 	${INSTALL} -c -m ${MANMODE} -o ${MANOWN} -g ${MANGRP} libpng.3 libpngpf.3 $(prefix)/man/man3
 ! 	${INSTALL} -c -m ${MANMODE} -o ${MANOWN} -g ${MANGRP} png.5 $(prefix)/man/man5
   
   clean:
   	rm -f *.o libpng.a pngtest pngout.png

Property changes on: head/graphics/png/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property
Index: head/graphics/png/pkg-plist
===================================================================
--- head/graphics/png/pkg-plist	(revision 10342)
+++ head/graphics/png/pkg-plist	(revision 10343)
@@ -1,9 +1,9 @@
 include/png.h
 include/pngconf.h
 lib/libpng.a
 @exec ranlib %D/%F
-lib/libpng.so.0.99
+lib/libpng.so.2.1
 @exec /sbin/ldconfig -m %B
 man/man3/libpng.3.gz
 man/man3/libpngpf.3.gz
 man/man5/png.5.gz

Property changes on: head/graphics/png/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.9
\ No newline at end of property
+1.10
\ No newline at end of property