- update png to 1.5.10

34 files changed, 93 insertions, 26 deletions

diff --git a/net-mgmt/argus-monitor/Makefile b/net-mgmt/argus-monitor/Makefile
index 478436ada764..9a74f07de190 100644
--- a/net-mgmt/argus-monitor/Makefile
+++ b/net-mgmt/argus-monitor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	argus-monitor
 PORTVERSION=	20100109
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.tcp4me.com/code/argus-archive/
 DISTNAME=	argus-dev-${PORTVERSION}
diff --git a/net-mgmt/bandwidthd/Makefile b/net-mgmt/bandwidthd/Makefile
index 5e35d380a1c8..f1851388e2b3 100644
--- a/net-mgmt/bandwidthd/Makefile
+++ b/net-mgmt/bandwidthd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bandwidthd
 PORTVERSION=	2.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
 EXTRACT_SUFX=	.tgz
diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile
index 6806d9e56456..d315931560d2 100644
--- a/net-mgmt/collectd/Makefile
+++ b/net-mgmt/collectd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	collectd
 PORTVERSION=	4.10.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
 
diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile
index 1787b2740eb0..7f220939eb3c 100644
--- a/net-mgmt/collectd5/Makefile
+++ b/net-mgmt/collectd5/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	collectd
 PORTVERSION=	5.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
 
diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index 0b314d3cfecd..bc76928950da 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	etherape
 PORTVERSION=	0.9.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt gnome
 MASTER_SITES=	SF
 
diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile
index 8590b2c88dfc..21bafd4bfd2c 100644
--- a/net-mgmt/ettercap/Makefile
+++ b/net-mgmt/ettercap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ettercap
 PORTVERSION=	0.7.4.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}-Lazarus \
diff --git a/net-mgmt/flowviewer/Makefile b/net-mgmt/flowviewer/Makefile
index a1b5b06e7e2c..d4ec2367cb5c 100644
--- a/net-mgmt/flowviewer/Makefile
+++ b/net-mgmt/flowviewer/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	flowviewer
 PORTVERSION=	3.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://ensight.eos.nasa.gov/FlowViewer/
 DISTNAME=	FlowViewer_${DISTVERSION}
diff --git a/net-mgmt/icinga/Makefile b/net-mgmt/icinga/Makefile
index e3948b3f5c79..f183967d90ff 100644
--- a/net-mgmt/icinga/Makefile
+++ b/net-mgmt/icinga/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	icinga
 PORTVERSION=	1.7.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
 
diff --git a/net-mgmt/lanmap/Makefile b/net-mgmt/lanmap/Makefile
index f952054a0b4e..c1216bf980dc 100644
--- a/net-mgmt/lanmap/Makefile
+++ b/net-mgmt/lanmap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lanmap
 DISTVERSION=	2006-03-07-rev81
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.parseerror.com/lanmap/rev/
 
diff --git a/net-mgmt/mbrowse/Makefile b/net-mgmt/mbrowse/Makefile
index 673bc578d267..bbc7a3bd2409 100644
--- a/net-mgmt/mbrowse/Makefile
+++ b/net-mgmt/mbrowse/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mbrowse
 PORTVERSION=	0.4.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}
 
diff --git a/net-mgmt/mrtg-ping-probe/Makefile b/net-mgmt/mrtg-ping-probe/Makefile
index 5b3928ac8f25..40d76fe31285 100644
--- a/net-mgmt/mrtg-ping-probe/Makefile
+++ b/net-mgmt/mrtg-ping-probe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mrtg-ping-probe
 PORTVERSION=	2.2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.pwo.de/pub/pwo/mrtg/${PORTNAME}/
 
