Use "png>=1.0.3" instead of "png-*" in dependence list.

32 files changed, 65 insertions, 65 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index a8e034074df..d9a352c73fa 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/02/09 15:22:28 tron Exp $
+# $NetBSD: Makefile,v 1.5 2000/02/09 20:20:52 tron Exp $
 #
 
 DISTNAME=	abi-${ABIWORD_VERS}
@@ -13,7 +13,7 @@ HOMEPAGE=	http://www.abisource.com/
 
 BUILD_DEPENDS+=	${LOCALBASE}/bin/unzip:../../archivers/unzip
 DEPENDS+=	gtk+-1.2.*:../../x11/gtk
-DEPENDS+=	png-*:../../graphics/png
+DEPENDS+=	png>=1.0.3:../../graphics/png
 
 USE_X11=	yes
 USE_GMAKE=	yes
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index aaa21320ca3..41816e4f462 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/02/09 15:22:26 tron Exp $
+# $NetBSD: Makefile,v 1.17 2000/02/09 20:20:53 tron Exp $
 # FreeBSD Id: Makefile,v 1.1.1.1 1997/09/03 19:27:57 gj Exp
 
 DISTNAME=	xemacs-21.1.6
@@ -16,7 +16,7 @@ HOMEPAGE=	http://www.xemacs.org/
 USE_XAW=	yes
 
 DEPENDS+=	gdbm-1.7.3:../../databases/gdbm
-DEPENDS+=	png-*:../../graphics/png
+DEPENDS+=	png>=1.0.3:../../graphics/png
 DEPENDS+=	tiff-*:../../graphics/tiff
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
 
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index d7f63a34a40..1abb4c0e1fb 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/01/10 19:11:08 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 2000/02/09 20:20:53 tron Exp $
 #
 
 DISTNAME=	freeciv-1.9.0
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.freeciv.org/
 
 DEPENDS+=	xpm-*:../../graphics/xpm
 DEPENDS+=	imlib-*:../../graphics/imlib
-DEPENDS+=	png-*:../../graphics/png
+DEPENDS+=	png>=1.0.3:../../graphics/png
 DEPENDS+=	jpeg-*:../../graphics/jpeg
 DEPENDS+=	gettext-0.10.*:../../devel/gettext
 
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index fdfefc76856..f877f77a148 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2000/02/09 15:22:28 tron Exp $
+# $NetBSD: Makefile,v 1.55 2000/02/09 20:20:53 tron Exp $
 
 DISTNAME=	ImageMagick-4.2.9
 CATEGORIES=	graphics
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.wizards.dupont.com/cristy/ImageMagick.html
 
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	mpeg2codec-1.2:../../graphics/mpeg2codec
-DEPENDS+=	png-*:../../graphics/png
+DEPENDS+=	png>=1.0.3:../../graphics/png
 DEPENDS+=	tiff-*:../../graphics/tiff
 
 MIRROR_DISTFILE= no
diff --git a/graphics/clanlib/Makefile b/graphics/clanlib/Makefile
index 7a0a6187904..80235f678eb 100644
--- a/graphics/clanlib/Makefile
+++ b/graphics/clanlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/02/09 15:22:35 tron Exp $
+# $NetBSD: Makefile,v 1.8 2000/02/09 20:20:53 tron Exp $
 
 DISTNAME=		ClanLib-0.2.2
 CATEGORIES=		graphics games devel x11
@@ -9,7 +9,7 @@ HOMEPAGE=		http://www.clanlib.org/
 
 DEPENDS+=		Hermes-1.2.6*:../../graphics/hermes
 DEPENDS+=		Mesa-*:../../graphics/Mesa
-DEPENDS+=		png-*:../../graphics/png
+DEPENDS+=		png>=1.0.3:../../graphics/png
 DEPENDS+=		pth-*:../../devel/pth
 
 USE_X11BASE=		yes
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index df56bf43b9d..ebb58bfb556 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 1999/11/01 03:29:29 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2000/02/09 20:20:54 tron Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/02/14 07:55:45 asami Exp
 #
 
@@ -13,7 +13,7 @@ USE_LIBTOOL=	yes
 USE_X11=	yes
 
 DEPENDS+=	freetype-*:../../graphics/freetype
