From nobody Wed Apr 5 13:16:55 2023 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 4Ps4sg3VJZz43SX9; Wed, 5 Apr 2023 13:16:55 +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 4Ps4sg2rKsz3MNQ; Wed, 5 Apr 2023 13:16:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680700615; 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=yAzJFjoBUThZ2hlFs/MyAz7k5OXAYYNNrIhIOVp+M44=; b=GVNwdPoOmyYm40m6VsBHZkqBTydsnHSnHrqbonYxszpl4IADBievtkGK69hsxAkNrTz78L 5RkNZ8PRGN+V+vQ4UKtkjB9C2ljedgvHuSQ1xL3UglbMJgmmtf5mE9WoXu3zKQTF7ewSf8 yWiY2de4B7IbCvUr4CdAo36C5E7K8pPGMejLlrnQ6IzmghyVmz7kRbctvpFT5KmGFP5om3 2yPMzIekOBdkOJuNpwcf4KYvbyarLFww82OiLFkU1HaXGpSVEx6Kht5ExtdFqSlyWBPwI9 WmVA/JR8urKkJC/sEvr0eKmekzZ/8U5KK4rPBcJnE4qKyTfRJudawAFQ/PgKXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680700615; 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=yAzJFjoBUThZ2hlFs/MyAz7k5OXAYYNNrIhIOVp+M44=; b=Y3OgNevEBPE8yF1IrFcdas9tD10Y2SDYtrGffikaVKhAfduUIqx0SQEJ2ytrHNpNvdQIfR Lmxi6u44Gi1tnYdDsOUz4WmBWLVoq0n8DbkfEFDUpIrs8BBHT+uzIAxMecZPpsstTTCm+A WsieFOnsm4f4Y9sfYahm8/Uk6s1G8FjEjfPSQRGlq2M3jsQKAVJVMGSQFNlGNutBpD549Q nsfYtp+5brBr86urQXgWbZ27mqSgBb0FPMj8Kjov1fiANMQMqoo1bPUisjFua9p6wqIqbU a+cuKFJdKm/Zt2UAVIypInDmSdGCODThQ2rI44Ovl0Mmh+Pct6xyVAe0JT2Gfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680700615; a=rsa-sha256; cv=none; b=PjJ6nLVooPI8kQOES4MdKfnBtiuuu/B0p/9ufB4B+TaHNotWxcSt8xHqXldkfrTL0CLAIj utregQ7stEoQ0cvUZztLHc52vhYa7sZOTMwNYkXx52v61n3xUXZVPyZUsMUNwbkaljSjW+ zHfjKnBjC8Jwvab2aulBJ6COWRxAGFkEiy5pA+VXq9ZWCMUCbKsl2JERvGB76wtdNXzT9m vfO1O4R82a32LosDTMxIFWFUhIDtKTFhudPVpDCbZTBI43/H69MYDCbkXuAVJ5Tnc3KXIr X5Z+r7xsbi47HU6sbNLSQ5Nx+lfylrKlNkm5l4yB7KF5KAvzP9xqJphU8feEBw== 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 4Ps4sg1xpdzNsd; Wed, 5 Apr 2023 13:16:55 +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 335DGtHl051893; Wed, 5 Apr 2023 13:16:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 335DGtWw051892; Wed, 5 Apr 2023 13:16:55 GMT (envelope-from git) Date: Wed, 5 Apr 2023 13:16:55 GMT Message-Id: <202304051316.335DGtWw051892@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 41acfec7a1ce - main - misc/gedkeeper: the port had been improved (+) 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41acfec7a1ce77f8135080f7cc6e8689a1cfe84c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=41acfec7a1ce77f8135080f7cc6e8689a1cfe84c commit 41acfec7a1ce77f8135080f7cc6e8689a1cfe84c Author: Alexey Dokuchaev AuthorDate: 2023-04-05 13:16:16 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-04-05 13:16:16 +0000 misc/gedkeeper: the port had been improved (+) - Make GetTempDir() function Unix-aware, where TMP environment variable is preferred over Windows' TEMP, and fallback to /tmp when it is unset - Change GetAppPath() function to uphold that we do not install the main program in another subdirectory (bin) since the whole project already lives under $DATADIR (Mono/.NET programs are not always hier(7)-conforming) - Fix provided *.desktop file (respect PREFIX and replace badly named startup wrapper script with ours) --- misc/gedkeeper/Makefile | 8 +++++++ .../files/patch-projects_GKCore_GKCore_GKUtils.cs | 25 ++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/misc/gedkeeper/Makefile b/misc/gedkeeper/Makefile index fe34618f21e3..eeff45f6e590 100644 --- a/misc/gedkeeper/Makefile +++ b/misc/gedkeeper/Makefile @@ -1,6 +1,7 @@ PORTNAME= gedkeeper PORTVERSION= 2.25.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= misc MAINTAINER= danfe@FreeBSD.org @@ -22,6 +23,11 @@ GH_SUBDIR= projects/GKCommunicator:gkc projects/GKGenetix:gkg _BUILD_TYPE= Release DATADIR= ${PREFIX}/lib/${PORTNAME} +post-patch: + @${REINPLACE_CMD} -E '/^(Path|Icon)=/s,/usr,${PREFIX}, ; \ + /^Exec=/s,gk_run\.sh,${PORTNAME},' \ + ${WRKSRC}/deploy/gedkeeper.desktop + do-build: cd ${BUILD_WRKSRC} && msbuild projects/GKv2/GEDKeeper2.sln \ /p:Configuration=${_BUILD_TYPE} /p:MonoCS=true \ @@ -51,3 +57,5 @@ do-test: projects/GKTests/bin/${_BUILD_TYPE}/GKTests.dll .include + +PATCH_ARGS= -l diff --git a/misc/gedkeeper/files/patch-projects_GKCore_GKCore_GKUtils.cs b/misc/gedkeeper/files/patch-projects_GKCore_GKCore_GKUtils.cs new file mode 100644 index 000000000000..7de8d94f966c --- /dev/null +++ b/misc/gedkeeper/files/patch-projects_GKCore_GKCore_GKUtils.cs @@ -0,0 +1,25 @@ +--- projects/GKCore/GKCore/GKUtils.cs.orig 2023-03-27 21:40:19 UTC ++++ projects/GKCore/GKCore/GKUtils.cs +@@ -1758,7 +1758,11 @@ namespace GKCore + + public static string GetTempDir() + { +- string tempPath = Environment.GetEnvironmentVariable("TEMP"); ++ string tempPath; ++ if (SysUtils.IsUnix()) ++ tempPath = Environment.GetEnvironmentVariable("TMP") ?? "/tmp"; ++ else ++ tempPath = Environment.GetEnvironmentVariable("TEMP"); + return tempPath + Path.DirectorySeparatorChar; + } + +@@ -1772,8 +1776,7 @@ namespace GKCore + + public static string GetAppPath() + { +- string result = Path.GetFullPath(Path.Combine(GetBinPath(), @".." + Path.DirectorySeparatorChar)); +- return result; ++ return GetBinPath(); + } + + public static string GetPluginsPath()