From nobody Wed Jan 24 19:40:59 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 4TKvT80r8Kz58bS1; Wed, 24 Jan 2024 19:41:00 +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 4TKvT80Pv9z44mN; Wed, 24 Jan 2024 19:41:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125260; 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=VzWBptMMqeit7hNyHL/IiHVFmZ7nYJTiRTNkgtuB9LE=; b=Rcr64qhpcwSTfQoKIipkh7ox2kIysBR74ORL3WhiXVW7uwvjlY9iu1lnQfux1+GEGlYR6B AAG0/V82EJFCTZ8QDlwVzwmROi4/kup8vdFqH4EQuNAQksDjArtBSKkKRYgUZtacrE2l7v HJnX6bd8yI+FKW7aCD4JEB4nfPMTIZPRx7sPcly+jzNXQLGhoOEqY8ggwgz4Jwjq95ZSDy JawqrZkAWQRwrRDe5sM6ElNav9dx8NqyYo0A1Q1xDTKm/YRg3aBOoKKMTka9ORqfDcucHs PJyxUprcssff66pzioiWFm5dQ3hqgDzFxueiqyhxPWV50Ut/YhBVmPMp7PKDLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706125260; 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=VzWBptMMqeit7hNyHL/IiHVFmZ7nYJTiRTNkgtuB9LE=; b=seTPSv+ddNv1/0BgW8eec81auJhLVyx1+/25oUxxf3uqE5Ww1Y6phhJp/ZAO5NO8Jj94QE +jO5ABALaAh1omYFcAYcStaqSC93q9quB0Gcx0Jiz20B2w4nERNf3UFGFzUuMDHy7YWa56 5XQUkCn8WGKW5d/BDmh0MkJU6WnN75Zh+aDTKKzI2/LOpFdY4NaqLtzB9bfM43EQxNWrNi ZR/EEun3DgMLmPPEPTSv/E907xs8ybgoG3A0CwUaF4xAeFaU0QgSiXN/5f0jspu1WwqSt6 mc61V2bTi2ycQtFSQZemh1anlON01r/egvgc+MeL582eCsOUyqLnlT0ENlq9qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706125260; a=rsa-sha256; cv=none; b=nOApGl/Sc+vTtZZj/4wL2QsZiHF945R8VCenwWLbC7ngZbYvZPtY30mW4DL0VpHsmP/WqG KFXrPd7iOIgP+WcSK5oqomOy42LkX70l54lVkaNzBus4C/7cChVD+RQl4nNK+2UdrcCPI9 qk66WzGATAjkqrTP8y81Jeeav/IcNgFsKxMjBjco1CCWgP1HhC6nVlqyRXEjqlJChHacM0 m5CaRRNhAY+JLfWJgBTFriZqR3Cw7y5k5j6LQw5BEIbvubHULA0abu8elYw7imtTg9p2Ay XmMAyF4HgMoBeGjpK8shSmwdLNRMEThZt7WpXfxC7eAXiesS/QK9dlgroBOIOA== 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 4TKvT76ZtxzRwg; Wed, 24 Jan 2024 19:40:59 +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 40OJexTV000363; Wed, 24 Jan 2024 19:40:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OJexor000360; Wed, 24 Jan 2024 19:40:59 GMT (envelope-from git) Date: Wed, 24 Jan 2024 19:40:59 GMT Message-Id: <202401241940.40OJexor000360@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rainer Hurling Subject: git: 7c6de6cb9652 - main - math/nlopt: Flavorize in full and minimize 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: rhurlin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7c6de6cb9652c5af4852ace681208646b93ed716 Auto-Submitted: auto-generated The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=7c6de6cb9652c5af4852ace681208646b93ed716 commit 7c6de6cb9652c5af4852ace681208646b93ed716 Author: Alexey Dokuchaev AuthorDate: 2024-01-24 19:27:31 +0000 Commit: Rainer Hurling CommitDate: 2024-01-24 19:32:20 +0000 math/nlopt: Flavorize in full and minimize - full: Complete installation as before [default] - minimum: No NumPy and Guile2 support, mainly C++ --- math/nlopt/Makefile | 27 +++++++++++++++++++-------- math/nlopt/pkg-plist | 4 ---- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/math/nlopt/Makefile b/math/nlopt/Makefile index 7f2b6edbb997..eeb959b8d964 100644 --- a/math/nlopt/Makefile +++ b/math/nlopt/Makefile @@ -1,7 +1,7 @@ PORTNAME= nlopt DISTVERSIONPREFIX= v DISTVERSION= 2.7.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MAINTAINER= rhurlin@FreeBSD.org @@ -15,15 +15,26 @@ LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_armv6= fails to package: Unable to access file site-packages/_nlopt.a:No such file or directory BROKEN_armv7= fails to package: Unable to access file site-packages/_nlopt.a:No such file or directory -BUILD_DEPENDS= swig:devel/swig \ - ${PYNUMPY} -RUN_DEPENDS= ${PYNUMPY} - -USES= cmake:testing compiler:features guile:2.2,alias,conflicts \ - localbase pathfix pkgconfig python - +USES= cmake:testing USE_GITHUB= yes GH_ACCOUNT= stevengj USE_LDCONFIG= yes +FLAVORS= full minimal + +.if ${FLAVOR:U} == minimal +PKGNAMESUFFIX= -${FLAVOR} +CMAKE_OFF= NLOPT_GUILE NLOPT_PYTHON NLOPT_SWIG +CONFLICTS_INSTALL= ${PORTNAME} +.else +USES+= guile:2.2,alias localbase pkgconfig python +BUILD_DEPENDS= swig:devel/swig ${PYNUMPY} +RUN_DEPENDS= ${PYNUMPY} +CONFLICTS_INSTALL= ${PORTNAME}-minimal +PLIST_FILES= lib/guile/2.2/extensions/nlopt_guile.so \ + ${PYTHON_SITELIBDIR}/_nlopt.so \ + ${PYTHON_SITELIBDIR}/nlopt.py \ + ${GUILE_SITE_DIR}/nlopt.scm +.endif + .include diff --git a/math/nlopt/pkg-plist b/math/nlopt/pkg-plist index cb367a91b99d..e54a29a5e4e9 100644 --- a/math/nlopt/pkg-plist +++ b/math/nlopt/pkg-plist @@ -5,14 +5,10 @@ lib/cmake/nlopt/NLoptConfig.cmake lib/cmake/nlopt/NLoptConfigVersion.cmake lib/cmake/nlopt/NLoptLibraryDepends-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/nlopt/NLoptLibraryDepends.cmake -lib/guile/2.2/extensions/nlopt_guile.so lib/libnlopt.so lib/libnlopt.so.0 lib/libnlopt.so.0.11.1 -%%PYTHON_SITELIBDIR%%/_nlopt.so -%%PYTHON_SITELIBDIR%%/nlopt.py libdata/pkgconfig/nlopt.pc share/man/man3/nlopt.3.gz share/man/man3/nlopt_minimize.3.gz share/man/man3/nlopt_minimize_constrained.3.gz -share/guile/site/2.2/nlopt.scm