From nobody Mon Sep 12 20:54:38 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 4MRJkQ6qNbz4cH9m; Mon, 12 Sep 2022 20:54:38 +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 4MRJkQ6JMQz3hB5; Mon, 12 Sep 2022 20:54:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663016078; 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=G4CnZstxpvqK18vXKNeTCHe1o9mQ7OksLgGkcs1K9Y4=; b=mSdfjdFfyZNovQNzLSCtpUg8Dsm9hzbGHYgKro/FtvNuFslTCbSpWmd2N+UuS9XG7iK/lI 4JrBDa5udw4urLoQVPkcdoGOLh3ZjH5nwVsCSuPb/LOpeDTvi36KMSK4WxzVdvZHQx083/ tA0G+3CuSC4TeZvhbQjWw3NVmrn1L+8/bz39PWWCqGErX3b9NPaLkv0/npo6mYsLgHK0es ocq5A4vJw/FJMcNCZ13KicgXKyXNJY78X+zaZQFF4aokFk5vK5VhMGKqHtTPldf83HKVSg O+JvqOmT6cEejKgPvRnltyixH/Jg0nVDaO3izGCdZFxcKP4Pc5eoRrrEti2erQ== 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 4MRJkQ5KKrz16Gj; Mon, 12 Sep 2022 20:54:38 +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 28CKsciR001970; Mon, 12 Sep 2022 20:54:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28CKscmR001969; Mon, 12 Sep 2022 20:54:38 GMT (envelope-from git) Date: Mon, 12 Sep 2022 20:54:38 GMT Message-Id: <202209122054.28CKscmR001969@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: 889217fc64fd - main - deskutils/treesheets: Adopt/Update to 3025803779 release 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: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 889217fc64fdcd29919819ffc1db2e700fa2bbe4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663016078; 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=G4CnZstxpvqK18vXKNeTCHe1o9mQ7OksLgGkcs1K9Y4=; b=AqK9kRhM2kkXWKm/rhL+ZAXmgV/kU/pOFh9Is389RlfHfs/Vi+RPgqb6eVaFjIzA9JL0b7 qve2q2TDoMjiCsKj1A6rmZ0UsGpIV6jQMspmabyb7aoHdtF5bIp5aABDO6tq/HLaumecTV c/tP0sRT0vR1lDWNHYqtawkTG7r8ssJrresw4QxqKvNDq8JXpDElmSNjJhynbVt/DE9GOF tD4hw0IwqX9BfaZ8VuTAh1tBrVSrokgIhT/KMOQ23orlRQc9LMuRTzWLEzVcemL8wy+Ri3 ADdd9rWiOq0a976LpBYcU1adfJp+Oy15JC1OvxYwqPRNYg9Z0xgcgYqDzXwzdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663016078; a=rsa-sha256; cv=none; b=Hg+jz1sSljM/4wMwkLfHDKNc9JUXhNGb/tyLxcbNI3RpbPMJLXvmFFicZb33PSUikEFPFC SiWd9OU6UgAYgr3fQw1VAgf0KwZXzGk6K72s3LOjcygjbpjT+hSivYDVl1DQgl856Uw3SX IRwHnkDSIo5UU26tzfC1O8a7IZBxikyESJgxwJtYJu4ZBt6np/ju4TNl+1ZFx1ez/McWKi TD0SjpQkh34cFdghMQaUOk95DSgVwGor2nszAGTZCxMh/0DrHGJO9pYiqNw/Clguc4p9Wl S4Pz3RXX1VtMAqsTv8T4d167g4VnbRaeAZ6kyHVfdEcq/eoN0BJfs7qD6AFKxw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=889217fc64fdcd29919819ffc1db2e700fa2bbe4 commit 889217fc64fdcd29919819ffc1db2e700fa2bbe4 Author: Nuno Teixeira AuthorDate: 2022-09-12 20:50:28 +0000 Commit: Nuno Teixeira CommitDate: 2022-09-12 20:52:36 +0000 deskutils/treesheets: Adopt/Update to 3025803779 release - update WWW url ChangeLog: https://github.com/aardappel/treesheets/compare/v1.0.2...3025803779 --- deskutils/treesheets/Makefile | 61 ++++++------------------- deskutils/treesheets/distinfo | 6 +-- deskutils/treesheets/files/patch-CMakeLists.txt | 11 +++++ deskutils/treesheets/files/patch-src_Makefile | 15 ------ deskutils/treesheets/pkg-plist | 6 +++ 5 files changed, 34 insertions(+), 65 deletions(-) diff --git a/deskutils/treesheets/Makefile b/deskutils/treesheets/Makefile index de54c81a473c..09644f404110 100644 --- a/deskutils/treesheets/Makefile +++ b/deskutils/treesheets/Makefile @@ -1,64 +1,31 @@ PORTNAME= treesheets -PORTVERSION= 1.0.2 -PORTREVISION= 2 -DISTVERSIONPREFIX= v +DISTVERSION= 1.0.20220909 CATEGORIES= deskutils -MAINTAINER= ports@FreeBSD.org +MAINTAINER= eduardo@FreeBSD.org COMMENT= Free form data organizer -WWW= http://treesheets.com +WWW= https://strlen.com/treesheets/ LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/ZLIB_LICENSE.txt -USES= compiler:c++17-lang desktop-file-utils gnome +NOT_FOR_ARCHS= i386 +NOT_FOR_ARCHS_REASON_i386= Fails to compile: warning: 16 enumeration values not handled in switch: 'V_MINVMTYPES' ... + +USES= cmake compiler:c++17-lang desktop-file-utils gettext gnome USE_GITHUB= yes GH_ACCOUNT= aardappel +GH_TAGNAME= 3025803779 +USE_WX= 3.1 -USE_WX= 3.0+ - -BUILD_WRKSRC= ${WRKSRC}/src -PACKAGE_VERSION= \"${PORTVERSION}\" -MAKE_ENV= PACKAGE_VERSION=${PACKAGE_VERSION:Q} - -PORTDATA= images scripts translations/*/*.mo -PORTDOCS= *.html docs -PORTEXAMPLES= * - -PLIST_FILES= bin/${PORTNAME} \ - share/applications/treesheets.desktop \ - share/icons/hicolor/scalable/apps/treesheets.svg \ - share/pixmaps/treesheets.png +PORTDATA= images scripts +PORTDOCS= docs readme.html +PORTEXAMPLES= examples OPTIONS_DEFINE= DOCS EXAMPLES -post-patch: .SILENT - ${REINPLACE_CMD} -e 's|sys->frame->GetPath(L"|(L"${DOCSDIR}/|' \ - ${BUILD_WRKSRC}/document.h - ${REINPLACE_CMD} -e 's|wxFileName(exename).GetPath()|L"${DATADIR}"|' \ - ${BUILD_WRKSRC}/myframe.h - ${REINPLACE_CMD} -e 's|frame->GetPath(L"examples|(L"${EXAMPLESDIR}|' \ - ${BUILD_WRKSRC}/system.h - ${REINPLACE_CMD} -e 's|^\(Icon=\).*|\1${PORTNAME}|' \ - ${WRKSRC}/TS/treesheets.desktop - -do-install: - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - (cd ${WRKSRC}/TS && ${COPYTREE_SHARE} "${PORTDATA}" ${STAGEDIR}${DATADIR}) - ${INSTALL_DATA} ${WRKSRC}/TS/treesheets.desktop \ - ${STAGEDIR}${PREFIX}/share/applications - @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps - ${INSTALL_DATA} ${WRKSRC}/TS/images/treesheets.svg \ - ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps - ${INSTALL_DATA} ${WRKSRC}/TS/images/icon32.png \ - ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png - -do-install-DOCS-on: - (cd ${WRKSRC}/TS && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) - -do-install-EXAMPLES-on: - (cd ${WRKSRC}/TS/examples && ${COPYTREE_SHARE} "${PORTEXAMPLES}" \ - ${STAGEDIR}${EXAMPLESDIR}) +post-patch: + @${REINPLACE_CMD} -e 's|%%EXAMPLESDIR%%|${EXAMPLESDIR}|' ${WRKSRC}/CMakeLists.txt .include diff --git a/deskutils/treesheets/distinfo b/deskutils/treesheets/distinfo index 0b058a7c9f25..6283e4bcdf2d 100644 --- a/deskutils/treesheets/distinfo +++ b/deskutils/treesheets/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1564766678 -SHA256 (aardappel-treesheets-v1.0.2_GH0.tar.gz) = 84eb82f122bc7be3ded399d2511536128911477a4a69c51b26b856de2160405f -SIZE (aardappel-treesheets-v1.0.2_GH0.tar.gz) = 2486893 +TIMESTAMP = 1663014371 +SHA256 (aardappel-treesheets-1.0.20220909-3025803779_GH0.tar.gz) = 46a5c0107ef90f02224a63dac3980e95a1b3d1a8b4b25e8265aa0fe3b651a7ae +SIZE (aardappel-treesheets-1.0.20220909-3025803779_GH0.tar.gz) = 2959449 diff --git a/deskutils/treesheets/files/patch-CMakeLists.txt b/deskutils/treesheets/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..8b84ad4da2d4 --- /dev/null +++ b/deskutils/treesheets/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2022-09-12 14:30:49 UTC ++++ CMakeLists.txt +@@ -90,7 +90,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/images DESTINATION ${TREESHEETS_PKGDATADIR}) + install(DIRECTORY TS/scripts DESTINATION ${TREESHEETS_PKGDATADIR}) diff --git a/deskutils/treesheets/files/patch-src_Makefile b/deskutils/treesheets/files/patch-src_Makefile deleted file mode 100644 index 421ddb344bae..000000000000 --- a/deskutils/treesheets/files/patch-src_Makefile +++ /dev/null @@ -1,15 +0,0 @@ ---- src/Makefile.orig 2019-08-02 17:24:38 UTC -+++ src/Makefile -@@ -20,8 +20,12 @@ DIST_ARGS?= -caf - APPNAME= treesheets - SRCS= main.cpp \ - lobster_impl.cpp \ -+ ../lobster/external/flatbuffers/src/idl_gen_text.cpp \ -+ ../lobster/external/flatbuffers/src/idl_parser.cpp \ -+ ../lobster/external/flatbuffers/src/util.cpp \ - ../lobster/src/builtins.cpp \ - ../lobster/src/compiler.cpp \ -+ ../lobster/src/disasm.cpp \ - ../lobster/src/file.cpp \ - ../lobster/src/lobsterreader.cpp \ - ../lobster/src/platform.cpp \ diff --git a/deskutils/treesheets/pkg-plist b/deskutils/treesheets/pkg-plist new file mode 100644 index 000000000000..5d636a45c37f --- /dev/null +++ b/deskutils/treesheets/pkg-plist @@ -0,0 +1,6 @@ +bin/treesheets +share/applications/treesheets.desktop +share/icons/hicolor/scalable/apps/treesheets.svg +share/locale/de/LC_MESSAGES/ts.mo +share/locale/it/LC_MESSAGES/ts.mo +share/locale/zh_CN/LC_MESSAGES/ts.mo