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, 29 insertions, 8 deletions

diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index dd6702ec987..7b59ccab583 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.202 2010/06/01 13:26:31 drochner Exp $
+# $NetBSD: Makefile,v 1.203 2010/06/13 22:45:39 wiz Exp $
 
 DISTNAME=		gtk+-2.20.1
 PKGNAME=		${DISTNAME:S/gtk/gtk2/}
+PKGREVISION=		1
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/2.20/ \
 			${MASTER_SITE_GNOME:=sources/gtk+/2.20/}
diff --git a/x11/gtk2/buildlink3.mk b/x11/gtk2/buildlink3.mk
index 544405470f2..7297994d816 100644
--- a/x11/gtk2/buildlink3.mk
+++ b/x11/gtk2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.43 2009/09/07 18:42:39 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.44 2010/06/13 22:45:39 wiz Exp $
 
 BUILDLINK_TREE+=	gtk2
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	gtk2
 GTK2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.4.0
-BUILDLINK_ABI_DEPENDS.gtk2+=	gtk2+>=2.16.5nb1
+BUILDLINK_ABI_DEPENDS.gtk2+=	gtk2+>=2.20.1nb1
 BUILDLINK_PKGSRCDIR.gtk2?=	../../x11/gtk2
 
 .include "../../mk/bsd.fast.prefs.mk"
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo
index eee7b1f0df1..3d449b6693a 100644
--- a/x11/gtk2/distinfo
+++ b/x11/gtk2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.128 2010/05/31 18:32:41 wiz Exp $
+$NetBSD: distinfo,v 1.129 2010/06/13 22:45:39 wiz Exp $
 
 SHA1 (gtk+-2.20.1.tar.bz2) = a80953b4e81c6a5bc2a986852f7fe60c8704cc02
 RMD160 (gtk+-2.20.1.tar.bz2) = bcd5f20f9e3f8d4e6f9bd91388de2fe9851ef361
 Size (gtk+-2.20.1.tar.bz2) = 19089076 bytes
 SHA1 (patch-aa) = 105a5b9d0bad708bcceb6f9a801207f0eff96eb3
 SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3
-SHA1 (patch-af) = 54408034519f752de662567ea9d65056f2d27d95
+SHA1 (patch-af) = eb3eb3033d7fb3b8fba92a965072786da2f18e19
 SHA1 (patch-aj) = 40d91c8698981662e6926a27e39006b5ec413133
diff --git a/x11/gtk2/patches/patch-af b/x11/gtk2/patches/patch-af
index 1f5d063fdda..21b35e6fa94 100644
--- a/x11/gtk2/patches/patch-af
+++ b/x11/gtk2/patches/patch-af
@@ -1,8 +1,28 @@
-$NetBSD: patch-af,v 1.17 2010/03/16 08:40:15 wiz Exp $
+$NetBSD: patch-af,v 1.18 2010/06/13 22:45:39 wiz Exp $
 
---- configure.orig	2010-03-15 22:37:29.000000000 +0000
+--- configure.orig	2010-05-02 23:55:05.000000000 +0000
 +++ configure
-@@ -23073,7 +23073,7 @@ _ACEOF
+@@ -21748,14 +21748,14 @@ $as_echo "$as_me: WARNING: *** JPEG load
+ fi
+ 
+   if test x$with_libpng != xno && test -z "$LIBPNG"; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12" >&5
+-$as_echo_n "checking for libpng12... " >&6; }
+-    if $PKG_CONFIG --exists libpng12 ; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng" >&5
++$as_echo_n "checking for libpng... " >&6; }
++    if $PKG_CONFIG --exists libpng ; then
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+         PNG='png'
+-	PNG_DEP_CFLAGS_PACKAGES=libpng12
+-	LIBPNG=`$PKG_CONFIG --libs libpng12`
++	PNG_DEP_CFLAGS_PACKAGES=libpng
++	LIBPNG=`$PKG_CONFIG --libs libpng`
+     else
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+@@ -23098,7 +23098,7 @@ _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
  $as_echo "no" >&6; }