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.

12 files changed, 85 insertions, 19 deletions

diff --git a/lang/classpath-gui/Makefile b/lang/classpath-gui/Makefile
index 21c571b757b..679e34512c8 100644
--- a/lang/classpath-gui/Makefile
+++ b/lang/classpath-gui/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2009/08/26 19:57:54 sno Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:44:51 wiz Exp $
 
 .include "../../lang/classpath/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/classpath/classpath-gui/}
-PKGREVISION=	3
+PKGREVISION=	4
 COMMENT+=	(GUI libraries)
 
 DEPENDS+=	classpath>=0.93:../../lang/classpath
diff --git a/lang/coq/Makefile b/lang/coq/Makefile
index 749f3d219e2..fdad8548738 100644
--- a/lang/coq/Makefile
+++ b/lang/coq/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2009/12/12 21:12:43 asau Exp $
+# $NetBSD: Makefile,v 1.25 2010/06/13 22:44:51 wiz Exp $
 #
 
 DISTNAME=	coq-8.2pl1
+PKGREVISION=	1
 CATEGORIES=	lang math
 MASTER_SITES=	http://coq.inria.fr/distrib/V8.2pl1/files/
 
diff --git a/lang/kaffe-x11/Makefile b/lang/kaffe-x11/Makefile
index 4ec129723a0..b5153f9565f 100644
--- a/lang/kaffe-x11/Makefile
+++ b/lang/kaffe-x11/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2010/01/18 09:59:11 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2010/06/13 22:44:51 wiz Exp $
 #
 
 .include "../../lang/kaffe/Makefile.common"
 
 PKGNAME=    	${DISTNAME:S/kaffe/kaffe-x11/}
-PKGREVISION=	4
+PKGREVISION=	5
 
 COMMENT+=   (AWT support through X11)
 
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile
index ac89991d32f..749a0923e15 100644
--- a/lang/openjdk7/Makefile
+++ b/lang/openjdk7/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/05/22 17:09:55 tnn Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/13 22:44:51 wiz Exp $
 
 DISTNAME=	openjdk-7-ea-src-b92-06_may_2010
 PKGNAME=	openjdk7-1.7.0.92.20100521
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 94d87ab0849..b275d1eeb02 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.77 2010/03/27 06:23:13 taca Exp $
+$NetBSD: distinfo,v 1.78 2010/06/13 22:44:51 wiz Exp $
 
 SHA1 (php-5.2.13/php-5.2.13.tar.bz2) = 7127a21f1b493e3cd43f45cadecdb46b623eb1fb
 RMD160 (php-5.2.13/php-5.2.13.tar.bz2) = 9e21d32a7b757d25ed827834b26235ea1eebfcc8
@@ -11,7 +11,7 @@ SHA1 (patch-af) = 68c5a31dccf1854ba1aff653e4c524767d6a64f6
 SHA1 (patch-ag) = 5e3e822657925a77fbccaca63f283863a1cc6d94
 SHA1 (patch-ah) = a25cb7fa3d1f5b9fb99493a4348fdba69d3d4728
 SHA1 (patch-aj) = 54812097499c81e5cb0196ab949cc86a4f24a9cc
-SHA1 (patch-al) = 0ee37782cc0d3bf5ede1a583de0589c2c1316b50
+SHA1 (patch-al) = 3945eef039ed285e623273cdde4c51c4c6bc978b
 SHA1 (patch-an) = 8f4174627b8cb5f8bfbc59413c95f71e26b9e602
 SHA1 (patch-ap) = 5eb0e0e4244a993da93e36f8fcb5553454207fce
 SHA1 (patch-aq) = 0c9d48547da2fa80aa8357d23ad8505d1c0330df
diff --git a/lang/php5/patches/patch-al b/lang/php5/patches/patch-al
index be353de85a2..f04664be2b4 100644
--- a/lang/php5/patches/patch-al
+++ b/lang/php5/patches/patch-al
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.3 2007/02/20 20:46:20 jdolecek Exp $
+$NetBSD: patch-al,v 1.4 2010/06/13 22:44:51 wiz Exp $
 
