From nobody Fri Mar 29 17:35:52 2024 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 4V5ncm3lTYz5FJxC; Fri, 29 Mar 2024 17:35:52 +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 4V5ncm3CdMz4dJ0; Fri, 29 Mar 2024 17:35:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711733752; 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=HCgzUYi1tCAWph7C7TsRu1dQYVn678scfjnYqaioWmI=; b=ZEXpL5Wfe9fTPv7cpmDt4zHERQqtO4IER+H8vs58QLkUP1RnwRy8qXbC7HjX/JiODSp5VE yQmEjq7eJG2x091jsQHIqSJbPA/RSOdM6fRsnr8oNl0qmu8wOoSiYxVtZPgyefGp5batz0 kM2y3raNTyu0FB6kIYA1QOtREE4uFaNsE70zKGnlLiPuXWgRL6r3r/mVgOIc/pnl1q5yhW Trjd1lwDeV847yBrYizWoH0bjE6jI64YopSRzjgdNE7EAy4KHzNwVqHymC7uolhIbeIAai 7ly0iXhup8JBAOSq9w3rFCyN2wW1Gse/OmiHg0B7yn8rWBoUrkX4ZyqyW7bQjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711733752; a=rsa-sha256; cv=none; b=MgIGQzjdRFOGCv05o5CoCP4GE8J+xvX+KW+4T7W8o9FylYy6RgNAJaw9WhlgRdXgTUb5WI c2ETxmy9mrLwcpNWWrk9yyaGj7v+uCRDtpgSCw2YOwnwlQRcu4gA+VOsY6F2MOh8+ecU4d XAh97dKEZuGEq5ggQAtlGj3ULAXwzxF+7sm1GBN4uOjwaiCaES+QyG7/v0hKJP/aaV2lQJ nR2o9Q7YbFkD6bmTSCLVs0OGy63rg/u3oEwGJmVejnvzbz7rlACRCw69hAC1UscUAAsagG pg8qSsw+HcMdq+geqP5AoboiZaAMujOlgS5CdpIq7fKA0f7dIBePyNcwGY/SFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711733752; 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=HCgzUYi1tCAWph7C7TsRu1dQYVn678scfjnYqaioWmI=; b=AtnjslYyErejDaxkAoAQMibQcJcq4nTRlInRMcuy4hwRWo8ltEb8DZ5dMSgLn9X4ESItI8 tsnEjqPt+T02WTNkUEI+66jXIsfcQRxH8MadvqQqWmpQsY9jygNWc/gXyJsqjH5nW+xSmV S2MNq5PbWtuSEJToKcv3xTnKPWT8fGF5088L1dT9QFR2aItuq85UrsS9Jx//z4bWEUxgow +aXcjh4lgaR1L6mRpb24JY1BTiiXLa1+v671b8jecx+d0cE2S8HcZlUM9oEx+h/NZ/N1QK JBddGRgXJfZFPJLG0Zm+ZJLRoU1uWQM0sE2T65GUJ3QCs3VggIW9g2LPImeQVQ== 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 4V5ncm2pQczKrK; Fri, 29 Mar 2024 17:35:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42THZq3E015552; Fri, 29 Mar 2024 17:35:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42THZqfn015549; Fri, 29 Mar 2024 17:35:52 GMT (envelope-from git) Date: Fri, 29 Mar 2024 17:35:52 GMT Message-Id: <202403291735.42THZqfn015549@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Fernando =?utf-8?Q?Apestegu=C3=ADa?= Subject: git: 5466c6ea6687 - main - print/lilypond: remove non-functional URW option 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: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5466c6ea6687667f9c19a5d9974f906f60b18fd2 Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=5466c6ea6687667f9c19a5d9974f906f60b18fd2 commit 5466c6ea6687667f9c19a5d9974f906f60b18fd2 Author: Martin Neubauer AuthorDate: 2024-03-26 19:11:29 +0000 Commit: Fernando Apesteguía CommitDate: 2024-03-29 17:35:39 +0000 print/lilypond: remove non-functional URW option ChangeLog: https://lilypond.org/doc/v2.24/Documentation/changes/index.html#notes-for-source-compilation-and-packagers The possibility to bundle text fonts was removed by upstream. The URW option therefore doesn't work anymore and might even result in a broken installation when building with non-default options. PR: 277917 Reported by: m.ne@gmx.net (maintainer) --- print/lilypond/Makefile | 12 ++++-------- print/lilypond/pkg-plist | 12 ------------ 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile index 6d2458ab1dc9..b960847009a3 100644 --- a/print/lilypond/Makefile +++ b/print/lilypond/Makefile @@ -1,6 +1,6 @@ PORTNAME= lilypond DISTVERSION= 2.24.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print audio MASTER_SITES= http://lilypond.org/download/source/v${DISTVERSION:R}/ @@ -24,7 +24,8 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans-Bold.ttf:x11-fonts/dejavu \ - mftrace:print/mftrace + mftrace:print/mftrace \ + urw-base35-fonts>0:x11-fonts/urw-base35-fonts USES= bison:build compiler:c++11-lib cpe ghostscript gmake gnome \ magick:7,build perl5 pkgconfig python @@ -59,7 +60,7 @@ INFO= lilypond-changes \ music-glossary PLIST_SUB= DISTVERSION=${DISTVERSION} -OPTIONS_DEFINE= NLS URW +OPTIONS_DEFINE= NLS OPTIONS_DEFAULT= GUILE2 OPTIONS_SINGLE= GUILE OPTIONS_SINGLE_GUILE= GUILE2 GUILE3 @@ -67,16 +68,11 @@ OPTIONS_SUB= yes GUILE2_DESC= Use guile2 GUILE3_DESC= Use guile3 -URW_DESC= Use bundled URW fonts GUILE2_USES= guile:2.2 GUILE3_USES= guile:3.0 NLS_USES= gettext -URW_BUILD_DEPENDS= urw-base35-fonts>0:x11-fonts/urw-base35-fonts -URW_RUN_DEPENDS_OFF= urw-base35-fonts>0:x11-fonts/urw-base35-fonts -URW_CONFIGURE_WITH= urwotf-dir=${LOCALBASE}/share/fonts/urw-base35-fonts - post-patch: @${SED} -e 's|%%FONTDIR%%|${WRKDIR}/fontconfig/cache/|' \ ${FILESDIR}/fonts.conf > ${WRKDIR}/.fonts.conf diff --git a/print/lilypond/pkg-plist b/print/lilypond/pkg-plist index 5b3bbd052647..3ea172177f79 100644 --- a/print/lilypond/pkg-plist +++ b/print/lilypond/pkg-plist @@ -365,15 +365,3 @@ share/man/man1/musicxml2ly.1.gz %%NLS%%share/locale/vi/LC_MESSAGES/lilypond.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/lilypond.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/lilypond.mo -%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/C059-BdIta.otf -%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/C059-Bold.otf -%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/C059-Italic.otf -%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/C059-Roman.otf -%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusMonoPS-Bold.otf -%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusMonoPS-BoldItalic.otf -%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusMonoPS-Italic.otf -%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusMonoPS-Regular.otf -%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusSans-Bold.otf -%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusSans-BoldItalic.otf -%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusSans-Italic.otf -%%URW%%%%DATADIR%%/%%DISTVERSION%%/fonts/otf/NimbusSans-Regular.otf