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, 75 insertions, 23 deletions

diff --git a/cad/boolean/Makefile b/cad/boolean/Makefile
index 234d3460bc5..235e8723b06 100644
--- a/cad/boolean/Makefile
+++ b/cad/boolean/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.45 2010/01/18 09:58:39 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2010/06/13 22:43:54 wiz Exp $
 #
 
 DISTNAME=	boolean_6_99
 PKGNAME=	boolean-6.99
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	cad graphics
 MASTER_SITES=	http://boolean.klaasholwerda.nl/download/boolzip/
 EXTRACT_SUFX=	.tgz
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index 10572e15d97..d58270338fe 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.63 2010/03/24 19:43:22 asau Exp $
+# $NetBSD: Makefile,v 1.64 2010/06/13 22:43:54 wiz Exp $
 #
 
 DISTNAME=	geda-gaf-${PKGVERSION}
 PKGNAME=	geda-${PKGVERSION}
 PKGVERSION=	1.6.1
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/release/v1.6/${PKGVERSION}/ \
 		http://geda.seul.org/release/v1.6/${PKGVERSION}/
diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile
index 1101195c83c..1caee376989 100644
--- a/cad/gerbv/Makefile
+++ b/cad/gerbv/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2010/02/24 03:40:05 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.39 2010/06/13 22:43:55 wiz Exp $
 #
 
 DISTNAME=	gerbv-2.4.0
+PKGREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gerbv/}
 
diff --git a/cad/gsmc/Makefile b/cad/gsmc/Makefile
index 88d71ada4df..267ca334cad 100644
--- a/cad/gsmc/Makefile
+++ b/cad/gsmc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2009/08/26 19:57:14 sno Exp $
+# $NetBSD: Makefile,v 1.14 2010/06/13 22:43:55 wiz Exp $
 #
 
 DISTNAME=	gsmc-1.1
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	cad
 MASTER_SITES=	http://www.qsl.net/ik5nax/
 
diff --git a/cad/gtk2-wcalc/Makefile b/cad/gtk2-wcalc/Makefile
index c734785a71c..1c705ea90cc 100644
--- a/cad/gtk2-wcalc/Makefile
+++ b/cad/gtk2-wcalc/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2010/01/28 01:11:27 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:43:55 wiz Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../cad/wcalc/Makefile.common"
 PKGNAME=	gtk2-${DISTNAME}
-PKGREVISION=	4
+PKGREVISION=	5
 
 COMMENT=	GTK2 Based Transmission Line Analysis/Synthesis Calculator
 
diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index 17d7e6cd61a..528c82aeaa1 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2010/01/31 21:31:21 joerg Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:43:55 wiz Exp $
 #
 
 DISTNAME=		gtkwave-3.3.2
+PKGREVISION=		1
 CATEGORIES=		cad
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gtkwave/}
 #MASTER_SITES=		http://home.nc.rr.com/gtkwave/
diff --git a/cad/gwave/Makefile b/cad/gwave/Makefile
index ba6681dd0d8..fc6c27eb508 100644
--- a/cad/gwave/Makefile
+++ b/cad/gwave/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.35 2009/12/15 21:31:52 joerg Exp $
+# $NetBSD: Makefile,v 1.36 2010/06/13 22:43:55 wiz Exp $
 #
 
 DISTNAME=	gwave-20060606
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	cad
 MASTER_SITES=	ftp://ftp.geda.seul.org/pub/geda/dist/ \
 		http://www.geda.seul.org/dist/
diff --git a/cad/nelma/Makefile b/cad/nelma/Makefile
index c6de54082ff..9854000f7b7 100644
--- a/cad/nelma/Makefile
+++ b/cad/nelma/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2010/01/28 19:27:03 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2010/06/13 22:43:55 wiz Exp $
 #
 
 DISTNAME=	nelma-3.0
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	http://www.tablix.org/~avian/nelma/releases/
 
