Bump PKGREVISION for libpng shlib name change.

Also add some patches to remove use of deprecated symbols and fix other
problems when looking for or compiling against libpng-1.4.x.

14 files changed, 38 insertions, 28 deletions

diff --git a/ham/fl_logbook/Makefile b/ham/fl_logbook/Makefile
index e94b49a92aa..50c22efd57d 100644
--- a/ham/fl_logbook/Makefile
+++ b/ham/fl_logbook/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2008/04/07 17:08:11 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2010/06/13 22:44:47 wiz Exp $
 #
 
 DISTNAME=		fl_logbook.121.src
 PKGNAME=		fl_logbook-1.21
+PKGREVISION=		1
 CATEGORIES=		ham
 MASTER_SITES=		http://www.w1hkj.com/LinuxApps/
 
diff --git a/ham/fldigi/Makefile b/ham/fldigi/Makefile
index a976d5c6856..fdb2b9b3ab1 100644
--- a/ham/fldigi/Makefile
+++ b/ham/fldigi/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2010/01/18 09:59:10 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2010/06/13 22:44:47 wiz Exp $
 #
 
 DISTNAME=	fldigi-3.03
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	ham
 MASTER_SITES=	http://www.w1hkj.com/fldigi-distro/
 
diff --git a/ham/fldigi/distinfo b/ham/fldigi/distinfo
index e1d0b5f327e..5939e8a9eb3 100644
--- a/ham/fldigi/distinfo
+++ b/ham/fldigi/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2009/02/15 19:41:10 joerg Exp $
+$NetBSD: distinfo,v 1.3 2010/06/13 22:44:47 wiz Exp $
 
 SHA1 (fldigi-3.03.tar.gz) = fcdc0f34fe62b6857c5e02bb8e7a8ecbe6e7050c
 RMD160 (fldigi-3.03.tar.gz) = 30fa50eee0b00c2a332f8c48999e0183df88f60a
 Size (fldigi-3.03.tar.gz) = 711226 bytes
 SHA1 (patch-aa) = 122d936e7f8bda5466dc252ffe17f501c0f341e8
-SHA1 (patch-ab) = cfca39f1e32e8cd4e15d994a2af4dd5a72e87ab9
+SHA1 (patch-ab) = 5934eab7879ef2928e23f91a7c71b65484dab7fa
 SHA1 (patch-ac) = def1ee6e6c3f60a2febb029560f3ad7f9c5a3364
diff --git a/ham/fldigi/patches/patch-ab b/ham/fldigi/patches/patch-ab
index 7a317986e19..42395360a10 100644
--- a/ham/fldigi/patches/patch-ab
+++ b/ham/fldigi/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/10/23 08:07:09 wulf Exp $
+$NetBSD: patch-ab,v 1.2 2010/06/13 22:44:47 wiz Exp $
 
---- src/widgets/picture.cxx.orig	2008-10-23 15:59:18.000000000 +1030
-+++ src/widgets/picture.cxx	2008-10-23 15:54:17.000000000 +1030
+--- src/widgets/picture.cxx.orig	2008-09-14 13:26:15.000000000 +0000
++++ src/widgets/picture.cxx
 @@ -31,8 +31,10 @@
  #include <FL/fl_ask.H>
  
@@ -13,3 +13,12 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/10/23 08:07:09 wulf Exp $
  #endif
  #if USE_LIBPNG
  #  include <png.h>
+@@ -317,7 +319,7 @@ int picture::save_png(const char* filena
+ 		return -1;
+ 	}
+ 	if ((info = png_create_info_struct(png)) == NULL) {
+-		png_destroy_write_struct(&png, png_infopp_NULL);
++		png_destroy_write_struct(&png, NULL);
+ 		fclose(fp);
+ 		return -1;
+ 	}
diff --git a/ham/gmfsk/Makefile b/ham/gmfsk/Makefile
index a011da4faa6..d050d4e5751 100644
--- a/ham/gmfsk/Makefile
+++ b/ham/gmfsk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.30 2010/01/18 09:59:10 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2010/06/13 22:44:47 wiz Exp $
 #
 
 DISTNAME=	gmfsk-0.6
-PKGREVISION=	16
+PKGREVISION=	17
 CATEGORIES=	ham
 MASTER_SITES=	http://gmfsk.connect.fi/
 
