summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorfhajny <fhajny@pkgsrc.org>2018-06-19 08:46:41 +0000
committerfhajny <fhajny@pkgsrc.org>2018-06-19 08:46:41 +0000
commit92f185871ee74d19fd23491bdec67af6436de296 (patch)
tree0b68b7877628430091356f77131a5d3eb6053354 /print
parenta770c4c03fe6641cef13ac619aadcc6c4203ec98 (diff)
downloadpkgsrc-92f185871ee74d19fd23491bdec67af6436de296.tar.gz
print/lilypond: Fix patch by removing an empty if/fi block.
Diffstat (limited to 'print')
-rw-r--r--print/lilypond/distinfo4
-rw-r--r--print/lilypond/patches/patch-configure16
2 files changed, 12 insertions, 8 deletions
diff --git a/print/lilypond/distinfo b/print/lilypond/distinfo
index 5e50dc4ccb4..6c0cd217c39 100644
--- a/print/lilypond/distinfo
+++ b/print/lilypond/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2016/08/02 07:20:21 wiz Exp $
+$NetBSD: distinfo,v 1.27 2018/06/19 08:46:41 fhajny 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) = 5104bb10e48fecf15e7118fd971488be92821456
+SHA1 (patch-configure) = e98c0b0e81dfa4ee2b593fd5eace444b8d58715d
diff --git a/print/lilypond/patches/patch-configure b/print/lilypond/patches/patch-configure
index 22adcfeb3e3..47906dd3c19 100644
--- a/print/lilypond/patches/patch-configure
+++ b/print/lilypond/patches/patch-configure
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.3 2016/08/02 07:20:21 wiz Exp $
+$NetBSD: patch-configure,v 1.4 2018/06/19 08:46:41 fhajny Exp $
Disable c/c++ version check; it fails e.g. with clang emulating gcc.
Allow more metapost versions than upstream until pkgsrc contains
@@ -41,11 +41,15 @@ Ignore result of broken pkg-config version test.
fi
{ $as_echo "$as_me:$LINENO: checking for working metafont mode" >&5
-@@ -10949,7 +10949,6 @@ $as_echo_n "checking $r version... " >&6
+@@ -10947,11 +10947,6 @@ $as_echo_n "checking $r version... " >&6
+ `
+ { $as_echo "$as_me:$LINENO: result: $ver" >&5
$as_echo "$ver" >&6; }
- if test "$num" -lt "$req"; then
-
+- if test "$num" -lt "$req"; then
+-
- eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\"
-
- fi
+-
+- fi
vervar="`echo PKG_CONFIG | tr 'a-z' 'A-Z'`_VERSION"
+ eval `echo $vervar=$num`
+ ## AC_SUBST(`eval echo $vervar`)