-DEPENDS+=	png-*:../../graphics/png
+DEPENDS+=	png>=1.0.3:../../graphics/png
 DEPENDS+=	xpm-*:../../graphics/xpm
 
 NO_CONFIGURE=	yes
diff --git a/graphics/gif2png/Makefile b/graphics/gif2png/Makefile
index 1edc4f632e3..a53b0c1a07c 100644
--- a/graphics/gif2png/Makefile
+++ b/graphics/gif2png/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/02/09 15:22:36 tron Exp $
+# $NetBSD: Makefile,v 1.8 2000/02/09 20:20:54 tron Exp $
 #
 
 DISTNAME=	gif2png-2.3.0
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.tuxedo.org/~esr/gif2png/ \
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.tuxedo.org/~esr/gif2png/
 
-DEPENDS+=	png-*:../../graphics/png
+DEPENDS+=	png>=1.0.3:../../graphics/png
 
 GNU_CONFIGURE=	YES
 MAKE_ENV+=	INCLUDES="-I${PREFIX}/include"
diff --git a/graphics/gimp-current/Makefile b/graphics/gimp-current/Makefile
index 8617f4baa95..531d54c3e33 100644
--- a/graphics/gimp-current/Makefile
+++ b/graphics/gimp-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/02/09 15:22:36 tron Exp $
+# $NetBSD: Makefile,v 1.5 2000/02/09 20:20:54 tron Exp $
 
 DISTNAME=		gimp-1.1.13
 CATEGORIES=		graphics
@@ -13,7 +13,7 @@ HOMEPAGE=		http://www.gimp.org/
 DEPENDS+=		jpeg-6b:../../graphics/jpeg
 DEPENDS+=		gtk+-1.2.*:../../x11/gtk
 DEPENDS+=		mpeg-1.2.1:../../graphics/mpeg-lib
-DEPENDS+=		png-*:../../graphics/png
+DEPENDS+=		png>=1.0.3:../../graphics/png
 DEPENDS+=		tiff-*:../../graphics/tiff
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
 DEPENDS+=		gettext-0.10.*:../../devel/gettext
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 9f19933424e..345e82d2400 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2000/02/09 15:22:29 tron Exp $
+# $NetBSD: Makefile,v 1.44 2000/02/09 20:20:54 tron Exp $
 
 DISTNAME=		gimp-1.0.4
 CATEGORIES=		graphics
@@ -15,7 +15,7 @@ HOMEPAGE=		http://www.gimp.org/
 DEPENDS+=		jpeg-6b:../../graphics/jpeg
 DEPENDS+=		gtk+-1.2.*:../../x11/gtk
 DEPENDS+=		mpeg-1.2.1:../../graphics/mpeg-lib
-DEPENDS+=		png-*:../../graphics/png
+DEPENDS+=		png>=1.0.3:../../graphics/png
 DEPENDS+=		tiff-*:../../graphics/tiff
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 26853457f5b..3361f2c8f3f 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2000/02/09 15:22:34 tron Exp $
+# $NetBSD: Makefile,v 1.30 2000/02/09 20:20:54 tron Exp $
 #
 
 DISTNAME=	imlib-1.9.8
@@ -13,7 +13,7 @@ DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 DEPENDS+=	libungif-*:../../graphics/libungif
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	netpbm-*:../../graphics/netpbm
-DEPENDS+=	png-*:../../graphics/png
+DEPENDS+=	png>=1.0.3:../../graphics/png
 DEPENDS+=	tiff-*:../../graphics/tiff
 
 USE_X11BASE=	yes
diff --git a/graphics/libgdgeda/Makefile b/graphics/libgdgeda/Makefile
index eea8a18c192..e9e6a9bc9e6 100644
--- a/graphics/libgdgeda/Makefile
+++ b/graphics/libgdgeda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/01/02 17:33:02 rh Exp $
+# $NetBSD: Makefile,v 1.2 2000/02/09 20:20:55 tron Exp $
 #
 
 DISTNAME=		libgdgeda-1.6
@@ -8,7 +8,7 @@ MASTER_SITES=		ftp://ftp.geda.seul.org/pub/geda/devel/support/
 MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://www.geda.seul.org/
 
-DEPENDS+=		png-*:../../graphics/png
+DEPENDS+=		png>=1.0.3:../../graphics/png
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 3e27de0659a..3662e898811 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2000/02/09 15:22:30 tron Exp $
+# $NetBSD: Makefile,v 1.34 2000/02/09 20:20:55 tron Exp $
 #
 
 DISTNAME=	netpbm
