From a5bb462e1edaebd32bf77cbf93e54054b42d20d6 Mon Sep 17 00:00:00 2001
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 19 Jul 2021 14:47:56 +0200
Subject: [PATCH] math/libxlsxwriter: update to 1.1.1

---
 math/libxlsxwriter/Makefile                 |  6 +----
 math/libxlsxwriter/distinfo                 |  6 ++---
 math/libxlsxwriter/files/patch-src_Makefile | 26 ++++-----------------
 math/libxlsxwriter/pkg-plist                |  3 ++-
 4 files changed, 10 insertions(+), 31 deletions(-)

diff --git a/math/libxlsxwriter/Makefile b/math/libxlsxwriter/Makefile
index 3fdd12251ce37..c98e3dbf84064 100644
--- a/math/libxlsxwriter/Makefile
+++ b/math/libxlsxwriter/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	libxlsxwriter
-PORTVERSION=	1.0.4
+PORTVERSION=	1.1.1
 DISTVERSIONPREFIX=	RELEASE_
 CATEGORIES=	math devel
 
@@ -15,8 +15,4 @@ MAKE_ARGS=	INSTALL_DIR=${STAGEDIR}${PREFIX}
 USE_LDCONFIG=	yes
 USES=		compiler:c11 gmake
 
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libxlsxwriter.so.0
-	${LN} -s libxlsxwriter.so.0 ${STAGEDIR}${PREFIX}/lib/libxlsxwriter.so
-
 .include <bsd.port.mk>
diff --git a/math/libxlsxwriter/distinfo b/math/libxlsxwriter/distinfo
index 0ae859b6ce4a7..5d20fb640a207 100644
--- a/math/libxlsxwriter/distinfo
+++ b/math/libxlsxwriter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1620881972
-SHA256 (jmcnamara-libxlsxwriter-RELEASE_1.0.4_GH0.tar.gz) = d1c8179ecebd3f216aa4bb4fab8618dea0ac74fe8bd7272e67abf51c12becebb
-SIZE (jmcnamara-libxlsxwriter-RELEASE_1.0.4_GH0.tar.gz) = 17614784
+TIMESTAMP = 1626697690
+SHA256 (jmcnamara-libxlsxwriter-RELEASE_1.1.1_GH0.tar.gz) = b0de1e8558958cb486c87584aaec1a9ec68be9cc299594c41b1847fabff60625
+SIZE (jmcnamara-libxlsxwriter-RELEASE_1.1.1_GH0.tar.gz) = 18754615
diff --git a/math/libxlsxwriter/files/patch-src_Makefile b/math/libxlsxwriter/files/patch-src_Makefile
index 3d5d7cad24d20..16df7eece123c 100644
--- a/math/libxlsxwriter/files/patch-src_Makefile
+++ b/math/libxlsxwriter/files/patch-src_Makefile
@@ -1,24 +1,6 @@
---- src/Makefile.orig	2021-03-30 13:12:10 UTC
+--- src/Makefile.orig	2021-07-12 22:30:20 UTC
 +++ src/Makefile
-@@ -82,7 +82,7 @@ endif
- 
- # Library names.
- LIBXLSXWRITER_A  = libxlsxwriter.a
--LIBXLSXWRITER_SO = libxlsxwriter.so
-+LIBXLSXWRITER_SO = libxlsxwriter.so.0
- 
- # Library with additional non-static functions for testing.
- LIBXLSXWRITER_TO = libxlsxwriter_test.a
-@@ -92,7 +92,7 @@ ARFLAGS = rc
- 
- # Flags passed to dynamic linker.
- FPIC = -fPIC
--SOFLAGS = -shared $(FPIC)
-+SOFLAGS = -shared $(FPIC) -Wl,-soname=${LIBXLSXWRITER_SO}
- 
- # Get Env/OS name.
- UNAME := $(shell uname)
-@@ -144,11 +144,11 @@ $(LIBXLSXWRITER_A) : $(OBJS)
+@@ -159,11 +159,11 @@ $(LIBXLSXWRITER_A) : $(OBJS)
  
  # The dynamic library.
  ifeq ($(findstring m32,$(CFLAGS)),m32)
@@ -27,8 +9,8 @@
  endif
  
  $(LIBXLSXWRITER_SO) : $(SOBJS)
--	$(Q)$(CC) $(LDFLAGS) $(SOFLAGS) $(ARCH) $(TARGET_ARCH) -o $@ $(MINIZIP_SO) $(TMPFILEPLUS_SO) $(MD5_SO) $^ $(LIBS)
-+	$(Q)$(CC) $(LDFLAGS) $(SOFLAGS) $(XLSX_ARCH) $(TARGET_ARCH) -o $@ $(MINIZIP_SO) $(TMPFILEPLUS_SO) $(MD5_SO) $^ $(LIBS)
+-	$(Q)$(CC) $(LDFLAGS) $(SOFLAGS) $(ARCH) $(TARGET_ARCH) -o $@ $(MINIZIP_SO) $(TMPFILEPLUS_SO) $(MD5_SO) $(DTOA_LIB_SO) $^ $(LIBS)
++	$(Q)$(CC) $(LDFLAGS) $(SOFLAGS) $(XSLX_ARCH) $(TARGET_ARCH) -o $@ $(MINIZIP_SO) $(TMPFILEPLUS_SO) $(MD5_SO) $(DTOA_LIB_SO) $^ $(LIBS)
  
  # The test library.
  $(LIBXLSXWRITER_TO) : $(TOBJS)
diff --git a/math/libxlsxwriter/pkg-plist b/math/libxlsxwriter/pkg-plist
index 60db3619aa5b6..8e99cd18720f4 100644
--- a/math/libxlsxwriter/pkg-plist
+++ b/math/libxlsxwriter/pkg-plist
@@ -16,6 +16,7 @@ include/xlsxwriter/relationships.h
 include/xlsxwriter/shared_strings.h
 include/xlsxwriter/styles.h
 include/xlsxwriter/theme.h
+include/xlsxwriter/third_party/emyg_dtoa.h
 include/xlsxwriter/third_party/ioapi.h
 include/xlsxwriter/third_party/md5.h
 include/xlsxwriter/third_party/queue.h
@@ -29,5 +30,5 @@ include/xlsxwriter/worksheet.h
 include/xlsxwriter/xmlwriter.h
 lib/libxlsxwriter.a
 lib/libxlsxwriter.so
-lib/libxlsxwriter.so.0
+lib/libxlsxwriter.so.2.1
 libdata/pkgconfig/xlsxwriter.pc