10 files changed, 113 insertions, 2 deletions
diff --git a/devel/coconut/Makefile b/devel/coconut/Makefile
index 0e2b691e517..14349ddba7a 100644
--- a/devel/coconut/Makefile
+++ b/devel/coconut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2015/07/04 16:18:29 joerg Exp $
+# $NetBSD: Makefile,v 1.64 2015/12/26 23:35:46 dholland Exp $
 #
 
 DISTNAME=	coconut-0.3.0
@@ -18,6 +18,13 @@ GNU_CONFIGURE=	YES
 CPPFLAGS+=	-I${PREFIX}/include/libxml2/libxml -DGL_GLEXT_LEGACY
 MAKE_ENV+=	AM_MAKEFLAGS="am__depfiles_maybe="
 
+SUBST_CLASSES+=	g_memmove
+SUBST_MESSAGE.g_memmove=	Eliminating g_memmove.
+SUBST_STAGE.g_memmove=		pre-configure
+SUBST_FILES.g_memmove=		coconut/cmemalloc.m coconut/cstack.m \
+				coconut/cset.m
+SUBST_SED.g_memmove=		-e s,g_memmove,memmove,g
+
 .include "../../graphics/gtkglext/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
diff --git a/devel/coconut/distinfo b/devel/coconut/distinfo
index 06cea9b0831..b1e96c557ca 100644
--- a/devel/coconut/distinfo
+++ b/devel/coconut/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 03:27:19 agc Exp $
+$NetBSD: distinfo,v 1.7 2015/12/26 23:35:46 dholland Exp $
 
 SHA1 (coconut-0.3.0.tar.gz) = 69c1c4cbf061def240f7c8c1636bdddb2c00da5b
 RMD160 (coconut-0.3.0.tar.gz) = 71098f8eb9a731f990534c98d532707ce93329dc
@@ -11,3 +11,11 @@ SHA1 (patch-ad) = 0dc62013310a4e3ec0b1137a082eb94d9174fbda
 SHA1 (patch-ae) = a60890cee110b68e01211e5a8e97af70110e3410
 SHA1 (patch-af) = 4f84102e6e16601d5ade202054f851cf0cf831f5
 SHA1 (patch-ag) = b69ac4769cd675602e9c2f2cdc90ce9698cbf9a2
