Try to find enchant a bit better.

[Benny Siegert <bsiegert%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Benny Siegert <bsiegert%gmail.com@localhost>
Pushed By:	bsiegert
Date:		Mon Nov 19 09:22:31 2018 +0100
Changeset:	90e58d0824bb8e109dba8ce409f0f729e6f899c9

Modified Files:
	psi/Makefile
	psi/distinfo
Added Files:
	psi/patches/patch-cmake_modules_FindEnchant.cmake

Log Message:
Try to find enchant a bit better.

Somehow the build picks up the already-installed enchant 1 instead
of 2. Or none at all. Needs more debugging.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=90e58d0824bb8e109dba8ce409f0f729e6f899c9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 psi/Makefile                                      |  4 ++--
 psi/distinfo                                      |  1 +
 psi/patches/patch-cmake_modules_FindEnchant.cmake | 15 +++++++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diffs:
diff --git a/psi/Makefile b/psi/Makefile
index 14ca7f7f86..a4e8178e2a 100644
--- a/psi/Makefile
+++ b/psi/Makefile
@@ -10,13 +10,13 @@ HOMEPAGE=	http://psi-im.org/
 COMMENT=	Psi XMPP/Jabber Client
 LICENSE=	gnu-gpl-v2
 
-DEPENDS+=	qca2-ossl>=2.0.0beta3:../../security/qca2-ossl
+#DEPENDS+=	qca2-ossl>=2.0.0beta3:../../security/qca2-ossl
 
 DIST_SUBDIR=	${DISTNAME}
 DISTFILES=	${DEFAULT_DISTFILES}
 
 USE_CMAKE=	yes
-USE_TOOLS+=	gmake unzip pkg-config
+USE_TOOLS+=	unzip pkg-config
 USE_LANGUAGES=	c c++11
 
 CONFIG_SHELL=	${SH}
diff --git a/psi/distinfo b/psi/distinfo
index 7e89007dba..9843fd29e8 100644
--- a/psi/distinfo
+++ b/psi/distinfo
@@ -5,4 +5,5 @@ RMD160 (psi-1.3/psi-1.3.tar.xz) = 699e9c0442efccbd54296978c1e6fc6ed641f40b
 SHA512 (psi-1.3/psi-1.3.tar.xz) = b1b0f8d0c8326d486cb908d7b7de8f48579a2775f4cad0721ebeb646abd35e890712df176dd8676bf6c6089db88e73cf1b0423bd7a0ea0054661bdcea89349fe
 Size (psi-1.3/psi-1.3.tar.xz) = 2143076 bytes
 SHA1 (patch-ad) = 3ee21a1cb17637ed650b6b58e5575c8fa246a4f0
+SHA1 (patch-cmake_modules_FindEnchant.cmake) = 9a6f3746139ab3d6a9269ca86dbeefed966836d8
 SHA1 (patch-iris_src_jdns_src_jdns_jdns__sys.c) = bbbeceda6d4ec9005058da46185af471ca02f86d
diff --git a/psi/patches/patch-cmake_modules_FindEnchant.cmake b/psi/patches/patch-cmake_modules_FindEnchant.cmake
new file mode 100644
index 0000000000..6462892de7
--- /dev/null
+++ b/psi/patches/patch-cmake_modules_FindEnchant.cmake
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Prefer enchant-2.
+
+--- cmake/modules/FindEnchant.cmake.orig	2017-09-24 06:42:59.000000000 +0000
++++ cmake/modules/FindEnchant.cmake
+@@ -32,7 +32,7 @@ endif ()
+ 
+ if ( UNIX AND NOT( APPLE OR CYGWIN ) )
+ 	find_package( PkgConfig QUIET )
+-	pkg_check_modules( PC_Enchant QUIET enchant )
++	pkg_check_modules( PC_Enchant QUIET enchant-2 )
+ 	set ( Enchant_DEFINITIONS 
+ 		${PC_Enchant_CFLAGS}
+ 		${PC_Enchant_CFLAGS_OTHER}