From owner-dev-commits-ports-main@freebsd.org Mon Jul 19 12:54:43 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4C12F6564F7; Mon, 19 Jul 2021 12:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GT1yW175Mz4mqj; Mon, 19 Jul 2021 12:54:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EE8D41736D; Mon, 19 Jul 2021 12:54:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16JCsgdL063552; Mon, 19 Jul 2021 12:54:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16JCsgt8063551; Mon, 19 Jul 2021 12:54:42 GMT (envelope-from git) Date: Mon, 19 Jul 2021 12:54:42 GMT Message-Id: <202107191254.16JCsgt8063551@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: a5bb462e1eda - main - math/libxlsxwriter: update to 1.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a5bb462e1edaebd32bf77cbf93e54054b42d20d6 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jul 2021 12:54:43 -0000 The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=a5bb462e1edaebd32bf77cbf93e54054b42d20d6 commit a5bb462e1edaebd32bf77cbf93e54054b42d20d6 Author: Baptiste Daroussin AuthorDate: 2021-07-19 12:47:56 +0000 Commit: Baptiste Daroussin CommitDate: 2021-07-19 12:48:27 +0000 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 3fdd12251ce3..c98e3dbf8406 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 diff --git a/math/libxlsxwriter/distinfo b/math/libxlsxwriter/distinfo index 0ae859b6ce4a..5d20fb640a20 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 3d5d7cad24d2..16df7eece123 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 60db3619aa5b..8e99cd18720f 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