From nobody Mon Feb 21 15:12:21 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 7102B19CFA0F; Mon, 21 Feb 2022 15:12:21 +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 4K2Ql92gs2z4TdD; Mon, 21 Feb 2022 15:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645456341; 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=GgekOQvgD6qNsI9R6EzeSw+5OrukExFT+3wzSDMA/Dw=; b=XHOwOqfDqTGTfOUDF2djuLZ5mAcuFAlJc0k1qbeIQNQI67EpA2ZmX6k48gydxDlhew7Z4z 365nRfBD7f09I4L+w/ZM0wSx1jZzW1BAzcy/PFASxTVasPCUGvTaotvfkvKV5mdT9Zb0Z2 wWqFH2miplo2Cj7wcY8/ifH1SxU2idP44Sq7jqA/78AQl/479pkmlfLRfCnuRQmbcY8hyS qrAiYdVzFKRItMdLuc3UwWLtj0/FF9vRtBWuF7gHHxhUrCbRwCQaF1W2JP2eVipdPMT5Hk /C64SdJBmoFnux2DGW5C2Mqp2+m5lcTqq25FSxe1mfLvagIHgx48WJo+Flqlug== 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 31D29128A5; Mon, 21 Feb 2022 15:12:21 +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 21LFCLjL013687; Mon, 21 Feb 2022 15:12:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LFCLE4013686; Mon, 21 Feb 2022 15:12:21 GMT (envelope-from git) Date: Mon, 21 Feb 2022 15:12:21 GMT Message-Id: <202202211512.21LFCLE4013686@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 615703b4b319 - main - editors/diamond: distinguish from biology/diamond 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: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 615703b4b3192ad6e3722889a04f28f631e37e95 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645456341; 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=GgekOQvgD6qNsI9R6EzeSw+5OrukExFT+3wzSDMA/Dw=; b=ydTd+nl291dsVX/YSmZhDRDnoM1aUFqpA+15xGQgMcrOJBA0r+3OCZWJDJbDEUxqd6s/kJ YNe1i6JYumzPPI+7wC7Ue19DvZdpq+0YgEd3cXosnbElIupYqml0TyAQD5aq6lbeFIi3Cu A4PH3nWJao8/gP50Lva/truoDm8CfMtjJe8iaIJophFJFFsEZHwfVlryAaCp7S2O5Q1OaZ X/TWV0m6TceLcdGWH9HQKVhgVkxmQsYXbUI+SSluug2exoHfgR+B+dCF3KtzbpPF2UkeMa +bunLSu5gjmlG2r+mLFNZ4xsov+jj4MqzWkHqYFQj+tX1vmmvKhaXYMxWB9YKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645456341; a=rsa-sha256; cv=none; b=EmVEeBXRUEmKu89zvqJ0PIK7Y5DxEoclsfvmy51+8RwWMTPjXkiXZ/04gWRgRkluUv8igo fZqXYRjBr70FlhpRtvF5pvWA8QZ9Yul2NCr52lJSlCw5GojtkRf7evnAM20U4zsbvQiHDz RcLnm92j9pvLZHQCArqly5wq4fFoKHDrvgyxtj4p7sJVqvLvMxAoPjvF+QiwoLFF/CCg5Q 6fvktxTR3dQf6vzQZ00VNMVCtqYSmo8yvoEMSNyd2g5ysSSw5Uv2+P/m37ziwQiEhDNxK6 Aqlgtme9bEpYmftXlMdOgdKSuWdpOW6jwfBZiAeIAVrMOHBonKG0FN8OLwYmAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=615703b4b3192ad6e3722889a04f28f631e37e95 commit 615703b4b3192ad6e3722889a04f28f631e37e95 Author: Adriaan de Groot AuthorDate: 2022-02-21 13:15:18 +0000 Commit: Adriaan de Groot CommitDate: 2022-02-21 15:12:19 +0000 editors/diamond: distinguish from biology/diamond Reported by: jrm --- editors/diamond/Makefile | 5 +++-- editors/diamond/files/patch-src_CMakeLists.txt | 9 +++++++++ editors/diamond/pkg-plist | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/editors/diamond/Makefile b/editors/diamond/Makefile index 37f3d8a80606..58562eaf6d2c 100644 --- a/editors/diamond/Makefile +++ b/editors/diamond/Makefile @@ -1,7 +1,9 @@ PORTNAME= diamond DISTVERSIONPREFIX= diamond- DISTVERSION= 1.3.6 +PORTREVISION= 1 CATEGORIES= editors +PKGNAMESUFFIX= -cs MAINTAINER= adridg@FreeBSD.org COMMENT= Compact programmers editor @@ -9,7 +11,7 @@ COMMENT= Compact programmers editor LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell +LIB_DEPENDS= libhunspell-1.7.so:textproc/hunspell BUILD_DEPENDS= copperspice>=1.7:x11-toolkits/copperspice RUN_DEPENDS= copperspice>=1.7:x11-toolkits/copperspice @@ -23,4 +25,3 @@ GH_ACCOUNT= copperspice GH_PROJECT= diamond .include - diff --git a/editors/diamond/files/patch-src_CMakeLists.txt b/editors/diamond/files/patch-src_CMakeLists.txt index 2105866af22a..d4f059428f38 100644 --- a/editors/diamond/files/patch-src_CMakeLists.txt +++ b/editors/diamond/files/patch-src_CMakeLists.txt @@ -9,6 +9,15 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin") set_target_properties(Diamond PROPERTIES OUTPUT_NAME diamond) +@@ -160,7 +162,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Darwin") + ) + + elseif(CMAKE_SYSTEM_NAME MATCHES "(Linux|OpenBSD|FreeBSD|NetBSD|DragonFly)") +- set_target_properties(Diamond PROPERTIES OUTPUT_NAME diamond) ++ set_target_properties(Diamond PROPERTIES OUTPUT_NAME diamond-cs) + + find_package(PkgConfig) + pkg_check_modules(Hunspell IMPORTED_TARGET hunspell) @@ -169,8 +171,9 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "(Linux|OpenBSD|FreeB PRIVATE PkgConfig::Hunspell diff --git a/editors/diamond/pkg-plist b/editors/diamond/pkg-plist index a4f2eb0d70d1..5b66a6d4a53e 100644 --- a/editors/diamond/pkg-plist +++ b/editors/diamond/pkg-plist @@ -1,4 +1,4 @@ -bin/diamond +bin/diamond-cs share/copperspice/diamond/diamond.png share/copperspice/diamond/dictionary/en_US.aff share/copperspice/diamond/dictionary/en_US.dic