Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_15072324369850"
MIME-Version: 1.0
Date: Thu, 5 Oct 2017 19:40:36 +0000
From: "Stoned Elipot" <seb@netbsd.org>
Subject: CVS commit: pkgsrc/devel/jsonnet
To: pkgsrc-changes@NetBSD.org
Reply-To: seb@netbsd.org
Message-Id: <20171005194036.08B52FBC7@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_15072324369850
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	seb
Date:		Thu Oct  5 19:40:35 UTC 2017

Added Files:
	pkgsrc/devel/jsonnet: DESCR Makefile PLIST buildlink3.mk distinfo
	pkgsrc/devel/jsonnet/patches: patch-Makefile

Log Message:
Add devel/jsonnet version 0.9.4 to the NetBSD packages collection


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/jsonnet/DESCR \
    pkgsrc/devel/jsonnet/Makefile pkgsrc/devel/jsonnet/PLIST \
    pkgsrc/devel/jsonnet/buildlink3.mk pkgsrc/devel/jsonnet/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/jsonnet/patches/patch-Makefile

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


--_----------=_15072324369850
Content-Disposition: inline
Content-Length: 6392
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Added files:

Index: pkgsrc/devel/jsonnet/DESCR
diff -u /dev/null pkgsrc/devel/jsonnet/DESCR:1.1
--- /dev/null	Thu Oct  5 19:40:35 2017
+++ pkgsrc/devel/jsonnet/DESCR	Thu Oct  5 19:40:35 2017
@@ -0,0 +1,4 @@
+Jsonnet is a domain specific configuration language that helps you
+define JSON data. Jsonnet lets you compute fragments of JSON within
+the structure, bringing the same benefit to structured data that
+templating languages bring to plain text.
Index: pkgsrc/devel/jsonnet/Makefile
diff -u /dev/null pkgsrc/devel/jsonnet/Makefile:1.1
--- /dev/null	Thu Oct  5 19:40:35 2017
+++ pkgsrc/devel/jsonnet/Makefile	Thu Oct  5 19:40:35 2017
@@ -0,0 +1,42 @@
+# $NetBSD: Makefile,v 1.1 2017/10/05 19:40:35 seb Exp $
+
+DISTNAME=	v0.9.4
+PKGNAME=	${GITHUB_PROJECT}-${DISTNAME:S/v//}
+#PKGREVISION=	1
+CATEGORIES=	devel local
+MASTER_SITES=	${MASTER_SITE_GITHUB:=google/}
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://jsonnet.org/
+COMMENT=	Domain specific configuration language
+LICENSE=	apache-2.0
+
+EXTRACT_USING=	gtar
+
+GITHUB_PROJECT=	jsonnet
+DIST_SUBDIR=	${GITHUB_PROJECT}
+
+USE_LANGUAGES=	c c++11
+
+USE_TOOLS+=	gmake bash
+REPLACE_BASH+=	examples/check.sh examples/terraform/check.sh
+REPLACE_BASH+=	test_suite/run_tests.sh test_suite/run_fmt_tests.sh
+
+WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
+
+TEST_TARGET=	test
+
+INSTALLATION_DIRS=	lib include bin
+
+# nothing to configure but REPLACE_BASH to apply
+do-configure:
+	@${DO_NADA}
+
+do-install:
+	${INSTALL_LIB} ${WRKSRC}/libjsonnet.so ${DESTDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKSRC}/libjsonnet++.so ${DESTDIR}${PREFIX}/lib
+	${INSTALL_DATA} ${WRKSRC}/include/libjsonnet.h ${DESTDIR}${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/include/libjsonnet++.h ${DESTDIR}${PREFIX}/include
+	${INSTALL_PROGRAM} ${WRKSRC}/jsonnet ${DESTDIR}${PREFIX}/bin
+
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/devel/jsonnet/PLIST
diff -u /dev/null pkgsrc/devel/jsonnet/PLIST:1.1
--- /dev/null	Thu Oct  5 19:40:35 2017
+++ pkgsrc/devel/jsonnet/PLIST	Thu Oct  5 19:40:35 2017
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST,v 1.1 2017/10/05 19:40:35 seb Exp $
+bin/jsonnet
+include/libjsonnet++.h
+include/libjsonnet.h
+lib/libjsonnet++.so
+lib/libjsonnet.so
Index: pkgsrc/devel/jsonnet/buildlink3.mk
diff -u /dev/null pkgsrc/devel/jsonnet/buildlink3.mk:1.1
--- /dev/null	Thu Oct  5 19:40:35 2017
+++ pkgsrc/devel/jsonnet/buildlink3.mk	Thu Oct  5 19:40:35 2017
@@ -0,0 +1,12 @@
+# $NetBSD: buildlink3.mk,v 1.1 2017/10/05 19:40:35 seb Exp $
+
+BUILDLINK_TREE+=	jsonnet
+
+.if !defined(JSONNET_BUILDLINK3_MK)
+JSONNET_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.jsonnet+=	jsonnet>=0.9.4
+BUILDLINK_PKGSRCDIR.jsonnet?=	../../devel/jsonnet
+.endif	# JSONNET_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-jsonnet
Index: pkgsrc/devel/jsonnet/distinfo
diff -u /dev/null pkgsrc/devel/jsonnet/distinfo:1.1
--- /dev/null	Thu Oct  5 19:40:35 2017
+++ pkgsrc/devel/jsonnet/distinfo	Thu Oct  5 19:40:35 2017
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2017/10/05 19:40:35 seb Exp $
+
+SHA1 (jsonnet/v0.9.4.tar.gz) = 61a07521ec245a288f2fa24ba63f54b4de128b81
+RMD160 (jsonnet/v0.9.4.tar.gz) = 1f6125e1e361d3bdfd6e73bf0a1359159202b9f6
+SHA512 (jsonnet/v0.9.4.tar.gz) = 0a2945aa5b9fa5411b8d049a94e253399607b92b4a0439307cb4f5ba2cc22a8def4f12dd8c1fec3df30ed4e112682b056a805a673fab84bc083a74b7c71b59a4
+Size (jsonnet/v0.9.4.tar.gz) = 556697 bytes
+SHA1 (patch-Makefile) = c0072b993fc238ea72f287f5f5b64be9c9aee8e6

Index: pkgsrc/devel/jsonnet/patches/patch-Makefile
diff -u /dev/null pkgsrc/devel/jsonnet/patches/patch-Makefile:1.1
--- /dev/null	Thu Oct  5 19:40:35 2017
+++ pkgsrc/devel/jsonnet/patches/patch-Makefile	Thu Oct  5 19:40:35 2017
@@ -0,0 +1,75 @@
+$NetBSD: patch-Makefile,v 1.1 2017/10/05 19:40:35 seb Exp $
+
+- leverage pkgsrc CPPFLAGS, CFLAGS and CXXFLAGS handling
+- take care of 'od -t u1' output variations
+- do not build the JavaScript implementation
+
+--- Makefile.orig	2017-06-21 02:59:07.000000000 +0000
++++ Makefile
+@@ -29,8 +29,9 @@ OD ?= od
+ 
+ OPT ?= -O3
+ 
+-CXXFLAGS ?= -g $(OPT) -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++0x -fPIC -Iinclude -Ithird_party/md5
+-CFLAGS ?= -g $(OPT) -Wall -Wextra -pedantic -std=c99 -fPIC -Iinclude
++CPPFLAGS += -Iinclude -Ithird_party/md5
++CXXFLAGS += $(OPT) -Wall -Wextra -Woverloaded-virtual -pedantic -std=c++0x -fPIC
++CFLAGS += $(OPT) -Wall -Wextra -pedantic -std=c99 -fPIC
+ MAKEDEPENDFLAGS ?= -Iinclude -Ithird_party/md5
+ EMCXXFLAGS = $(CXXFLAGS) --memory-init-file 0 -s DISABLE_EXCEPTION_CATCHING=0
+ EMCFLAGS = $(CFLAGS) --memory-init-file 0 -s DISABLE_EXCEPTION_CATCHING=0
+@@ -67,8 +68,6 @@ ALL = \
+ 	libjsonnet++.so \
+ 	libjsonnet_test_snippet \
+ 	libjsonnet_test_file \
+-	libjsonnet.js \
+-	doc/js/libjsonnet.js \
+ 	$(LIB_OBJ)
+ 
+ ALL_HEADERS = \
+@@ -108,17 +107,17 @@ MAKEDEPEND_SRCS = \
+ 
+ depend:
+ 	rm -f Makefile.depend
+-	for FILE in $(LIB_SRC) $(MAKEDEPEND_SRCS) ; do $(CXX) -MM $(CXXFLAGS) $$FILE -MT $$(dirname $$FILE)/$$(basename $$FILE .cpp).o >> Makefile.depend ; done
++	for FILE in $(LIB_SRC) $(MAKEDEPEND_SRCS) ; do $(CXX) -MM $(CPPFLAGS) $(CXXFLAGS) $$FILE -MT $$(dirname $$FILE)/$$(basename $$FILE .cpp).o >> Makefile.depend ; done
+ 
+ core/desugarer.cpp: core/std.jsonnet.h
+ 
+ # Object files
+ %.o: %.cpp
+-	$(CXX) -c $(CXXFLAGS) $< -o $@
++	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< -o $@
+ 
+ # Commandline executable.
+ jsonnet: cmd/jsonnet.cpp $(LIB_OBJ)
+-	$(CXX) $(CXXFLAGS) $(LDFLAGS) $< $(LIB_SRC:.cpp=.o) -o $@
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $< $(LIB_SRC:.cpp=.o) -o $@
+ 
+ # C binding.
+ libjsonnet.so: $(LIB_OBJ)
+@@ -144,7 +143,7 @@ LIBJSONNET_TEST_SNIPPET_SRCS = \
+ 	include/libjsonnet.h
+ 
+ libjsonnet_test_snippet: $(LIBJSONNET_TEST_SNIPPET_SRCS)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $< -L. -ljsonnet -o $@
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $< -L. -ljsonnet -o $@
+ 
+ LIBJSONNET_TEST_FILE_SRCS = \
+ 	core/libjsonnet_test_file.c \
+@@ -152,13 +151,13 @@ LIBJSONNET_TEST_FILE_SRCS = \
+ 	include/libjsonnet.h
+ 
+ libjsonnet_test_file: $(LIBJSONNET_TEST_FILE_SRCS)
+-	$(CC) $(CFLAGS) $(LDFLAGS) $< -L. -ljsonnet -o $@
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $< -L. -ljsonnet -o $@
+ 
+ # Encode standard library for embedding in C
+ core/%.jsonnet.h: stdlib/%.jsonnet
+ 	(($(OD) -v -Anone -t u1 $< \
+ 		| tr " " "\n" \
+-		| grep -v "^$$" \
++		| sed -e 's/^0//;/^$$/d' \
+ 		| tr "\n" "," ) && echo "0") > $@
+ 	echo >> $@
+ 


--_----------=_15072324369850--