[pkgsrc/trunk]: pkgsrc/www/dillo pull in configure fix from upstream to make ...

[chuck <chuck%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/60cad3f3ff0f
branches:  trunk
changeset: 583214:60cad3f3ff0f
user:      chuck <chuck%pkgsrc.org@localhost>
date:      Sat Dec 11 19:08:35 2010 +0000

description:
pull in configure fix from upstream to make this compile on OS X once again:

(cautious version of) fix for configure.in for libpng 1.4 (reported by xentalion)
changeset 1573:         1d4de024f7cb
parent 1572:    2307d3f8e41b
child 1575:     bb02b0e5110b
author:         corvid <corvid%lavabit.com@localhost>
date:   Fri Feb 19 21:31:12 2010 +0000
files:  ChangeLog configure.in

diffstat:

 www/dillo/distinfo         |   4 ++--
 www/dillo/patches/patch-ad |  22 ++++++++++++++++++----
 2 files changed, 20 insertions(+), 6 deletions(-)

diffs (49 lines):

diff -r 71c0efc9adc2 -r 60cad3f3ff0f www/dillo/distinfo
--- a/www/dillo/distinfo        Sat Dec 11 17:22:30 2010 +0000
+++ b/www/dillo/distinfo        Sat Dec 11 19:08:35 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2010/02/14 20:19:25 snj Exp $
+$NetBSD: distinfo,v 1.31 2010/12/11 19:08:35 chuck Exp $
 
 SHA1 (dillo-2.2.tar.bz2) = 06b325a246a639d936dabfc73d005f951d23c151
 RMD160 (dillo-2.2.tar.bz2) = 050f5bcd46042764c9bba536e6e5fd97453e1d6f
@@ -6,4 +6,4 @@
 SHA1 (patch-aa) = df4222ae9a0bd58af4c5481f920b60893145dbc1
 SHA1 (patch-ab) = 827ed561c4622cf0d940090fcaac37f98d6cbab4
 SHA1 (patch-ac) = f129ed7bb341211895fc51a7b70a81c94e70b158
-SHA1 (patch-ad) = 005df4881ecea7b1a7aff51ea06697e9949547dd
+SHA1 (patch-ad) = 85080e130adeb44ca0dedce473529b3c0b188346
diff -r 71c0efc9adc2 -r 60cad3f3ff0f www/dillo/patches/patch-ad
--- a/www/dillo/patches/patch-ad        Sat Dec 11 17:22:30 2010 +0000
+++ b/www/dillo/patches/patch-ad        Sat Dec 11 19:08:35 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2009/07/09 05:04:03 snj Exp $
+$NetBSD: patch-ad,v 1.2 2010/12/11 19:08:35 chuck Exp $
 
---- configure.orig     2009-07-08 21:32:56.000000000 -0700
-+++ configure  2009-07-08 21:33:06.000000000 -0700
-@@ -2346,7 +2346,7 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
+--- configure.orig     2010-02-11 05:19:59.000000000 -0500
++++ configure  2010-12-11 13:52:46.000000000 -0500
+@@ -2999,7 +2999,7 @@
  
  ac_config_headers="$ac_config_headers config.h"
  
@@ -11,3 +11,17 @@
  
  
  
+@@ -6214,8 +6214,12 @@
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng-config" >&5
+ $as_echo_n "checking for libpng-config... " >&6; }
+ 
++
+   if test -z "$PNG_CONFIG"; then
+-    PNG_CONFIG=`which libpng12-config`
++    PNG_CONFIG=`which libpng14-config`
++    if test -z "$PNG_CONFIG"; then
++      PNG_CONFIG=`which libpng12-config`
++    fi
+     if test -z "$PNG_CONFIG"; then
+       PNG_CONFIG=`which libpng-config`
+     fi