Roll back libpng major to 2.

34 files changed, 68 insertions, 68 deletions

diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index b69d3c8dafc4..aead39d9fb67 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 August 1997
 # Whom:			Michael Elbel (me)
 #
-# $Id: Makefile,v 1.19 1998/09/15 11:57:40 asami Exp $
+# $Id: Makefile,v 1.20 1998/09/17 00:32:31 asami Exp $
 #
 
 DISTNAME=	xemacs-20.4
@@ -20,7 +20,7 @@ MAINTAINER=	me@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.3:${PORTSDIR}/graphics/png
+		png.2:${PORTSDIR}/graphics/png
 
 USE_GMAKE=	yes
 STRIP=
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index b69d3c8dafc4..aead39d9fb67 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 August 1997
 # Whom:			Michael Elbel (me)
 #
-# $Id: Makefile,v 1.19 1998/09/15 11:57:40 asami Exp $
+# $Id: Makefile,v 1.20 1998/09/17 00:32:31 asami Exp $
 #
 
 DISTNAME=	xemacs-20.4
@@ -20,7 +20,7 @@ MAINTAINER=	me@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.3:${PORTSDIR}/graphics/png
+		png.2:${PORTSDIR}/graphics/png
 
 USE_GMAKE=	yes
 STRIP=
diff --git a/editors/xemacs20/Makefile b/editors/xemacs20/Makefile
index b69d3c8dafc4..aead39d9fb67 100644
--- a/editors/xemacs20/Makefile
+++ b/editors/xemacs20/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 August 1997
 # Whom:			Michael Elbel (me)
 #
-# $Id: Makefile,v 1.19 1998/09/15 11:57:40 asami Exp $
+# $Id: Makefile,v 1.20 1998/09/17 00:32:31 asami Exp $
 #
 
 DISTNAME=	xemacs-20.4
@@ -20,7 +20,7 @@ MAINTAINER=	me@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.3:${PORTSDIR}/graphics/png
+		png.2:${PORTSDIR}/graphics/png
 
 USE_GMAKE=	yes
 STRIP=
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index 2938b5345c14..db9b1735ca63 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 Dec 1997
 # Whom:			Kazuyuki IENAGA <ienaga@jsys.co.jp>
 #
-# $Id: Makefile,v 1.5 1998/09/15 11:57:35 asami Exp $
+# $Id: Makefile,v 1.6 1998/09/17 00:32:30 asami Exp $
 #
 
 DISTNAME=	xemacs-20.4
@@ -21,7 +21,7 @@ MAINTAINER?=	kiri@kiri.toba-cmt.ac.jp
 BUILD_DEPENDS=	${BUILD_INPUT_METHOD}
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.3:${PORTSDIR}/graphics/png \
+		png.2:${PORTSDIR}/graphics/png \
 		compface\\.1\\.:${PORTSDIR}/mail/faces \
 		${LIB_INPUT_METHOD}
 RUN_DEPENDS=	${PREFIX}/lib/xemacs-20.4/etc/BABYL:${PORTSDIR}/editors/xemacs-mule-common
diff --git a/editors/xemacs21/Makefile b/editors/xemacs21/Makefile
index b69d3c8dafc4..aead39d9fb67 100644
--- a/editors/xemacs21/Makefile
+++ b/editors/xemacs21/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 August 1997
 # Whom:			Michael Elbel (me)
 #
-# $Id: Makefile,v 1.19 1998/09/15 11:57:40 asami Exp $
+# $Id: Makefile,v 1.20 1998/09/17 00:32:31 asami Exp $
 #
 
 DISTNAME=	xemacs-20.4
@@ -20,7 +20,7 @@ MAINTAINER=	me@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.3:${PORTSDIR}/graphics/png
+		png.2:${PORTSDIR}/graphics/png
 
 USE_GMAKE=	yes
 STRIP=
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index b55acceb827d..3125edabbcce 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 November 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.49 1998/09/15 11:45:51 asami Exp $
+# $Id: Makefile,v 1.50 1998/09/15 11:57:40 asami Exp $
 #
 
 DISTNAME=       ImageMagick-4.0.9
@@ -22,7 +22,7 @@ MAINTAINER=	jseger@FreeBSD.org
 LIB_DEPENDS=    jpeg.9:${PORTSDIR}/graphics/jpeg \
 		mpeg\\.1\\.[2-9]:${PORTSDIR}/graphics/mpeg-lib \
 		tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
