Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 Sep 2019 16:59:03 +0000 (UTC)
From:      Niclas Zeising <zeising@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r511649 - in head/print/lilypond: . files
Message-ID:  <201909091659.x89Gx35N059659@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: zeising
Date: Mon Sep  9 16:59:02 2019
New Revision: 511649
URL: https://svnweb.freebsd.org/changeset/ports/511649

Log:
  print/lilypond: Fix configure
  
  Fix configure script issues detecting fontforge after fontforge update.
  
  Based on the idea in PR 240407

Modified:
  head/print/lilypond/Makefile
  head/print/lilypond/files/patch-configure

Modified: head/print/lilypond/Makefile
==============================================================================
--- head/print/lilypond/Makefile	Mon Sep  9 16:54:33 2019	(r511648)
+++ head/print/lilypond/Makefile	Mon Sep  9 16:59:02 2019	(r511649)
@@ -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 \

Modified: head/print/lilypond/files/patch-configure
==============================================================================
--- head/print/lilypond/files/patch-configure	Mon Sep  9 16:54:33 2019	(r511648)
+++ head/print/lilypond/files/patch-configure	Mon Sep  9 16:59:02 2019	(r511649)
@@ -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
  



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909091659.x89Gx35N059659>