From nobody Sun Oct 15 08:28:20 2023 X-Original-To: dev-commits-ports-all@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 4S7YKc2LpRz4xs9Z; Sun, 15 Oct 2023 08:28:20 +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 4S7YKc1jVMz4VWx; Sun, 15 Oct 2023 08:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697358500; 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=G8Mr+PHwkdXEOVIoI8gaN9BJu6T01EQDePafgw9g7Ck=; b=ECJ7rkoyvtRbYW1QMOyKbselgl7KRdIJw4ijO5ogatXTLRak/Ekhf9UH4Q7jg51maksv0h mX+U1BqSaEEFG9DZrDZjYgTGYlJHqoBQeK3MuarVVchonMeDXKAOaQHxssO4RSX2bFPXpP cgY0/JjcH4S6qur/Fm4ObnHjCKKZPbo83FWJTEejFNn+xM0TNfO6Je4QUImsXc2TmH+O67 pM/TH2hdxxbf7QpFrPkLqq/L8flJSMZjFNhp6YoJpd/Qv3yUyLV4Kd1vdS4ORBySGEAG1G VpFwAzYGtgim0RqHLmk2GIs/2IKV/OI2f1CLdJngmM+oaxBe+LTlYC4X27CcVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697358500; a=rsa-sha256; cv=none; b=x8mDbL75njGRuQ9iXZBH6oMXjaT6SGAoVS1CXHojVMmw1v38qDQ+m1Q4h8nbloHL0bOleO 2fDiphVmwP+wyITl/D5g8GD4cUkE+MLfF0q2MvVpMT9XCCrV2cMhOzD0RKfM8CInpieEwj UbmDEBcuTi7KcA8vNAvCqWUCPu+4idC16KIKGuLTuHRkYn2IPDcLLQmFu7/Cps6CjXn5ua a0G912vwUqLlMazkjKToi1OHP8FB7NWpE4vUqbo+nj0GX9pHF+2VFHRpr79hHe519KS5HC kFbNr/9h03T1kUciAN0xvyOIVAW4ijvbKO9egBUehHu9ZQ72EtZkMLl1pAW8Vw== 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=1697358500; 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=G8Mr+PHwkdXEOVIoI8gaN9BJu6T01EQDePafgw9g7Ck=; b=fFE+8PzSClwvJEC03DVLB3S7Au3QEIuf6dX/Oo3MYHs5PIeFSaSvU1wAILYusmE+Aa7tmn 8xEWDvBzzVaPmS58hyNI/tam1KRI1KcxHaMCLkUKp5rzye8hstsvS6+pZU2wldBr0UQLCc 1GuvgfHf1LgXQFm/hA/QHQ7c06Z8dJlCAbzyDyu1yGtn4H5XfPkQaNQFXjqSp0kymPznS8 Qx4eOGHLvLYLSqatHDRzddii7qt0AhwT1oIV1XoGfzJkVsoK7UPl0tlYMpbJ1uFv4PZRQW 5KT7L7fY2GBtFPEpWw17p/Ec0+EBSNSDVMZbfyTjWemxt4gaPqkhqeTyRn7rww== 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 4S7YKc0nPmz15Ph; Sun, 15 Oct 2023 08:28:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39F8SKmX075977; Sun, 15 Oct 2023 08:28:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39F8SKut075974; Sun, 15 Oct 2023 08:28:20 GMT (envelope-from git) Date: Sun, 15 Oct 2023 08:28:20 GMT Message-Id: <202310150828.39F8SKut075974@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 5f682b0ef389 - main - cad/{,py-}gdstk: update 0.9.42 =?utf-8?Q?=E2=86=92?= 0.9.46 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f682b0ef389d0e6b2d8dafe522721d933234612 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=5f682b0ef389d0e6b2d8dafe522721d933234612 commit 5f682b0ef389d0e6b2d8dafe522721d933234612 Author: Yuri Victorovich AuthorDate: 2023-10-15 04:41:00 +0000 Commit: Yuri Victorovich CommitDate: 2023-10-15 08:28:15 +0000 cad/{,py-}gdstk: update 0.9.42 → 0.9.46 Reported by: portscout --- cad/gdstk/Makefile | 6 +++- cad/gdstk/distinfo | 6 ++-- cad/gdstk/files/patch-CMakeLists.txt | 11 -------- cad/gdstk/pkg-plist | 55 +++++++++++++++++++----------------- cad/py-gdstk/Makefile | 15 +++++++--- cad/py-gdstk/distinfo | 6 ++-- 6 files changed, 51 insertions(+), 48 deletions(-) diff --git a/cad/gdstk/Makefile b/cad/gdstk/Makefile index c505a5c14bc7..66860b40d7d2 100644 --- a/cad/gdstk/Makefile +++ b/cad/gdstk/Makefile @@ -1,6 +1,6 @@ PORTNAME= gdstk DISTVERSIONPREFIX= v -DISTVERSION= 0.9.42 +DISTVERSION= 0.9.46 CATEGORIES= cad MAINTAINER= yuri@FreeBSD.org @@ -10,6 +10,8 @@ WWW= https://heitzmann.github.io/gdstk/ LICENSE= BSL LICENSE_FILE= ${WRKSRC}/LICENSE +LIB_DEPENDS= libqhull_r.so:math/qhull + USES= cmake compiler:c++11-lang USE_GITHUB= yes @@ -17,4 +19,6 @@ GH_ACCOUNT= heitzmann CMAKE_ON= BUILD_SHARED_LIBS +CONFLICTS_INSTALL= misc/vxl # both install lib/libclipper.so + .include diff --git a/cad/gdstk/distinfo b/cad/gdstk/distinfo index 3771818e5ad2..aa8b239be848 100644 --- a/cad/gdstk/distinfo +++ b/cad/gdstk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1693211997 -SHA256 (heitzmann-gdstk-v0.9.42_GH0.tar.gz) = 303c6fc4b1de91091c776da928ae71ef0fcfc1b86ed1d1aacae4e2339968d5b4 -SIZE (heitzmann-gdstk-v0.9.42_GH0.tar.gz) = 629280 +TIMESTAMP = 1697306396 +SHA256 (heitzmann-gdstk-v0.9.46_GH0.tar.gz) = 3a2538e0a530a6bd112b528fd436807091335d21fdfde718cd08583052793e3a +SIZE (heitzmann-gdstk-v0.9.46_GH0.tar.gz) = 363141 diff --git a/cad/gdstk/files/patch-CMakeLists.txt b/cad/gdstk/files/patch-CMakeLists.txt deleted file mode 100644 index 98f04cb62ae5..000000000000 --- a/cad/gdstk/files/patch-CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2023-08-28 08:41:29 UTC -+++ CMakeLists.txt -@@ -50,7 +50,7 @@ foreach(IT ${ZLIB_LIBRARIES}) - set(PRIVATE_LIBS "${PRIVATE_LIBS} ${IT}") - endforeach() - --add_library(gdstk STATIC -+add_library(gdstk - src/cell.cpp - src/clipper_tools.cpp - src/curve.cpp diff --git a/cad/gdstk/pkg-plist b/cad/gdstk/pkg-plist index 7d972a760a47..269be7208980 100644 --- a/cad/gdstk/pkg-plist +++ b/cad/gdstk/pkg-plist @@ -1,28 +1,31 @@ -include/gdstk.h -include/gdstk/allocator.h -include/gdstk/array.h -include/gdstk/cell.h -include/gdstk/clipper_tools.h -include/gdstk/curve.h -include/gdstk/flexpath.h -include/gdstk/font.h -include/gdstk/gdsii.h -include/gdstk/gdswriter.h -include/gdstk/label.h -include/gdstk/library.h -include/gdstk/map.h -include/gdstk/oasis.h -include/gdstk/pathcommon.h -include/gdstk/polygon.h -include/gdstk/property.h -include/gdstk/rawcell.h -include/gdstk/reference.h -include/gdstk/repetition.h -include/gdstk/robustpath.h -include/gdstk/set.h -include/gdstk/sort.h -include/gdstk/style.h -include/gdstk/utils.h -include/gdstk/vec.h +include/clipper/clipper.hpp +include/gdstk/allocator.hpp +include/gdstk/array.hpp +include/gdstk/cell.hpp +include/gdstk/clipper_tools.hpp +include/gdstk/curve.hpp +include/gdstk/flexpath.hpp +include/gdstk/font.hpp +include/gdstk/gdsii.hpp +include/gdstk/gdstk.hpp +include/gdstk/gdswriter.hpp +include/gdstk/label.hpp +include/gdstk/library.hpp +include/gdstk/map.hpp +include/gdstk/oasis.hpp +include/gdstk/pathcommon.hpp +include/gdstk/polygon.hpp +include/gdstk/property.hpp +include/gdstk/rawcell.hpp +include/gdstk/reference.hpp +include/gdstk/repetition.hpp +include/gdstk/robustpath.hpp +include/gdstk/set.hpp +include/gdstk/sort.hpp +include/gdstk/style.hpp +include/gdstk/tagmap.hpp +include/gdstk/utils.hpp +include/gdstk/vec.hpp +lib/libclipper.so lib/libgdstk.so libdata/pkgconfig/gdstk.pc diff --git a/cad/py-gdstk/Makefile b/cad/py-gdstk/Makefile index 9aed69397199..47339d89dbb0 100644 --- a/cad/py-gdstk/Makefile +++ b/cad/py-gdstk/Makefile @@ -1,7 +1,8 @@ PORTNAME= gdstk -DISTVERSION= 0.9.42 +DISTVERSIONPREFIX= v +DISTVERSION= 0.9.46 CATEGORIES= cad -MASTER_SITES= PYPI +#MASTER_SITES= PYPI # build fails from PYPI: https://github.com/heitzmann/gdspy/issues/236 PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org @@ -15,11 +16,17 @@ BUILD_DEPENDS= cmake:devel/cmake-core \ ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \ ${PYNUMPY} +LIB_DEPENDS= libqhull_r.so:math/qhull USES= compiler:c++11-lang python -USE_PYTHON= pep517 autoplist +USE_PYTHON= pep517 autoplist pytest # tests fail to run, see https://github.com/heitzmann/gdspy/issues/237 + +USE_GITHUB= yes +GH_ACCOUNT= heitzmann + +TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gdstk${PYTHON_EXT_SUFFIX}.so + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gdstk/gdstk${PYTHON_EXT_SUFFIX}.so .include diff --git a/cad/py-gdstk/distinfo b/cad/py-gdstk/distinfo index 60456b065423..033436cf4892 100644 --- a/cad/py-gdstk/distinfo +++ b/cad/py-gdstk/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1693240074 -SHA256 (gdstk-0.9.42.tar.gz) = bd7ab2f72e50df3ca396e94b82c202a4dfbef1e1206ab6d371d961ab12edfa97 -SIZE (gdstk-0.9.42.tar.gz) = 513544 +TIMESTAMP = 1697344042 +SHA256 (heitzmann-gdstk-v0.9.46_GH0.tar.gz) = 3a2538e0a530a6bd112b528fd436807091335d21fdfde718cd08583052793e3a +SIZE (heitzmann-gdstk-v0.9.46_GH0.tar.gz) = 363141