-		png.3:${PORTSDIR}/graphics/png \
+		png.2:${PORTSDIR}/graphics/png \
 		jbig\\.1\\.:${PORTSDIR}/graphics/jbigkit \
 		ttf\\.2\\.:${PORTSDIR}/print/freetype
 BUILD_DEPENDS=	fig2dev:${PORTSDIR}/print/transfig \
diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index d1d372223163..dfd0fe039e6c 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.40 1998/09/15 11:57:40 asami Exp $
+# $Id: Makefile,v 1.41 1998/09/17 00:32:41 asami Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -20,7 +20,7 @@ LIB_DEPENDS+=	aa\\.1\\.:${PORTSDIR}/graphics/aalib
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
-LIB_DEPENDS+=	png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 #LIB_DEPENDS+=	xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta
 
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index d1d372223163..dfd0fe039e6c 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.40 1998/09/15 11:57:40 asami Exp $
+# $Id: Makefile,v 1.41 1998/09/17 00:32:41 asami Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -20,7 +20,7 @@ LIB_DEPENDS+=	aa\\.1\\.:${PORTSDIR}/graphics/aalib
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
-LIB_DEPENDS+=	png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 #LIB_DEPENDS+=	xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta
 
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index d1d372223163..dfd0fe039e6c 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.40 1998/09/15 11:57:40 asami Exp $
+# $Id: Makefile,v 1.41 1998/09/17 00:32:41 asami Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -20,7 +20,7 @@ LIB_DEPENDS+=	aa\\.1\\.:${PORTSDIR}/graphics/aalib
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
-LIB_DEPENDS+=	png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 #LIB_DEPENDS+=	xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta
 
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index d1d372223163..dfd0fe039e6c 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.40 1998/09/15 11:57:40 asami Exp $
+# $Id: Makefile,v 1.41 1998/09/17 00:32:41 asami Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -20,7 +20,7 @@ LIB_DEPENDS+=	aa\\.1\\.:${PORTSDIR}/graphics/aalib
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
-LIB_DEPENDS+=	png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 #LIB_DEPENDS+=	xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta
 
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index d1d372223163..dfd0fe039e6c 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.40 1998/09/15 11:57:40 asami Exp $
+# $Id: Makefile,v 1.41 1998/09/17 00:32:41 asami Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -20,7 +20,7 @@ LIB_DEPENDS+=	aa\\.1\\.:${PORTSDIR}/graphics/aalib
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
-LIB_DEPENDS+=	png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 #LIB_DEPENDS+=	xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta
 
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index d1d372223163..dfd0fe039e6c 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.40 1998/09/15 11:57:40 asami Exp $
+# $Id: Makefile,v 1.41 1998/09/17 00:32:41 asami Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -20,7 +20,7 @@ LIB_DEPENDS+=	aa\\.1\\.:${PORTSDIR}/graphics/aalib
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
-LIB_DEPENDS+=	png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 #LIB_DEPENDS+=	xdelta\\.0\\.18:${PORTSDIR}/misc/xdelta
 
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 8c4ce356b9ef..47a1feeb1056 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.28 1998/09/15 11:45:53 asami Exp $
+# $Id: Makefile,v 1.29 1998/09/15 11:57:41 asami Exp $
 #
 
 DISTNAME=	imlib-1.7
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-LIB_DEPENDS=    png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=    png.2:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
 		gif\\.3\\.:${PORTSDIR}/graphics/giflib \
diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile
index 8c4ce356b9ef..47a1feeb1056 100644
--- a/graphics/imlib2-tmp/Makefile
+++ b/graphics/imlib2-tmp/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.28 1998/09/15 11:45:53 asami Exp $
+# $Id: Makefile,v 1.29 1998/09/15 11:57:41 asami Exp $
 #
 
 DISTNAME=	imlib-1.7
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-LIB_DEPENDS=    png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=    png.2:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
 		gif\\.3\\.:${PORTSDIR}/graphics/giflib \
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 8c4ce356b9ef..47a1feeb1056 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.28 1998/09/15 11:45:53 asami Exp $
+# $Id: Makefile,v 1.29 1998/09/15 11:57:41 asami Exp $
 #
 
 DISTNAME=	imlib-1.7
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-LIB_DEPENDS=    png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=    png.2:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
 		gif\\.3\\.:${PORTSDIR}/graphics/giflib \
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 46ee3c0bd51a..ee7bd91fe595 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 Dec 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.13 1998/07/09 23:39:36 ache Exp $
+# $Id: Makefile,v 1.14 1998/09/14 19:43:12 markm Exp $
 #
 
 DISTNAME=       libpng-1.0.2
