From nobody Wed Aug 30 19:18:36 2023 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 4RbYx90F6Tz4sPDv; Wed, 30 Aug 2023 19:18:37 +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 4RbYx86s5Qz4Dhs; Wed, 30 Aug 2023 19:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693423117; 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=lOzKCJQf6ThHGl4O5oCKPEvvrkHCF6H3PC5KtH801CQ=; b=nQw/C17ThwwCapcODwE0u1+qTRAbHNO1lnqsb4ksXvCfoT1bWq8InYicDuyOi8DMnGdSKZ IBB6suTVeA5mdYjAulM3sEHU9VvwBpJTzkvuJYkROdOzt44b+P5I9hLg/c7ViJHX9732b9 +IpRvk/IzCe5X7bGNv9gw/QJyvjt4wdouKBE69qzvwkU+lPbkO1bDv8xF/x59LLCND9bBW /2Hnx2YdVt3tNtztA/Xov1UEgkxRG1+lF9A5dR0IFh8KzfVFGPrxEdE1R8u2XjzlV07RHv 4HwMPPZEnv2A4yLusFgRjRs7S1EHm8b0BoEmdJ1FrGVNYhyttqlPsGOZH9IntA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693423117; a=rsa-sha256; cv=none; b=mhXbDU/SHXFnYMUp4LfTchDXIEdmWyl2FnaD4n0HaTKhDN5J9NNC2LKQtixbw90KckC0Xy wWaOV4VRFLV/clSUltKl/GnvyuqvpwYUVqQjlQzXouuKITxJP84U/SKruwP1iZNHm5SVVM 1HguQTPtlmZMAoFV0q42p71WKSg1Bbrrjjx2g9HSs8f+jh5SLQbmiAGY/e+irDmSO9WIKo ZeBfnUzKgEpOBP7jKiPvmG6werhCVaOdPs8JPCGNdVfXX36DMaJAyQh7oMCtZT882qBJCH +WrkemQKgPklQ9LvLyBs5Ai+EEUTIsQTsD/FhgHuLPnjmbzjr9kUXmWjjCJjHA== 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=1693423117; 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=lOzKCJQf6ThHGl4O5oCKPEvvrkHCF6H3PC5KtH801CQ=; b=RKAanA48l9Iybkj2g9UM5y8/Tp0wo7gLF+P80WlTYdnMZ8BaB8TPRSUx1GOd+/O/DVFHpC ca9IjPo+9F4x5nZ/MRL6IWrJyw92RRuUiq1H7WOb0oVrsj7XWuBwelTN7PjaC9nmzt6Sc1 mRO8QZgwuZb26RkSxm1D37n/SP4NCXAqlQHJo2d2LGGryPqyqCLYeZwgfRAJu8IzmgDtVe R/R1GGFUH12PuXFzgAIebZJZEF2eC3Vo/FGABPP4Z5RKTwY/8ctwAV/S2ko+v8tYWWovDh gsP575yOzlSQERG6+S8uRtoZkBLYSaodGfb2U7Aj+dCasIhZho5LlNn+j3g6zQ== 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 4RbYx85wm2zmCc; Wed, 30 Aug 2023 19:18:36 +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 37UJIaKq025584; Wed, 30 Aug 2023 19:18:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37UJIa8s025581; Wed, 30 Aug 2023 19:18:36 GMT (envelope-from git) Date: Wed, 30 Aug 2023 19:18:36 GMT Message-Id: <202308301918.37UJIa8s025581@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: 5793cc4d68a3 - main - math/py-igraph: Update to 0.10.6 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 5793cc4d68a34d1d90ecda4f35a5416e6c837579 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=5793cc4d68a34d1d90ecda4f35a5416e6c837579 commit 5793cc4d68a34d1d90ecda4f35a5416e6c837579 Author: Daniel Engberg AuthorDate: 2023-08-30 03:29:19 +0000 Commit: Daniel Engberg CommitDate: 2023-08-30 19:18:32 +0000 math/py-igraph: Update to 0.10.6 * Switch to DISTVERSION * Always use Flex from ports * Use available dependencies in tree instead of vendored This is also consistent with math/igraph Changelog: https://github.com/igraph/python-igraph/releases/tag/0.10.6 PR: 273168 Reviewed by: lwhsu (maintainer) Sponsored by: Blinkinblox --- math/py-igraph/Makefile | 20 ++++++++++++++++---- math/py-igraph/distinfo | 6 +++--- math/py-igraph/files/patch-setup.py | 24 ++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 7 deletions(-) diff --git a/math/py-igraph/Makefile b/math/py-igraph/Makefile index 41c46f383d55..a2418c9a2506 100644 --- a/math/py-igraph/Makefile +++ b/math/py-igraph/Makefile @@ -1,8 +1,9 @@ PORTNAME= igraph -DISTVERSION= 0.10.4 +DISTVERSION= 0.10.6 CATEGORIES= math python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +DIST_SUBDIR= python-igraph MAINTAINER= lwhsu@FreeBSD.org COMMENT= High performance graph data structures and algorithms @@ -10,8 +11,15 @@ WWW= https://igraph.org/python/ LICENSE= GPLv2 -BUILD_DEPENDS= cmake:devel/cmake-core -LIB_DEPENDS= libigraph.so:math/igraph +BUILD_DEPENDS= cmake:devel/cmake-core \ + ${LOCALBASE}/bin/flex:textproc/flex +LIB_DEPENDS= libigraph.so:math/igraph \ + libarpack.so:math/arpack-ng \ + libblas.so:math/blas \ + libglpk.so:math/glpk \ + libgmp.so:math/gmp \ + liblapack.so:math/lapack \ + libopenblas.so:math/openblas RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}texttable>=1.6.2:textproc/py-texttable@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cairocffi>0:graphics/py-cairocffi@${PY_FLAVOR} TEST_DEPENDS= py.test:devel/py-pytest@${PY_FLAVOR} @@ -20,8 +28,12 @@ USES= bison gnome pkgconfig python USE_PYTHON= distutils concurrent autoplist USE_GNOME= libxml2 +post-patch: + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/setup.py + post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/igraph/_igraph${PYTHON_EXT_SUFFIX}.so + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/igraph/_igraph*.so do-test: install (cd ${WRKSRC} && py.test) diff --git a/math/py-igraph/distinfo b/math/py-igraph/distinfo index 3a7cc08d64d3..92d43956c400 100644 --- a/math/py-igraph/distinfo +++ b/math/py-igraph/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1684430156 -SHA256 (igraph-0.10.4.tar.gz) = 4786e05919ee93f6479fe8ca697d68537edfe47549ed09dfb33bda4daced1fb9 -SIZE (igraph-0.10.4.tar.gz) = 4209850 +TIMESTAMP = 1692030616 +SHA256 (python-igraph/igraph-0.10.6.tar.gz) = 76f7aad294514412f835366a7d9a9c1e7a34c3e6ef0a6c3a1a835234323228e8 +SIZE (python-igraph/igraph-0.10.6.tar.gz) = 4233333 diff --git a/math/py-igraph/files/patch-setup.py b/math/py-igraph/files/patch-setup.py new file mode 100644 index 000000000000..c45c6da41642 --- /dev/null +++ b/math/py-igraph/files/patch-setup.py @@ -0,0 +1,24 @@ +--- setup.py.orig 2023-07-13 11:49:16 UTC ++++ setup.py +@@ -281,7 +281,7 @@ class IgraphCCoreCMakeBuilder: + + # Build the Python interface with vendored libraries + for deps in "ARPACK BLAS GLPK GMP LAPACK".split(): +- args.append("-DIGRAPH_USE_INTERNAL_" + deps + "=ON") ++ args.append("-DIGRAPH_USE_INTERNAL_" + deps + "=OFF") + + # -fPIC is needed on Linux so we can link to a static igraph lib from a + # Python shared library +@@ -289,6 +289,12 @@ class IgraphCCoreCMakeBuilder: + + # No need to build tests + args.append("-DBUILD_TESTING=OFF") ++ ++ # Always use flex from ports ++ args.append("-DFLEX_EXECUTABLE:FILEPATH=%%LOCALBASE%%/bin/flex") ++ ++ # Don't try to use git ++ args.append("-DCMAKE_DISABLE_FIND_PACKAGE_Git:BOOL=True") + + # Do not treat compilation warnings as errors in case someone is trying + # to "pip install" igraph in an environment for which we don't provide