---- ext/gd/config.m4.orig	2007-02-20 21:14:31.000000000 +0100
+--- ext/gd/config.m4.orig	2007-07-03 17:25:43.000000000 +0000
 +++ ext/gd/config.m4
 @@ -48,18 +48,7 @@ dnl Checks for the configure options
  dnl
@@ -30,3 +30,34 @@ $NetBSD: patch-al,v 1.3 2007/02/20 20:46:20 jdolecek Exp $
  ])
  
  AC_DEFUN([PHP_GD_JPEG],[
+@@ -100,11 +88,11 @@ AC_DEFUN([PHP_GD_PNG],[
+   if test "$PHP_PNG_DIR" != "no"; then
+ 
+     for i in $PHP_PNG_DIR /usr/local /usr; do
+-      test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break
++      test -f $i/$PHP_LIBDIR/libpng14.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng14.a && GD_PNG_DIR=$i && break
+     done
+ 
+     if test -z "$GD_PNG_DIR"; then
+-      AC_MSG_ERROR([libpng.(a|so) not found.])
++      AC_MSG_ERROR([libpng14.(a|so) not found.])
+     fi
+ 
+     if test "$PHP_ZLIB_DIR" = "no"; then
+@@ -115,13 +103,13 @@ AC_DEFUN([PHP_GD_PNG],[
+       AC_MSG_ERROR([png.h not found.])
+     fi
+ 
+-    PHP_CHECK_LIBRARY(png,png_write_image,
++    PHP_CHECK_LIBRARY(png14,png_write_image,
+     [
+       PHP_ADD_INCLUDE($GD_PNG_DIR/include)
+       PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
+-      PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
++      PHP_ADD_LIBRARY_WITH_PATH(png14, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
+     ],[
+-      AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.])
++      AC_MSG_ERROR([Problem with libpng14.(a|so) or libz.(a|so). Please check config.log for more information.])
+     ],[
+       -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR
+     ])
diff --git a/lang/php53/distinfo b/lang/php53/distinfo
index 502c902c166..8a65ef0e52a 100644
--- a/lang/php53/distinfo
+++ b/lang/php53/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2010/05/28 15:31:04 joerg Exp $
+$NetBSD: distinfo,v 1.5 2010/06/13 22:44:51 wiz Exp $
 
 SHA1 (php-5.3.2/php-5.3.2.tar.bz2) = 79ea4ee3da3a7542d1e348ac963a5b38bcbb4b6b
 RMD160 (php-5.3.2/php-5.3.2.tar.bz2) = 60a8aac0d51511ecaf8dcad9d31bdf072c0c99cf
@@ -8,7 +8,7 @@ RMD160 (php-5.3.2/suhosin-patch-5.3.2-0.9.9.1.patch.gz) = 64d8b7ec2ec91fd7a43b0c
 Size (php-5.3.2/suhosin-patch-5.3.2-0.9.9.1.patch.gz) = 40847 bytes
 SHA1 (patch-aa) = f51491af7c577f36979fc07d52b5857368392e09
 SHA1 (patch-ab) = 07c1a5463a302ea155aba10da0d6b0ee0aee43a8
-SHA1 (patch-ac) = f1a0c3ebe65bc3c486c44411b384bc882288b55d
+SHA1 (patch-ac) = a896371d3343c07a5cf46c79d9ca9e1b2164797a
 SHA1 (patch-ad) = 1608c58860a43b4e31df8646b5ded253ec9aa881
 SHA1 (patch-ae) = e590db60a60f4e5ef2da4e5edb786335a67a3d56
 SHA1 (patch-af) = 6e903ea7ff501226601fa73ce74c272d44d7346b
diff --git a/lang/php53/patches/patch-ac b/lang/php53/patches/patch-ac
index a76a602da46..d5da9e97de3 100644
--- a/lang/php53/patches/patch-ac
+++ b/lang/php53/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
+$NetBSD: patch-ac,v 1.2 2010/06/13 22:44:51 wiz Exp $
 
 --- ext/gd/config.m4.orig	2009-05-27 08:18:24.000000000 +0000
 +++ ext/gd/config.m4
@@ -30,3 +30,34 @@ $NetBSD: patch-ac,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
  ])
  
  AC_DEFUN([PHP_GD_JPEG],[
+@@ -97,11 +85,11 @@ AC_DEFUN([PHP_GD_PNG],[
+   if test "$PHP_PNG_DIR" != "no"; then
+ 
+     for i in $PHP_PNG_DIR /usr/local /usr; do
+-      test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break
++      test -f $i/$PHP_LIBDIR/libpng14.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libpng14.a && GD_PNG_DIR=$i && break
+     done
+ 
+     if test -z "$GD_PNG_DIR"; then
+-      AC_MSG_ERROR([libpng.(a|so) not found.])
++      AC_MSG_ERROR([libpng14.(a|so) not found.])
+     fi
+ 
+     if test "$PHP_ZLIB_DIR" = "no"; then
+@@ -112,13 +100,13 @@ AC_DEFUN([PHP_GD_PNG],[
+       AC_MSG_ERROR([png.h not found.])
+     fi
+ 
+-    PHP_CHECK_LIBRARY(png,png_write_image,
++    PHP_CHECK_LIBRARY(png14,png_write_image,
+     [
+       PHP_ADD_INCLUDE($GD_PNG_DIR/include)
+       PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
+-      PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
++      PHP_ADD_LIBRARY_WITH_PATH(png14, $GD_PNG_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
+     ],[
+-      AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.])
++      AC_MSG_ERROR([Problem with libpng14.(a|so) or libz.(a|so). Please check config.log for more information.])
+     ],[
+       -L$PHP_ZLIB_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR
+     ])
diff --git a/lang/sablevm-classpath-gui/Makefile b/lang/sablevm-classpath-gui/Makefile
index 934f542acd2..9db36cd841a 100644
--- a/lang/sablevm-classpath-gui/Makefile
+++ b/lang/sablevm-classpath-gui/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.17 2009/08/26 19:57:54 sno Exp $
+# $NetBSD: Makefile,v 1.18 2010/06/13 22:44:51 wiz Exp $
 #
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../lang/sablevm-classpath/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/classpath/classpath-gui/}
-PKGREVISION=	3
+PKGREVISION=	4
 COMMENT+=	(GUI libraries)
 
 DEPENDS+=	sablevm-classpath>=1.13nb1:../../lang/sablevm-classpath
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 7a0f2c80ead..7501a62610e 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.51 2010/04/09 01:54:20 obache Exp $
+# $NetBSD: Makefile,v 1.52 2010/06/13 22:44:51 wiz Exp $
 
 DISTNAME=	smalltalk-3.1
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=smalltalk/}
 
diff --git a/lang/squeak-vm/Makefile b/lang/squeak-vm/Makefile
index f0d79df2aa6..9b510ef19f0 100644
--- a/lang/squeak-vm/Makefile
+++ b/lang/squeak-vm/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/02/11 00:58:19 asau Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/13 22:44:51 wiz Exp $
 #
 
 SQUEAK_VERSION=	3.11.3.2135
 
 DISTNAME=	Squeak-$(SQUEAK_VERSION)-src
 PKGNAME=	squeak-vm-$(SQUEAK_VERSION:C/-/./)
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://ftp.squeak.org/3.10/unix-linux/ \
 		http://squeakvm.org/unix/release/
diff --git a/lang/vala/Makefile b/lang/vala/Makefile
index 81828f2af07..2456c915a79 100644
--- a/lang/vala/Makefile
+++ b/lang/vala/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2010/05/07 08:34:22 ahoka Exp $
+# $NetBSD: Makefile,v 1.8 2010/06/13 22:44:52 wiz Exp $
 #
 
 DISTNAME=	vala-0.7.10
+PKGREVISION=	1
 CATEGORIES=	lang gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/vala/0.7/}
 EXTRACT_SUFX=	.tar.bz2