From nobody Fri Mar 22 07:30:17 2024 X-Original-To: dev-commits-ports-all@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 4V1DWF2JWFz5FysM; Fri, 22 Mar 2024 07:30:17 +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 4V1DWF1ndQz4L7s; Fri, 22 Mar 2024 07:30:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711092617; 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=L9LIEbW6o9nHyxEu6ITx9Ya0znEIRZbsOUyPAfnEf48=; b=cHnxa+ZOy4qV+15mqAVNXB619CgfXfyxcks4Gr6AvdQ7dN1avHmf2uwE7yu61qPtrwlgnj YjTTV71jUsMxFWNQ9CoMflKGpHSxhMMAry6f1KwDuAZmdyEY2e80lgcrbQE2fj3dKbHZrD 6OSgtbHWtE/6TdxR9d6pZJtG2FZA4hKly2ywZOKsfEbXEesV/r+KqAA3rRBN5YnW5CwCiN 1euP3JmwKNPGMxsiUx9LikqJ/fUtnXDRU/tjAAWG1at8KToQNsv24oMU/fOUUXfbza1EAj l6Fhvp8A/GF2Sz/oaJaqTKB5W3IoHUqxZhziIkpdUMUEXOn6VkR9I/Mu4o3ryQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711092617; a=rsa-sha256; cv=none; b=PakzpP9+qbrmj1q1ROz6HfxKboma23L29dpzneZ8EBoCKTm09hP1rLCivqFFMDYX9ZeFbv yoANGpfQ4hxSfbhIqMFqPsLs3kE9fDyDzBgu5857Pu8qEEbTg8eZoOulqT9522gSF8/E32 fG1g/NqHvPB8PkmfZs/aPiD3Xkqdf6YKkXRyS+brnwfq/apVdz0NthVjhsYTfM9M0dmJzV FZNyR4bohfAUKCmyw1aYUpZofj2L1qhEeIBOAUaceg/MkF/+8i4j9eu3PQtWhQ5cFvwVNI ihtkeCDc5fOwPBrKltbjVRcdPWadZBVoiE0V/pvR+hili1/8H+DaeqxHp9DDBQ== 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=1711092617; 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=L9LIEbW6o9nHyxEu6ITx9Ya0znEIRZbsOUyPAfnEf48=; b=PnyEMfEcmcn7ErNFNbqFDEvJEfDRp++glM+NXSCcWTucYT4xragQXxomriRp8RbnWYdApO zDQK1j6r84oJxn3QHj4/kvjAtFRQFXgtzhQqWfKNzc5qRNk2X+pv9/NE7omUoOlwOyhqWD uLmIujc5oOCXQuDtf171bXj3KKSWHNughlj9pH5VZ1Ml1Ag3+f6ULap8ksMmMzar/v8Km2 MxxMIBBs+oj+KGh8CtTEd3bcoU1RRjqu6N3pUAHoGmd20wecdm83ylqkt/gwPDiE/5wY3i ejQv/A4LY1SUo63wxtyYO60zz7oQeRGF9y9WrB7Sr6wxQyKiXUaQ0snW+Yo3Ig== 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 4V1DWF1Gxxz189W; Fri, 22 Mar 2024 07:30:17 +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 42M7UHaq084216; Fri, 22 Mar 2024 07:30:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M7UH3v084209; Fri, 22 Mar 2024 07:30:17 GMT (envelope-from git) Date: Fri, 22 Mar 2024 07:30:17 GMT Message-Id: <202403220730.42M7UH3v084209@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 73265dd40101 - main - audio/musescore3: Move man pages to share/man List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73265dd40101352fc8d0d14b8081f41f7c3bd281 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=73265dd40101352fc8d0d14b8081f41f7c3bd281 commit 73265dd40101352fc8d0d14b8081f41f7c3bd281 Author: Yasuhiro Kimura AuthorDate: 2024-03-22 07:25:05 +0000 Commit: Yasuhiro Kimura CommitDate: 2024-03-22 07:29:47 +0000 audio/musescore3: Move man pages to share/man Approved by: portmgr (blanket) --- audio/musescore3/Makefile | 7 ++++--- audio/musescore3/files/patch-CMakeLists.txt | 32 +++++++---------------------- audio/musescore3/pkg-plist | 4 ++-- 3 files changed, 13 insertions(+), 30 deletions(-) diff --git a/audio/musescore3/Makefile b/audio/musescore3/Makefile index 0f57c947ae54..671615583dba 100644 --- a/audio/musescore3/Makefile +++ b/audio/musescore3/Makefile @@ -1,6 +1,7 @@ PORTNAME= ${GH_PROJECT:tl}3 DISTVERSIONPREFIX= v DISTVERSION= 3.6.2 +PORTREVISION= 1 CATEGORIES= audio MAINTAINER= adridg@FreeBSD.org @@ -65,9 +66,9 @@ post-install: ${MV} ${STAGEDIR}${PREFIX}/bin/mscore ${STAGEDIR}${PREFIX}/bin/mscore3 ${RM} ${STAGEDIR}${PREFIX}/bin/musescore ${LN} -s mscore3 ${STAGEDIR}${PREFIX}/bin/musescore3 - ${MV} ${STAGEDIR}${PREFIX}/man/man1/mscore.1.gz ${STAGEDIR}${PREFIX}/man/man1/mscore3.1.gz - ${RM} ${STAGEDIR}${PREFIX}/man/man1/musescore.1.gz - ${LN} -s mscore3.1.gz ${STAGEDIR}${PREFIX}/man/man1/musescore3.1.gz + ${MV} ${STAGEDIR}${PREFIX}/share/man/man1/mscore.1.gz ${STAGEDIR}${PREFIX}/share/man/man1/mscore3.1.gz + ${RM} ${STAGEDIR}${PREFIX}/share/man/man1/musescore.1.gz + ${LN} -s mscore3.1.gz ${STAGEDIR}${PREFIX}/share/man/man1/musescore3.1.gz ${RM} ${STAGEDIR}${DATADIR}/sound/MuseScore_General.sf3 ${INSTALL_DATA} ${DISTDIR}/MuseScore_General.sf3 ${STAGEDIR}${DATADIR}/sound/ ${FIND} ${STAGEDIR}${PREFIX} -name mscore.png -execdir ${MV} mscore.png mscore3.png \; diff --git a/audio/musescore3/files/patch-CMakeLists.txt b/audio/musescore3/files/patch-CMakeLists.txt index ab903adb9122..5f54c2f6a867 100644 --- a/audio/musescore3/files/patch-CMakeLists.txt +++ b/audio/musescore3/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2023-09-19 20:26:02.967705000 +0000 -+++ CMakeLists.txt 2023-09-19 20:26:07.529933000 +0000 -@@ -25,7 +25,7 @@ +--- CMakeLists.txt.orig 2021-02-08 12:16:37 UTC ++++ CMakeLists.txt +@@ -25,7 +25,7 @@ include(build/functions.cmake) # library of CMake func include(build/functions.cmake) # library of CMake functions ("fn__" namespace) # Print Qt version or fail the build if Qt (qmake) is not in PATH. @@ -9,7 +9,7 @@ # Libraries linked via full path no longer produce linker search paths. cmake_policy(SET CMP0003 NEW) -@@ -108,7 +108,7 @@ +@@ -108,7 +108,7 @@ add_definitions(-DMUSESCORE_REVISION="${MUSESCORE_REVI add_definitions(-DMUSESCORE_REVISION="${MUSESCORE_REVISION}") # Setup version number and general build settings @@ -18,7 +18,7 @@ # Possible MUSESCORE_BUILD_CONFIG values: # - dev - for development/nightly builds # - testing - for testing versions (alpha, beta, RC) -@@ -157,7 +157,7 @@ +@@ -157,7 +157,7 @@ option(BUILD_LAME "Enable MP3 export" option(USE_SYSTEM_FREETYPE "Use system FreeType" OFF) # requires freetype >= 2.5.2, does not work on win option(USE_SYSTEM_POPPLER "Use system Poppler for OMR" OFF) option(BUILD_LAME "Enable MP3 export" ON) # Requires libmp3lame, call CMake with -DBUILD_LAME="OFF" to disable @@ -27,7 +27,7 @@ # licence incompatibility, must never be distributed set(OCR OFF) -@@ -629,6 +629,38 @@ +@@ -629,6 +629,38 @@ else(APPLE) set_target_properties(oggdll PROPERTIES IMPORTED_IMPLIB ${OGG_LIBRARY}) else (MINGW OR MSVC) set(SNDFILE_LIB sndfile) @@ -66,25 +66,7 @@ endif (MINGW OR MSVC) set(OGG_LIB ogg) -@@ -733,7 +765,7 @@ - ) - endif (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD") - # Install man pages in either compressed or uncompressed form -- install( FILES ${MAN_BUILD} DESTINATION share/man/man1 COMPONENT doc) -+ install( FILES ${MAN_BUILD} DESTINATION man/man1 COMPONENT doc) - # Create symlink alias for man pages so `man musescore` = `man mscore` - find_program( LN_EXECUTABLE ln DOC "A tool for creating symbolic link aliases (optional)." ) - if (LN_EXECUTABLE) -@@ -744,7 +776,7 @@ - COMMAND ${LN_EXECUTABLE} -sf "${MAN_FULL_NAME}" "${MAN_FULL_ALIAS}" - COMMAND echo 'Symlink alias: ${MAN_FULL_ALIAS} -> ${MAN_FULL_NAME}' - ) -- install( FILES ${PROJECT_BINARY_DIR}/${MAN_FULL_ALIAS} DESTINATION share/man/man1 COMPONENT doc) -+ install( FILES ${PROJECT_BINARY_DIR}/${MAN_FULL_ALIAS} DESTINATION man/man1 COMPONENT doc) - else (LN_EXECUTABLE) - message(STATUS "'ln' not found (it is optional). No symlink aliases will be created.") - endif (LN_EXECUTABLE) -@@ -771,8 +803,8 @@ +@@ -771,8 +803,8 @@ if (NOT MSVC) # MSVC does not require these targets, as all.h is not copied and the # PCH generation is done per-project if (NOT MSVC) diff --git a/audio/musescore3/pkg-plist b/audio/musescore3/pkg-plist index bc3030f10dbf..f249773a77a1 100644 --- a/audio/musescore3/pkg-plist +++ b/audio/musescore3/pkg-plist @@ -1,7 +1,5 @@ bin/mscore3 bin/musescore3 -man/man1/mscore3.1.gz -man/man1/musescore3.1.gz share/applications/mscore3.desktop share/icons/hicolor/128x128/apps/mscore3.png share/icons/hicolor/16x16/apps/mscore3.png @@ -20,6 +18,8 @@ share/icons/hicolor/scalable/mimetypes/application-vnd.recordare.musicxml+xml.sv share/icons/hicolor/scalable/mimetypes/application-vnd.recordare.musicxml.svg share/icons/hicolor/scalable/mimetypes/application-x-musescore+xml.svg share/icons/hicolor/scalable/mimetypes/application-x-musescore.svg +share/man/man1/mscore3.1.gz +share/man/man1/musescore3.1.gz share/metainfo/org.musescore.MuseScore.appdata.xml share/mime/packages/musescore.xml %%DATADIR%%/demos/Brassed_Up.mscx