From owner-svn-ports-head@freebsd.org Mon Sep 9 16:59:03 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 950F0D832E; Mon, 9 Sep 2019 16:59:03 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46RvWq3Ltqz4F7H; Mon, 9 Sep 2019 16:59:03 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5730018AC2; Mon, 9 Sep 2019 16:59:03 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x89Gx3FG059661; Mon, 9 Sep 2019 16:59:03 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x89Gx35N059659; Mon, 9 Sep 2019 16:59:03 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201909091659.x89Gx35N059659@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Mon, 9 Sep 2019 16:59:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511649 - in head/print/lilypond: . files X-SVN-Group: ports-head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in head/print/lilypond: . files X-SVN-Commit-Revision: 511649 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2019 16:59:03 -0000 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