Date: Thu, 28 Mar 2024 10:36:13 GMT From: Nuno Teixeira <eduardo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 30b24173a826 - main - deskutils/treesheets: Update to 20240324 snapshot Message-ID: <202403281036.42SAaDwo057345@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=30b24173a8262c7c7ef82c3de4325dba640c2c39 commit 30b24173a8262c7c7ef82c3de4325dba640c2c39 Author: Nuno Teixeira <eduardo@FreeBSD.org> AuthorDate: 2024-03-28 09:15:45 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> CommitDate: 2024-03-28 10:35:55 +0000 deskutils/treesheets: Update to 20240324 snapshot ChangeLog: https://github.com/aardappel/treesheets/compare/7861249636...8406978550 --- deskutils/treesheets/Makefile | 7 ++----- deskutils/treesheets/distinfo | 6 +++--- deskutils/treesheets/files/patch-CMakeLists.txt | 20 +++++++++++++++++--- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/deskutils/treesheets/Makefile b/deskutils/treesheets/Makefile index 9913e03e4256..8c0239306b47 100644 --- a/deskutils/treesheets/Makefile +++ b/deskutils/treesheets/Makefile @@ -1,5 +1,5 @@ PORTNAME= treesheets -DISTVERSION= 1.0.20240211 +DISTVERSION= 1.0.20240324 CATEGORIES= deskutils MAINTAINER= eduardo@FreeBSD.org @@ -12,7 +12,7 @@ LICENSE_FILE= ${WRKSRC}/ZLIB_LICENSE.txt USES= cmake desktop-file-utils shared-mime-info USE_GITHUB= yes GH_ACCOUNT= aardappel -GH_TAGNAME= 7861249636 +GH_TAGNAME= 8406978550 USE_WX= 3.2 PORTSCOUT= ignore:1 # upstream uses CI run ids as releases @@ -26,7 +26,4 @@ OPTIONS_SUB= yes NLS_USES= gettext-tools -pre-build: - @${REINPLACE_CMD} -e 's|%%EXAMPLESDIR%%|${EXAMPLESDIR}|' ${WRKSRC}/CMakeLists.txt - .include <bsd.port.mk> diff --git a/deskutils/treesheets/distinfo b/deskutils/treesheets/distinfo index 8be69405f764..dff376c3e186 100644 --- a/deskutils/treesheets/distinfo +++ b/deskutils/treesheets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1707664027 -SHA256 (aardappel-treesheets-1.0.20240211-7861249636_GH0.tar.gz) = b1fb9449af918694f685ea4271e0e687e59b5f165630b4c6498c6ba6d8eab420 -SIZE (aardappel-treesheets-1.0.20240211-7861249636_GH0.tar.gz) = 3020712 +TIMESTAMP = 1711615963 +SHA256 (aardappel-treesheets-1.0.20240324-8406978550_GH0.tar.gz) = ebc07c46175a0e09673dba44e45121745f4b1321342c1878fcd68623d4c81797 +SIZE (aardappel-treesheets-1.0.20240324-8406978550_GH0.tar.gz) = 3020825 diff --git a/deskutils/treesheets/files/patch-CMakeLists.txt b/deskutils/treesheets/files/patch-CMakeLists.txt index cd69ca1d798b..615468cb42c2 100644 --- a/deskutils/treesheets/files/patch-CMakeLists.txt +++ b/deskutils/treesheets/files/patch-CMakeLists.txt @@ -1,11 +1,25 @@ ---- CMakeLists.txt.orig 2024-01-06 23:03:16 UTC +--- CMakeLists.txt.orig 2024-03-24 04:56:12 UTC +++ CMakeLists.txt -@@ -113,7 +113,7 @@ install(FILES TS/readme.html DESTINATION ${TREESHEETS_ +@@ -95,11 +95,11 @@ target_link_libraries( + + ########## TREESHEETS INSTALLATION SETTINGS ############### + +-if(LINUX) ++if(LINUX OR BSD) + OPTION(TREESHEETS_RELOCATABLE_INSTALLATION "Install data relative to the treesheets binary, instead of respecting the Filesystem Hierarchy Standard" OFF) + endif() + +-if(LINUX AND NOT TREESHEETS_RELOCATABLE_INSTALLATION) ++if((LINUX OR BSD) AND NOT TREESHEETS_RELOCATABLE_INSTALLATION) + include(GNUInstallDirs) + + set(TREESHEETS_BINDIR ${CMAKE_INSTALL_BINDIR}) +@@ -125,7 +125,7 @@ install(FILES TS/readme.html DESTINATION ${TREESHEETS_ install(TARGETS treesheets DESTINATION ${TREESHEETS_BINDIR}) install(DIRECTORY TS/docs DESTINATION ${TREESHEETS_DOCDIR}) install(FILES TS/readme.html DESTINATION ${TREESHEETS_DOCDIR}) -install(DIRECTORY TS/examples DESTINATION ${TREESHEETS_DOCDIR}) -+install(DIRECTORY TS/examples DESTINATION %%EXAMPLESDIR%%) ++install(DIRECTORY TS/examples DESTINATION ${CMAKE_INSTALL_DATADIR}/examples/${CMAKE_PROJECT_NAME}) install(DIRECTORY TS/images DESTINATION ${TREESHEETS_PKGDATADIR}) install(DIRECTORY TS/scripts DESTINATION ${TREESHEETS_PKGDATADIR})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403281036.42SAaDwo057345>