svn commit: r511648 - in head/print/lilypond-devel: . files
Niclas Zeising
zeising at FreeBSD.org
Mon Sep 9 16:54:34 UTC 2019
Author: zeising
Date: Mon Sep 9 16:54:33 2019
New Revision: 511648
URL: https://svnweb.freebsd.org/changeset/ports/511648
Log:
print/lilypond-devel: Fix configure
Fix configure script issues detecting fontforge after fontforge update.
PR: 240407
Submitted by: m.ne at gmx.net (maintainer)
Modified:
head/print/lilypond-devel/Makefile
head/print/lilypond-devel/files/patch-configure
Modified: head/print/lilypond-devel/Makefile
==============================================================================
--- head/print/lilypond-devel/Makefile Mon Sep 9 16:51:15 2019 (r511647)
+++ head/print/lilypond-devel/Makefile Mon Sep 9 16:54:33 2019 (r511648)
@@ -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 \
Modified: head/print/lilypond-devel/files/patch-configure
==============================================================================
--- head/print/lilypond-devel/files/patch-configure Mon Sep 9 16:51:15 2019 (r511647)
+++ head/print/lilypond-devel/files/patch-configure Mon Sep 9 16:54:33 2019 (r511648)
@@ -1,7 +1,23 @@
---- 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
- r="`eval echo '$'"PKG_CONFIG"`"
@@ -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)"\"`\"
More information about the svn-ports-all
mailing list