diff --git a/ham/gnuradio-examples/Makefile b/ham/gnuradio-examples/Makefile
index 0db3fd23216..7d9961263a8 100644
--- a/ham/gnuradio-examples/Makefile
+++ b/ham/gnuradio-examples/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2010/01/18 09:59:10 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2010/06/13 22:44:47 wiz Exp $
 
 PKGNAME=	gnuradio-examples-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	GUI framework for GNU Radio based on wxPython
 COMMENT=	Examples for GNU Radio
 
diff --git a/ham/gnuradio-radio-astronomy/Makefile b/ham/gnuradio-radio-astronomy/Makefile
index 873b265a7be..ad820494d7c 100644
--- a/ham/gnuradio-radio-astronomy/Makefile
+++ b/ham/gnuradio-radio-astronomy/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2010/03/24 19:43:24 asau Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:47 wiz Exp $
 
 PKGNAME=	gnuradio-radio-astronomy-${VERSION}
-PKGREVISION=	4
+PKGREVISION=	5
 COMMENT=	GNU Radio module for radio astronomy
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/ham/gnuradio-wxgui/Makefile b/ham/gnuradio-wxgui/Makefile
index a6626c9f41a..74340ef3a9e 100644
--- a/ham/gnuradio-wxgui/Makefile
+++ b/ham/gnuradio-wxgui/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2010/01/18 09:59:10 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:44:47 wiz Exp $
 
 PKGNAME=	gnuradio-wxgui-${VERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	GUI framework for GNU Radio based on wxPython
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/ham/gnuradio-wxgui/buildlink3.mk b/ham/gnuradio-wxgui/buildlink3.mk
index 13f854d6baa..41419fb9757 100644
--- a/ham/gnuradio-wxgui/buildlink3.mk
+++ b/ham/gnuradio-wxgui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2010/01/18 09:59:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2010/06/13 22:44:47 wiz Exp $
 
 BUILDLINK_TREE+=	gnuradio-wxgui
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gnuradio-wxgui
 GNURADIO_WXGUI_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gnuradio-wxgui+=	gnuradio-wxgui>=3.0.4
-BUILDLINK_ABI_DEPENDS.gnuradio-wxgui?=	gnuradio-wxgui>=3.2nb2
+BUILDLINK_ABI_DEPENDS.gnuradio-wxgui?=	gnuradio-wxgui>=3.2nb3
 BUILDLINK_PKGSRCDIR.gnuradio-wxgui?=	../../ham/gnuradio-wxgui
 
 .include "../../ham/gnuradio-core/buildlink3.mk"
diff --git a/ham/gpredict/Makefile b/ham/gpredict/Makefile
index 665bb5449c9..834dac42527 100644
--- a/ham/gpredict/Makefile
+++ b/ham/gpredict/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2010/06/11 09:57:01 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2010/06/13 22:44:48 wiz Exp $
 
 DISTNAME=	gpredict-0.8.0
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	ham
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=groundstation/}
 
diff --git a/ham/grig/Makefile b/ham/grig/Makefile
index 7ca914b5e14..dfdeaa95e24 100644
--- a/ham/grig/Makefile
+++ b/ham/grig/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2009/08/26 19:57:53 sno Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:44:48 wiz Exp $
 #
 
 DISTNAME=	grig-0.7.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	ham
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=groundstation/}
 
diff --git a/ham/linpsk/Makefile b/ham/linpsk/Makefile
index 61217680a2d..6fa426c55d9 100644
--- a/ham/linpsk/Makefile
+++ b/ham/linpsk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/01/29 23:46:10 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:44:48 wiz Exp $
 #
 
 DISTNAME=	linpsk-0.8.1
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	ham
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=linpsk/}
 
diff --git a/ham/xdx/Makefile b/ham/xdx/Makefile
index e15c2526535..9cc404d7cca 100644
--- a/ham/xdx/Makefile
+++ b/ham/xdx/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2009/08/26 19:57:53 sno Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:44:48 wiz Exp $
 #
 
 DISTNAME=	xdx-2.4.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	ham
 MASTER_SITES=	http://www.qsl.net/pg4i/download/
 
diff --git a/ham/xlog/Makefile b/ham/xlog/Makefile
index 179319baa4c..1c5f63e8097 100644
--- a/ham/xlog/Makefile
+++ b/ham/xlog/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.33 2010/01/18 09:59:11 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2010/06/13 22:44:48 wiz Exp $
 #
 
 DISTNAME=	xlog-1.5
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	ham
 MASTER_SITES=	http://www.qsl.net/pg4i/download/