@@ -13,7 +13,7 @@ MASTER_SITES=   ftp://ftp.uu.net/graphics/png/src/
 
 MAINTAINER=     ache@FreeBSD.org
 
-MAN3=           libpng.3 libpngpf.3
+MAN3=           libpng.2 libpngpf.3
 MAN5=           png.5
 
 do-configure:
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index a16f2488847d..70f772740654 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -3,7 +3,7 @@
 # Date created:         3 Dec 1996
 # Whom:                 paulo@isr.uc.pt
 #
-# $Id: Makefile,v 1.9 1998/08/20 18:56:00 jseger Exp $
+# $Id: Makefile,v 1.10 1998/09/15 11:57:42 asami Exp $
 #
 
 DISTNAME=       povray3
@@ -16,7 +16,7 @@ DISTFILES=      povuni_s.tgz povuni_d.tgz
 
 MAINTAINER=	ports@freebsd.org
 
-LIB_DEPENDS=    png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS=    png.2:${PORTSDIR}/graphics/png
 
 BROKEN=		checksum
 
diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile
index a16f2488847d..70f772740654 100644
--- a/graphics/povray36/Makefile
+++ b/graphics/povray36/Makefile
@@ -3,7 +3,7 @@
 # Date created:         3 Dec 1996
 # Whom:                 paulo@isr.uc.pt
 #
-# $Id: Makefile,v 1.9 1998/08/20 18:56:00 jseger Exp $
+# $Id: Makefile,v 1.10 1998/09/15 11:57:42 asami Exp $
 #
 
 DISTNAME=       povray3
@@ -16,7 +16,7 @@ DISTFILES=      povuni_s.tgz povuni_d.tgz
 
 MAINTAINER=	ports@freebsd.org
 
-LIB_DEPENDS=    png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS=    png.2:${PORTSDIR}/graphics/png
 
 BROKEN=		checksum
 
diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index a16f2488847d..70f772740654 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -3,7 +3,7 @@
 # Date created:         3 Dec 1996
 # Whom:                 paulo@isr.uc.pt
 #
-# $Id: Makefile,v 1.9 1998/08/20 18:56:00 jseger Exp $
+# $Id: Makefile,v 1.10 1998/09/15 11:57:42 asami Exp $
 #
 
 DISTNAME=       povray3
@@ -16,7 +16,7 @@ DISTFILES=      povuni_s.tgz povuni_d.tgz
 
 MAINTAINER=	ports@freebsd.org
 
-LIB_DEPENDS=    png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS=    png.2:${PORTSDIR}/graphics/png
 
 BROKEN=		checksum
 
diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile
index 10014d6520fc..0394a3a318fe 100644
--- a/graphics/xaos/Makefile
+++ b/graphics/xaos/Makefile
@@ -3,7 +3,7 @@
 # Date created:				24 February 1996
 # Whom:					Joseph Koshy <koshy@india.hp.com>
 #
-# $Id: Makefile,v 1.6 1998/09/07 02:36:03 jkoshy Exp $
+# $Id: Makefile,v 1.7 1998/09/15 11:57:43 asami Exp $
 #
 
 DISTNAME=	XaoS-3.0
@@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=	graphics
 
 MAINTAINER=	jkoshy@freebsd.org
 
-LIB_DEPENDS=	png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png.2:${PORTSDIR}/graphics/png
 
 # This port will benefit from all-stops-out optimization of the code
 
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index 244c7409210a..39e06ab9b83d 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -3,7 +3,7 @@
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.24 1998/09/15 11:57:43 asami Exp $
+# $Id: Makefile,v 1.25 1998/09/17 00:32:42 asami Exp $
 #
 
 DISTNAME=       xpaint-2.5.4
@@ -15,7 +15,7 @@ MAINTAINER=	jseger@FreeBSD.org
 LIB_DEPENDS=    jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34 \
 		Xpm.4:${PORTSDIR}/graphics/xpm   \
-		png.3:${PORTSDIR}/graphics/png
+		png.2:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/xpaint
 USE_IMAKE=      yes
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index 7b7146c6d186..aa3607541751 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 October 1994
 # Whom:			smace
 #
-# $Id: Makefile,v 1.23 1998/09/14 20:16:03 markm Exp $
+# $Id: Makefile,v 1.24 1998/09/15 11:57:45 asami Exp $
 #
 
 DISTNAME=	xv-3.10a
@@ -26,7 +26,7 @@ MAINTAINER=	shige@kuis.kyoto-u.ac.jp
 
 LIB_DEPENDS=    jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff34.1:${PORTSDIR}/graphics/tiff34 \
