CVS commit: pkgsrc/devel/mustach

["Sijmen J. Mulder" <sjmulder%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sjmulder
Date:           Wed Dec 25 17:34:32 UTC 2019

Modified Files:
        pkgsrc/devel/mustach: Makefile
Added Files:
        pkgsrc/devel/mustach/patches: patch-mustach-json-c.c patch-mustach.c

Log Message:
devel/mustach: Patch to fix on Solaris-likes


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/mustach/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/mustach/patches/patch-mustach-json-c.c \
    pkgsrc/devel/mustach/patches/patch-mustach.c

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

Modified files:

Index: pkgsrc/devel/mustach/Makefile
diff -u pkgsrc/devel/mustach/Makefile:1.1 pkgsrc/devel/mustach/Makefile:1.2
--- pkgsrc/devel/mustach/Makefile:1.1   Thu Sep 19 11:46:30 2019
+++ pkgsrc/devel/mustach/Makefile       Wed Dec 25 17:34:31 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2019/09/19 11:46:30 sjmulder Exp $
+# $NetBSD: Makefile,v 1.2 2019/12/25 17:34:31 sjmulder Exp $
 
 DISTNAME=      mustach-0.99
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  https://gitlab.com/jobol/mustach/-/archive/${PKGVERSION_NOREV}/
 
@@ -9,5 +10,10 @@ HOMEPAGE=     https://gitlab.com/jobol/musta
 COMMENT=       C implementation of mustache templating
 LICENSE=       apache-2.0
 
+.include "../../mk/bsd.prefs.mk"
+
+# Workaround is portable, might as well use it everywhere.
+CFLAGS+=       -DNO_OPEN_MEMSTREAM
+
 .include "../../textproc/json-c/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/devel/mustach/patches/patch-mustach-json-c.c
diff -u /dev/null pkgsrc/devel/mustach/patches/patch-mustach-json-c.c:1.1
--- /dev/null   Wed Dec 25 17:34:32 2019
+++ pkgsrc/devel/mustach/patches/patch-mustach-json-c.c Wed Dec 25 17:34:32 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-mustach-json-c.c,v 1.1 2019/12/25 17:34:32 sjmulder Exp $
+
+Include alloca.h on Solaris-likes to fix the build.
+
+--- mustach-json-c.c.orig      2019-09-19 08:20:36.000000000 +0000
++++ mustach-json-c.c
+@@ -21,6 +21,9 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#ifdef __sun
++# include <alloca.h>
++#endif
+ 
+ #include <json-c/json.h>
+ 
Index: pkgsrc/devel/mustach/patches/patch-mustach.c
diff -u /dev/null pkgsrc/devel/mustach/patches/patch-mustach.c:1.1
--- /dev/null   Wed Dec 25 17:34:32 2019
+++ pkgsrc/devel/mustach/patches/patch-mustach.c        Wed Dec 25 17:34:32 2019
@@ -0,0 +1,16 @@
+$NetBSD: patch-mustach.c,v 1.1 2019/12/25 17:34:32 sjmulder Exp $
+
+Include alloca.h on Solaris-likes to fix the build.
+
+--- mustach.c.orig     2019-09-19 08:20:36.000000000 +0000
++++ mustach.c
+@@ -24,6 +24,9 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <ctype.h>
++#ifdef __sun
++# include <alloca.h>
++#endif
+ 
+ #include "mustach.h"
+