Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_165022563593010"
MIME-Version: 1.0
Date: Sun, 17 Apr 2022 20:00:35 +0000
From: "Sijmen J. Mulder" <sjmulder@netbsd.org>
Subject: CVS commit: pkgsrc/devel/mustach
To: pkgsrc-changes@NetBSD.org
Reply-To: sjmulder@netbsd.org
Message-Id: <20220417200035.084A1FB19@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	sjmulder
Date:		Sun Apr 17 20:00:34 UTC 2022

Modified Files:
	pkgsrc/devel/mustach: Makefile distinfo
Added Files:
	pkgsrc/devel/mustach/patches: patch-Makefile
Removed Files:
	pkgsrc/devel/mustach/patches: patch-test6_Makefile

Log Message:
devel/mustach: Remove old patch, fix macOS build

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


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/mustach/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/mustach/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/mustach/patches/patch-Makefile
cvs rdiff -u -r1.1 -r0 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.


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

Modified files:

Index: pkgsrc/devel/mustach/Makefile
diff -u pkgsrc/devel/mustach/Makefile:1.8 pkgsrc/devel/mustach/Makefile:1.9
--- pkgsrc/devel/mustach/Makefile:1.8	Sat Nov 20 00:31:10 2021
+++ pkgsrc/devel/mustach/Makefile	Sun Apr 17 20:00:34 2022
@@ -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}/
 

Index: pkgsrc/devel/mustach/distinfo
diff -u pkgsrc/devel/mustach/distinfo:1.7 pkgsrc/devel/mustach/distinfo:1.8
--- pkgsrc/devel/mustach/distinfo:1.7	Sat Nov 20 00:31:10 2021
+++ pkgsrc/devel/mustach/distinfo	Sun Apr 17 20:00:34 2022
@@ -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

Added files:

Index: pkgsrc/devel/mustach/patches/patch-Makefile
diff -u /dev/null pkgsrc/devel/mustach/patches/patch-Makefile:1.1
--- /dev/null	Sun Apr 17 20:00:34 2022
+++ pkgsrc/devel/mustach/patches/patch-Makefile	Sun Apr 17 20:00:34 2022
@@ -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
+ 


--_----------=_165022563593010--