From nobody Sat Aug 31 08:51:19 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wwpdz5dqxz5TtT1; Sat, 31 Aug 2024 08:51:19 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wwpdz3RVsz4rGk; Sat, 31 Aug 2024 08:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725094279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ndQ7OxL+lPuatU29MWfkke1+5LoNeO6s+RNA204FkpA=; b=o//6IRGYSxBDtBiOZE4YkFadMpVFlZbP2G1Xfnrz+OHIlCCRxnI1PIzO/F8ZbFY8sm8P96 fDEBFmmgmTkFm5L3fLa5ScMeTZa/C4GpHGW2UEAdrmwFsMwE6OXzOv9LFT6TwBQnDaUA/d ozQ3yyBKvbUd8Waeo+DYatKPpVeACrtjy+temVuecWWPkakDfd6iYT1ePpFzg/DK+TC8Ho QMLeuPIs9Be0K6RP0qnRBBX/9wNaFVZ+uf1mHTOjeE4eHGYBxpIDcEyzv/kf4Vm4pHhlQb pXcJUNKoAOlYDmuZCpEP8YfXTNWCcXrYD6wuZTvqLrCBeaMx2KRVPqucaO3gAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725094279; a=rsa-sha256; cv=none; b=vrgUih2lMq7tCaMYOZRXXvq/40QaHSA5Q51Xfv/ZhSCyRd8wKR1OduSvYhRAz1TUIh2az9 3hcP4EjWJDmfQwSQM1QwvNk+PFRv6XGWbWvStzJBTQiooXDUWDtLqRErwY/VzskNfUAO6B BIv/hw9oO3Xh3cBtyfSiOX68SOVEwnrC0QzNUKUvjop8EhZRp8c23mK59W7/r4DK6/3vCj DxAq61zF+Hu+M1tLkM1dUlDOcU2EXoyomlqbrWaoQx9ayck9nlyuOXGTCjBEDL1xc05klp uvpdqvocSSRuDdhmtUJuPmrzJTMtB0Kv9Mu8kVPbwUtSBn+Yfnll2Xq1YexPQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725094279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ndQ7OxL+lPuatU29MWfkke1+5LoNeO6s+RNA204FkpA=; b=LIU9wuPfQcLtwyuGrfHOOmS8CGk8sm1xmRBKAk1+DEvVF7yTHP0pgactjz/xFmbhb9vOsq m+i+CWu82s6HbsjNSaLuwwYooyNnVZkmFRLhrK7URf+L9e2FSvAQgOOKS2DOYXNDst1CzA AimzYn0kqj6h032a0k+rzWvvFcsOdFi4tyfQV15le2J1/Ko2G+ZJnvIMp1O/j5w0DfdqHS pnP73BRRRB4tQ+GhPYOtSBxG1r4j1RpEaN1w2BRTs9IMDj8ian9bQ4iSfuTNfIv8Pd215A UFXY+c8A9aVNvFKDnfRtJSnTltiohzmQg0CEsi30ytvW5H7YW2FBgHKHXL4C7Q== 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 4Wwpdz2m4hzdfV; Sat, 31 Aug 2024 08:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47V8pJbU031599; Sat, 31 Aug 2024 08:51:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47V8pJRl031596; Sat, 31 Aug 2024 08:51:19 GMT (envelope-from git) Date: Sat, 31 Aug 2024 08:51:19 GMT Message-Id: <202408310851.47V8pJRl031596@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: b2bbc1ba676c - main - math/libxlsxwriter: Improve port and switch to CMake List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2bbc1ba676c2c811fd81dd6aec4f8295341449b Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=b2bbc1ba676c2c811fd81dd6aec4f8295341449b commit b2bbc1ba676c2c811fd81dd6aec4f8295341449b Author: Daniel Engberg AuthorDate: 2024-08-30 22:19:12 +0000 Commit: Daniel Engberg CommitDate: 2024-08-31 08:50:46 +0000 math/libxlsxwriter: Improve port and switch to CMake * Switch to CMake * Enable "make test" * Unbundle libs (md5 and minizip) * Import upstreamed PR #454 Reference: https://github.com/jmcnamara/libxlsxwriter/pull/454 PR: 281018 Reviewed by: bapt (maintainer) --- math/libxlsxwriter/Makefile | 25 +++++++++++++++++++++---- math/libxlsxwriter/distinfo | 4 +++- math/libxlsxwriter/files/patch-src_Makefile | 16 ---------------- math/libxlsxwriter/pkg-plist | 1 - 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/math/libxlsxwriter/Makefile b/math/libxlsxwriter/Makefile index 4a6331f9a524..7894210895a9 100644 --- a/math/libxlsxwriter/Makefile +++ b/math/libxlsxwriter/Makefile @@ -1,19 +1,36 @@ PORTNAME= libxlsxwriter -PORTVERSION= 1.1.8 DISTVERSIONPREFIX= v +DISTVERSION= 1.1.8 +PORTREVISION= 1 CATEGORIES= math devel +PATCH_SITES= https://github.com/jmcnamara/libxlsxwriter/commit/ +PATCHFILES= 5af9c1fd3e330a6a4aeaba58599e2c5294c521ab.patch:-p1 + MAINTAINER= bapt@FreeBSD.org COMMENT= C library for creating Excel XLSX files WWW= https://libxlsxwriter.github.io/ LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/License.txt + +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} + +USES= cmake:testing compiler:c11 localbase:ldflags minizip pathfix \ + pkgconfig python:test ssl +USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= jmcnamara -MAKE_ARGS= INSTALL_DIR=${STAGEDIR}${PREFIX} -USE_LDCONFIG= yes -USES= compiler:c11 gmake +EXTRACT_AFTER_ARGS= --exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/third_party/md5 \ + --exclude ${GH_PROJECT_DEFAULT}-${GH_TAGNAME_EXTRACT}/third_party/minizip \ + --no-same-owner --no-same-permissions + +CMAKE_TESTING_ON= BUILD_TESTS + +CMAKE_ON= BUILD_SHARED_LIBS \ + USE_OPENSSL_MD5 \ + USE_SYSTEM_MINIZIP .include diff --git a/math/libxlsxwriter/distinfo b/math/libxlsxwriter/distinfo index 1cfeb170499f..94ae562def03 100644 --- a/math/libxlsxwriter/distinfo +++ b/math/libxlsxwriter/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1724058226 +TIMESTAMP = 1725056181 SHA256 (jmcnamara-libxlsxwriter-v1.1.8_GH0.tar.gz) = 122c98353e5b69284a1cd782be7ae67bdefde2146f8197ef89a1aaf886058e86 SIZE (jmcnamara-libxlsxwriter-v1.1.8_GH0.tar.gz) = 21840785 +SHA256 (5af9c1fd3e330a6a4aeaba58599e2c5294c521ab.patch) = b5b9d12c52bb6640c5399967360f9d1cd7a31a7c15bd2a6d3226d8c50b445074 +SIZE (5af9c1fd3e330a6a4aeaba58599e2c5294c521ab.patch) = 3271 diff --git a/math/libxlsxwriter/files/patch-src_Makefile b/math/libxlsxwriter/files/patch-src_Makefile deleted file mode 100644 index 16df7eece123..000000000000 --- a/math/libxlsxwriter/files/patch-src_Makefile +++ /dev/null @@ -1,16 +0,0 @@ ---- src/Makefile.orig 2021-07-12 22:30:20 UTC -+++ src/Makefile -@@ -159,11 +159,11 @@ $(LIBXLSXWRITER_A) : $(OBJS) - - # The dynamic library. - ifeq ($(findstring m32,$(CFLAGS)),m32) --ARCH = -m32 -+XSLX_ARCH = -m32 - endif - - $(LIBXLSXWRITER_SO) : $(SOBJS) -- $(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 fe2b4a09efe2..55e069be4b40 100644 --- a/math/libxlsxwriter/pkg-plist +++ b/math/libxlsxwriter/pkg-plist @@ -33,7 +33,6 @@ include/xlsxwriter/vml.h include/xlsxwriter/workbook.h include/xlsxwriter/worksheet.h include/xlsxwriter/xmlwriter.h -lib/libxlsxwriter.a lib/libxlsxwriter.so lib/libxlsxwriter.so.7 libdata/pkgconfig/xlsxwriter.pc