diff --git a/net-mgmt/mrtg/Makefile b/net-mgmt/mrtg/Makefile
index 01fc40a37ce6..54a8b58cf98f 100644
--- a/net-mgmt/mrtg/Makefile
+++ b/net-mgmt/mrtg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mrtg
 PORTVERSION=	2.17.4
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	http://oss.oetiker.ch/mrtg/pub/ \
diff --git a/net-mgmt/nagiosagent/Makefile b/net-mgmt/nagiosagent/Makefile
index 0966bbe42db8..00c3d36f45a2 100644
--- a/net-mgmt/nagiosagent/Makefile
+++ b/net-mgmt/nagiosagent/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	NagiosAgent
 PORTVERSION=	1.2.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.netpatch.ru/projects/nagiosagent/ \
 		http://www.netpatch.ru/projects/nagiosagent/old/
diff --git a/net-mgmt/nagiosgrapher/Makefile b/net-mgmt/nagiosgrapher/Makefile
index 3eab0569b058..58166a74907a 100644
--- a/net-mgmt/nagiosgrapher/Makefile
+++ b/net-mgmt/nagiosgrapher/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nagiosgrapher
 PORTVERSION=	1.7.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/NagiosGrapher-${PORTVERSION}/ \
 		https://www.nagiosforge.org/gf/download/frsrelease/135/285/
diff --git a/net-mgmt/nagstamon/Makefile b/net-mgmt/nagstamon/Makefile
index f0c9ad3219d5..3bd7f247a28c 100644
--- a/net-mgmt/nagstamon/Makefile
+++ b/net-mgmt/nagstamon/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nagstamon
 PORTVERSION=	0.9.9
+PORTREVISION=	1
 CATEGORIES=	net-mgmt python
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION} \
 		CRITICAL/.
diff --git a/net-mgmt/ndoutils/Makefile b/net-mgmt/ndoutils/Makefile
index 3e41e2df2d61..d7c4599bced6 100644
--- a/net-mgmt/ndoutils/Makefile
+++ b/net-mgmt/ndoutils/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ndoutils
 PORTVERSION=	1.4b8
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/nagios/${PORTNAME}-1.x/${PORTNAME}-${PORTVERSION}
 
diff --git a/net-mgmt/nettop/Makefile b/net-mgmt/nettop/Makefile
index c83f53a8c81b..e85496f916d6 100644
--- a/net-mgmt/nettop/Makefile
+++ b/net-mgmt/nettop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nettop
 PORTVERSION=	0.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://srparish.net/scripts/
 
diff --git a/net-mgmt/nfdump-devel/Makefile b/net-mgmt/nfdump-devel/Makefile
index 6e133942a882..d00e4c74ba31 100644
--- a/net-mgmt/nfdump-devel/Makefile
+++ b/net-mgmt/nfdump-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nfdump-devel
 PORTVERSION=	20070808
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/nfdump/snapshot/nfdump-snapshot-${PORTVERSION}
 DISTNAME=	nfdump-snapshot-${PORTVERSION}
diff --git a/net-mgmt/nfdump/Makefile b/net-mgmt/nfdump/Makefile
index 68480f9fa15b..bd0c5d0b3bd2 100644
--- a/net-mgmt/nfdump/Makefile
+++ b/net-mgmt/nfdump/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nfdump
 PORTVERSION=	1.6.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION}
 
diff --git a/net-mgmt/nsca/Makefile b/net-mgmt/nsca/Makefile
index 8005a9fce357..892beced488d 100644
--- a/net-mgmt/nsca/Makefile
+++ b/net-mgmt/nsca/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	nsca
 PORTVERSION=	2.9.1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/nagios/nsca-2.x/nsca-${PORTVERSION}
 
diff --git a/net-mgmt/p5-FusionInventory-Agent/Makefile b/net-mgmt/p5-FusionInventory-Agent/Makefile
index 1e0d0f1f4133..f972fecc7b22 100644
--- a/net-mgmt/p5-FusionInventory-Agent/Makefile
+++ b/net-mgmt/p5-FusionInventory-Agent/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	FusionInventory-Agent
 PORTVERSION=	2.1.13
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FUSINV
diff --git a/net-mgmt/qkismet/Makefile b/net-mgmt/qkismet/Makefile
index 96c78885c899..aadd29a9bee0 100644
--- a/net-mgmt/qkismet/Makefile
+++ b/net-mgmt/qkismet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qkismet
 PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/${PORTNAME}/qKismet/${PORTVERSION}
 
