summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--textproc/libxlsxwriter/Makefile16
-rw-r--r--textproc/libxlsxwriter/PLIST6
-rw-r--r--textproc/libxlsxwriter/buildlink3.mk7
-rw-r--r--textproc/libxlsxwriter/distinfo10
4 files changed, 26 insertions, 13 deletions
diff --git a/textproc/libxlsxwriter/Makefile b/textproc/libxlsxwriter/Makefile
index 4461d519809..40adddb45f7 100644
--- a/textproc/libxlsxwriter/Makefile
+++ b/textproc/libxlsxwriter/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2020/10/01 21:10:41 sjmulder Exp $
+# $NetBSD: Makefile,v 1.15 2021/07/26 01:02:12 sjmulder Exp $
-DISTNAME= libxlsxwriter-1.0.0
+DISTNAME= libxlsxwriter-1.1.1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GITHUB:=jmcnamara/}
GITHUB_TAG= RELEASE_${PKGVERSION_NOREV}
@@ -19,10 +19,16 @@ USE_TOOLS+= gmake
.include "../../lang/python/pyversion.mk"
-MAKE_ENV+= PYTEST=py.test-${PYVERSSUFFIX}
MAKE_ENV+= OPT_LEVEL=
-# minizip/ioapi.c has broken logic for checking for fopen64 etc
-CFLAGS+= -DIOAPI_NO_64 -D_FILE_OFFSET_BITS=64
+# Prefer non-bundled dependencies
+MAKE_ENV+= USE_SYSTEM_MINIZIP=1
+MAKE_ENV+= USE_STANDARD_TMPFILE=1
+MAKE_ENV+= USE_OPENSSL_MD5=1
+# minizip has C++ style comments
+BUILDLINK_TRANSFORM+= rm:-ansi
+
+.include "../../archivers/minizip/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/libxlsxwriter/PLIST b/textproc/libxlsxwriter/PLIST
index aa5e5c3e059..0649439e6b0 100644
--- a/textproc/libxlsxwriter/PLIST
+++ b/textproc/libxlsxwriter/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2020/01/15 14:36:07 sjmulder Exp $
+@comment $NetBSD: PLIST,v 1.4 2021/07/26 01:02:12 sjmulder Exp $
include/xlsxwriter.h
include/xlsxwriter/app.h
include/xlsxwriter/chart.h
@@ -11,11 +11,13 @@ include/xlsxwriter/custom.h
include/xlsxwriter/drawing.h
include/xlsxwriter/format.h
include/xlsxwriter/hash_table.h
+include/xlsxwriter/metadata.h
include/xlsxwriter/packager.h
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,3 +31,5 @@ include/xlsxwriter/worksheet.h
include/xlsxwriter/xmlwriter.h
lib/libxlsxwriter.a
lib/libxlsxwriter.so
+lib/libxlsxwriter.so.2.1
+lib/pkgconfig/xlsxwriter.pc
diff --git a/textproc/libxlsxwriter/buildlink3.mk b/textproc/libxlsxwriter/buildlink3.mk
index 4fd56b06d28..b1ef72e8e8f 100644
--- a/textproc/libxlsxwriter/buildlink3.mk
+++ b/textproc/libxlsxwriter/buildlink3.mk
@@ -1,14 +1,17 @@
-# $NetBSD: buildlink3.mk,v 1.9 2020/10/01 21:10:41 sjmulder Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2021/07/26 01:02:12 sjmulder Exp $
BUILDLINK_TREE+= libxlsxwriter
.if !defined(LIBXLSXWRITER_BUILDLINK3_MK)
LIBXLSXWRITER_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.libxlsxwriter+= libxlsxwriter>=1.0.0
+BUILDLINK_API_DEPENDS.libxlsxwriter+= libxlsxwriter>=1.1.1
BUILDLINK_PKGSRCDIR.libxlsxwriter?= ../../textproc/libxlsxwriter
+.include "../../archivers/minizip/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+
.endif # LIBXLSXWRITER_BUILDLINK3_MK
BUILDLINK_TREE+= -libxlsxwriter
diff --git a/textproc/libxlsxwriter/distinfo b/textproc/libxlsxwriter/distinfo
index 681fac29725..f60c7e481c3 100644
--- a/textproc/libxlsxwriter/distinfo
+++ b/textproc/libxlsxwriter/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2020/10/01 21:10:41 sjmulder Exp $
+$NetBSD: distinfo,v 1.13 2021/07/26 01:02:12 sjmulder Exp $
-SHA1 (libxlsxwriter-1.0.0.tar.gz) = 8c0faeac06171d14e60387c0caf7fe32c5b7b9af
-RMD160 (libxlsxwriter-1.0.0.tar.gz) = f09c44c6dea45349d4df5b6c35dfdf0ab0e3855e
-SHA512 (libxlsxwriter-1.0.0.tar.gz) = bad49a87dba97c965030274005cb19757ac5128c5d298b30344771beea8538214d06ca7122ec9a239267529ed1852f085611618aeb68fb884ed56543bf759698
-Size (libxlsxwriter-1.0.0.tar.gz) = 17352002 bytes
+SHA1 (libxlsxwriter-1.1.1.tar.gz) = 6fe0f4d2a5a3c362bc728debde9b0b1db488e1f6
+RMD160 (libxlsxwriter-1.1.1.tar.gz) = 6575683358049760b70fdc82e4b0e3d82d45f96c
+SHA512 (libxlsxwriter-1.1.1.tar.gz) = 6284c1af5238a37d9d2b498da2def20f935ba64ffd63c3a96064a73d3a344a923e1945e44e615bb584ae77ed396580f5da3faf9540aff7e4d453bcc4d6a0dc1b
+Size (libxlsxwriter-1.1.1.tar.gz) = 18754615 bytes