aboutsummaryrefslogtreecommitdiffstats
path: root/math
diff options
context:
space:
mode:
authorcpm <cpm@FreeBSD.org>2016-06-07 19:27:39 +0800
committercpm <cpm@FreeBSD.org>2016-06-07 19:27:39 +0800
commitd9f2b825b3e0f761fb6eead67ed9bb1885cfa516 (patch)
tree51ef1a78323cc9d1bbf29a49ceaae3397ac3d83c /math
parente1725ac1f17a70e6055da87afd0d2afc2487d897 (diff)
downloadfreebsd-ports-gnome-d9f2b825b3e0f761fb6eead67ed9bb1885cfa516.tar.gz
freebsd-ports-gnome-d9f2b825b3e0f761fb6eead67ed9bb1885cfa516.tar.zst
freebsd-ports-gnome-d9f2b825b3e0f761fb6eead67ed9bb1885cfa516.zip
- Fix CONFLICTS with math/ogdf
- Update MAINTAINER to my @FreeBSD.org address - Switch to OPTION helpers Reviewed by: amdmi3 (mentor) Approved by: amdmi3 (mentor) Differential Revision: D6741
Diffstat (limited to 'math')
-rw-r--r--math/coinmp/Makefile21
-rw-r--r--math/coinmp/distinfo1
2 files changed, 8 insertions, 14 deletions
diff --git a/math/coinmp/Makefile b/math/coinmp/Makefile
index 04d26a5948e0..5b1cae647e97 100644
--- a/math/coinmp/Makefile
+++ b/math/coinmp/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.8.3
CATEGORIES= math
MASTER_SITES= http://www.coin-or.org/download/source/CoinMP/
-MAINTAINER= cpm@fbsd.es
+MAINTAINER= cpm@FreeBSD.org
COMMENT= Optimization library with support for COIN-OR CLP, CBC, and CGL
LICENSE= CPL
@@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/CoinMP/LICENSE
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
# note: with ogdf only if build with COIN option
-CONFLICTS= clp-[0-9]* ogdf-*
+CONFLICTS= clp-[0-9]* ogdf-[0-9]*
GNU_CONFIGURE= yes
USES= libtool pkgconfig tar:tgz
@@ -29,19 +29,12 @@ GLPK_DESC= GNU Linear Programming Kit support
PORTDOCS= *
-.include <bsd.port.options.mk>
+DEBUG_CXXFLAGS= -fomit-frame-pointer
-.if ${PORT_OPTIONS:MGLPK}
-CONFIGURE_ARGS+= --with-gmpl-incdir=${LOCALBASE}/include \
- --with-gmpl-lib="-L${LOCALBASE}/lib -lglpk"
-LIB_DEPENDS+= libglpk.so:math/glpk
-.else
-CONFIGURE_ARGS+= --disable-glpk-libcheck
-.endif
-
-.if ${PORT_OPTIONS:MDEBUG}
-CXXFLAGS+= -fomit-frame-pointer
-.endif
+GLPK_LIB_DEPENDS= libglpk.so:math/glpk
+GLPK_CONFIGURE_ON= --with-gmpl-incdir=${LOCALBASE}/include \
+ --with-gmpl-lib="-L${LOCALBASE}/lib -lglpk"
+GLPK_CONFIGURE_OFF= --disable-glpk-libcheck
STRIP_FILES= libCoinUtils libOsi libOsiClp libOsiCommonTests libClp libClpSolver \
libCgl libCbc libCbcSolver libOsiCbc libCoinMP
diff --git a/math/coinmp/distinfo b/math/coinmp/distinfo
index 51064f11c811..a3a084b4864c 100644
--- a/math/coinmp/distinfo
+++ b/math/coinmp/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1465255566
SHA256 (CoinMP-1.8.3.tgz) = a1a665db36c7fd69c1e53fffbd108cae1bf22f08acf81c394cd454b8168f22f7
SIZE (CoinMP-1.8.3.tgz) = 10535972