diff --git a/math/libxlsxwriter/Makefile b/math/libxlsxwriter/Makefile index 06adf3bf3fb8a..14877aeea2d38 100644 --- a/math/libxlsxwriter/Makefile +++ b/math/libxlsxwriter/Makefile @@ -1,5 +1,5 @@ PORTNAME= libxlsxwriter -PORTVERSION= 1.0.0 +PORTVERSION= 1.0.1 DISTVERSIONPREFIX= RELEASE_ CATEGORIES= math devel diff --git a/math/libxlsxwriter/distinfo b/math/libxlsxwriter/distinfo index de95d90a4f853..1c32b434102e4 100644 --- a/math/libxlsxwriter/distinfo +++ b/math/libxlsxwriter/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1600109612 -SHA256 (jmcnamara-libxlsxwriter-RELEASE_1.0.0_GH0.tar.gz) = 8b353379333c323d14a9d265cd2491d3a6c0032c8d6ec2141f10b82ab66a087c -SIZE (jmcnamara-libxlsxwriter-RELEASE_1.0.0_GH0.tar.gz) = 17352002 +TIMESTAMP = 1617972819 +SHA256 (jmcnamara-libxlsxwriter-RELEASE_1.0.1_GH0.tar.gz) = 86df82e1180f07bd0be19225776db8fbe199d66e715a343d8c0c3444b05ec00b +SIZE (jmcnamara-libxlsxwriter-RELEASE_1.0.1_GH0.tar.gz) = 17520424 diff --git a/math/libxlsxwriter/files/patch-src_Makefile b/math/libxlsxwriter/files/patch-src_Makefile index 8eb22c8466de9..3d5d7cad24d20 100644 --- a/math/libxlsxwriter/files/patch-src_Makefile +++ b/math/libxlsxwriter/files/patch-src_Makefile @@ -1,6 +1,6 @@ ---- src/Makefile.orig 2019-12-26 18:59:41 UTC +--- src/Makefile.orig 2021-03-30 13:12:10 UTC +++ src/Makefile -@@ -73,7 +73,7 @@ endif +@@ -82,7 +82,7 @@ endif # Library names. LIBXLSXWRITER_A = libxlsxwriter.a @@ -9,7 +9,7 @@ # Library with additional non-static functions for testing. LIBXLSXWRITER_TO = libxlsxwriter_test.a -@@ -83,7 +83,7 @@ ARFLAGS = rc +@@ -92,7 +92,7 @@ ARFLAGS = rc # Flags passed to dynamic linker. FPIC = -fPIC @@ -18,7 +18,7 @@ # Get Env/OS name. UNAME := $(shell uname) -@@ -135,11 +135,11 @@ $(LIBXLSXWRITER_A) : $(OBJS) +@@ -144,11 +144,11 @@ $(LIBXLSXWRITER_A) : $(OBJS) # The dynamic library. ifeq ($(findstring m32,$(CFLAGS)),m32) @@ -27,8 +27,8 @@ endif $(LIBXLSXWRITER_SO) : $(SOBJS) -- $(Q)$(CC) $(LDFLAGS) $(SOFLAGS) $(ARCH) -o $@ $(MINIZIP_SO) $(TMPFILEPLUS_SO) $(MD5_SO) $^ $(LIBS) -+ $(Q)$(CC) $(LDFLAGS) $(SOFLAGS) $(XSLX_ARCH) -o $@ $(MINIZIP_SO) $(TMPFILEPLUS_SO) $(MD5_SO) $^ $(LIBS) +- $(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) # The test library. $(LIBXLSXWRITER_TO) : $(TOBJS) diff --git a/math/libxlsxwriter/pkg-plist b/math/libxlsxwriter/pkg-plist index 8541482fef5a5..486ce9e2272b4 100644 --- a/math/libxlsxwriter/pkg-plist +++ b/math/libxlsxwriter/pkg-plist @@ -29,3 +29,4 @@ include/xlsxwriter/xmlwriter.h lib/libxlsxwriter.a lib/libxlsxwriter.so lib/libxlsxwriter.so.0 +libdata/pkgconfig/xlsxwriter.pc