git: 615703b4b319 - main - editors/diamond: distinguish from biology/diamond

From: Adriaan de Groot <adridg_at_FreeBSD.org>
Date: Mon, 21 Feb 2022 15:12:21 UTC 
The branch main has been updated by adridg:

URL: https://cgit.FreeBSD.org/ports/commit/?id=615703b4b3192ad6e3722889a04f28f631e37e95

commit 615703b4b3192ad6e3722889a04f28f631e37e95
Author:     Adriaan de Groot <adridg@FreeBSD.org>
AuthorDate: 2022-02-21 13:15:18 +0000
Commit:     Adriaan de Groot <adridg@FreeBSD.org>
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 <bsd.port.mk>
-
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