diff -uNr libpng-1.0.13.ORIG/scripts/makefile.macosx libpng-1.0.13/scripts/makefile.macosx
--- libpng-1.0.13.ORIG/scripts/makefile.macosx	Mon Apr 15 23:19:41 2002
+++ libpng-1.0.13/scripts/makefile.macosx	Fri Oct 11 00:00:22 2002
@@ -9,20 +9,18 @@
 prefix=/usr/local
 
 # Where the zlib library and include files are located
-#ZLIBLIB=/usr/local/lib
-#ZLIBINC=/usr/local/include
-ZLIBLIB=../zlib
-ZLIBINC=../zlib
+ZLIBLIB=/usr/local/lib
+ZLIBINC=/usr/local/include
 
 CC=cc
 CFLAGS=-fno-common -I$(ZLIBINC) -O # -g -DPNG_DEBUG=5
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz
-LDSHARED=cc -lz -dynamiclib -compatibility_version $(VER) -current_version $(VER)
+LDSHARED=cc -lz -dynamiclib -compatibility_version $(PNGVER) -current_version $(PNGVER) -install_name $(LIBPATH)/libpng.$(PNGMAJ).$(SHAREDLIB_POSTFIX)
 
-PNGMAJ = 0
+PNGMAJ = 2
 PNGMIN = 1.0.13
-VER = $(PNGMAJ).$(PNGMIN)
-LIBNAME=libpng10
+PNGVER = $(PNGMAJ).$(PNGMIN)
+LIBNAME=libpng
 SHAREDLIB_POSTFIX=dylib
 LIBPATH=$(prefix)/lib
 INCPATH=$(prefix)/include
@@ -36,13 +34,13 @@
 
 all: libpng.a pngtest shared
 
-shared: $(LIBNAME).$(VER).$(SHAREDLIB_POSTFIX)
+shared: $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX)
 
 libpng.a: $(OBJS)
 	ar rc $@  $(OBJS)
 	$(RANLIB) $@
 
-$(LIBNAME).$(VER).$(SHAREDLIB_POSTFIX): $(OBJS)
+$(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX): $(OBJS)
 	$(LDSHARED) -o $@ $(OBJS)
 
 pngtest: pngtest.o libpng.a
@@ -53,51 +51,30 @@
 
 
 install-headers: png.h pngconf.h
-	-@if [ ! -d $(INCPATH) ]; then mkdir $(INCPATH); fi
-	-@if [ ! -d $(INCPATH)/$(LIBNAME) ]; then mkdir $(INCPATH)/$(LIBNAME); fi
+	-@if [ ! -d $(INCPATH)/$(LIBNAME) ]; then mkdir -p $(INCPATH)/$(LIBNAME); fi
 	cp png.h pngconf.h $(INCPATH)/$(LIBNAME)
 	chmod 644 $(INCPATH)/$(LIBNAME)/png.h $(INCPATH)/$(LIBNAME)/pngconf.h
-	-@/bin/rm -f $(INCPATH)/png.h $(INCPATH)/pngconf.h
-	-@/bin/rm -f $(INCPATH)/libpng
-	ln -f -s $(INCPATH)/$(LIBNAME) $(INCPATH)/libpng
 
 install-static: install-headers libpng.a
 	-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi
-	cp libpng.a $(LIBPATH)/$(LIBNAME).a
-	chmod 644 $(LIBPATH)/$(LIBNAME).a
-	-@/bin/rm -f $(LIBPATH)/libpng.a
-	ln -f -s $(LIBPATH)/$(LIBNAME).a $(LIBPATH)/libpng.a
+	cp -p libpng.a $(LIBPATH)/$(LIBNAME).a
+	chown root:wheel $(LIBPATH)/$(LIBNAME).a
 
 install-shared: install-headers $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX)
