- update png to 1.5.10

38 files changed, 51 insertions, 29 deletions

diff --git a/comms/amtterm/Makefile b/comms/amtterm/Makefile
index c637d199c655..98d4c8251d5b 100644
--- a/comms/amtterm/Makefile
+++ b/comms/amtterm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	amtterm
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	https://www.kraxel.org/releases/${PORTNAME}/
 
diff --git a/comms/cutecom/Makefile b/comms/cutecom/Makefile
index 1638382ff132..3846a2a50e8d 100644
--- a/comms/cutecom/Makefile
+++ b/comms/cutecom/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	cutecom
 PORTVERSION=	0.20.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms
 MASTER_SITES=	http://cutecom.sourceforge.net/ \
 		http://personalpages.tds.net/~jwbacon/Ports/distfiles/
diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile
index b5ce0fd6d07d..ecb24294815f 100644
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	efax-gtk
 PORTVERSION=	3.2.9
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	SF
 EXTRACT_SUFX=	.src.tgz
diff --git a/comms/efax/Makefile b/comms/efax/Makefile
index e7e9cd6f1850..f259d8404741 100644
--- a/comms/efax/Makefile
+++ b/comms/efax/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	efax-0.9a
 PORTVERSION=	001114a7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	comms
 MASTER_SITES=	http://shino.pos.to/linux/
 
diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index 86211aa8e493..ddb0f534d182 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	fldigi
 PORTVERSION=	3.21.41
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/downloads/fldigi/\
 		${MASTER_SITE_LOCAL}
diff --git a/comms/flwrap/Makefile b/comms/flwrap/Makefile
index 48201ef2d139..7719dfdfdc86 100644
--- a/comms/flwrap/Makefile
+++ b/comms/flwrap/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	flwrap
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/fldigi-distro/ \
 		${MASTER_SITE_LOCAL}
diff --git a/comms/geoid/Makefile b/comms/geoid/Makefile
index 6a9de8380f18..ba5bf7a53016 100644
--- a/comms/geoid/Makefile
+++ b/comms/geoid/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	geoid
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 DISTVERSIONSUFFIX=	.src
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/LinuxApps/ \
diff --git a/comms/ghfaxviewer/Makefile b/comms/ghfaxviewer/Makefile
index 1635111e2521..3b1d56a91334 100644
--- a/comms/ghfaxviewer/Makefile
+++ b/comms/ghfaxviewer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghfaxviewer
 PORTVERSION=	0.22.0
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	halifax
diff --git a/comms/gnocky/Makefile b/comms/gnocky/Makefile
index 4b021568cff6..8fd0c45dd19d 100644
--- a/comms/gnocky/Makefile
+++ b/comms/gnocky/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnocky
 PORTVERSION=	0.0.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms
 MASTER_SITES=	http://www.gnokii.org/download/gnocky/
 
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index 3e4938523730..5a292a67da63 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnokii
 PORTVERSION=	0.6.31
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	comms
 MASTER_SITES=	http://www.gnokii.org/download/gnokii/ \
diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile
index a2ef66a6122f..fc8c99b52847 100644
--- a/comms/gnuradio/Makefile
+++ b/comms/gnuradio/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnuradio
 PORTVERSION=	3.2.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	comms astro hamradio
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gnuradio
diff --git a/comms/gpredict/Makefile b/comms/gpredict/Makefile
index 876d7b0f3cd0..09eb31525db1 100644
--- a/comms/gpredict/Makefile
+++ b/comms/gpredict/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	gpredict
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/gpredict/Gpredict/${PORTVERSION}
 
diff --git a/comms/gpsk31/Makefile b/comms/gpsk31/Makefile
index 86573fc52cd7..ec10f5169977 100644
--- a/comms/gpsk31/Makefile
+++ b/comms/gpsk31/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	gpsk31
 PORTVERSION=	0.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.qsl.net/pg4i/download/
 
diff --git a/comms/grig/Makefile b/comms/grig/Makefile
index b44c12f5e7fb..c22d4375601b 100644
--- a/comms/grig/Makefile
+++ b/comms/grig/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	grig
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/groundstation/Grig/${PORTVERSION}
 
diff --git a/comms/gscmxx/Makefile b/comms/gscmxx/Makefile
index c36c1cedcedd..282fe905b015 100644
--- a/comms/gscmxx/Makefile
+++ b/comms/gscmxx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gscmxx
 PORTVERSION=	0.4.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	comms
 MASTER_SITES=	SF
 