-		png.3:${PORTSDIR}/graphics/png
+		png.2:${PORTSDIR}/graphics/png
 
 USE_IMAKE=	yes
 
diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index 1d9439e4b10e..913c35fe8fdd 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -3,7 +3,7 @@
 # Date created:         19 April 1998
 # Whom:                 chuckr
 #
-# $Id: Makefile,v 1.17 1998/04/28 21:30:23 chuckr Exp $
+# $Id: Makefile,v 1.18 1998/09/15 11:57:46 asami Exp $
 #
 
 DISTNAME=	gnuplot-beta340
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.che.wisc.edu/pub/gnuplot/
 
 MAINTAINER=	chuckr@FreeBSD.org
 
-LIB_DEPENDS=    png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS=    png.2:${PORTSDIR}/graphics/png
 BUILD_DEPENDS=	$(PREFIX)/lib/libgd.a:${PORTSDIR}/graphics/gd
 
 WRKSRC=		${WRKDIR}/gnuplot
diff --git a/news/knews/Makefile b/news/knews/Makefile
index 1ec46ab1bfa6..b71a4aacc703 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Sun Apr 14 09:23:59 MET DST 1996
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.18 1998/09/15 11:57:47 asami Exp $
+# $Id: Makefile,v 1.19 1998/09/17 00:32:47 asami Exp $
 #
 
 DISTNAME=	knews-1.0b.0
@@ -14,7 +14,7 @@ MAINTAINER=	andreas@FreeBSD.ORG
 
 LIB_DEPENDS=    Xpm.4:${PORTSDIR}/graphics/xpm \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.3:${PORTSDIR}/graphics/png
+		png.2:${PORTSDIR}/graphics/png
 RUN_DEPENDS=    newsp:${PORTSDIR}/print/mp
 
 WRKSRC=		${WRKDIR}/knews
diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile
index 250402379848..85000a08526c 100644
--- a/www/Mosaic/Makefile
+++ b/www/Mosaic/Makefile
@@ -3,7 +3,7 @@
 # Date created:         7 August 1995
 # Whom:                 torstenb
 #
-# $Id: Makefile,v 1.19 1998/09/15 11:57:47 asami Exp $
+# $Id: Makefile,v 1.20 1998/09/17 00:32:53 asami Exp $
 #
 
 DISTNAME=       Mosaic-src-2.7b5
@@ -12,7 +12,7 @@ CATEGORIES=     www
 MASTER_SITES=	ftp://ftp.ncsa.uiuc.edu/Web/Mosaic/Unix/source/
 
 LIB_DEPENDS=    jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.3:${PORTSDIR}/graphics/png \
+		png.2:${PORTSDIR}/graphics/png \
 		Xpm.4:${PORTSDIR}/graphics/xpm \
 
 REQUIRES_MOTIF=	yes
diff --git a/www/arena/Makefile b/www/arena/Makefile
index bb11b9958d3f..6425addf53d6 100644
--- a/www/arena/Makefile
+++ b/www/arena/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Dec 1 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.11 1998/09/15 11:46:06 asami Exp $
+# $Id: Makefile,v 1.12 1998/09/15 11:57:48 asami Exp $
 #
 
 DISTNAME=       arena-CJK-beta3a
@@ -14,7 +14,7 @@ MASTER_SITES=   ftp://ftp-eu.w3.org/pub/Arena/beta-3/
 MAINTAINER=     ache@FreeBSD.ORG
 
 LIB_DEPENDS+=   jpeg.9:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+=   png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=   png.2:${PORTSDIR}/graphics/png
 
 BROKEN=		png upgrade
 
diff --git a/www/chimera2/Makefile b/www/chimera2/Makefile
index a935893aa3f0..d8b701cd7b20 100644
--- a/www/chimera2/Makefile
+++ b/www/chimera2/Makefile
@@ -3,7 +3,7 @@
 # Date created:         24 Nov 1997
 # Whom:                 Bruce Gingery <bgingery@gtcs.com>
 #
-# $Id: Makefile,v 1.17 1998/09/15 11:46:06 asami Exp $
+# $Id: Makefile,v 1.18 1998/09/15 11:57:49 asami Exp $
 #
 
 DISTNAME=	chimera-2.0a11
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.cs.unlv.edu/pub/chimera-alpha/
 MAINTAINER=	bgingery@gtcs.com
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.3:${PORTSDIR}/graphics/png
+		png.2:${PORTSDIR}/graphics/png
 
 USE_IMAKE=	yes
 
diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index 446da2807946..fe92c69c028e 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -3,7 +3,7 @@
 # Date created:		August 13, 1997
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.28 1998/09/15 11:57:50 asami Exp $
+# $Id: Makefile,v 1.29 1998/09/17 00:32:59 asami Exp $
 
 DISTNAME=	WindowMaker-0.19.3
 PKGNAME=	windowmaker-0.19.3
@@ -18,7 +18,7 @@ RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		gif\\.3\\.:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.3:${PORTSDIR}/graphics/png \
+		png.2:${PORTSDIR}/graphics/png \
 		tiff34\\.1:${PORTSDIR}/graphics/tiff34
 
 USE_X_PREFIX=	yes
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 446da2807946..fe92c69c028e 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -3,7 +3,7 @@
 # Date created:		August 13, 1997
 # Whom:			handy@physics.montana.edu
 #
-# $Id: Makefile,v 1.28 1998/09/15 11:57:50 asami Exp $
+# $Id: Makefile,v 1.29 1998/09/17 00:32:59 asami Exp $
 
 DISTNAME=	WindowMaker-0.19.3
 PKGNAME=	windowmaker-0.19.3
@@ -18,7 +18,7 @@ RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		gif\\.3\\.:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.3:${PORTSDIR}/graphics/png \
+		png.2:${PORTSDIR}/graphics/png \
 		tiff34\\.1:${PORTSDIR}/graphics/tiff34
 
 USE_X_PREFIX=	yes
diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index d8dd540b4620..1538d71b67fd 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -3,7 +3,7 @@
 # Date created:        22 April 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.3 1998/09/15 11:46:13 asami Exp $
+# $Id: Makefile,v 1.4 1998/09/15 11:57:50 asami Exp $
 #
 
 DISTNAME=	dgs-0.5.0
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MAINTAINER=	Nakai@technologist.com
 
 LIB_DEPENDS= 	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.3:${PORTSDIR}/graphics/png \
+		png.2:${PORTSDIR}/graphics/png \
 		tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/dgs
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index f8bd0f944918..ace933e086f6 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -3,7 +3,7 @@
 # Date created:        17 June 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.5 1998/09/15 11:57:51 asami Exp $
+# $Id: Makefile,v 1.6 1998/09/17 00:33:00 asami Exp $
 #
 
 DISTNAME=	gnome-libs-0.27
@@ -20,7 +20,7 @@ LIB_DEPENDS+=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
 LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	gif\\.3\\.:${PORTSDIR}/graphics/giflib
-LIB_DEPENDS+=	png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 USE_X_PREFIX=	yes
diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile
index f8bd0f944918..ace933e086f6 100644
--- a/x11/gnomelibs/Makefile
+++ b/x11/gnomelibs/Makefile
@@ -3,7 +3,7 @@
 # Date created:        17 June 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.5 1998/09/15 11:57:51 asami Exp $
+# $Id: Makefile,v 1.6 1998/09/17 00:33:00 asami Exp $
 #
 
 DISTNAME=	gnome-libs-0.27
@@ -20,7 +20,7 @@ LIB_DEPENDS+=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
 LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	gif\\.3\\.:${PORTSDIR}/graphics/giflib
-LIB_DEPENDS+=	png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 USE_X_PREFIX=	yes
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index f8bd0f944918..ace933e086f6 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -3,7 +3,7 @@
 # Date created:        17 June 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.5 1998/09/15 11:57:51 asami Exp $
+# $Id: Makefile,v 1.6 1998/09/17 00:33:00 asami Exp $
 #
 
 DISTNAME=	gnome-libs-0.27
@@ -20,7 +20,7 @@ LIB_DEPENDS+=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
 LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	gif\\.3\\.:${PORTSDIR}/graphics/giflib
-LIB_DEPENDS+=	png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 USE_X_PREFIX=	yes
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 87ed8c2c42cb..6b60dc6ee00d 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -3,7 +3,7 @@
 # Date created:		August 31, 1998
 # Whom:			Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.6 1998/09/15 11:57:51 asami Exp $
+# $Id: Makefile,v 1.7 1998/09/17 00:33:00 asami Exp $
 
 DISTNAME=	wdm-0.90
 CATEGORIES=	x11
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.ORG
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		gif\\.3\\.:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		png.3:${PORTSDIR}/graphics/png \
+		png.2:${PORTSDIR}/graphics/png \
 		tiff34\\.1:${PORTSDIR}/graphics/tiff34 \
 		PropList\\.0\\.8:${PORTSDIR}/x11-wm/windowmaker