[pkgsrc/trunk]: pkgsrc/devel/mustach devel/mustach: Remove old patch, fix mac...

[sjmulder <sjmulder%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ac7b5186753d
branches:  trunk
changeset: 377195:ac7b5186753d
user:      sjmulder <sjmulder%pkgsrc.org@localhost>
date:      Sun Apr 17 20:00:34 2022 +0000

description:
devel/mustach: Remove old patch, fix macOS build

 - test6/Makefile patch is merged upstream
 - Fix macOS breakage caused by -soname use

diffstat:

 devel/mustach/Makefile                     |   3 +-
 devel/mustach/distinfo                     |   4 +-
 devel/mustach/patches/patch-Makefile       |  55 ++++++++++++++++++++++++++++++
 devel/mustach/patches/patch-test6_Makefile |  15 --------
 4 files changed, 59 insertions(+), 18 deletions(-)

diffs (102 lines):

diff -r 524d2f369bf0 -r ac7b5186753d devel/mustach/Makefile
--- a/devel/mustach/Makefile    Sun Apr 17 19:09:57 2022 +0000
+++ b/devel/mustach/Makefile    Sun Apr 17 20:00:34 2022 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2021/11/20 00:31:10 sjmulder Exp $
+# $NetBSD: Makefile,v 1.9 2022/04/17 20:00:34 sjmulder Exp $
 
 DISTNAME=      mustach-1.2.2
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  https://gitlab.com/jobol/mustach/-/archive/${PKGVERSION_NOREV}/
 
diff -r 524d2f369bf0 -r ac7b5186753d devel/mustach/distinfo
--- a/devel/mustach/distinfo    Sun Apr 17 19:09:57 2022 +0000
+++ b/devel/mustach/distinfo    Sun Apr 17 20:00:34 2022 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2021/11/20 00:31:10 sjmulder Exp $
+$NetBSD: distinfo,v 1.8 2022/04/17 20:00:34 sjmulder Exp $
 
 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
+SHA1 (patch-Makefile) = c24272ce1671a9bce63cef16a52289260842826a
diff -r 524d2f369bf0 -r ac7b5186753d devel/mustach/patches/patch-Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/mustach/patches/patch-Makefile      Sun Apr 17 20:00:34 2022 +0000
@@ -0,0 +1,55 @@
+$NetBSD: patch-Makefile,v 1.1 2022/04/17 20:00:34 sjmulder Exp $
+
+Don't use -soname on macOS.
+https://gitlab.com/jobol/mustach/-/merge_requests/26
+
+--- Makefile.orig      2022-04-17 19:51:45.000000000 +0000
++++ Makefile
+@@ -148,11 +148,17 @@ $(info cjson   = ${cjson})
+ override CFLAGS += -fPIC -Wall -Wextra -DVERSION=${VERSION}
+ 
+ ifeq ($(shell uname),Darwin)
+- darwin_single = -install_name $(LIBDIR)/libmustach.so$(SOVEREV)
+- darwin_core = -install_name $(LIBDIR)/libmustach-core.so$(SOVEREV)
+- darwin_cjson = -install_name $(LIBDIR)/libmustach-cjson.so$(SOVEREV)
+- darwin_jsonc = -install_name $(LIBDIR)/libmustach-json-c.so$(SOVEREV)
+- darwin_jansson = -install_name $(LIBDIR)/libmustach-jansson.so$(SOVEREV)
++ LDFLAGS_single  += -install_name $(LIBDIR)/libmustach.so$(SOVEREV)
++ LDFLAGS_core    += -install_name $(LIBDIR)/libmustach-core.so$(SOVEREV)
++ LDFLAGS_cjson   += -install_name $(LIBDIR)/libmustach-cjson.so$(SOVEREV)
++ LDFLAGS_jsonc   += -install_name $(LIBDIR)/libmustach-json-c.so$(SOVEREV)
++ LDFLAGS_jansson += -install_name $(LIBDIR)/libmustach-jansson.so$(SOVEREV)
++else
++ LDFLAGS_single  += -Wl,-soname,libmustach.so$(SOVER)
++ LDFLAGS_core    += -Wl,-soname,libmustach-core.so$(SOVER)
++ LDFLAGS_cjson   += -Wl,-soname,libmustach-cjson.so$(SOVER)
++ LDFLAGS_jsonc   += -Wl,-soname,libmustach-json-c.so$(SOVER)
++ LDFLAGS_jansson += -Wl,-soname,libmustach-jansson.so$(SOVER)
+ endif
+ 
+ # targets
+@@ -164,19 +170,19 @@ mustach: $(TOOLOBJS)
+       $(CC) $(LDFLAGS) $(TOOLFLAGS) -o mustach $(TOOLOBJS) $(TOOLLIBS)
+ 
+ libmustach.so$(SOVEREV): $(SINGLEOBJS)
+-      $(CC) -shared -Wl,-soname,libmustach.so$(SOVER) $(LDFLAGS) $(darwin_single) -o $@ $^ $(SINGLELIBS)
++      $(CC) -shared $(LDFLAGS) $(LDFLAGS_single) -o $@ $^ $(SINGLELIBS)
+ 
+ libmustach-core.so$(SOVEREV): $(COREOBJS)
+-      $(CC) -shared -Wl,-soname,libmustach-core.so$(SOVER) $(LDFLAGS) $(darwin_core) -o $@ $(COREOBJS) $(lib_OBJ)
++      $(CC) -shared $(LDFLAGS) $(LDFLAGS_core) -o $@ $(COREOBJS) $(lib_OBJ)
+ 
+ libmustach-cjson.so$(SOVEREV): $(COREOBJS) mustach-cjson.o
+-      $(CC) -shared -Wl,-soname,libmustach-cjson.so$(SOVER) $(LDFLAGS) $(darwin_cjson) -o $@ $^ $(cjson_libs)
++      $(CC) -shared $(LDFLAGS) $(LDFLAGS_cjson) -o $@ $^ $(cjson_libs)
+ 
+ libmustach-json-c.so$(SOVEREV): $(COREOBJS) mustach-json-c.o
+-      $(CC) -shared -Wl,-soname,libmustach-json-c.so$(SOVER) $(LDFLAGS) $(darwin_jsonc) -o $@ $^ $(jsonc_libs)
++      $(CC) -shared $(LDFLAGS) $(LDFLAGS_jsonc) -o $@ $^ $(jsonc_libs)
+ 
+ libmustach-jansson.so$(SOVEREV): $(COREOBJS) mustach-jansson.o
+-      $(CC) -shared -Wl,-soname,libmustach-jansson.so$(SOVER) $(LDFLAGS) $(darwin_jansson) -o $@ $^ $(jansson_libs)
++      $(CC) -shared $(LDFLAGS) $(LDFLAGS_jansson) -o $@ $^ $(jansson_libs)
+ 
+ # pkgconfigs
+ 
diff -r 524d2f369bf0 -r ac7b5186753d devel/mustach/patches/patch-test6_Makefile
--- a/devel/mustach/patches/patch-test6_Makefile        Sun Apr 17 19:09:57 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$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