diff options
| author | chuck <chuck> | 2010-12-11 19:08:35 +0000 |
|---|---|---|
| committer | chuck <chuck> | 2010-12-11 19:08:35 +0000 |
| commit | 03d3b1f40b92c422d4c5f2cfd33382e21b19741e (patch) | |
| tree | 3a7dde4dffedf8894cc6939c701de7c584484c9c | |
| parent | 1395af414b5b41a64a5da5be2d15381773f6ebf9 (diff) | |
| download | pkgsrc-03d3b1f40b92c422d4c5f2cfd33382e21b19741e.tar.gz | |
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>
date: Fri Feb 19 21:31:12 2010 +0000
files: ChangeLog configure.in
| -rw-r--r-- | www/dillo/distinfo | 4 | ||||
| -rw-r--r-- | www/dillo/patches/patch-ad | 22 |
2 files changed, 20 insertions, 6 deletions
diff --git a/www/dillo/distinfo b/www/dillo/distinfo index 34bf7c43442..0e29d42495c 100644 --- a/www/dillo/distinfo +++ b/www/dillo/distinfo @@ -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 @@ Size (dillo-2.2.tar.bz2) = 630259 bytes SHA1 (patch-aa) = df4222ae9a0bd58af4c5481f920b60893145dbc1 SHA1 (patch-ab) = 827ed561c4622cf0d940090fcaac37f98d6cbab4 SHA1 (patch-ac) = f129ed7bb341211895fc51a7b70a81c94e70b158 -SHA1 (patch-ad) = 005df4881ecea7b1a7aff51ea06697e9949547dd +SHA1 (patch-ad) = 85080e130adeb44ca0dedce473529b3c0b188346 diff --git a/www/dillo/patches/patch-ad b/www/dillo/patches/patch-ad index ef8bcb173f0..24cd78ff83f 100644 --- a/www/dillo/patches/patch-ad +++ b/www/dillo/patches/patch-ad @@ -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 @@ $NetBSD: patch-ad,v 1.1 2009/07/09 05:04:03 snj Exp $ +@@ -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 |