diff --git a/net-mgmt/rrdbot/Makefile b/net-mgmt/rrdbot/Makefile
index e335ec18dafe..858b40d4d8e4 100644
--- a/net-mgmt/rrdbot/Makefile
+++ b/net-mgmt/rrdbot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rrdbot
 PORTVERSION=	0.9.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://thewalter.net/stef/software/rrdbot/
 
diff --git a/net-mgmt/smokeping/Makefile b/net-mgmt/smokeping/Makefile
index dd01752659c8..c9d252590a70 100644
--- a/net-mgmt/smokeping/Makefile
+++ b/net-mgmt/smokeping/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	smokeping
 PORTVERSION=	2.6.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	http://oss.oetiker.ch/smokeping/pub/ \
 		http://smokeping.cs.pu.edu.tw/pub/
diff --git a/net-mgmt/spectools/Makefile b/net-mgmt/spectools/Makefile
index 04952c696d76..8c10a9ef9419 100644
--- a/net-mgmt/spectools/Makefile
+++ b/net-mgmt/spectools/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	spectools
 PORTVERSION=	201004.r1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.kismetwireless.net/code/ \
 		${MASTER_SITE_LOCAL}
diff --git a/net-mgmt/tork/Makefile b/net-mgmt/tork/Makefile
index 62473f48a9f9..2ffcd3b3147f 100644
--- a/net-mgmt/tork/Makefile
+++ b/net-mgmt/tork/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tork
 PORTVERSION=	0.30
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	SF/${PORTNAME}/TorK%20Source%20Tarball/TorK-${PORTVERSION}
 
diff --git a/net-mgmt/torrus/Makefile b/net-mgmt/torrus/Makefile
index 55bd3ef35a86..9383182eb200 100644
--- a/net-mgmt/torrus/Makefile
+++ b/net-mgmt/torrus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	torrus
 PORTVERSION=	2.01
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
 
diff --git a/net-mgmt/vidalia/Makefile b/net-mgmt/vidalia/Makefile
index 18f84283bee8..8c5512fa2d6b 100644
--- a/net-mgmt/vidalia/Makefile
+++ b/net-mgmt/vidalia/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vidalia
 PORTVERSION=	0.2.18
+PORTREVISION=	1
 CATEGORIES=	net-mgmt security
 MASTER_SITES=	https://archive.torproject.org/tor-package-archive/vidalia/ \
 		https://www.torproject.org/dist/vidalia/ \
diff --git a/net-mgmt/virt-viewer/Makefile b/net-mgmt/virt-viewer/Makefile
index 76ead149c053..8def7f61f45a 100644
--- a/net-mgmt/virt-viewer/Makefile
+++ b/net-mgmt/virt-viewer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	virt-viewer
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://virt-manager.org/download/sources/${PORTNAME}/
 
diff --git a/net-mgmt/wifimgr/Makefile b/net-mgmt/wifimgr/Makefile
index 15d4455bdf94..a172d7ec3c0c 100644
--- a/net-mgmt/wifimgr/Makefile
+++ b/net-mgmt/wifimgr/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wifimgr
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	net-mgmt sysutils
 MASTER_SITES=	http://opal.com/freebsd/ports/net-mgmt/wifimgr/ \
 		CRITICAL
diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile
index 4de565b832b8..f4fe5c8b2154 100644
--- a/net-mgmt/xymon-server/Makefile
+++ b/net-mgmt/xymon-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xymon
 PORTVERSION=	4.3.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	SF/xymon/Xymon/${PORTVERSION}
 PKGNAMESUFFIX=	-server${PKGNAMESUFFIX2}
