CVS commit: pkgsrc/devel/mustach

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

Module Name:    pkgsrc
Committed By:   sjmulder
Date:           Sat Nov 20 00:31:10 UTC 2021

Modified Files:
        pkgsrc/devel/mustach: Makefile PLIST buildlink3.mk distinfo
Added Files:
        pkgsrc/devel/mustach/patches: patch-test6_Makefile

Log Message:
devel/mustach: Update to 1.2.2

(Also adds test target)

Changes in 1.2.2:

Fix:
 - Fix: SONAME of libmustach-json-c.so

Changes in 1.2.1:

New:
 - Add SONAME in libraries.
 - Flag Mustach_With_PartialDataFirst to switch the
   policy of resolving partials.
Fix:
 - Identification of types in cJSON

Changes in 1.2.0:

New:
 - Add hook 'mustach_wrap_get_partial' for handling partials.
 - Add test of mustache specifications https://github.com/mustache/spec.
Changes:
 - Mustach_With_SingleDot is always set.
 - Mustach_With_IncPartial is always set.
 - Mustach_With_AllExtensions is changed to use currently known extensions.
 - Output of tests changed.
 - Makefile improved.
 - Partials are first searched as file then in current selection.
 - Improved management of delimiters.
Fixes:
 - Improved output accordingly to https://github.com/mustache/spec:
   - escaping of quote "
   - interpolating null with empty string
   - removal of empty lines with standalone tag
   - don't enter section if null
   - indentation of partials
 - comment improved for get of mustach_wrap_itf.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/mustach/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/mustach/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/mustach/buildlink3.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/mustach/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/mustach/patches/patch-test6_Makefile

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.7 pkgsrc/devel/mustach/Makefile:1.8
--- pkgsrc/devel/mustach/Makefile:1.7   Thu Aug 19 09:37:50 2021
+++ pkgsrc/devel/mustach/Makefile       Sat Nov 20 00:31:10 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2021/08/19 09:37:50 sjmulder Exp $
+# $NetBSD: Makefile,v 1.8 2021/11/20 00:31:10 sjmulder Exp $
 
-DISTNAME=      mustach-1.1.1
+DISTNAME=      mustach-1.2.2
 CATEGORIES=    devel
 MASTER_SITES=  https://gitlab.com/jobol/mustach/-/archive/${PKGVERSION_NOREV}/
 
@@ -9,6 +9,10 @@ HOMEPAGE=      https://gitlab.com/jobol/musta
 COMMENT=       C implementation of mustache templating
 LICENSE=       apache-2.0
 
+# 'test' is basic-tests and spec-tests, which downloads files with git
+TEST_TARGET=   basic-tests
+TEST_DEPENDS+= valgrind-[0-9]*:../../devel/valgrind
+
 USE_TOOLS+=    gmake gsed pkg-config
 
 .include "../../mk/bsd.prefs.mk"

Index: pkgsrc/devel/mustach/PLIST
diff -u pkgsrc/devel/mustach/PLIST:1.2 pkgsrc/devel/mustach/PLIST:1.3
--- pkgsrc/devel/mustach/PLIST:1.2      Fri Aug  6 00:49:20 2021
+++ pkgsrc/devel/mustach/PLIST  Sat Nov 20 00:31:10 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2021/08/06 00:49:20 sjmulder Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/11/20 00:31:10 sjmulder Exp $
 bin/mustach
 include/mustach/mustach-jansson.h
 include/mustach/mustach-json-c.h
@@ -6,6 +6,6 @@ include/mustach/mustach-wrap.h
 include/mustach/mustach.h
 lib/libmustach.so
 lib/libmustach.so.1
-lib/libmustach.so.1.1
+lib/libmustach.so.1.2
 lib/pkgconfig/libmustach.pc
 man/man1/mustach.1

