From nobody Thu Mar 28 10:36:13 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 4V50M14kskz5FXc0; Thu, 28 Mar 2024 10:36:13 +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 4V50M147X3z4J6g; Thu, 28 Mar 2024 10:36:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711622173; 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=3LiUnEtwOf9zPuJMxI8dAMjTuVg01Oyt+s32Xjv5kAY=; b=hciA/szGpmwOfMYvrAJQKthxnKHEgbOuSXaYS91iviI+AEj2Y02aYZ0oIM+zHiID/VkegK SiwUBHmTM68K8tf5EizVqY6YjJP2UZ4Nb6FOBAuymv9ezcDHW4Sti4AncinBEI5Zb0wGdY sE8/g3ZKSKU5OnMibj17deTFfIXTE0etU7pwtv2G2DZscB/b74gMvWXzoGDtt6o4G1Vk+g PdUx8JgIdEoYkpMXfOb7RHdLN7Duf+/ZhbYdT2bdcwR8E7c2n6F3GcNvAxowtL4VKJWwT/ qALtGKpmPJsvq4rIVsim3cGdDMfB0Av/pJeeqAPaQWgS/9CRJfGSMX0yOaquMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711622173; a=rsa-sha256; cv=none; b=M0T6V5yJmHIpJ1NkB62Z7MwRIYEgCAMKPLgmXQZh3VY2GqhO7Mrh7l0AwH73Q7FDSAqv1X ctI4a6rbHOnoTX6ACBjE2Ea5/sRHku3mKvLfkMIOOotGKqFxH7pYKokAdvER01DHXLeUB2 MMguID/hDm7fs9WijQ4WKB7IV/0Uz7PgNoKCIr/lEDhTKOT7UMgg98MxZPHSoGjhx2923U rO/i297jnCeZBLQw6SBL2jR2noyJiKMZ4d82eb3p9lzv2welrvk3TVOLVq95DI/58eMBfo cEJRvXm+B3/C8VuK3DhzJYEV+M7bvPO3kz1TKlD1GEN0u5Owe3i5Il9khXWtDg== 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=1711622173; 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=3LiUnEtwOf9zPuJMxI8dAMjTuVg01Oyt+s32Xjv5kAY=; b=ClgazmtQTFE8KEwq+fci2LqJTcRZDLTO97dxUuzyQP3V5RODa4Tem7ZCU7b4p0lB04gI6o KmarUHKPd+/t0IuuXkvE0OiuRxXeEn6QNh6oEoXsuBal3FwUEmSzxtwS/j46vRwItY4EU2 9JJbgXubZWKJcnFpWZ/fc7RNYqzPOX4QcKbtv9a3jh4B5YER1qjC89OkHPRgYW11K5kRxK /LMch6RzQsrbFm92s322q5NFE0+FJ2Pf8a3nHreZgllQm1LlAxQNuGCdQMbmHKSfGHTEAy yD+59yptM4MuzMOa6/K3DjqfRl1EfKzXf6pydHDDoyzH8ULesBYcUl7Fx3u8/A== 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 4V50M13kSYzNy2; Thu, 28 Mar 2024 10:36:13 +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 42SAaDYI057348; Thu, 28 Mar 2024 10:36:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42SAaDwo057345; Thu, 28 Mar 2024 10:36:13 GMT (envelope-from git) Date: Thu, 28 Mar 2024 10:36:13 GMT Message-Id: <202403281036.42SAaDwo057345@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 30b24173a826 - main - deskutils/treesheets: Update to 20240324 snapshot 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: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 30b24173a8262c7c7ef82c3de4325dba640c2c39 Auto-Submitted: auto-generated The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=30b24173a8262c7c7ef82c3de4325dba640c2c39 commit 30b24173a8262c7c7ef82c3de4325dba640c2c39 Author: Nuno Teixeira AuthorDate: 2024-03-28 09:15:45 +0000 Commit: Nuno Teixeira 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 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})