CVS commit: pkgsrc/textproc/enchant2

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon May 15 09:30:29 UTC 2023

Modified Files:
        pkgsrc/textproc/enchant2: Makefile distinfo
Added Files:
        pkgsrc/textproc/enchant2/patches: patch-config.h.in

Log Message:
enchant2: Requires groff.  Fix build on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/textproc/enchant2/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/textproc/enchant2/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/enchant2/patches/patch-config.h.in

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

Modified files:

Index: pkgsrc/textproc/enchant2/Makefile
diff -u pkgsrc/textproc/enchant2/Makefile:1.23 pkgsrc/textproc/enchant2/Makefile:1.24
--- pkgsrc/textproc/enchant2/Makefile:1.23      Thu Apr 27 08:07:50 2023
+++ pkgsrc/textproc/enchant2/Makefile   Mon May 15 09:30:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2023/04/27 08:07:50 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2023/05/15 09:30:29 jperkin Exp $
 
 DISTNAME=              enchant-2.3.4
 PKGNAME=               ${DISTNAME:S/enchant/enchant2/}
@@ -12,7 +12,7 @@ HOMEPAGE=             https://abiword.github.io/enc
 COMMENT=               Generic spell checking library
 LICENSE=               gnu-lgpl-v2.1
 
-USE_TOOLS+=            pkg-config autoconf
+USE_TOOLS+=            autoconf groff pkg-config
 USE_LANGUAGES=         c c++
 USE_PKGLOCALEDIR=      yes
 USE_LIBTOOL=           yes

Index: pkgsrc/textproc/enchant2/distinfo
diff -u pkgsrc/textproc/enchant2/distinfo:1.18 pkgsrc/textproc/enchant2/distinfo:1.19
--- pkgsrc/textproc/enchant2/distinfo:1.18      Thu Apr 27 08:07:50 2023
+++ pkgsrc/textproc/enchant2/distinfo   Mon May 15 09:30:29 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.18 2023/04/27 08:07:50 wiz Exp $
+$NetBSD: distinfo,v 1.19 2023/05/15 09:30:29 jperkin Exp $
 
 BLAKE2s (enchant-2.3.4.tar.gz) = f4d401e6cde4dd4ce6fb863320c2a25267b6e825006dd0eecd13b9c88ce0ade1
 SHA512 (enchant-2.3.4.tar.gz) = d109ab320ed84d6c9eec6c558c72a54d71ad30237c2bf11650b0e4030fbd9990a5ccf06a20851e46b6530279e1a9916b891cd394eefabc8812f7f92da62cbe1a
 Size (enchant-2.3.4.tar.gz) = 1015430 bytes
+SHA1 (patch-config.h.in) = e463ae5fcb3b7d457318ff027f32456e3c57498b

Added files:

Index: pkgsrc/textproc/enchant2/patches/patch-config.h.in
diff -u /dev/null pkgsrc/textproc/enchant2/patches/patch-config.h.in:1.1
--- /dev/null   Mon May 15 09:30:29 2023
+++ pkgsrc/textproc/enchant2/patches/patch-config.h.in  Mon May 15 09:30:29 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-config.h.in,v 1.1 2023/05/15 09:30:29 jperkin Exp $
+
+GCC 12 on SunOS doesn't like the __malloc__ attribute.
+
+--- config.h.in.orig   2023-02-19 14:46:56.000000000 +0000
++++ config.h.in
+@@ -613,7 +613,7 @@
+    _GL_ATTRIBUTE_DEALLOC_FREE declares that the function returns pointers that
+    can be freed via 'free'; it can be used only after declaring 'free'.  */
+ /* Applies to: functions.  Cannot be used on inline functions.  */
+-#if _GL_GNUC_PREREQ (11, 0)
++#if _GL_GNUC_PREREQ (11, 0) && !defined(__sun)
+ # define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i)))
+ #else
+ # define _GL_ATTRIBUTE_DEALLOC(f, i)