summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2000-07-04 07:13:35 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2000-07-04 07:13:35 +0000
commit6db96c05006f9dc75e9717730eb1a12a7476f363 (patch)
tree0b0138a6c6fb473a21e0292bbb3459d380585f98
parentAdd tiff2png, a TIFF-to-PNG image converter. (diff)
Bump png shared library version.
Submitted by: Hajimu UMEMOTO <ume@mahoroba.org>
Notes
Notes: svn path=/head/; revision=30165
Diffstat (limited to '')
-rw-r--r--astro/xtide/Makefile2
-rw-r--r--audio/timidity++/Makefile2
-rw-r--r--devel/swarm/Makefile2
-rw-r--r--editors/AbiWord/Makefile2
-rw-r--r--editors/AbiWord2/Makefile2
-rw-r--r--editors/abiword-devel/Makefile2
-rw-r--r--editors/abiword/Makefile2
-rw-r--r--editors/xemacs-devel/Makefile2
-rw-r--r--editors/xemacs/Makefile2
-rw-r--r--editors/xemacs20/Makefile2
-rw-r--r--editors/xemacs21/Makefile2
-rw-r--r--games/gltron/Makefile2
-rw-r--r--games/gracer/Makefile2
-rw-r--r--graphics/EZWGL/Makefile2
-rw-r--r--graphics/ImageMagick/Makefile2
-rw-r--r--graphics/dc20ctrl/Makefile2
-rw-r--r--graphics/enfle/Makefile2
-rw-r--r--graphics/gd/Makefile2
-rw-r--r--graphics/gd1/Makefile2
-rw-r--r--graphics/gd2/Makefile2
-rw-r--r--graphics/gif2png/Makefile2
-rw-r--r--graphics/gimp-app-devel/Makefile2
-rw-r--r--graphics/gimp-app/Makefile2
-rw-r--r--graphics/gimp-devel/Makefile2
-rw-r--r--graphics/gimp/Makefile2
-rw-r--r--graphics/gimp1/Makefile2
-rw-r--r--graphics/gimpshop/Makefile2
-rw-r--r--graphics/gtksee/Makefile2
-rw-r--r--graphics/imlib/Makefile2
-rw-r--r--graphics/imlib2-tmp/Makefile2
-rw-r--r--graphics/imlib2/Makefile2
-rw-r--r--graphics/libimg/Makefile2
-rw-r--r--graphics/libwmf/Makefile2
-rw-r--r--graphics/netpbm/Makefile2
-rw-r--r--graphics/png/Makefile6
-rw-r--r--graphics/png/files/patch-aa6
-rw-r--r--graphics/png/pkg-plist2
-rw-r--r--graphics/png2html/Makefile2
-rw-r--r--graphics/povray/Makefile2
-rw-r--r--graphics/povray31/Makefile2
-rw-r--r--graphics/povray36/Makefile2
-rw-r--r--graphics/povray37/Makefile2
-rw-r--r--graphics/xaos/Makefile2
-rw-r--r--graphics/xli/Makefile2
-rw-r--r--graphics/xpaint/Makefile2
-rw-r--r--graphics/xsane/Makefile2
-rw-r--r--graphics/xv/Makefile2
-rw-r--r--java/kaffe/Makefile2
-rw-r--r--math/gnuplot+/Makefile2
-rw-r--r--math/gnuplot/Makefile2
-rw-r--r--math/grace/Makefile2
-rw-r--r--misc/alevt/Makefile2
-rw-r--r--misc/magicpoint/Makefile2
-rw-r--r--misc/videotext/Makefile2
-rw-r--r--news/knews/Makefile2
-rw-r--r--print/ghostscript-afpl/Makefile2
-rw-r--r--print/ghostscript-gnu/Makefile2
-rw-r--r--print/ghostscript-gpl/Makefile2
-rw-r--r--print/ghostscript5/Makefile2
-rw-r--r--print/ghostscript55/Makefile2
-rw-r--r--print/ghostscript6/Makefile2
-rw-r--r--print/ghostscript7/Makefile2
-rw-r--r--print/ghostscript8/Makefile2
-rw-r--r--print/hp2xx/Makefile2
-rw-r--r--print/jadetex/Makefile2
-rw-r--r--print/teTeX-base/Makefile2
-rw-r--r--print/teTeX/Makefile2
-rw-r--r--www/Mosaic/Makefile2
-rw-r--r--www/arena/Makefile2
-rw-r--r--www/chimera2/Makefile2
-rw-r--r--x11-toolkits/fox-devel/Makefile2
-rw-r--r--x11-toolkits/fox/Makefile2
-rw-r--r--x11-toolkits/fox10/Makefile2
-rw-r--r--x11-toolkits/fox14/Makefile2
-rw-r--r--x11-toolkits/jx/Makefile2
-rw-r--r--x11-toolkits/qt22/Makefile2
-rw-r--r--x11-toolkits/qt23/Makefile2
-rw-r--r--x11-toolkits/qt30/Makefile2
-rw-r--r--x11-toolkits/qt31/Makefile2
-rw-r--r--x11-toolkits/qt32/Makefile2
-rw-r--r--x11-toolkits/qt33/Makefile2
-rw-r--r--x11-toolkits/xmhtml/Makefile2
-rw-r--r--x11-wm/afterstep-stable/Makefile2
-rw-r--r--x11-wm/windowmaker-i18n/Makefile2
-rw-r--r--x11-wm/windowmaker/Makefile2
-rw-r--r--x11-wm/wmakerconf/Makefile2
-rw-r--r--x11/aterm/Makefile2
-rw-r--r--x11/dgs/Makefile2
-rw-r--r--x11/kdelibs11/Makefile2
-rw-r--r--x11/kdelibs2/Makefile2
-rw-r--r--x11/kdelibs3/Makefile2
-rw-r--r--x11/kdelibs4/Makefile2
92 files changed, 98 insertions, 94 deletions
diff --git a/astro/xtide/Makefile b/astro/xtide/Makefile
index 021cf769b1a8..38eff8bb39e8 100644
--- a/astro/xtide/Makefile
+++ b/astro/xtide/Makefile
@@ -15,7 +15,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= patseal@hyperhost.net
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
- png.3:${PORTSDIR}/graphics/png
+ png.4:${PORTSDIR}/graphics/png
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index ec4b429a2181..e80716ed6083 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -25,7 +25,7 @@ USE_BZIP2= yes
GNU_CONFIGURE= yes
.if !defined(WITHOUT_X11)
USE_XLIB= yes
-LIB_DEPENDS+= png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png.4:${PORTSDIR}/graphics/png
.endif
DIST_SUBDIR= timidity
diff --git a/devel/swarm/Makefile b/devel/swarm/Makefile
index 618fef768a35..b24291ddcd15 100644
--- a/devel/swarm/Makefile
+++ b/devel/swarm/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.santafe.edu/pub/swarm/src/swarm/
MAINTAINER= horance@freedom.ie.cycu.edu.tw
LIB_DEPENDS= ffi.2:${PORTSDIR}/devel/libffi \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
Xpm.4:${PORTSDIR}/graphics/xpm \
BLT24.2:${PORTSDIR}/x11-toolkits/blt
diff --git a/editors/AbiWord/Makefile b/editors/AbiWord/Makefile
index 27e3f6822b16..87c38373cf6a 100644
--- a/editors/AbiWord/Makefile
+++ b/editors/AbiWord/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= wolman@cs.washington.edu
# unzip is needed during the installation process
BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
- png.3:${PORTSDIR}/graphics/png
+ png.4:${PORTSDIR}/graphics/png
RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
DIST_SUBDIR= AbiWord
diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile
index 27e3f6822b16..87c38373cf6a 100644
--- a/editors/AbiWord2/Makefile
+++ b/editors/AbiWord2/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= wolman@cs.washington.edu
# unzip is needed during the installation process
BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
- png.3:${PORTSDIR}/graphics/png
+ png.4:${PORTSDIR}/graphics/png
RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
DIST_SUBDIR= AbiWord
diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile
index 27e3f6822b16..87c38373cf6a 100644
--- a/editors/abiword-devel/Makefile
+++ b/editors/abiword-devel/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= wolman@cs.washington.edu
# unzip is needed during the installation process
BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
- png.3:${PORTSDIR}/graphics/png
+ png.4:${PORTSDIR}/graphics/png
RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
DIST_SUBDIR= AbiWord
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 27e3f6822b16..87c38373cf6a 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= wolman@cs.washington.edu
# unzip is needed during the installation process
BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
- png.3:${PORTSDIR}/graphics/png
+ png.4:${PORTSDIR}/graphics/png
RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
DIST_SUBDIR= AbiWord
diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile
index 1021317862f5..b7787ce26853 100644
--- a/editors/xemacs-devel/Makefile
+++ b/editors/xemacs-devel/Makefile
@@ -20,7 +20,7 @@ MAINTAINER?= gj@FreeBSD.org
RUN_DEPENDS+= ${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
LIB_DEPENDS+= Xpm.4:${PORTSDIR}/graphics/xpm \
jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
XEMACS_REL= 21.1
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 1021317862f5..b7787ce26853 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -20,7 +20,7 @@ MAINTAINER?= gj@FreeBSD.org
RUN_DEPENDS+= ${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
LIB_DEPENDS+= Xpm.4:${PORTSDIR}/graphics/xpm \
jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
XEMACS_REL= 21.1
diff --git a/editors/xemacs20/Makefile b/editors/xemacs20/Makefile
index 0d87c50cd251..d51eb5f66cb2 100644
--- a/editors/xemacs20/Makefile
+++ b/editors/xemacs20/Makefile
@@ -20,7 +20,7 @@ MAINTAINER= gj@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.3:${PORTSDIR}/graphics/png
+ png.4:${PORTSDIR}/graphics/png
USE_GMAKE= yes
STRIP=
diff --git a/editors/xemacs21/Makefile b/editors/xemacs21/Makefile
index 1021317862f5..b7787ce26853 100644
--- a/editors/xemacs21/Makefile
+++ b/editors/xemacs21/Makefile
@@ -20,7 +20,7 @@ MAINTAINER?= gj@FreeBSD.org
RUN_DEPENDS+= ${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages
LIB_DEPENDS+= Xpm.4:${PORTSDIR}/graphics/xpm \
jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
XEMACS_REL= 21.1
diff --git a/games/gltron/Makefile b/games/gltron/Makefile
index dc555c8f0ddd..7dcbe0ace7b2 100644
--- a/games/gltron/Makefile
+++ b/games/gltron/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
glut.3:${PORTSDIR}/graphics/Mesa3 \
- png.3:${PORTSDIR}/graphics/png
+ png.4:${PORTSDIR}/graphics/png
.if defined(NO_SOUND)
SOUND=""
diff --git a/games/gracer/Makefile b/games/gracer/Makefile
index bcb8ee4a6977..943308beb8ee 100644
--- a/games/gracer/Makefile
+++ b/games/gracer/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= nox@jelal.kn-bremen.de
BUILD_DEPENDS= ${X11BASE}/lib/libsl.a:${PORTSDIR}/x11-toolkits/plib
LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 \
ungif.5:${PORTSDIR}/graphics/libungif \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
tcl82.1:${PORTSDIR}/lang/tcl82
diff --git a/graphics/EZWGL/Makefile b/graphics/EZWGL/Makefile
index 0b4d65fd474e..d9f8d3f17728 100644
--- a/graphics/EZWGL/Makefile
+++ b/graphics/EZWGL/Makefile
@@ -14,7 +14,7 @@ DISTFILES= ${DISTNAME}-demo.tgz ${DISTNAME}-doc.tgz ${DISTNAME}-src.tgz
MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
- png.3:${PORTSDIR}/graphics/png
+ png.4:${PORTSDIR}/graphics/png
USE_X_PREFIX= yes
INSTALLS_SHLIB= yes
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 3921b280adb9..57694a455b40 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -22,7 +22,7 @@ MAINTAINER= jseger@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
df.1:${PORTSDIR}/graphics/hdf \
tiff.4:${PORTSDIR}/graphics/tiff \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
jbig.1:${PORTSDIR}/graphics/jbigkit \
ttf.4:${PORTSDIR}/print/freetype
diff --git a/graphics/dc20ctrl/Makefile b/graphics/dc20ctrl/Makefile
index c753b02348af..4e4ed024c21e 100644
--- a/graphics/dc20ctrl/Makefile
+++ b/graphics/dc20ctrl/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
- png.3:${PORTSDIR}/graphics/png
+ png.4:${PORTSDIR}/graphics/png
MAKE_ARGS= -DUSE_JPEG -DUSE_TIFF -DUSE_PNG
diff --git a/graphics/enfle/Makefile b/graphics/enfle/Makefile
index b2f08dd217aa..c7fdbacdfbd0 100644
--- a/graphics/enfle/Makefile
+++ b/graphics/enfle/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://enfle.fennel.org/ \
MAINTAINER= samy@goldmoon.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
bz2.1:${PORTSDIR}/archivers/bzip2 \
arc.1:${PORTSDIR}/archivers/libarc
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index e6f749684217..8d57c4be5dde 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.boutell.com/gd/http/ \
MAINTAINER= billf@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg
.if defined(WITH_X11)
LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype \
diff --git a/graphics/gd1/Makefile b/graphics/gd1/Makefile
index e6f749684217..8d57c4be5dde 100644
--- a/graphics/gd1/Makefile
+++ b/graphics/gd1/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.boutell.com/gd/http/ \
MAINTAINER= billf@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg
.if defined(WITH_X11)
LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype \
diff --git a/graphics/gd2/Makefile b/graphics/gd2/Makefile
index e6f749684217..8d57c4be5dde 100644
--- a/graphics/gd2/Makefile
+++ b/graphics/gd2/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.boutell.com/gd/http/ \
MAINTAINER= billf@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg
.if defined(WITH_X11)
LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype \
diff --git a/graphics/gif2png/Makefile b/graphics/gif2png/Makefile
index fba95501ce8b..fdf1716f552c 100644
--- a/graphics/gif2png/Makefile
+++ b/graphics/gif2png/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.tuxedo.org/~esr/gif2png/
MAINTAINER= saper@system.pl
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png
RUN_DEPENDS= python:${PORTSDIR}/lang/python
GNU_CONFIGURE= yes
diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 3924ad384690..a6d0dd83e6c3 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
jpeg.9:${PORTSDIR}/graphics/jpeg \
gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
mpeg.1:${PORTSDIR}/graphics/mpeg-lib \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 3924ad384690..a6d0dd83e6c3 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
jpeg.9:${PORTSDIR}/graphics/jpeg \
gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
mpeg.1:${PORTSDIR}/graphics/mpeg-lib \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index 3924ad384690..a6d0dd83e6c3 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
jpeg.9:${PORTSDIR}/graphics/jpeg \
gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
mpeg.1:${PORTSDIR}/graphics/mpeg-lib \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 3924ad384690..a6d0dd83e6c3 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
jpeg.9:${PORTSDIR}/graphics/jpeg \
gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
mpeg.1:${PORTSDIR}/graphics/mpeg-lib \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index 3924ad384690..a6d0dd83e6c3 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
jpeg.9:${PORTSDIR}/graphics/jpeg \
gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
mpeg.1:${PORTSDIR}/graphics/mpeg-lib \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 3924ad384690..a6d0dd83e6c3 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
jpeg.9:${PORTSDIR}/graphics/jpeg \
gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
mpeg.1:${PORTSDIR}/graphics/mpeg-lib \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile
index b3a696962062..cdd92ad5b079 100644
--- a/graphics/gtksee/Makefile
+++ b/graphics/gtksee/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= dirk@FreeBSD.org
LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
RUN_DEPENDS= bzip:${PORTSDIR}/archivers/bzip \
bzip2:${PORTSDIR}/archivers/bzip2
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 74b6503703d6..f108ba488e84 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= stable/sources/imlib
MAINTAINER= vanilla@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
ungif.5:${PORTSDIR}/graphics/libungif \
gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile
index 74b6503703d6..f108ba488e84 100644
--- a/graphics/imlib2-tmp/Makefile
+++ b/graphics/imlib2-tmp/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= stable/sources/imlib
MAINTAINER= vanilla@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
ungif.5:${PORTSDIR}/graphics/libungif \
gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 74b6503703d6..f108ba488e84 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= stable/sources/imlib
MAINTAINER= vanilla@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
ungif.5:${PORTSDIR}/graphics/libungif \
gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
diff --git a/graphics/libimg/Makefile b/graphics/libimg/Makefile
index cc3c903abdc9..6453397dfd67 100644
--- a/graphics/libimg/Makefile
+++ b/graphics/libimg/Makefile
@@ -14,7 +14,7 @@ DISTNAME= img${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index 57f9d6d7259b..94089979c761 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.csn.ul.ie/~caolan/publink/libwmf/
MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
ttf.4:${PORTSDIR}/print/freetype
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index cfb7b52dddd4..a9100cc7a444 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.3:${PORTSDIR}/graphics/png
+ png.4:${PORTSDIR}/graphics/png
USE_GMAKE= yes
MAKEFILE= GNUmakefile
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 350a4baffb47..1a8b1a2e4fc2 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -22,8 +22,12 @@ PATCH_SITES= ftp://ftp.libpng.org/pub/png/src/
MAINTAINER= ache@FreeBSD.org
INSTALLS_SHLIB= yes
+SHLIB_VER= 4
-MAN3= libpng.3 libpngpf.3
+MAKE_ENV= SHLIB_VER="${SHLIB_VER}"
+PLIST_SUB= SHLIB_VER="${SHLIB_VER}"
+
+MAN3= libpng.4 libpngpf.3
MAN5= png.5
do-configure:
diff --git a/graphics/png/files/patch-aa b/graphics/png/files/patch-aa
index d7002498835e..566d7e34121c 100644
--- a/graphics/png/files/patch-aa
+++ b/graphics/png/files/patch-aa
@@ -1,5 +1,5 @@
---- scripts/makefile.std.orig Fri Jul 31 23:15:22 1998
-+++ scripts/makefile.std Sat Jan 23 14:08:51 1999
+--- scripts/makefile.std.orig Thu Dec 9 01:44:40 1999
++++ scripts/makefile.std Tue Jul 4 09:16:46 2000
@@ -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
@@ -8,7 +8,7 @@
+# have to change it.
+# I bump PNGMAJ to 3, because imlib can't work with png 1.0.2.
+# I should bump PNGMAJ for ports depend.
-+PNGMAJ = 3
++PNGMAJ = $(SHLIB_VER)
+.if (${PORTOBJFORMAT} == "elf")
+PNGVER = $(PNGMAJ)
+.else
diff --git a/graphics/png/pkg-plist b/graphics/png/pkg-plist
index 0106ac62a87c..6ee9f0ba0b3b 100644
--- a/graphics/png/pkg-plist
+++ b/graphics/png/pkg-plist
@@ -1,6 +1,6 @@
include/png.h
include/pngconf.h
lib/libpng.a
-lib/libpng.so.3
+lib/libpng.so.%%SHLIB_VER%%
@exec ln -sf %f %B/libpng.so
@unexec rm -f %B/libpng.so
diff --git a/graphics/png2html/Makefile b/graphics/png2html/Makefile
index b2c66f4f67e1..2ece6f1b1537 100644
--- a/graphics/png2html/Makefile
+++ b/graphics/png2html/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://www.engr.mun.ca/~holden/
MAINTAINER= jedgar@fxp.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
gd.1:${PORTSDIR}/graphics/gd
do-configure:
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index 447fa3db7838..38eccdd660b9 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -17,7 +17,7 @@ DISTFILES= povuni_s.tgz povuni_d.tgz
MAINTAINER= kris@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png
DIST_SUBDIR= povray30
diff --git a/graphics/povray31/Makefile b/graphics/povray31/Makefile
index e3572e21fa60..e78b9200faa1 100644
--- a/graphics/povray31/Makefile
+++ b/graphics/povray31/Makefile
@@ -17,7 +17,7 @@ DISTFILES= povuni_s.tgz povuni_d.tgz
MAINTAINER= olli@fromme.com
#BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png
DIST_SUBDIR= povray31
diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile
index 447fa3db7838..38eccdd660b9 100644
--- a/graphics/povray36/Makefile
+++ b/graphics/povray36/Makefile
@@ -17,7 +17,7 @@ DISTFILES= povuni_s.tgz povuni_d.tgz
MAINTAINER= kris@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png
DIST_SUBDIR= povray30
diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index 447fa3db7838..38eccdd660b9 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -17,7 +17,7 @@ DISTFILES= povuni_s.tgz povuni_d.tgz
MAINTAINER= kris@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png
DIST_SUBDIR= povray30
diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile
index ddadd076af10..de90b0015f60 100644
--- a/graphics/xaos/Makefile
+++ b/graphics/xaos/Makefile
@@ -16,7 +16,7 @@ DISTNAME= XaoS-${PORTVERSION}
MAINTAINER= jkoshy@freebsd.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png
USE_XLIB= yes
diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile
index 4eb4909d7faa..a980ae1afa48 100644
--- a/graphics/xli/Makefile
+++ b/graphics/xli/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= applications
MAINTAINER= jkoshy@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg
USE_IMAKE= yes
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index e842cef35a88..2c586e63b073 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -15,7 +15,7 @@ MAINTAINER= jseger@FreeBSD.org
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
Xpm.4:${PORTSDIR}/graphics/xpm \
- png.3:${PORTSDIR}/graphics/png
+ png.4:${PORTSDIR}/graphics/png
WRKSRC= ${WRKDIR}/xpaint
USE_IMAKE= yes
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 55c39d498bef..a8c686f36469 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
sane.1:${PORTSDIR}/graphics/sane \
jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
- png.3:${PORTSDIR}/graphics/png
+ png.4:${PORTSDIR}/graphics/png
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index f7610163e256..2280b6a6e41e 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -27,7 +27,7 @@ MAINTAINER?= shige@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
- png.3:${PORTSDIR}/graphics/png
+ png.4:${PORTSDIR}/graphics/png
USE_IMAKE= yes
.if !defined(NOMAN)
diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index abe1edbde964..6e57094e952a 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= xaa@xaa.iae.nl
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
ungif.5:${PORTSDIR}/graphics/libungif \
- png.3:${PORTSDIR}/graphics/png
+ png.4:${PORTSDIR}/graphics/png
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/math/gnuplot+/Makefile b/math/gnuplot+/Makefile
index 89d527a028aa..25d3fe932be9 100644
--- a/math/gnuplot+/Makefile
+++ b/math/gnuplot+/Makefile
@@ -19,7 +19,7 @@ EXTRACT_ONLY= gnuplot-3.7.1.tar.gz
MAINTAINER= nakaji@tutrp.tut.ac.jp
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
VFlib2.24:${PORTSDIR}/japanese/vflib
.if defined(WITH_JP)
BUILD_DEPENDS= ${LOCALBASE}/lib/libgd.a:${PORTSDIR}/japanese/gd \
diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index 1fcb0b02b222..c3325453607e 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= ftp://ftp.gnuplot.vt.edu/pub/gnuplot/
MAINTAINER= chuckr@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
gd.1:${PORTSDIR}/graphics/gd
USE_XLIB= yes
diff --git a/math/grace/Makefile b/math/grace/Makefile
index a7e30a3bd052..dc955d003df2 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -29,7 +29,7 @@ LIB_DEPENDS= Xbae.7:${PORTSDIR}/x11-toolkits/xbae \
pdf.2:${PORTSDIR}/print/pdflib \
tiff.4:${PORTSDIR}/graphics/tiff \
jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
t1.1:${PORTSDIR}/devel/t1lib
MAN1= grace.1 xmgrace.1 gracebat.1 grconvert.1
diff --git a/misc/alevt/Makefile b/misc/alevt/Makefile
index 9536522c8099..a785c2df1887 100644
--- a/misc/alevt/Makefile
+++ b/misc/alevt/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= apps/video
MAINTAINER= roger@freebsd.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile
index 7d6f118b59fb..f081443f5db6 100644
--- a/misc/magicpoint/Makefile
+++ b/misc/magicpoint/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.mew.org/pub/MagicPoint/
MAINTAINER?= mita@jp.FreeBSD.org
LIB_DEPENDS+= ttf.4:${PORTSDIR}/print/freetype \
- png.3:${PORTSDIR}/graphics/png
+ png.4:${PORTSDIR}/graphics/png
USE_IMAKE= yes
GNU_CONFIGURE= yes
diff --git a/misc/videotext/Makefile b/misc/videotext/Makefile
index 0e52d0e0dabf..fc5a66b19fca 100644
--- a/misc/videotext/Makefile
+++ b/misc/videotext/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://elektra.e-technik.uni-ulm.de/~mbuck/download/
MAINTAINER= roger@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
xview.3:${PORTSDIR}/x11-toolkits/xview
USE_X_PREFIX= yes
diff --git a/news/knews/Makefile b/news/knews/Makefile
index 5de45f376e4d..7413e7b7f049 100644
--- a/news/knews/Makefile
+++ b/news/knews/Makefile
@@ -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.4:${PORTSDIR}/graphics/png
# compface:${PORTSDIR}/mail/faces
RUN_DEPENDS= newsp:${PORTSDIR}/print/mp-letter
diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index f6cf0bec3910..dd19d26b28b0 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -21,7 +21,7 @@ MAINTAINER= andreas@FreeBSD.org
Y2K= http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
BUILD_DEPENDS= /nonexistent:${PORTSDIR}/graphics/jpeg:extract
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png
PLIST_SUB= GS_VERSION=${PORTVERSION}
USE_XLIB= yes
diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index ea5301fc155b..3b009132e9fc 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -21,7 +21,7 @@ Y2K= http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
BUILD_DEPENDS= /nonexistent:${PORTSDIR}/graphics/jpeg:extract \
/nonexistent:${PORTSDIR}/graphics/png:extract \
unzip:${PORTSDIR}/archivers/unzip
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png
USE_XLIB= yes
EXTRACT_ONLY= ${GS_SOURCES}
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index f6cf0bec3910..dd19d26b28b0 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -21,7 +21,7 @@ MAINTAINER= andreas@FreeBSD.org
Y2K= http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
BUILD_DEPENDS= /nonexistent:${PORTSDIR}/graphics/jpeg:extract
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png
PLIST_SUB= GS_VERSION=${PORTVERSION}
USE_XLIB= yes
diff --git a/print/ghostscript5/Makefile b/print/ghostscript5/Makefile
index 7e2a86c4b47a..92e6e52b858b 100644
--- a/print/ghostscript5/Makefile
+++ b/print/ghostscript5/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= ports@FreeBSD.org
RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/Fontmap:${PORTSDIR}/print/gsfonts
BUILD_DEPENDS= /nonexistent:${PORTSDIR}/graphics/jpeg:extract \
/nonexistent:${PORTSDIR}/graphics/png:extract
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png
USE_XLIB= yes
EXTRACT_ONLY= ${GS_SOURCES} ${PCL3_DRV}
diff --git a/print/ghostscript55/Makefile b/print/ghostscript55/Makefile
index ea5301fc155b..3b009132e9fc 100644
--- a/print/ghostscript55/Makefile
+++ b/print/ghostscript55/Makefile
@@ -21,7 +21,7 @@ Y2K= http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
BUILD_DEPENDS= /nonexistent:${PORTSDIR}/graphics/jpeg:extract \
/nonexistent:${PORTSDIR}/graphics/png:extract \
unzip:${PORTSDIR}/archivers/unzip
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png
USE_XLIB= yes
EXTRACT_ONLY= ${GS_SOURCES}
diff --git a/print/ghostscript6/Makefile b/print/ghostscript6/Makefile
index f6cf0bec3910..dd19d26b28b0 100644
--- a/print/ghostscript6/Makefile
+++ b/print/ghostscript6/Makefile
@@ -21,7 +21,7 @@ MAINTAINER= andreas@FreeBSD.org
Y2K= http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
BUILD_DEPENDS= /nonexistent:${PORTSDIR}/graphics/jpeg:extract
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png
PLIST_SUB= GS_VERSION=${PORTVERSION}
USE_XLIB= yes
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index ea5301fc155b..3b009132e9fc 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -21,7 +21,7 @@ Y2K= http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
BUILD_DEPENDS= /nonexistent:${PORTSDIR}/graphics/jpeg:extract \
/nonexistent:${PORTSDIR}/graphics/png:extract \
unzip:${PORTSDIR}/archivers/unzip
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png
USE_XLIB= yes
EXTRACT_ONLY= ${GS_SOURCES}
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index f6cf0bec3910..dd19d26b28b0 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -21,7 +21,7 @@ MAINTAINER= andreas@FreeBSD.org
Y2K= http://www.cs.wisc.edu/~ghost/aladdin/y2k.html
BUILD_DEPENDS= /nonexistent:${PORTSDIR}/graphics/jpeg:extract
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png
PLIST_SUB= GS_VERSION=${PORTVERSION}
USE_XLIB= yes
diff --git a/print/hp2xx/Makefile b/print/hp2xx/Makefile
index 7cc601bff430..91807ab0a0f8 100644
--- a/print/hp2xx/Makefile
+++ b/print/hp2xx/Makefile
@@ -14,7 +14,7 @@ DISTNAME= hp2xx-3.20-png
MAINTAINER= Lars.Koeller@Uni-Bielefeld.DE
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png
WRKSRC= ${WRKDIR}/${DISTNAME}/sources
USE_XLIB= yes
diff --git a/print/jadetex/Makefile b/print/jadetex/Makefile
index d3d14c59ac39..e42a37320258 100644
--- a/print/jadetex/Makefile
+++ b/print/jadetex/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.tug.org/applications/jadetex/
MAINTAINER= kelly@ad1440.net
BUILD_DEPENDS= tex:${PORTSDIR}/print/teTeX
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png
RUN_DEPENDS= tex:${PORTSDIR}/print/teTeX
MAKE_ENV= TEXMFCNF=${FILESDIR}:${PREFIX}/share/texmf/web2c
diff --git a/print/teTeX-base/Makefile b/print/teTeX-base/Makefile
index 74cd9131f6b7..7d33f1c5ed7e 100644
--- a/print/teTeX-base/Makefile
+++ b/print/teTeX-base/Makefile
@@ -15,7 +15,7 @@ DISTFILES= ${TETEX_SRC} ${TETEX_TEXMF}
MAINTAINER= br@netland.inka.de
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
wwwcore.1:${PORTSDIR}/www/libwww
USE_XLIB= yes
diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile
index 74cd9131f6b7..7d33f1c5ed7e 100644
--- a/print/teTeX/Makefile
+++ b/print/teTeX/Makefile
@@ -15,7 +15,7 @@ DISTFILES= ${TETEX_SRC} ${TETEX_TEXMF}
MAINTAINER= br@netland.inka.de
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
wwwcore.1:${PORTSDIR}/www/libwww
USE_XLIB= yes
diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile
index d072a945f04c..6143d62c2fc3 100644
--- a/www/Mosaic/Makefile
+++ b/www/Mosaic/Makefile
@@ -14,7 +14,7 @@ DISTNAME= Mosaic-src-2.7b5
MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
Xpm.4:${PORTSDIR}/graphics/xpm \
REQUIRES_MOTIF= yes
diff --git a/www/arena/Makefile b/www/arena/Makefile
index 344fd70faa00..150d206566f4 100644
--- a/www/arena/Makefile
+++ b/www/arena/Makefile
@@ -14,7 +14,7 @@ DISTNAME= arena-CJK-beta3a
MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+= png.3:${PORTSDIR}/graphics/png
+LIB_DEPENDS+= png.4:${PORTSDIR}/graphics/png
USE_XLIB= yes
WRKSRC= ${WRKDIR}/WWW
diff --git a/www/chimera2/Makefile b/www/chimera2/Makefile
index 86e7232c2a52..7a7b09b2ff86 100644
--- a/www/chimera2/Makefile
+++ b/www/chimera2/Makefile
@@ -15,7 +15,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.4:${PORTSDIR}/graphics/png
MAN1= chimera.1
USE_IMAKE= yes
diff --git a/x11-toolkits/fox-devel/Makefile b/x11-toolkits/fox-devel/Makefile
index d51436a03386..9377caa92da2 100644
--- a/x11-toolkits/fox-devel/Makefile
+++ b/x11-toolkits/fox-devel/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.cfdrc.com/pub/FOX/ \
MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
GL.14:${PORTSDIR}/graphics/Mesa3
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/fox/Makefile b/x11-toolkits/fox/Makefile
index d51436a03386..9377caa92da2 100644
--- a/x11-toolkits/fox/Makefile
+++ b/x11-toolkits/fox/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.cfdrc.com/pub/FOX/ \
MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
GL.14:${PORTSDIR}/graphics/Mesa3
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/fox10/Makefile b/x11-toolkits/fox10/Makefile
index d51436a03386..9377caa92da2 100644
--- a/x11-toolkits/fox10/Makefile
+++ b/x11-toolkits/fox10/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.cfdrc.com/pub/FOX/ \
MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
GL.14:${PORTSDIR}/graphics/Mesa3
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index d51436a03386..9377caa92da2 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ftp://ftp.cfdrc.com/pub/FOX/ \
MAINTAINER= ports@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
GL.14:${PORTSDIR}/graphics/Mesa3
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/jx/Makefile b/x11-toolkits/jx/Makefile
index 9daf6b608d7d..3b455654ffbb 100644
--- a/x11-toolkits/jx/Makefile
+++ b/x11-toolkits/jx/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}_source-${PORTVERSION}
MAINTAINER= lioux@linf.unb.br
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
Xpm.4:${PORTSDIR}/graphics/xpm
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-toolkits/qt22/Makefile b/x11-toolkits/qt22/Makefile
index 86e07490d0d7..ec167dc2ee44 100644
--- a/x11-toolkits/qt22/Makefile
+++ b/x11-toolkits/qt22/Makefile
@@ -13,7 +13,7 @@ DISTNAME= ${PORTNAME}-x11-${PORTVERSION}
MAINTAINER= imura@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
GL.14:${PORTSDIR}/graphics/Mesa3
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index 86e07490d0d7..ec167dc2ee44 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -13,7 +13,7 @@ DISTNAME= ${PORTNAME}-x11-${PORTVERSION}
MAINTAINER= imura@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
GL.14:${PORTSDIR}/graphics/Mesa3
diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index 86e07490d0d7..ec167dc2ee44 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -13,7 +13,7 @@ DISTNAME= ${PORTNAME}-x11-${PORTVERSION}
MAINTAINER= imura@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
GL.14:${PORTSDIR}/graphics/Mesa3
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index 86e07490d0d7..ec167dc2ee44 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -13,7 +13,7 @@ DISTNAME= ${PORTNAME}-x11-${PORTVERSION}
MAINTAINER= imura@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
GL.14:${PORTSDIR}/graphics/Mesa3
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index 86e07490d0d7..ec167dc2ee44 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -13,7 +13,7 @@ DISTNAME= ${PORTNAME}-x11-${PORTVERSION}
MAINTAINER= imura@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
GL.14:${PORTSDIR}/graphics/Mesa3
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 86e07490d0d7..ec167dc2ee44 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -13,7 +13,7 @@ DISTNAME= ${PORTNAME}-x11-${PORTVERSION}
MAINTAINER= imura@FreeBSD.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
GL.14:${PORTSDIR}/graphics/Mesa3
diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile
index e48aa57be846..d7f8d84b3276 100644
--- a/x11-toolkits/xmhtml/Makefile
+++ b/x11-toolkits/xmhtml/Makefile
@@ -17,7 +17,7 @@ PATCHFILES= patch-102697.gz
MAINTAINER= thepish@freebsd.org
-LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.4:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg
REQUIRES_MOTIF= yes
diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index 82bb991fb860..247d6140f14e 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -15,7 +15,7 @@ DISTNAME= AfterStep-${PORTVERSION}
MAINTAINER= dima@Chg.ru
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg
NO_LATEST_LINK= yes
diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index 6d38508e32bf..5ef3ce2a732d 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -17,7 +17,7 @@ MAINTAINER= mac@jp.freebsd.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
ungif.5:${PORTSDIR}/graphics/libungif \
jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
PropList.2:${PORTSDIR}/devel/libPropList \
intl.1:${PORTSDIR}/devel/gettext
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 668320fd17fe..989bc43edfd2 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -19,7 +19,7 @@ MAINTAINER= sobomax@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
ungif.5:${PORTSDIR}/graphics/libungif \
jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
PropList.2:${PORTSDIR}/devel/libPropList
diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index e3140f980579..b08f6a0ba5a9 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
Xpm.4:${PORTSDIR}/graphics/xpm \
jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
wraster.3:${PORTSDIR}/x11-wm/windowmaker \
wmfun.0:${PORTSDIR}/x11-wm/windowmaker
BUILD_DEPENDS= bunzip2:${PORTSDIR}/archivers/bzip2 \
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index 56aa3a8a4dd6..ebb52e800fdd 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= jim@FreeBSD.org
LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \
jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.3:${PORTSDIR}/graphics/png
+ png.4:${PORTSDIR}/graphics/png
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile
index 7056db9f4317..d990868aafc6 100644
--- a/x11/dgs/Makefile
+++ b/x11/dgs/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= dgs
MAINTAINER= nakai@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
glib12.3:${PORTSDIR}/devel/glib12
BUILD_DEPENDS= gs:${PORTSDIR}/print/ghostscript55
diff --git a/x11/kdelibs11/Makefile b/x11/kdelibs11/Makefile
index 1db03f69a40d..fbcf1074ffe8 100644
--- a/x11/kdelibs11/Makefile
+++ b/x11/kdelibs11/Makefile
@@ -15,7 +15,7 @@ DISTNAME= kdelibs-1.1.2
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
LIBVER= 3
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 37cf27b99975..4ccdf6e76b82 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= unstable/distribution/tar/src
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
kde-qt-addon.4:${PORTSDIR}/x11-toolkits/kde-qt-addon
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 37cf27b99975..4ccdf6e76b82 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= unstable/distribution/tar/src
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
kde-qt-addon.4:${PORTSDIR}/x11-toolkits/kde-qt-addon
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 37cf27b99975..4ccdf6e76b82 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= unstable/distribution/tar/src
MAINTAINER= will@FreeBSD.org
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
- png.3:${PORTSDIR}/graphics/png \
+ png.4:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
kde-qt-addon.4:${PORTSDIR}/x11-toolkits/kde-qt-addon