diff --git a/comms/hamfax/Makefile b/comms/hamfax/Makefile
index 590ba600b16f..4c37f98b8d12 100644
--- a/comms/hamfax/Makefile
+++ b/comms/hamfax/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	hamfax
 PORTVERSION=	0.6.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	comms audio hamradio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/HamFax%20${PORTVERSION}
 DISTNAME=	HamFax-${PORTVERSION}
diff --git a/comms/hf/Makefile b/comms/hf/Makefile
index ce0b33cb4f89..4dfae2c5a8da 100644
--- a/comms/hf/Makefile
+++ b/comms/hf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	hf
 PORTVERSION=	0.8
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/${PORTNAME}term/${PORTNAME}/${PORTVERSION}
 
diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index 0bc78eb2f600..0d030c04561e 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	hylafax
 PORTVERSION=	6.0.5
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.hylafax.org/source/
 
diff --git a/comms/kallers/Makefile b/comms/kallers/Makefile
index 43716ef14a8b..c1464e35fe06 100644
--- a/comms/kallers/Makefile
+++ b/comms/kallers/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kallers
 PORTVERSION=	0.3.0
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	comms kde
 MASTER_SITES=	http://www.nadmm.com/kallers/src/
 
diff --git a/comms/kb/Makefile b/comms/kb/Makefile
index 9f1937d4dabd..c30b95ccb261 100644
--- a/comms/kb/Makefile
+++ b/comms/kb/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kb
 PORTVERSION=	8.04
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.db.net/downloads/ \
 		${MASTER_SITE_LOCAL}
diff --git a/comms/klog/Makefile b/comms/klog/Makefile
index d2283810cc24..cec6974dd400 100644
--- a/comms/klog/Makefile
+++ b/comms/klog/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	klog
 PORTVERSION=	0.4.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	comms hamradio
 MASTER_SITES=	BERLIOS
 
diff --git a/comms/kmobiletools/Makefile b/comms/kmobiletools/Makefile
index 008e918c75a8..137685c226ef 100644
--- a/comms/kmobiletools/Makefile
+++ b/comms/kmobiletools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kmobiletools
 PORTVERSION=	0.4.3.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	comms kde
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	kmobiletools
diff --git a/comms/kpsk/Makefile b/comms/kpsk/Makefile
index 18ec28b37942..9d7ea7f601af 100644
--- a/comms/kpsk/Makefile
+++ b/comms/kpsk/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	kpsk
 PORTVERSION=	1.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	comms kde hamradio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/_.tar.bz2%20files
 
diff --git a/comms/ktrack/Makefile b/comms/ktrack/Makefile
index 28f614b7392b..95bd4eb2f384 100644
--- a/comms/ktrack/Makefile
+++ b/comms/ktrack/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	ktrack
 PORTVERSION=	0.3.0r1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.3.0-rc1
 DISTNAME=	${PORTNAME}-0.3.0-rc1
diff --git a/comms/linpsk/Makefile b/comms/linpsk/Makefile
index 7a36ebc3316d..71ef4b3b36a3 100644
--- a/comms/linpsk/Makefile
+++ b/comms/linpsk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	linpsk
 PORTVERSION=	0.8.1
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
diff --git a/comms/qfaxreader/Makefile b/comms/qfaxreader/Makefile
index 27353bbc488a..2523a7c16efe 100644
--- a/comms/qfaxreader/Makefile
+++ b/comms/qfaxreader/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	qfaxreader
 DISTVERSION=	0.3.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	comms graphics print
 MASTER_SITES=	SF
 
diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile
index c5d8410a65bd..c3ad418a3a97 100644
--- a/comms/qsstv/Makefile
+++ b/comms/qsstv/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qsstv
 PORTVERSION=	6.0a
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://users.telenet.be/on4qz/snapshots/download/ \
 		${MASTER_SITE_LOCAL}
diff --git a/comms/tilp2/Makefile b/comms/tilp2/Makefile
index e104b32674f9..9a05cd544b6f 100644
--- a/comms/tilp2/Makefile
+++ b/comms/tilp2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	tilp2
 PORTVERSION=	1.16
+PORTREVISION=	1
 CATEGORIES=	comms
 MASTER_SITES=	SF/tilp/tilp2-linux/${DISTNAME}
 
diff --git a/comms/tkhylafax/Makefile b/comms/tkhylafax/Makefile
index f6cdfd2da66f..975eceeec947 100644
--- a/comms/tkhylafax/Makefile
+++ b/comms/tkhylafax/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tkhylafax
 PORTVERSION=	3.2b
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	comms tk
 MASTER_SITES=	ftp://ftp.hylafax.org/contrib/tkhylafax/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/b/beta/}
