summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2016-08-02 07:20:21 +0000
committerwiz <wiz@pkgsrc.org>2016-08-02 07:20:21 +0000
commited2ff9a1b59a87719816cdfa5325e800c214b045 (patch)
tree07f2fc5f510714ee8f607cfce7dbd0a75ae47991
parentce55a62ee50362028c007c7efeb33ada3a38253c (diff)
downloadpkgsrc-ed2ff9a1b59a87719816cdfa5325e800c214b045.tar.gz
Ignore result of broken pkg-config version test.
-rw-r--r--print/lilypond/distinfo4
-rw-r--r--print/lilypond/patches/patch-configure14
2 files changed, 14 insertions, 4 deletions
diff --git a/print/lilypond/distinfo b/print/lilypond/distinfo
index 6daf2fbac85..5e50dc4ccb4 100644
--- a/print/lilypond/distinfo
+++ b/print/lilypond/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.25 2015/11/04 01:01:35 agc Exp $
+$NetBSD: distinfo,v 1.26 2016/08/02 07:20:21 wiz Exp $
SHA1 (lilypond-2.18.2.tar.gz) = 09d3a1e0e9fadeb8ef6e279227a2b30812c7ee9b
RMD160 (lilypond-2.18.2.tar.gz) = a355201334fd0beac36c96f844c75d8e27b4ea9d
SHA512 (lilypond-2.18.2.tar.gz) = 0692f6eb41733076ba7f610cd1e65762f4dfd67307e2ab9e222b140d58ae3a1bb1c6b3be3bcff778d57f161868cf6d57e99bf43bf20f2663d042a07493942ec6
Size (lilypond-2.18.2.tar.gz) = 16027977 bytes
SHA1 (patch-ab) = a1d327ab900cca18b9306846f137e1bbcfdca945
-SHA1 (patch-configure) = 7ff9100e72f9683b933f0765b86805c0bb8fdcba
+SHA1 (patch-configure) = 5104bb10e48fecf15e7118fd971488be92821456
diff --git a/print/lilypond/patches/patch-configure b/print/lilypond/patches/patch-configure
index 163b03c5c9d..22adcfeb3e3 100644
--- a/print/lilypond/patches/patch-configure
+++ b/print/lilypond/patches/patch-configure
@@ -1,10 +1,12 @@
-$NetBSD: patch-configure,v 1.2 2014/01/05 22:29:47 wiz Exp $
+$NetBSD: patch-configure,v 1.3 2016/08/02 07:20:21 wiz Exp $
Disable c/c++ version check; it fails e.g. with clang emulating gcc.
Allow more metapost versions than upstream until pkgsrc contains
a new enough metapost.
---- configure.orig 2013-11-24 12:24:16.000000000 +0000
+Ignore result of broken pkg-config version test.
+
+--- configure.orig 2014-03-17 15:29:16.000000000 +0000
+++ configure
@@ -5297,7 +5297,7 @@ $as_echo_n "checking $r version... " >&6
`
@@ -39,3 +41,11 @@ a new enough metapost.
fi
{ $as_echo "$as_me:$LINENO: checking for working metafont mode" >&5
+@@ -10949,7 +10949,6 @@ $as_echo_n "checking $r version... " >&6
+ $as_echo "$ver" >&6; }
+ if test "$num" -lt "$req"; then
+
+- eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\"
+
+ fi
+ vervar="`echo PKG_CONFIG | tr 'a-z' 'A-Z'`_VERSION"