From nobody Sun Feb 13 17:10:44 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E207E19C2D8D; Sun, 13 Feb 2022 17:10:44 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JxYlS5zrwz4WTc; Sun, 13 Feb 2022 17:10:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644772244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=871Mkht82MXDihyQQRi4ikwz9pAEm8snU77ceccyvwg=; b=Qry5ruNoBAWCkfzWnPcj1ovp7wGgwHyOber2dqpmvbHVsF58X6QEv8yEaAWmwxPy788V20 pkwZ0WuWlcsCTq+zrDGh7WO/SiCp9y49B86TMzqWWmp14nvBcPQvvredkDvM3U0S9jRRDx T8CQeCX3nrAVNfP7qvibq+JqhnXDoOdv6QMzWDSkR1e60UwHTrI9gI3pPPyxYe23EH3JN6 IfWUhEK7QgFgKmi5B1sHPjPoJrP9orB09DR4cv2KI3blvAWy79yTKTOMWdBh3I6AM0KYbs UrWLym45iHiQd0aDcuYckvoFNNM+F1lnqFXtuRusDmRPpFDXHsHUVxOWKkIBMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ADCCC1F000; Sun, 13 Feb 2022 17:10:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21DHAiTL003115; Sun, 13 Feb 2022 17:10:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21DHAie6003114; Sun, 13 Feb 2022 17:10:44 GMT (envelope-from git) Date: Sun, 13 Feb 2022 17:10:44 GMT Message-Id: <202202131710.21DHAie6003114@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Li-Wen Hsu Subject: git: fee7c3488474 - main - print/lilypond-devel: 2.23.6 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fee7c34884744c8a71ffeabc028fd949fa77c628 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644772244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=871Mkht82MXDihyQQRi4ikwz9pAEm8snU77ceccyvwg=; b=cYzGXz8P6JYXIztoF3cijKjpJzafi6VGDNxZ6iEi6r8ikLbMSTDNwL4YJGagkajIQHj/eK Dw9Ji/KIBG1Wcg7qKiwQkx/obISE+EhmbzaVrk9QQwVjvE//PiIMkwohrgJiV/xfSYQXQv 1uaEPo9Mnq8LKBjcQ3uVf7TpYLUyDIS38LDfa1XQSBUbfQUcaeyLhWvDpJfMWqIP7B/RQn iOYGB+NLYi2x4E0G7stIAbsrErursOmhxAZV6KUHKB2heIo1+cK+HV6nj5IZyy0QlNgxNN yqmca49XKaW9TDebWu1AXrYwuED2haGNzdfpNqnZgbnEJwdIopqXy/WV3KL1QA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644772244; a=rsa-sha256; cv=none; b=nSw1GIeg/UcnWsg6afguYQe/XOmvxpo16Cp1F9qXn7MPMh8kqo4U2h71UFftwzAV9CziXx NGoI1ncfHx2taz5nm0RkjSDaTmCUyrLWBRPZcg9uYxUZBp+8M1mpqxAdumPbQYIpzYrIKM z9q7uBk0we9qF1lW1NJ/iOoRGH8NFKA2SR+/qPrQzGQ6xptokP+DtHnV/BGYadhrK8n4Sk lj9YLvEaeaxohX6ePLcJgWeDenHUb8rnuLR3n5EOL3JaeBleg4Q3c7+/6GieTBokDU3szU kmN1qb4/lJEiXTWa1XvI4uUUWfKVHQN3MlaUvPqS2Cqj9WCTCtKypgHLUCp7+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=fee7c34884744c8a71ffeabc028fd949fa77c628 commit fee7c34884744c8a71ffeabc028fd949fa77c628 Author: Martin Neubauer AuthorDate: 2022-02-13 17:09:44 +0000 Commit: Li-Wen Hsu CommitDate: 2022-02-13 17:09:44 +0000 print/lilypond-devel: 2.23.6 - Ensure using the chosen guile version once multiple versions can be installed concurrently PR: 261854 --- print/lilypond-devel/Makefile | 7 ++++--- print/lilypond-devel/distinfo | 6 +++--- print/lilypond-devel/files/patch-lily_dispatcher.cc | 14 -------------- print/lilypond-devel/pkg-plist | 3 ++- 4 files changed, 9 insertions(+), 21 deletions(-) diff --git a/print/lilypond-devel/Makefile b/print/lilypond-devel/Makefile index 985860b04960..51a24002b235 100644 --- a/print/lilypond-devel/Makefile +++ b/print/lilypond-devel/Makefile @@ -1,7 +1,7 @@ # Created by: patrick, trevor PORTNAME= lilypond -DISTVERSION= 2.23.5 +DISTVERSION= 2.23.6 CATEGORIES= print audio MASTER_SITES= http://lilypond.org/download/source/v${DISTVERSION:R}/ PKGNAMESUFFIX= -devel @@ -43,11 +43,11 @@ CONFIGURE_ENV+= ac_cv_prog_MAKEINFO="${LOCALBASE}/bin/makeinfo" \ HOME=${WRKDIR} \ YACC=${YACC} -CONFLICTS_INSTALL= lilypond - MAKEFILE= GNUmakefile ALL_TARGET= all +CONFLICTS_INSTALL= lilypond + BINARY_ALIAS= python=${PYTHON_VERSION} INFO= lilypond-changes \ @@ -71,6 +71,7 @@ URW_DESC= Use bundled URW fonts GUILE2_LIB_DEPENDS= libgc-threaded.so:devel/boehm-gc-threaded \ libguile-2.2.so:lang/guile2 GUILE2_LIB_DEPENDS_OFF= libguile.so:lang/guile1 +GUILE2_CONFIGURE_ENV= GUILE_FLAVOR=guile-2.2 NLS_USES= gettext diff --git a/print/lilypond-devel/distinfo b/print/lilypond-devel/distinfo index f59b892a2a4f..6d765fc48a7a 100644 --- a/print/lilypond-devel/distinfo +++ b/print/lilypond-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1638223494 -SHA256 (lilypond-2.23.5.tar.gz) = 53fd289eac318356003bf19b2d9e8ec43cb32e2ea926363145c1b26482bd1678 -SIZE (lilypond-2.23.5.tar.gz) = 17180401 +TIMESTAMP = 1644228992 +SHA256 (lilypond-2.23.6.tar.gz) = a179bd974a0e64390efef5bb0cc1e7287f1218237548433adba51c4f25bba2ce +SIZE (lilypond-2.23.6.tar.gz) = 17311135 diff --git a/print/lilypond-devel/files/patch-lily_dispatcher.cc b/print/lilypond-devel/files/patch-lily_dispatcher.cc deleted file mode 100644 index e33d090c2f6e..000000000000 --- a/print/lilypond-devel/files/patch-lily_dispatcher.cc +++ /dev/null @@ -1,14 +0,0 @@ ---- lily/dispatcher.cc.orig 2021-11-28 13:46:28 UTC -+++ lily/dispatcher.cc -@@ -23,8 +23,10 @@ - #include "warn.hh" - #include "lily-imports.hh" - --#ifdef __MINGW32__ -+#if defined __MINGW32__ - #include -+#elif defined __FreeBSD__ -+#include - #else - #include - #endif diff --git a/print/lilypond-devel/pkg-plist b/print/lilypond-devel/pkg-plist index f5b4f92a03ee..ea19211db351 100644 --- a/print/lilypond-devel/pkg-plist +++ b/print/lilypond-devel/pkg-plist @@ -111,6 +111,7 @@ share/emacs/site-lisp/lilypond-words.el %%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-rests.mf %%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-scripts.mf %%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-sharps.mf +%%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-sori-koron.mf %%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-ties.mf %%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-timesignatures.mf %%DATADIR%%/%%DISTVERSION%%/fonts/source/feta-trills.mf @@ -188,7 +189,6 @@ share/emacs/site-lisp/lilypond-words.el %%DATADIR%%/%%DISTVERSION%%/ly/event-listener.ly %%DATADIR%%/%%DISTVERSION%%/ly/festival.ly %%DATADIR%%/%%DISTVERSION%%/ly/generate-documentation.ly -%%DATADIR%%/%%DISTVERSION%%/ly/generate-interface-doc-init.ly %%DATADIR%%/%%DISTVERSION%%/ly/grace-init.ly %%DATADIR%%/%%DISTVERSION%%/ly/graphviz-init.ly %%DATADIR%%/%%DISTVERSION%%/ly/gregorian.ly @@ -205,6 +205,7 @@ share/emacs/site-lisp/lilypond-words.el %%DATADIR%%/%%DISTVERSION%%/ly/norsk.ly %%DATADIR%%/%%DISTVERSION%%/ly/paper-defaults-init.ly %%DATADIR%%/%%DISTVERSION%%/ly/performer-init.ly +%%DATADIR%%/%%DISTVERSION%%/ly/persian.ly %%DATADIR%%/%%DISTVERSION%%/ly/piano-tkit.ly %%DATADIR%%/%%DISTVERSION%%/ly/portugues.ly %%DATADIR%%/%%DISTVERSION%%/ly/predefined-fretboards-init.ly