diff options
| author | Niclas Zeising <zeising@FreeBSD.org> | 2019-09-09 16:59:02 +0000 |
|---|---|---|
| committer | Niclas Zeising <zeising@FreeBSD.org> | 2019-09-09 16:59:02 +0000 |
| commit | 435d8a15b8a22e2b9537190a446baaf6220ffe36 (patch) | |
| tree | 288cd2c3af68b5b4dc6e45d35dd533775f9aae67 /print | |
| parent | 26c279312a5be3001c8433f64897dc373826e497 (diff) | |
print/lilypond: Fix configure
Fix configure script issues detecting fontforge after fontforge update.
Based on the idea in PR 240407
Notes
Notes:
svn path=/head/; revision=511649
Diffstat (limited to 'print')
| -rw-r--r-- | print/lilypond/Makefile | 2 | ||||
| -rw-r--r-- | print/lilypond/files/patch-configure | 18 |
2 files changed, 17 insertions, 3 deletions
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile index 9e7b6e38d48e..68d7e1d3badd 100644 --- a/print/lilypond/Makefile +++ b/print/lilypond/Makefile @@ -13,8 +13,6 @@ COMMENT= GNU music typesetter LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN= fails to configure - BUILD_DEPENDS= pdftexi2dvi:print/texinfo \ t1ascii:print/t1utils \ bash:shells/bash \ diff --git a/print/lilypond/files/patch-configure b/print/lilypond/files/patch-configure index 20e7cde5eca3..65b1b290f364 100644 --- a/print/lilypond/files/patch-configure +++ b/print/lilypond/files/patch-configure @@ -1,6 +1,22 @@ --- configure.orig 2014-03-17 15:29:16 UTC +++ configure -@@ -10881,73 +10881,7 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no" +@@ -9800,13 +9800,8 @@ $as_echo_n "checking $r version... " >&6; } + ## for compatibility reasons. + + ## grab the first version number in --version output. +- eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 | +- grep -E '(^| )[0-9][0-9]*\.[0-9]' | +- head -n 1 | +- tr ' ' '\n' | +- sed 's/\([0-9][0-9]*\.[0-9][0-9.]*\).*/\1/g' | +- grep -E '(^| )[0-9][0-9]*\.[0-9]' | +- head -n 1\`\" ++ eval _ver=\"\`("$exe" --version || "$exe" -V) 2>/dev/null | ++ awk '$1 ~ "fontforge" { print $2 }'\`\" + + if test -z "$_ver"; then + ## If empty, try date [fontforge] +@@ -10881,73 +10876,7 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no" if test $? -eq 0 -a -n "0.9.0"; then |