@@ -15,7 +15,7 @@ DISTFILES=	netpbm-1mar1994.tar.gz \
 MAINTAINER=	packages@netbsd.org
 
 DEPENDS+=	tiff-*:../../graphics/tiff
-DEPENDS+=	png-*:../../graphics/png
+DEPENDS+=	png>=1.0.3:../../graphics/png
 
 WRKSRC=		${WRKDIR}/netpbm
 MAKE_ENV +=	PREFIX=${PREFIX} MANCP="${INSTALL_MAN}"
diff --git a/graphics/ploticus/Makefile b/graphics/ploticus/Makefile
index 75c1c6ab8c5..38781ad81e6 100644
--- a/graphics/ploticus/Makefile
+++ b/graphics/ploticus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/11/24 20:29:10 rh Exp $
+# $NetBSD: Makefile,v 1.2 2000/02/09 20:20:55 tron Exp $
 #
 
 DISTNAME=	plsrc13
@@ -11,7 +11,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${MANDIST}${EXTRACT_SUFX}
 MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.sgpr.net/
 
-DEPENDS+=	png-*:../../graphics/png
+DEPENDS+=	png>=1.0.3:../../graphics/png
 
 NO_CONFIGURE=	YES
 USE_X11=	YES
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index 8a0281ec60c..7298c06da8a 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/02/09 15:22:33 tron Exp $
+# $NetBSD: Makefile,v 1.8 2000/02/09 20:20:55 tron Exp $
 # FreeBSD Id: Makefile,v 1.9 1998/08/20 18:56:00 jseger Exp
 #
 
@@ -14,7 +14,7 @@ DIST_SUBDIR=	${PKGNAME}
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.povray.org/
 
-DEPENDS+=	png-*:../../graphics/png
+DEPENDS+=	png>=1.0.3:../../graphics/png
 
 USE_X11=	yes
 
diff --git a/graphics/xart/Makefile b/graphics/xart/Makefile
index e851ac27acc..51290ff5169 100644
--- a/graphics/xart/Makefile
+++ b/graphics/xart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/02/09 15:22:32 tron Exp $
+# $NetBSD: Makefile,v 1.13 2000/02/09 20:20:55 tron Exp $
 #
 
 DISTNAME=       xart19980415
@@ -13,7 +13,7 @@ HOMEPAGE=	http://www.cqi.com/~humbubba/linux.html
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
 DEPENDS+=	tiff-*:../../graphics/tiff
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
-DEPENDS+=	png-*:../../graphics/png
+DEPENDS+=	png>=1.0.3:../../graphics/png
 
 WRKSRC=		${WRKDIR}/19980415
 USE_IMAKE=      yes
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index e38a595b99a..48dab238b20 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2000/02/09 15:22:32 tron Exp $
+# $NetBSD: Makefile,v 1.20 2000/02/09 20:20:56 tron Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/08/29 12:17:50 tg Exp
 #
 
@@ -13,7 +13,7 @@ HOMEPAGE=	http://www.danbbs.dk/~torsten/xpaint/
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
 DEPENDS+=	tiff-*:../../graphics/tiff
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	png-*:../../graphics/png
+DEPENDS+=	png>=1.0.3:../../graphics/png
 
 USE_IMAKE=      yes
 
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 034bd6eb2be..ced38f716b6 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/02/09 15:22:35 tron Exp $
+# $NetBSD: Makefile,v 1.14 2000/02/09 20:20:56 tron Exp $
 #
 
 DISTNAME=	xsane-0.51
@@ -16,7 +16,7 @@ MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.wolfsburg.de/~rauch/sane/sane-xsane.html
 
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	png-*:../../graphics/png
+DEPENDS+=	png>=1.0.3:../../graphics/png
 DEPENDS+=	tiff-*:../../graphics/tiff
 DEPENDS+=	gtk+-1.2.*:../../x11/gtk
 DEPENDS+=	sane-1.0.1:../../graphics/sane
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index 3e7a0732e1a..c82c90fefb3 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2000/02/09 15:22:33 tron Exp $
+# $NetBSD: Makefile,v 1.25 2000/02/09 20:20:56 tron Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/07/03 07:37:08 asami Exp
 #
 