diff --git a/cad/nelma/distinfo b/cad/nelma/distinfo
index aec3db94133..59ea714ceb5 100644
--- a/cad/nelma/distinfo
+++ b/cad/nelma/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2010/01/28 19:27:03 joerg Exp $
+$NetBSD: distinfo,v 1.5 2010/06/13 22:43:55 wiz Exp $
 
 SHA1 (nelma-3.0.tar.gz) = e08f1b0097ce7a90e535cb1920658780c50aec5c
 RMD160 (nelma-3.0.tar.gz) = 68056717d5fe9b8268aeca5d839f974090e305ad
 Size (nelma-3.0.tar.gz) = 64078 bytes
 SHA1 (patch-aa) = 1ed06b063a0e0766e3a9d597629180aa27de9714
 SHA1 (patch-ab) = a1ced09d3ce03ea92d82e8ad4edc51ed1050cfb0
+SHA1 (patch-ac) = 5585eed126e7bd3133cb412aaf191a7c363dcc1c
diff --git a/cad/nelma/patches/patch-ac b/cad/nelma/patches/patch-ac
new file mode 100644
index 00000000000..355ea00208a
--- /dev/null
+++ b/cad/nelma/patches/patch-ac
@@ -0,0 +1,49 @@
+$NetBSD: patch-ac,v 1.1 2010/06/13 22:43:55 wiz Exp $
+
+--- src/pngutil.c.orig	2006-12-10 15:50:19.000000000 +0000
++++ src/pngutil.c
+@@ -145,7 +145,7 @@ int png_read(struct image **dest, char *
+ 	{
+ 		error("Can't allocate memory");
+ 		fclose(fp);
+-		png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
++		png_destroy_read_struct(&png_ptr, NULL, NULL);
+ 		return -1;
+ 	}
+ 
+@@ -159,7 +159,7 @@ int png_read(struct image **dest, char *
+ 		error("libpng error");
+ 		/* Free all of the memory associated with the png_ptr and 
+ 		 * info_ptr */
+-		png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++		png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ 		fclose(fp);
+ 		/* If we get here, we had a problem reading the file */
+ 		return -1;
+@@ -185,7 +185,7 @@ int png_read(struct image **dest, char *
+ 				PNG_TRANSFORM_PACKING | 
+ 				PNG_TRANSFORM_EXPAND;
+ 
+-	png_read_png(png_ptr, info_ptr, png_transforms, png_voidp_NULL);
++	png_read_png(png_ptr, info_ptr, png_transforms, NULL);
+ 
+ 	/* At this point you have read the entire image */
+ 	img=png_alloc(	png_get_image_width(png_ptr, info_ptr), 
+@@ -209,7 +209,7 @@ int png_read(struct image **dest, char *
+ 	*dest=img;
+ 
+ 	/* Clean up after the read, and free any memory allocated - REQUIRED */
+-	png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++	png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ 
+ 	/* close the file */
+ 	fclose(fp);
+@@ -253,7 +253,7 @@ int png_write(struct image *img, char *f
+ 	if (info_ptr == NULL) {
+ 		error("Can't allocate memory");
+ 		fclose(fp);
+-		png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
++		png_destroy_write_struct(&png_ptr,  NULL);
+ 		return -1;
+ 	}
+ 
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index dbe0be8444a..daa6177d76c 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.48 2010/01/18 09:58:40 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2010/06/13 22:43:55 wiz Exp $
 #
 
 DISTNAME=	pcb-20091103
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pcb/}
 
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index e7f3e881212..eb59bc5c229 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2010/01/18 09:58:40 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2010/06/13 22:43:55 wiz Exp $
 #
 
 DISTNAME=		qcad-2.0.5.0-1-community.src
@@ -6,7 +6,7 @@ DISTNAME=		qcad-2.0.5.0-1-community.src
 # (there's a 2.0.4.7 for some platforms), though I don't know about the
 # thing after the hyphen, which always seems to be 1. Can I use four digits?
 PKGNAME=		qcad-2.0.5.0
-PKGREVISION=		2
+PKGREVISION=		3
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/cad/transcalc/Makefile b/cad/transcalc/Makefile
index 8fed4911de5..280c11a91b4 100644
--- a/cad/transcalc/Makefile
+++ b/cad/transcalc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2010/01/18 09:58:40 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2010/06/13 22:43:55 wiz Exp $
 #
 
 DISTNAME=	transcalc-0.14
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	cad
 MASTER_SITES=	http://transcalc.sourceforge.net/
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=transcalc/}
diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index de4ef1dbdb5..4de9419b4fb 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.51 2010/01/18 09:58:40 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2010/06/13 22:43:56 wiz Exp $
 #
 
 DISTNAME=	ViPEC-3.2.0
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=vipec/}