git: ffb7e6256b0d - main - print/lilypond-devel: Update to 2.23.13

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Guangyuan Yang <ygy_at_FreeBSD.org>
Date: Wed, 05 Oct 2022 06:43:13 UTC
The branch main has been updated by ygy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ffb7e6256b0df7f47a4a4506c7d06d039ac5ea40

commit ffb7e6256b0df7f47a4a4506c7d06d039ac5ea40
Author:     Martin Neubauer <m.ne@gmx.net>
AuthorDate: 2022-10-05 06:42:56 +0000
Commit:     Guangyuan Yang <ygy@FreeBSD.org>
CommitDate: 2022-10-05 06:42:56 +0000

    print/lilypond-devel: Update to 2.23.13
    
    Changelog:      https://lilypond.org/news.html#LilyPond-2_002e23_002e13-released-September-18_002c-2022
    
    PR:             266832
---
 print/lilypond-devel/Makefile              |  3 +-
 print/lilypond-devel/distinfo              |  6 +--
 print/lilypond-devel/files/patch-configure | 77 ------------------------------
 print/lilypond-devel/pkg-plist             |  5 +-
 4 files changed, 7 insertions(+), 84 deletions(-)

diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile
index ace458178f03..8ffc099fa929 100644
--- a/print/lilypond-devel/Makefile
+++ b/print/lilypond-devel/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	lilypond
-DISTVERSION=	2.23.11
-PORTREVISION=	1
+DISTVERSION=	2.23.13
 CATEGORIES=	print audio
 MASTER_SITES=	http://lilypond.org/download/source/v${DISTVERSION:R}/
 PKGNAMESUFFIX=	-devel
diff --git a/print/lilypond-devel/distinfo b/print/lilypond-devel/distinfo
index fa76907cb1a1..a7b6bae62100 100644
--- a/print/lilypond-devel/distinfo
+++ b/print/lilypond-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1658915776
-SHA256 (lilypond-2.23.11.tar.gz) = e158dcb99bd19a93e6899e36cf293dc583e5b1237a904b014917b7d0ffab690f
-SIZE (lilypond-2.23.11.tar.gz) = 19271435
+TIMESTAMP = 1664622707
+SHA256 (lilypond-2.23.13.tar.gz) = 17a9d1ad0ec7d1b7501b742d6b65ef371c88007537a7b8cbc9d54573270ddf0a
+SIZE (lilypond-2.23.13.tar.gz) = 19352865
diff --git a/print/lilypond-devel/files/patch-configure b/print/lilypond-devel/files/patch-configure
deleted file mode 100644
index fd6b0e6af92e..000000000000
--- a/print/lilypond-devel/files/patch-configure
+++ /dev/null
@@ -1,77 +0,0 @@
---- configure.orig	2022-05-20 13:40:50 UTC
-+++ configure
-@@ -8770,71 +8770,10 @@ test -n "$PKG_CONFIG" || PKG_CONFIG="no"
-     if test $? -eq 0; then
-         if test -n "0.9.0" -o -n ""; then
- 
--    r="`eval echo '$'"PKG_CONFIG"`"
--    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking $r version" >&5
--printf %s "checking $r version... " >&6; }
--    exe=`
--    ## which doesn't work in ash, if /usr/bin/which isn't installed
--    ## type -p doesn't work in ash
--    ## command -v doesn't work in zsh
--    ## command -v "$r" 2>&1
--    ## this test should work in ash, bash, pdksh (ksh), zsh
--    type -p $r 2>/dev/null | tail -n 1 | awk '{print $NF}'
--`
--    ver=`
--    ## "$exe" --version 2>&1 | grep -v '^$' | head -n 1 | awk '{print $NF}'
--    ##
--    ## ARG.
--    ## Workaround for broken Debian gcc version string:
--    ##     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.
--    ## use eval trickery, because we cannot use multi-level $() instead of ``
--    ## 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\`\"
--
--    if test -z "$_ver"; then
--        ## If empty, try date [fontforge]
--        eval _ver=\"\`("$exe" --version || "$exe" -V) 2>&1 \
--        | grep '\(^\|[^0-9a-f]\)[0-9]\{6,8\}\([^0-9a-f]\|$\)' \
--        | head -n 1 \
--        | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\"
--    fi
--    echo "$_ver"
--    #dnl
--`
--    num=`
--    echo "$ver" | awk -F. '
--    {
--      if ($3) {three = $3}
--      else {three = 0}
--    }
--    {printf "%.0f\n", $1*1000000 + $2*1000 + three}'
--`
--    min=`
--    echo "0.9.0" | awk -F. '
--    {
--      if ($3) {three = $3}
--      else {three = 0}
--    }
--    {printf "%.0f\n", $1*1000000 + $2*1000 + three}'
--`
--    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ver" >&5
--printf "%s\n" "$ver" >&6; }
--    if test "$num" -lt "$min"; then
--
-+    if test ! $?; then
-+    ver=`$PKG_CONFIG --version`
-     eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r >= 0.9.0 (installed: $ver)"\"`\"
- 
-     fi
diff --git a/print/lilypond-devel/pkg-plist b/print/lilypond-devel/pkg-plist
index 2715116fc683..0d463ade6a9e 100644
--- a/print/lilypond-devel/pkg-plist
+++ b/print/lilypond-devel/pkg-plist
@@ -262,6 +262,7 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/chord-name.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/clip-region.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/color.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/curried-definitions.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/define-context-properties.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/define-event-classes.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/define-grob-interfaces.scm
@@ -291,6 +292,7 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/documentation-lib.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/file-cache.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/flag-styles.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/font-encodings.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/font.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-cairo.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/framework-ps.scm
@@ -322,8 +324,6 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/part-combiner.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/predefined-fretboards.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/ps-to-png.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/lily/safe-lily.scm
-%%DATADIR%%/%%DISTVERSION%%/scm/lily/safe-utility-defs.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/scheme-engravers.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/scheme-performers.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/script.scm
@@ -332,6 +332,7 @@ share/emacs/site-lisp/lilypond-words.el
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/song.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/stencil.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/tablature.scm
+%%DATADIR%%/%%DISTVERSION%%/scm/lily/text-replacements.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/time-signature-settings.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/time-signature.scm
 %%DATADIR%%/%%DISTVERSION%%/scm/lily/titling.scm