From owner-dev-commits-ports-all@freebsd.org Mon May 3 01:42:11 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 92CAE6239AE; Mon, 3 May 2021 01:42:11 +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 4FYQh33qgkz3pHX; Mon, 3 May 2021 01:42:11 +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 7660815BDC; Mon, 3 May 2021 01:42:11 +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 1431gBHS057406; Mon, 3 May 2021 01:42:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1431gBZd057405; Mon, 3 May 2021 01:42:11 GMT (envelope-from git) Date: Mon, 3 May 2021 01:42:11 GMT Message-Id: <202105030142.1431gBZd057405@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: 0be3078d6da3 - main - math/couenne: Link with libnauty from math/nauty 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: 0be3078d6da35b906a865e00e967d751b31cfcef Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 May 2021 01:42:11 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=0be3078d6da35b906a865e00e967d751b31cfcef commit 0be3078d6da35b906a865e00e967d751b31cfcef Author: Yuri Victorovich AuthorDate: 2021-05-03 01:41:19 +0000 Commit: Yuri Victorovich CommitDate: 2021-05-03 01:42:09 +0000 math/couenne: Link with libnauty from math/nauty --- math/couenne/Makefile | 10 +++++++--- math/couenne/pkg-plist | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/math/couenne/Makefile b/math/couenne/Makefile index 5a168e54c06f..d219b9882385 100644 --- a/math/couenne/Makefile +++ b/math/couenne/Makefile @@ -1,7 +1,7 @@ PORTNAME= couenne DISTVERSIONPREFIX= releases/ DISTVERSION= 0.5.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math PKGNAMEPREFIX= coin-or- @@ -11,6 +11,7 @@ COMMENT= Convex Over and Under Envelopes for NonliNear Estimation LICENSE= EPL LICENSE_FILE= ${WRKSRC}/Couenne/LICENSE +BUILD_DEPENDS= ${LOCALBASE}/lib/libnauty.a:math/nauty LIB_DEPENDS= libbonmin.so:math/bonmin \ libCbc.so:math/cbc \ libCgl.so:math/cgl \ @@ -18,11 +19,14 @@ LIB_DEPENDS= libbonmin.so:math/bonmin \ libipopt.so:math/ipopt USES= blaslapack:netlib fortran gmake libtool pkgconfig -GNU_CONFIGURE= yes +USE_LDCONFIG= yes + USE_GITHUB= yes GH_ACCOUNT= coin-or GH_PROJECT= Couenne -USE_LDCONFIG= yes + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-nauty-incdir=${LOCALBASE}/include/nauty --with-nauty-lib=${LOCALBASE}/lib/libnauty.a INSTALL_TARGET= install-strip diff --git a/math/couenne/pkg-plist b/math/couenne/pkg-plist index 00b8f4003810..3cf3e6a2eddb 100644 --- a/math/couenne/pkg-plist +++ b/math/couenne/pkg-plist @@ -82,6 +82,7 @@ include/coin/CouenneTwoImplied.hpp include/coin/CouenneTypes.hpp include/coin/CouenneVTObject.hpp include/coin/CouenneVarObject.hpp +include/coin/Nauty.h lib/libCouenne.so lib/libCouenne.so.1 lib/libCouenne.so.1.4.8