Index: pkgsrc/devel/mustach/buildlink3.mk
diff -u pkgsrc/devel/mustach/buildlink3.mk:1.1 pkgsrc/devel/mustach/buildlink3.mk:1.2
--- pkgsrc/devel/mustach/buildlink3.mk:1.1      Fri Aug  6 00:49:20 2021
+++ pkgsrc/devel/mustach/buildlink3.mk  Sat Nov 20 00:31:10 2021
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2021/08/06 00:49:20 sjmulder Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2021/11/20 00:31:10 sjmulder Exp $
 
 BUILDLINK_TREE+=       mustach
 
 .if !defined(MUSTACH_BUILDLINK3_MK)
 MUSTACH_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.mustach+=        mustach>=1.1.0
+BUILDLINK_API_DEPENDS.mustach+=        mustach>=1.2.2
 BUILDLINK_PKGSRCDIR.mustach?=  ../../devel/mustach
 
 .include "../../textproc/jansson/buildlink3.mk"

Index: pkgsrc/devel/mustach/distinfo
diff -u pkgsrc/devel/mustach/distinfo:1.6 pkgsrc/devel/mustach/distinfo:1.7
--- pkgsrc/devel/mustach/distinfo:1.6   Tue Oct 26 10:15:41 2021
+++ pkgsrc/devel/mustach/distinfo       Sat Nov 20 00:31:10 2021
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:15:41 nia Exp $
+$NetBSD: distinfo,v 1.7 2021/11/20 00:31:10 sjmulder Exp $
 
-BLAKE2s (mustach-1.1.1.tar.gz) = c2fd04599a5f047351c740847de60e4012e23831590e0d56c984f08cf77d4743
-SHA512 (mustach-1.1.1.tar.gz) = 7210e418533a168a3e6f3948c78e84077b38e3d96aa25b21ed6013f3c42f068d1eb2a5790ebf8bc0fa5a206fc0e79e0c14228ec5e662d41697222fc902084aaa
-Size (mustach-1.1.1.tar.gz) = 28676 bytes
+BLAKE2s (mustach-1.2.2.tar.gz) = bfb5bb378dd3f9535a7188bd81d9624242b85f5f30364dc0c8bb179badb1b265
+SHA512 (mustach-1.2.2.tar.gz) = d714dd5a0c58d9bd23826cd56f91b0ad04ff0bb0733b0dfca41100219436ab90b42b8fd3878932f5101cfd2a4f6ae3c85dcaea9010521ef1a17dd00e980363a7
+Size (mustach-1.2.2.tar.gz) = 36229 bytes
+SHA1 (patch-test6_Makefile) = 59d63febabaad20b880ed440587d12d3c5a40599

Added files:

Index: pkgsrc/devel/mustach/patches/patch-test6_Makefile
diff -u /dev/null pkgsrc/devel/mustach/patches/patch-test6_Makefile:1.1
--- /dev/null   Sat Nov 20 00:31:10 2021
+++ pkgsrc/devel/mustach/patches/patch-test6_Makefile   Sat Nov 20 00:31:10 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-test6_Makefile,v 1.1 2021/11/20 00:31:10 sjmulder Exp $
+
+- Respect LDFLAGS when building test.
+
+--- test6/Makefile.orig        2021-10-28 15:03:09.000000000 +0000
++++ test6/Makefile
+@@ -2,7 +2,7 @@
+ 
+ test-custom-write: test-custom-write.c ../mustach-json-c.h ../mustach-json-c.c ../mustach-wrap.c ../mustach.h ../mustach.c
+       @echo building test-custom-write
+-      $(CC) $(CFLAGS) -g -o test-custom-write test-custom-write.c  ../mustach.c  ../mustach-json-c.c ../mustach-wrap.c -ljson-c
++      $(CC) $(CFLAGS) $(LDFLAGS) -g -o test-custom-write test-custom-write.c  ../mustach.c  ../mustach-json-c.c ../mustach-wrap.c -ljson-c
+ 
+ test: test-custom-write
+       @echo starting test