-	-@if [ ! -d $(LIBPATH) ]; then mkdir $(LIBPATH); fi
-	-@/bin/rm -f $(LIBPATH)/$(LIBNAME).$(PNGMAJ)*.$(SHAREDLIB_POSTFIX)
-	-@/bin/rm -f $(LIBPATH)/$(LIBNAME).$(SHAREDLIB_POSTFIX)
-	-@/bin/rm -f libpng.$(SHARED_POSTFIX)
-	-@/bin/rm -f libpng.2.$(SHARED_POSTFIX)
-	-@/bin/rm -f libpng.2.*.$(SHARED_POSTFIX)
+	-@if [ ! -d $(LIBPATH) ]; then mkdir -p $(LIBPATH); fi
 	cp $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) $(LIBPATH)
 	chmod 755 $(LIBPATH)/$(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX)
 	(cd $(LIBPATH); \
-	ln -f -s $(LIBNAME).$(PNGVER).$(SHARED_POSTFIX) ]
-	libpng.$(SHARED_POSTFIX); \
-	ln -f -s $(LIBNAME).$(PNGVER).$(SHARED_POSTFIX) ]
-	libpng.2.$(SHARED_POSTFIX); \
-	ln -f -s $(LIBNAME).$(PNGVER).$(SHARED_POSTFIX) ]
-	libpng.2.$(PNGMIN).$(SHARED_POSTFIX); \
 	ln -sf $(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) \
 	$(LIBNAME).$(PNGMAJ).$(SHAREDLIB_POSTFIX); \
 	ln -sf $(LIBNAME).$(PNGMAJ).$(SHAREDLIB_POSTFIX) \
 	$(LIBNAME).$(SHAREDLIB_POSTFIX))
-	-@if [ ! -d $(LIBPATH)/pkgconfig ]; then mkdir $(LIBPATH)/pkgconfig; fi
-	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
-	cp libpng.pc $(LIBPATH)/pkgconfig/libpng10.pc
-	chmod 644 $(LIBPATH)/pkgconfig/libpng10.pc
 
 install: install-shared
 
 clean:
 	rm -f *.o libpng.a pngtest pngout.png \
-	$(LIBNAME).$(VER).$(SHAREDLIB_POSTFIX) \
+	$(LIBNAME).$(PNGVER).$(SHAREDLIB_POSTFIX) \
 	$(LIBNAME).$(SHAREDLIB_POSTFIX)
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
@@ -106,20 +83,20 @@
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-png.o: png.h pngconf.h
-pngerror.o: png.h pngconf.h
-pngrio.o: png.h pngconf.h
-pngwio.o: png.h pngconf.h
-pngmem.o: png.h pngconf.h
-pngset.o: png.h pngconf.h
-pngget.o: png.h pngconf.h
-pngread.o: png.h pngconf.h
-pngrtran.o: png.h pngconf.h
-pngrutil.o: png.h pngconf.h
-pngtest.o: png.h pngconf.h
-pngtrans.o: png.h pngconf.h
-pngwrite.o: png.h pngconf.h
-pngwtran.o: png.h pngconf.h
-pngwutil.o: png.h pngconf.h
-pngpread.o: png.h pngconf.h
+png.o png.pic.o: png.h pngconf.h
+pngerror.o pngerror.pic.o: png.h pngconf.h
+pngrio.o pngrio.pic.o: png.h pngconf.h
+pngwio.o pngwio.pic.o: png.h pngconf.h
+pngmem.o pngmem.pic.o: png.h pngconf.h
+pngset.o pngset.pic.o: png.h pngconf.h
+pngget.o pngget.pic.o: png.h pngconf.h
+pngread.o pngread.pic.o: png.h pngconf.h
+pngrtran.o pngrtran.pic.o: png.h pngconf.h
+pngrutil.o pngrutil.pic.o: png.h pngconf.h
+pngtrans.o pngtrans.pic.o: png.h pngconf.h
+pngwrite.o pngwrite.pic.o: png.h pngconf.h
+pngwtran.o pngwtran.pic.o: png.h pngconf.h
+pngwutil.o pngwutil.pic.o: png.h pngconf.h
+pngpread.o pngpread.pic.o: png.h pngconf.h
 
+pngtest.o: png.h pngconf.h