From owner-svn-ports-head@freebsd.org Mon Sep 9 16:54:34 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 02940D82C1; Mon, 9 Sep 2019 16:54:34 +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 46RvQd5zbJz4F1H; Mon, 9 Sep 2019 16:54:33 +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 B085F18ABC; Mon, 9 Sep 2019 16:54:33 +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 x89GsXSa059295; Mon, 9 Sep 2019 16:54:33 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x89GsXCF059293; Mon, 9 Sep 2019 16:54:33 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201909091654.x89GsXCF059293@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:54:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r511648 - in head/print/lilypond-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in head/print/lilypond-devel: . files X-SVN-Commit-Revision: 511648 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:54:34 -0000 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@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)"\"`\"