+SHA1 (patch-test_ccmdexit-test.m) = dab490aab32133a15490a575b0ddb60d2a6261ba
+SHA1 (patch-test_ccmdprint-test.m) = 419eba5460f4a5b3a4f825cccf61eaec48bb1183
+SHA1 (patch-test_ccmdtext-test.m) = edc807adefab38f580e8c93d2464661a05b9b827
+SHA1 (patch-test_cdir-test.m) = 39779a02bfaf531dc19c1ba934591c7c9c9efd01
+SHA1 (patch-test_cidset-test.m) = b1d8d80ef0447096433674385201edd765f9a4e8
+SHA1 (patch-test_cnode-test.m) = 70c58fbc49f4dffafbf45a5a2dc990ecc121325a
+SHA1 (patch-test_cset-test.m) = c13c7d9255e4f48aec2a27b29d8f91184f09cc71
+SHA1 (patch-test_ctree-test.m) = 7415ded225c7185834314a69bf6f96d13c01a535
diff --git a/devel/coconut/patches/patch-test_ccmdexit-test.m b/devel/coconut/patches/patch-test_ccmdexit-test.m
new file mode 100644
index 00000000000..43a792df83a
--- /dev/null
+++ b/devel/coconut/patches/patch-test_ccmdexit-test.m
@@ -0,0 +1,12 @@
+$NetBSD: patch-test_ccmdexit-test.m,v 1.1 2015/12/26 23:35:46 dholland Exp $
+
+Use standard headers.
+
+--- test/ccmdexit-test.m~	2002-08-04 12:17:00.000000000 +0000
++++ test/ccmdexit-test.m
+@@ -8,4 +8,5 @@
+  */
+ 
++#include <stdio.h>
+ #include <coconut/ccmdexit.h>
+ #include <coconut/cint.h>
diff --git a/devel/coconut/patches/patch-test_ccmdprint-test.m b/devel/coconut/patches/patch-test_ccmdprint-test.m
new file mode 100644
index 00000000000..6d882ed53d8
--- /dev/null
+++ b/devel/coconut/patches/patch-test_ccmdprint-test.m
@@ -0,0 +1,12 @@
+$NetBSD: patch-test_ccmdprint-test.m,v 1.1 2015/12/26 23:35:46 dholland Exp $
+
+Use standard headers.
+
+--- test/ccmdprint-test.m~	2002-08-15 02:06:18.000000000 +0000
++++ test/ccmdprint-test.m
+@@ -8,4 +8,5 @@
+  */
+ 
++#include <stdio.h>
+ #include <coconut/ccmdprint.h>
+ #include <coconut/ccmdtext.h>
diff --git a/devel/coconut/patches/patch-test_ccmdtext-test.m b/devel/coconut/patches/patch-test_ccmdtext-test.m
new file mode 100644
index 00000000000..2effe706cc1
--- /dev/null
+++ b/devel/coconut/patches/patch-test_ccmdtext-test.m
@@ -0,0 +1,12 @@
+$NetBSD: patch-test_ccmdtext-test.m,v 1.1 2015/12/26 23:35:46 dholland Exp $
+
+Use standard headers.
+
+--- test/ccmdtext-test.m~	2002-08-15 02:23:46.000000000 +0000
++++ test/ccmdtext-test.m
+@@ -8,4 +8,5 @@
+  */
+ 
++#include <stdio.h>
+ #include <coconut/ccmdtext.h>
+ #include <coconut/cstring.h>
diff --git a/devel/coconut/patches/patch-test_cdir-test.m b/devel/coconut/patches/patch-test_cdir-test.m
new file mode 100644
index 00000000000..e7b7158b16a
--- /dev/null
+++ b/devel/coconut/patches/patch-test_cdir-test.m
@@ -0,0 +1,12 @@
+$NetBSD: patch-test_cdir-test.m,v 1.1 2015/12/26 23:35:46 dholland Exp $
+
+Use standard headers.
+
+--- test/cdir-test.m~	2002-06-20 17:24:29.000000000 +0000
++++ test/cdir-test.m
+@@ -8,4 +8,5 @@
+  */
+ 
++#include <stdio.h>
+ #include <coconut/cdir.h>
+ #include <coconut/cconststr.h>
diff --git a/devel/coconut/patches/patch-test_cidset-test.m b/devel/coconut/patches/patch-test_cidset-test.m
new file mode 100644
index 00000000000..2ea1c67805c
--- /dev/null
+++ b/devel/coconut/patches/patch-test_cidset-test.m
@@ -0,0 +1,12 @@
+$NetBSD: patch-test_cidset-test.m,v 1.1 2015/12/26 23:35:46 dholland Exp $
+
+Use standard headers.
+
+--- test/cidset-test.m~	2002-08-01 14:45:19.000000000 +0000
++++ test/cidset-test.m
+@@ -8,4 +8,5 @@
+  */
+ 
++#include <stdio.h>
+ #include <coconut/cidset.h>
+ #include <coconut/cindtstream.h>
diff --git a/devel/coconut/patches/patch-test_cnode-test.m b/devel/coconut/patches/patch-test_cnode-test.m
new file mode 100644
index 00000000000..c24995ba8d6
--- /dev/null
+++ b/devel/coconut/patches/patch-test_cnode-test.m
@@ -0,0 +1,12 @@
+$NetBSD: patch-test_cnode-test.m,v 1.1 2015/12/26 23:35:46 dholland Exp $
+
+Use standard headers.
+
+--- test/cnode-test.m~	2002-08-06 15:14:58.000000000 +0000
++++ test/cnode-test.m
+@@ -8,4 +8,5 @@
+  */
+ 
++#include <stdio.h>
+ #include <coconut/cnode.h>
+ #include <coconut/cstring.h>
diff --git a/devel/coconut/patches/patch-test_cset-test.m b/devel/coconut/patches/patch-test_cset-test.m
new file mode 100644
index 00000000000..f3216b6d7d3
--- /dev/null
+++ b/devel/coconut/patches/patch-test_cset-test.m
@@ -0,0 +1,12 @@
+$NetBSD: patch-test_cset-test.m,v 1.1 2015/12/26 23:35:46 dholland Exp $
+
+Use standard headers.
+
+--- test/cset-test.m~	2002-06-16 04:46:42.000000000 +0000
++++ test/cset-test.m
+@@ -8,4 +8,5 @@
+  */
+ 
++#include <stdio.h>
+ #include <coconut/cset.h>
+ #include <coconut/cindtstream.h>
diff --git a/devel/coconut/patches/patch-test_ctree-test.m b/devel/coconut/patches/patch-test_ctree-test.m
new file mode 100644
index 00000000000..bf23e322f17
--- /dev/null
+++ b/devel/coconut/patches/patch-test_ctree-test.m
@@ -0,0 +1,12 @@
+$NetBSD: patch-test_ctree-test.m,v 1.1 2015/12/26 23:35:46 dholland Exp $
+
+Use standard headers.
+
+--- test/ctree-test.m~	2002-08-01 16:07:12.000000000 +0000
++++ test/ctree-test.m
+@@ -8,4 +8,5 @@
+  */
+ 
++#include <stdio.h>
+ #include <coconut/ctree.h>
+ #include <coconut/cnode.h>