math/couenne: Link with libnauty from math/nauty

freebsd · May 3, 2021 · 0be3078 · 0be3078
1 parent 7051ab8
commit 0be3078
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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,18 +11,22 @@ 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 \
 		libClp.so:math/clp \
 		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
@@ -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