diff -urN /usr/ports/graphics/png/Makefile graphics/png/Makefile
--- /usr/ports/graphics/png/Makefile	Mon Dec 17 03:16:45 2001
+++ graphics/png/Makefile	Wed Apr 17 01:29:28 2002
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	png
-PORTVERSION=    1.2.1
+PORTVERSION=	1.2.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.libpng.org/pub/png/src/ \
 		ftp://swrinde.nde.swri.edu/pub/png/src/ \
diff -urN /usr/ports/graphics/png/distinfo graphics/png/distinfo
--- /usr/ports/graphics/png/distinfo	Mon Dec 17 03:16:46 2001
+++ graphics/png/distinfo	Wed Apr 17 00:47:59 2002
@@ -1 +1 @@
-MD5 (libpng-1.2.1.tar.gz) = 75a21cbfae566158a0ac6d9f39087c4d
+MD5 (libpng-1.2.2.tar.gz) = 4a23be1a1752537ec3bf210bb3fd03ad
diff -urN /usr/ports/graphics/png/files/patch-aa graphics/png/files/patch-aa
--- /usr/ports/graphics/png/files/patch-aa	Tue Sep 11 18:45:51 2001
+++ graphics/png/files/patch-aa	Wed Apr 17 00:51:53 2002
@@ -1,5 +1,5 @@
---- scripts/makefile.std.orig	Sat Jan  6 03:25:50 2001
-+++ scripts/makefile.std	Tue Sep 11 05:44:27 2001
+--- scripts/makefile.std.orig	Mon Apr  8 06:13:07 2002
++++ scripts/makefile.std	Wed Apr 17 00:51:42 2002
 @@ -2,18 +2,30 @@
  # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
  # For conditions of distribution and use, see copyright notice in png.h
@@ -68,14 +68,18 @@
  pngtest: pngtest.o libpng.a
  	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
  
-@@ -37,12 +66,12 @@
+@@ -36,16 +65,13 @@
+ 
  install: libpng.a
  	-@mkdir $(prefix)/include
+-	-@mkdir $(prefix)/include/libpng
  	-@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
+-	-@rm -f $(prefix)/include/png.h
+-	-@rm -f $(prefix)/include/pngconf.h
+-	cp png.h $(prefix)/include/libpng
+-	cp pngconf.h $(prefix)/include/libpng
+-	chmod 644 $(prefix)/include/libpng/png.h
+-	chmod 644 $(prefix)/include/libpng/pngconf.h
 -	cp libpng.a $(prefix)/lib
 -	chmod 644 $(prefix)/lib/libpng.a
 +	${BSD_INSTALL_DATA} png.h pngconf.h $(prefix)/include
@@ -87,7 +91,7 @@
  
  clean:
  	rm -f *.o libpng.a pngtest pngout.png
-@@ -69,4 +98,5 @@
+@@ -72,4 +98,5 @@
  pngwtran.o: png.h pngconf.h
  pngwutil.o: png.h pngconf.h
  pngpread.o: png.h pngconf.h