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.

4 files changed, 35 insertions, 8 deletions

diff --git a/x11/wxGTK24/Makefile b/x11/wxGTK24/Makefile
index 398ffc9aa35..6566584a056 100644
--- a/x11/wxGTK24/Makefile
+++ b/x11/wxGTK24/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2010/02/16 17:33:39 taca Exp $
+# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:53 wiz Exp $
 #
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
 
-PKGREVISION=		16
+PKGREVISION=		17
 COMMENT=		GTK-based implementation of the wxWidgets GUI library
 CONFLICTS+=		wxGTK<=2.4.2nb5
 
@@ -14,5 +14,6 @@ INSTALLATION_DIRS=	${DOCDIR}
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DESTDIR}${DOCDIR}/LICENSE
 
+.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/wxGTK24/buildlink3.mk b/x11/wxGTK24/buildlink3.mk
index 20135617c98..ca93208ab47 100644
--- a/x11/wxGTK24/buildlink3.mk
+++ b/x11/wxGTK24/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.12 2010/01/18 09:59:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2010/06/13 22:45:53 wiz Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -8,7 +8,7 @@ BUILDLINK_TREE+=	wxGTK24
 WXGTK24_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.wxGTK24+=	wxGTK24>=2.4.2
-BUILDLINK_ABI_DEPENDS.wxGTK24?=	wxGTK24>=2.4.2nb15
+BUILDLINK_ABI_DEPENDS.wxGTK24?=	wxGTK24>=2.4.2nb17
 BUILDLINK_PKGSRCDIR.wxGTK24?=	../../x11/wxGTK24
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/x11/wxGTK24/distinfo b/x11/wxGTK24/distinfo
index c13939e0045..517fbae3217 100644
--- a/x11/wxGTK24/distinfo
+++ b/x11/wxGTK24/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2010/02/16 17:33:39 taca Exp $
+$NetBSD: distinfo,v 1.11 2010/06/13 22:45:53 wiz Exp $
 
 SHA1 (wxGTK-2.4.2.tar.bz2) = 3f1ebacaaf8eb5510c14ee10bafbc5f225be842c
 RMD160 (wxGTK-2.4.2.tar.bz2) = 8076d1ba31c9b23becb241cbad5a83763fee776e
 Size (wxGTK-2.4.2.tar.bz2) = 5381935 bytes
-SHA1 (patch-aa) = 1d6b86da5e7a1fd3a13805465e9059d21dbbfc7a
+SHA1 (patch-aa) = f7510b2dafd73da3c79808b141fee6a60cd47269
 SHA1 (patch-ab) = bab52051778a93439cfd3144f052bdbcc7024e30
 SHA1 (patch-ac) = 06a047a28260d30516b87d85a4dd4d5a6c18cfc4
 SHA1 (patch-ad) = 809a12f89b018373910b31442dfd315276cafbdf
diff --git a/x11/wxGTK24/patches/patch-aa b/x11/wxGTK24/patches/patch-aa
index 2ac91d155a9..bb14e9ee7f1 100644
--- a/x11/wxGTK24/patches/patch-aa
+++ b/x11/wxGTK24/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2009/11/29 20:16:20 joerg Exp $
+$NetBSD: patch-aa,v 1.5 2010/06/13 22:45:53 wiz Exp $
 
---- configure.orig	2003-09-21 13:31:30.000000000 +0200
+--- configure.orig	2003-09-21 11:31:30.000000000 +0000
 +++ configure
 @@ -1247,7 +1247,7 @@ EOF
  
@@ -24,6 +24,32 @@ $NetBSD: patch-aa,v 1.4 2009/11/29 20:16:20 joerg Exp $
  
  
  cat > confcache <<\EOF
+@@ -11972,9 +11973,9 @@ fi
+ echo "$ac_t""$ac_cv_header_png_h" 1>&6
+ 
+             if test "$ac_cv_header_png_h" = "yes"; then
+-                echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6
+-echo "configure:11977: checking for png_check_sig in -lpng" >&5
+-ac_lib_var=`echo png'_'png_check_sig | sed 'y%./+-%__p_%'`
++                echo $ac_n "checking for png_sig_cmp in -lpng""... $ac_c" 1>&6
++echo "configure:11977: checking for png_sig_cmp in -lpng" >&5
++ac_lib_var=`echo png'_'png_sig_cmp | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -11986,10 +11987,10 @@ cat > conftest.$ac_ext <<EOF
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+     builtin and then its argument prototype would still apply.  */
+-char png_check_sig();
++char png_sig_cmp();
+ 
+ int main() {
+-png_check_sig()
++png_sig_cmp()
+ ; return 0; }
+ EOF
+ if { (eval echo configure:11996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 @@ -13381,6 +13382,101 @@ echo "configure:13351: checking PANGOFT2
    fi