diff --git a/comms/trustedqsl/Makefile b/comms/trustedqsl/Makefile
index f76abb69cba3..c8706680d2c0 100644
--- a/comms/trustedqsl/Makefile
+++ b/comms/trustedqsl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	trustedqsl
 PORTVERSION=	1.11
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/${PORTNAME}/tqsllib/V2.0
 DISTFILES=	tqsllib-2.0.tar.gz TrustedQSL-1.11.tar.gz
diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile
index 5383e2356957..fc05b8e99959 100644
--- a/comms/xastir/Makefile
+++ b/comms/xastir/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xastir
 PORTVERSION=	2.0.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTNAME}-${PORTVERSION}
 
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	xfontsel:${PORTSDIR}/x11-fonts/xfontsel
 RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		jpeg:${PORTSDIR}/graphics/jpeg \
-		png:${PORTSDIR}/graphics/png
+		png15:${PORTSDIR}/graphics/png
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/comms/xdx/Makefile b/comms/xdx/Makefile
index 450be137adc5..6e1bc7420781 100644
--- a/comms/xdx/Makefile
+++ b/comms/xdx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xdx
 PORTVERSION=	2.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.chronos.org.uk/download/ \
 		${MASTER_SITE_LOCAL}
diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile
index 20b841268390..4a173ae5c0ae 100644
--- a/comms/xlog/Makefile
+++ b/comms/xlog/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xlog
 PORTVERSION=	2.0.5
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	${MASTER_SITE_SAVANNAH} \
 		http://www.chronos.org.uk/download/
diff --git a/comms/xmorse/Makefile b/comms/xmorse/Makefile
index 820d454dc4f2..f6f75b144441 100644
--- a/comms/xmorse/Makefile
+++ b/comms/xmorse/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmorse
 PORTVERSION=	20041125
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://c2.com/morse/files/SourceCode/ \
 		http://www.525183.com/freebsd/xmorse/ \
diff --git a/comms/xnecview/Makefile b/comms/xnecview/Makefile
index f49dd8befe13..11d2a8a31dea 100644
--- a/comms/xnecview/Makefile
+++ b/comms/xnecview/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	xnecview
 PORTVERSION=	1.36
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://wwwhome.cs.utwente.nl/%7Eptdeboer/ham/xnecview/
 EXTRACT_SUFX=	.tgz
@@ -13,7 +14,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	xride@FreeBSD.org
 COMMENT=	A X viewer of nec2c data
 
-LIB_DEPENDS=	png:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	nec2c:${PORTSDIR}/comms/nec2c
 
 USE_GNOME=	gtk20
diff --git a/comms/xnecview/files/patch-Makefile b/comms/xnecview/files/patch-Makefile
index a8cc806e1791..09cec08bab2a 100644
--- a/comms/xnecview/files/patch-Makefile
+++ b/comms/xnecview/files/patch-Makefile
@@ -17,8 +17,8 @@
  ifeq ($(PNG),yes)
  CFLAGS	+= -DHAVE_LIBPNG
 -LDFLAGS	+= -lpng
-+CFLAGS	+= `pkg-config --cflags ${LOCALBASE}/libdata/pkgconfig/libpng14.pc`
-+LDFLAGS    += `pkg-config --libs ${LOCALBASE}/libdata/pkgconfig/libpng14.pc`
++CFLAGS	+= `pkg-config --cflags ${LOCALBASE}/libdata/pkgconfig/libpng15.pc`
++LDFLAGS    += `pkg-config --libs ${LOCALBASE}/libdata/pkgconfig/libpng15.pc`
  endif
  
  SRCS	= xnecview.c xwin.c parse_input.c parse_output.c draw.c draw_opaque.c freqplot.c postscript.c icon.xbm
diff --git a/comms/xnecview/files/patch-xwin.c b/comms/xnecview/files/patch-xwin.c
new file mode 100644
index 000000000000..6d56247a50ce
--- /dev/null
+++ b/comms/xnecview/files/patch-xwin.c
@@ -0,0 +1,11 @@
+--- xwin.c.orig	2011-07-26 00:03:37.000000000 +0200
++++ xwin.c	2012-05-01 08:33:19.000000000 +0200
+@@ -277,7 +277,7 @@
+       fclose(f);
+       return 1;
+    }
+-   if (setjmp(pp->jmpbuf)) {
++   if (setjmp(png_jmpbuf(pp))) {
+       png_destroy_write_struct(&pp,&ip);
+       fclose(f);
+       gdk_image_destroy(image);
diff --git a/comms/xwota/Makefile b/comms/xwota/Makefile
index d37c5af4e82e..33051b634f57 100644
--- a/comms/xwota/Makefile
+++ b/comms/xwota/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xwota
 PORTVERSION=	0.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://people.fabaris.it/iz0ete/xwota/ \
 		${MASTER_SITE_LOCAL}