git: 0be3078d6da3 - main - math/couenne: Link with libnauty from math/nauty

Yuri Victorovich yuri at FreeBSD.org
Mon May 3 01:42:11 UTC 2021


The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=0be3078d6da35b906a865e00e967d751b31cfcef

commit 0be3078d6da35b906a865e00e967d751b31cfcef
Author:     Yuri Victorovich <yuri at FreeBSD.org>
AuthorDate: 2021-05-03 01:41:19 +0000
Commit:     Yuri Victorovich <yuri at FreeBSD.org>
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


More information about the dev-commits-ports-all mailing list