@@ -18,7 +18,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.trilon.com/xv/
 
 DEPENDS+=	ghostscript-5.50:../../print/ghostscript5
-DEPENDS+=	png-*:../png
+DEPENDS+=	png>=1.0.3:../png
 DEPENDS+=	tiff-*:../../graphics/tiff
 
 USE_IMAKE=	yes
diff --git a/japanese/vfghostscript5/Makefile b/japanese/vfghostscript5/Makefile
index 0dcd60b0985..c69fac13762 100644
--- a/japanese/vfghostscript5/Makefile
+++ b/japanese/vfghostscript5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/02/09 15:22:37 tron Exp $
+# $NetBSD: Makefile,v 1.4 2000/02/09 20:20:56 tron Exp $
 #
 
 DISTNAME=	ja-vfghostscript-5.50
@@ -30,7 +30,7 @@ HOMEPAGE=	http://www.cs.wisc.edu/~ghost/index.html
 
 BUILD_DEPENDS=	${BUILD_ROOT}/graphics/jpeg/${WRKDIR:T}/jpeg-6b:../../graphics/jpeg:extract \
 		unzip:../../archivers/unzip
-DEPENDS=	png-*:../../graphics/png \
+DEPENDS=	png>=1.0.3:../../graphics/png \
 		ja-vflib-2.24.2:../../japanese/vflib \
 		ghostscript-5.50:../../print/ghostscript5
 
diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index e2800c225f6..d116de8d774 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2000/02/09 15:22:38 tron Exp $
+# $NetBSD: Makefile,v 1.26 2000/02/09 20:20:56 tron Exp $
 #
 
 DISTNAME=		kaffe-1.0.5
@@ -9,7 +9,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.kaffe.org/
 
 DEPENDS+=		jpeg-6b:../../graphics/jpeg
-DEPENDS+=		png-*:../../graphics/png
+DEPENDS+=		png>=1.0.3:../../graphics/png
 DEPENDS+=		libungif-*:../../graphics/libungif
 
 USE_X11=		yes
diff --git a/news/knews/Makefile b/news/knews/Makefile
index 55e24b9ad84..7ee6fc8e406 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2000/02/09 15:22:40 tron Exp $
+# $NetBSD: Makefile,v 1.24 2000/02/09 20:20:57 tron Exp $
 
 DISTNAME=	knews-1.0b.1
 PKGNAME=	knews-1.0b1
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.matematik.su.se/~kjj/
 
 DEPENDS+=	faces-1.6.1:../../mail/faces
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	png-*:../../graphics/png
+DEPENDS+=	png>=1.0.3:../../graphics/png
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
 
 CONFLICTS=	knews-1.0b0
diff --git a/print/cups/Makefile b/print/cups/Makefile
index d193700f736..5bc140aacae 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/02/09 15:22:43 tron Exp $
+# $NetBSD: Makefile,v 1.3 2000/02/09 20:20:57 tron Exp $
 #
 
 DISTNAME=	cups-1.0.2-source
@@ -17,7 +17,7 @@ MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://www.cups.org/
 
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	png-*:../../graphics/png
+DEPENDS+=	png>=1.0.3:../../graphics/png
 DEPENDS+=	tiff-*:../../graphics/tiff
 
 USE_LIBTOOL=	yes
diff --git a/print/ghostscript5/Makefile b/print/ghostscript5/Makefile
index b255be40253..128b56e0a87 100644
--- a/print/ghostscript5/Makefile
+++ b/print/ghostscript5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2000/02/09 15:22:41 tron Exp $
+# $NetBSD: Makefile,v 1.46 2000/02/09 20:20:57 tron Exp $
 #
 
 DISTNAME=	ghostscript-5.50
@@ -21,7 +21,7 @@ HOMEPAGE=	http://www.cs.wisc.edu/~ghost/index.html
 
 BUILD_DEPENDS=	${BUILD_ROOT}/graphics/jpeg/${WRKDIR:T}/jpeg-6b:../../graphics/jpeg:extract \
 		unzip:../../archivers/unzip
-DEPENDS=	png-*:../../graphics/png
+DEPENDS=	png>=1.0.3:../../graphics/png
 
 USE_X11=	yes
 
