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, 62 insertions, 7 deletions

diff --git a/print/ghostscript/Makefile b/print/ghostscript/Makefile
index 4b5d2e25ebc..2c3507413ff 100644
--- a/print/ghostscript/Makefile
+++ b/print/ghostscript/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.78 2010/04/09 22:04:22 tron Exp $
+# $NetBSD: Makefile,v 1.79 2010/06/13 22:45:15 wiz Exp $
 
 DISTNAME=	ghostscript-8.71
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ghostscript/}
 MASTER_SITES+=	http://ghostscript.com/releases/
diff --git a/print/ghostscript/buildlink3.mk b/print/ghostscript/buildlink3.mk
index 6a0d6972c79..d0fef39f44c 100644
--- a/print/ghostscript/buildlink3.mk
+++ b/print/ghostscript/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2010/01/18 09:59:22 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2010/06/13 22:45:15 wiz Exp $
 
 BUILDLINK_TREE+=	ghostscript
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ghostscript
 GHOSTSCRIPT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ghostscript+=	ghostscript>=8.63nb1
-BUILDLINK_ABI_DEPENDS.ghostscript?=	ghostscript>=8.70nb3
+BUILDLINK_ABI_DEPENDS.ghostscript?=	ghostscript>=8.71nb3
 BUILDLINK_PKGSRCDIR.ghostscript?=	../../print/ghostscript
 
 .include "../../graphics/png/buildlink3.mk"
diff --git a/print/ghostscript/distinfo b/print/ghostscript/distinfo
index 6f07e09ab06..764c72b895a 100644
--- a/print/ghostscript/distinfo
+++ b/print/ghostscript/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2010/04/09 19:39:06 drochner Exp $
+$NetBSD: distinfo,v 1.33 2010/06/13 22:45:15 wiz Exp $
 
 SHA1 (ghostscript-8.71.tar.gz) = 629299140f612fac32f6289be0904107dfd1b555
 RMD160 (ghostscript-8.71.tar.gz) = efce74cf22cf99b2b1a145df466e79a86e3dfefb
@@ -9,7 +9,7 @@ SHA1 (patch-ac) = b1f71dc446f433be0b07b0511dc1028e8e3b77f3
 SHA1 (patch-ad) = 8b3b743b2d6405ea35bfb16970942ecd55702401
 SHA1 (patch-af) = 13aa7b5159cbd5413353b48380d5665ed879fe64
 SHA1 (patch-ag) = bdfbe40c849537d84ac2b3def4a0a3a87ecc152f
-SHA1 (patch-ah) = 8cdf9cc1a62e3eb34ca8edf7bbaf9d542b612519
+SHA1 (patch-ah) = 2007d42df0bf1d93af90dedaadc882da9fc3e5bc
 SHA1 (patch-ai) = ad69ddd4a4bd50cf2263ac6c6d17a59798ef3124
 SHA1 (patch-aj) = 620d921210b5c0efec0a84e33bc416e4ab4bd11c
 SHA1 (patch-al) = 86489b704c60320385794c3eb68170d9b9f1f6cc
diff --git a/print/ghostscript/patches/patch-ah b/print/ghostscript/patches/patch-ah
index 0479e726f4a..501801c6c37 100644
--- a/print/ghostscript/patches/patch-ah
+++ b/print/ghostscript/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.4 2010/02/23 20:31:26 drochner Exp $
+$NetBSD: patch-ah,v 1.5 2010/06/13 22:45:15 wiz Exp $
 
 --- configure.orig	2010-02-10 20:31:30.000000000 +0000
 +++ configure
@@ -11,6 +11,61 @@ $NetBSD: patch-ah,v 1.4 2010/02/23 20:31:26 drochner Exp $
  
  cat >>confdefs.h <<\_ACEOF
  #define USE_LIBPAPER 1
+@@ -8739,9 +8739,9 @@ $as_echo "yes" >&6; }
+ else
+ 	{ $as_echo "$as_me:$LINENO: result: no" >&5
+ $as_echo "no" >&6; }
+-	{ $as_echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
+-$as_echo_n "checking for png_check_sig in -lpng... " >&6; }
+-if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
++	{ $as_echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
++$as_echo_n "checking for png_sig_cmp in -lpng... " >&6; }
++if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -8759,11 +8759,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char png_check_sig ();
++char png_sig_cmp ();
+ int
+ main ()
+ {
+-return png_check_sig ();
++return png_sig_cmp ();
+   ;
+   return 0;
+ }
+@@ -8789,12 +8789,12 @@ $as_echo "$ac_try_echo") >&5
+ 	 test "$cross_compiling" = yes ||
+ 	 $as_test_x conftest$ac_exeext
+        }; then
+-  ac_cv_lib_png_png_check_sig=yes
++  ac_cv_lib_png_png_sig_cmp=yes
+ else
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_cv_lib_png_png_check_sig=no
++	ac_cv_lib_png_png_sig_cmp=no
+ fi
+ 
+ rm -rf conftest.dSYM
+@@ -8802,9 +8802,9 @@ rm -f core conftest.err conftest.$ac_obj
+       conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
+-$as_echo "$ac_cv_lib_png_png_check_sig" >&6; }
+-if test "x$ac_cv_lib_png_png_check_sig" = x""yes; then
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5
++$as_echo "$ac_cv_lib_png_png_sig_cmp" >&6; }
++if test "x$ac_cv_lib_png_png_sig_cmp" = x""yes; then
+ 
+ 
+ for ac_header in png.h
 @@ -9203,7 +9203,7 @@ done
  
  fi