diff options
| author | Niclas Zeising <zeising@FreeBSD.org> | 2019-09-09 16:54:33 +0000 |
|---|---|---|
| committer | Niclas Zeising <zeising@FreeBSD.org> | 2019-09-09 16:54:33 +0000 |
| commit | 26c279312a5be3001c8433f64897dc373826e497 (patch) | |
| tree | aa7807a0df57bfd32b2c034d5cbe470f079f80a2 /print | |
| parent | 678e57ceeb5e3006a3a3ed0f8165e46b77e3688c (diff) | |
Notes
Diffstat (limited to 'print')
| -rw-r--r-- | print/lilypond-devel/Makefile | 2 | ||||
| -rw-r--r-- | print/lilypond-devel/files/patch-configure | 25 |
2 files changed, 20 insertions, 7 deletions
diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile index 73a44422ae97..1ae8f0c8e86a 100644 --- a/print/lilypond-devel/Makefile +++ b/print/lilypond-devel/Makefile @@ -13,8 +13,6 @@ COMMENT= GNU music typesetter LICENSE= GPLv3 -BROKEN= fails to configure - BUILD_DEPENDS= pdftexi2dvi:print/texinfo \ t1ascii:print/t1utils \ bash:shells/bash \ diff --git a/print/lilypond-devel/files/patch-configure b/print/lilypond-devel/files/patch-configure index ec85d6c7d6d5..48afff01b139 100644 --- a/print/lilypond-devel/files/patch-configure +++ b/print/lilypond-devel/files/patch-configure @@ -1,6 +1,22 @@ ---- configure.orig 2017-10-15 16:42:11 UTC +--- configure.orig 2019-03-20 13:52:23 UTC +++ configure -@@ -11527,75 +11527,10 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no" +@@ -10512,13 +10512,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] +@@ -11595,75 +11590,10 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no" if test $? -eq 0 -a -n "0.9.0"; then @@ -26,7 +42,8 @@ - ## gcc (GCC) 3.1.1 20020606 (Debian prerelease) - ## - ## -V: Workaround for python -- ++ $PKG_CONFIG --atleast-pkgconfig-version 0.9.0 + - #dnl - - ## Assume and hunt for dotted version multiplet. @@ -73,8 +90,6 @@ -$as_echo "$ver" >&6; } - if test "$num" -lt "$req"; then - -+ $PKG_CONFIG --atleast-pkgconfig-version 0.9.0 -+ + if test ! $?; then + ver=`$PKG_CONFIG --version` eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\" |