diff --git a/print/teTeX-bin/Makefile b/print/teTeX-bin/Makefile
index 59a297a7261..e4c620ac126 100644
--- a/print/teTeX-bin/Makefile
+++ b/print/teTeX-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2000/02/09 15:22:42 tron Exp $
+# $NetBSD: Makefile,v 1.15 2000/02/09 20:20:57 tron Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp
 #
 
@@ -15,7 +15,7 @@ DEPENDS+=	teTeX-share-1.0:../teTeX-share
 DEPENDS+=	dialog-0.6z:../../misc/dialog
 DEPENDS+=	libwww-5.2.8:../../www/libwww
 DEPENDS+=	ncurses>=4.2:../../devel/ncurses
-DEPENDS+=	png-*:../../graphics/png
+DEPENDS+=	png>=1.0.3:../../graphics/png
 
 CONFLICTS+=	omega-*
 
diff --git a/textproc/ted/Makefile b/textproc/ted/Makefile
index ba6dfbf2773..0511f11fdd8 100644
--- a/textproc/ted/Makefile
+++ b/textproc/ted/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/02/09 15:22:43 tron Exp $
+# $NetBSD: Makefile,v 1.7 2000/02/09 20:20:57 tron Exp $
 
 DISTNAME=	ted-2.6.src
 PKGNAME=	ted-2.6
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.nllgg.nl/Ted/
 
 DEPENDS+=	libungif-*:../../graphics/libungif
 DEPENDS+=       jpeg-6b:../../graphics/jpeg
-DEPENDS+=	png-*:../../graphics/png
+DEPENDS+=	png>=1.0.3:../../graphics/png
 DEPENDS+=       tiff-*:../../graphics/tiff
 DEPENDS+=       xpm-3.4k:../../graphics/xpm
 
diff --git a/www/arena/Makefile b/www/arena/Makefile
index fee2c5cc415..e64d7c9c0c9 100644
--- a/www/arena/Makefile
+++ b/www/arena/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2000/02/09 15:22:45 tron Exp $
+# $NetBSD: Makefile,v 1.20 2000/02/09 20:20:58 tron Exp $
 # FreeBSD Id: Makefile,v 1.10 1998/05/04 20:22:31 jseger Exp
 #
 
@@ -14,7 +14,7 @@ BUILD_DEPENDS+=		autoconf:../../devel/autoconf
 DEPENDS+=		gettext-0.10.*:../../devel/gettext
 DEPENDS+=		jpeg-6b:../../graphics/jpeg
 DEPENDS+=		libwww-5.2.8:../../www/libwww
-DEPENDS+=		png-*:../../graphics/png
+DEPENDS+=		png>=1.0.3:../../graphics/png
 DEPENDS+=		xpm-3.4k:../../graphics/xpm
 
 #XXX "black screen" fixed for 16-bit displays on mac68k, not verified on alpha.
@@ -55,7 +55,7 @@ GLOBAL_EXCLUDE_ARG=	-c
 EXCLUDE_ARG=		--exclude
 .endif
 EXTRACT_ELEMENTS=	${GLOBAL_EXCLUDE_ARG}
-.for DONT_EXTRACT_SUBDIR in jpeg-* libpng-* zlib-*
+.for DONT_EXTRACT_SUBDIR in jpeg-* libpng>=1.0.3 zlib-*
 EXTRACT_ELEMENTS+=	${EXCLUDE_ARG} Arena-*/Auxiliary/${DONT_EXTRACT_SUBDIR}
 .endfor
 
diff --git a/www/htmldoc/Makefile b/www/htmldoc/Makefile
index d23b7930530..f627b762f2a 100644
--- a/www/htmldoc/Makefile
+++ b/www/htmldoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/02/09 15:22:45 tron Exp $
+# $NetBSD: Makefile,v 1.8 2000/02/09 20:20:58 tron Exp $
 #
 
 DISTNAME=		${PKGNAME}-source
@@ -11,7 +11,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.easysw.com/~mike/htmldoc/
 
 DEPENDS+=		jpeg-6b:../../graphics/jpeg
-DEPENDS+=		png-*:../../graphics/png
+DEPENDS+=		png>=1.0.3:../../graphics/png
 
 NOT_FOR_PLATFORM=	*-*-alpha	#ps-pdf.cpp:3229: Internal compiler error. on 1.4 - 1.7 unknown
 
diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile
index 148633fdf2e..a766c206e1b 100644
--- a/x11/XmHTML/Makefile
+++ b/x11/XmHTML/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/02/09 15:22:47 tron Exp $
+# $NetBSD: Makefile,v 1.12 2000/02/09 20:20:58 tron Exp $
 #
 
 DISTNAME=       XmHTML-1.1.7
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.xs4all.nl/~ripley/XmHTML/
 
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	png-*:../../graphics/png
+DEPENDS+=	png>=1.0.3:../../graphics/png
 
 USE_X11=	yes
 USE_MOTIF=	yes
diff --git a/x11/afterstep-current/Makefile b/x11/afterstep-current/Makefile
index bb33b083fca..fd6be99b190 100644
--- a/x11/afterstep-current/Makefile
+++ b/x11/afterstep-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2000/02/09 15:22:49 tron Exp $
+# $NetBSD: Makefile,v 1.19 2000/02/09 20:20:58 tron Exp $
 
 DISTNAME=	AfterStep-1.7.164
 PKGNAME=	afterstep-1.7.165
@@ -26,7 +26,7 @@ HOMEPAGE=		http://www.afterstep.org/
 BUILD_DEPENDS+=		autoconf:../../devel/autoconf
 DEPENDS+=		asclock-1.0:../../x11/asclock
 DEPENDS+=		jpeg-6b:../../graphics/jpeg
-DEPENDS+=		png-*:../../graphics/png
+DEPENDS+=		png>=1.0.3:../../graphics/png
 DEPENDS+=		rplay-3.2.*:../../audio/rplay
 DEPENDS+=		xli-1.16:../../graphics/xli
 DEPENDS+=		xp-1.2b10:../../x11/xp
diff --git a/x11/afterstep/Makefile b/x11/afterstep/Makefile
index adc966b8673..55932d7d39b 100644
--- a/x11/afterstep/Makefile
+++ b/x11/afterstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2000/02/09 15:22:47 tron Exp $
+# $NetBSD: Makefile,v 1.16 2000/02/09 20:20:58 tron Exp $
 
 DISTNAME=	AfterStep-1.6.10
 PKGNAME=	afterstep-1.6.10
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.afterstep.org/
 
 DEPENDS+=	asclock-1.0:../../x11/asclock
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	png-*:../../graphics/png
+DEPENDS+=	png>=1.0.3:../../graphics/png
 DEPENDS+=	rplay-3.2.*:../../audio/rplay
 DEPENDS+=	xli-1.16:../../graphics/xli
 DEPENDS+=	xpm-3.4k:../../graphics/xpm
diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile
index 3d652c36bb9..276ea9e6715 100644
--- a/x11/kdelibs/Makefile
+++ b/x11/kdelibs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2000/02/09 15:22:46 tron Exp $
+# $NetBSD: Makefile,v 1.43 2000/02/09 20:20:59 tron Exp $
 # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp
 #
 
@@ -12,7 +12,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=       http://www.kde.org/
 
 DEPENDS+=	jpeg-6b:../../graphics/jpeg
-DEPENDS+=	png-*:../../graphics/png
+DEPENDS+=	png>=1.0.3:../../graphics/png
 DEPENDS+=	qt-1.44:../../x11/qt
 DEPENDS+=	tiff-*:../../graphics/tiff
 
diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile
index a74272abbd9..e929d25d767 100644
--- a/x11/windowmaker/Makefile
+++ b/x11/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2000/02/09 15:22:48 tron Exp $
+# $NetBSD: Makefile,v 1.41 2000/02/09 20:20:59 tron Exp $
 
 DISTNAME=		WindowMaker-0.61.1
 PKGNAME=		windowmaker-0.61.1
@@ -15,7 +15,7 @@ HOMEPAGE=		http://www.windowmaker.org/
 DEPENDS+=		libproplist-0.9.*:../../devel/libproplist
 DEPENDS+=		libungif-*:../../graphics/libungif
 DEPENDS+=		jpeg-6b:../../graphics/jpeg
-DEPENDS+=		png-*:../../graphics/png
+DEPENDS+=		png>=1.0.3:../../graphics/png
 DEPENDS+=		tiff-*:../../graphics/tiff
 DEPENDS+=		xpm-3.4k:../../graphics/xpm