@@ -16,7 +16,7 @@ MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	System for monitoring servers and networks
 
 BUILD_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
-LIB_DEPENDS=	png:${PORTSDIR}/graphics/png \
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		pcre:${PORTSDIR}/devel/pcre
 RUN_DEPENDS=	rrdtool:${PORTSDIR}/databases/rrdtool
 
diff --git a/net-mgmt/yabm/Makefile b/net-mgmt/yabm/Makefile
index 23706f8bcd12..c560c5f757fc 100644
--- a/net-mgmt/yabm/Makefile
+++ b/net-mgmt/yabm/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	yabm
 PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.shapeshifter.se/code/yabm/release/
 
 MAINTAINER=	fli@shapeshifter.se
 COMMENT=	Yet Another Bandwidth Meter, somewhat resembles the Linux bwbar
 
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 
 USE_RC_SUBR=	yes
 RC_SCRIPTS_SUB=	PREFIX=${PREFIX} RC_SUBR=/etc/rc.subr
diff --git a/net-mgmt/yabm/files/patch-Makefile b/net-mgmt/yabm/files/patch-Makefile
new file mode 100644
index 000000000000..680280badd03
--- /dev/null
+++ b/net-mgmt/yabm/files/patch-Makefile
@@ -0,0 +1,49 @@
+--- src/mylibpng/Makefile.orig	2005-04-21 18:44:48.000000000 +0200
++++ src/mylibpng/Makefile	2012-05-06 18:42:26.000000000 +0200
+@@ -1,9 +1,10 @@
+ include ../../Makefile.inc
+ 
+-CFLAGS += -I${PREFIX}/include 
++CFLAGS += -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15
+ OBJS	= mylibpng.o font.o
+ 
+ all::	${OBJS}
++	@touch done
+ 
+ clean::
+ 	@-rm ${OBJS}
+--- src/Makefile.orig	2005-04-21 18:44:48.000000000 +0200
++++ src/Makefile	2012-05-06 18:44:54.000000000 +0200
+@@ -3,9 +3,10 @@
+ DIRS		= mylibpng
+ OBJS		= yabm.o bw.o
+ 
+-all::	${DIRS} ${OBJS} 
++all::	${DIRS}/done ${OBJS}
++	@touch done
+ 
+-mylibpng: force_look
++mylibpng/done:
+ 	@cd mylibpng; ${MAKE}
+ 
+ force_look:
+--- Makefile.orig	2005-04-21 18:44:48.000000000 +0200
++++ Makefile	2012-05-06 18:44:32.000000000 +0200
+@@ -8,7 +8,7 @@
+ 
+ LINK		= -lkvm -L${PREFIX}/lib -lpng 
+ 
+-all::	${DIRS} yabm
++all::	${DIRS}/done yabm
+ 
+ install:: 
+ 	${INSTALL} -o root -m 0755 ${BIN} ${PREFIX}/bin/${BIN}
+@@ -18,7 +18,7 @@
+ 		${MYLIBPNG_OBJS} \
+ 		${OBJS} ${LINK}
+ 
+-src: force_look
++src/done: force_look
+ 	@cd src; ${MAKE}
+ 
+ force_look:
diff --git a/net-mgmt/yabm/files/patch-mylibpng.c b/net-mgmt/yabm/files/patch-mylibpng.c
new file mode 100644
index 000000000000..aff8beab5321
--- /dev/null
+++ b/net-mgmt/yabm/files/patch-mylibpng.c
@@ -0,0 +1,10 @@
+--- src/mylibpng/mylibpng.c.orig	2005-04-21 18:44:48.000000000 +0200
++++ src/mylibpng/mylibpng.c	2012-05-06 06:45:47.000000000 +0200
+@@ -35,6 +35,7 @@
+ #include <errno.h>
+ 
+ #include <png.h>
++#include <pngpriv.h>
+ 
+ #include "mylibpng.h"
+