Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 Jun 2016 11:27:39 +0000 (UTC)
From:      "Carlos J. Puga Medina" <cpm@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r416507 - head/math/coinmp
Message-ID:  <201606071127.u57BRdf5034048@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cpm
Date: Tue Jun  7 11:27:39 2016
New Revision: 416507
URL: https://svnweb.freebsd.org/changeset/ports/416507

Log:
  - 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

Modified:
  head/math/coinmp/Makefile
  head/math/coinmp/distinfo

Modified: head/math/coinmp/Makefile
==============================================================================
--- head/math/coinmp/Makefile	Tue Jun  7 10:46:11 2016	(r416506)
+++ head/math/coinmp/Makefile	Tue Jun  7 11:27:39 2016	(r416507)
@@ -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 su
 
 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

Modified: head/math/coinmp/distinfo
==============================================================================
--- head/math/coinmp/distinfo	Tue Jun  7 10:46:11 2016	(r416506)
+++ head/math/coinmp/distinfo	Tue Jun  7 11:27:39 2016	(r416507)
@@ -1,2 +1,3 @@
+TIMESTAMP = 1465255566
 SHA256 (CoinMP-1.8.3.tgz) = a1a665db36c7fd69c1e53fffbd108cae1bf22f08acf81c394cd454b8168f22f7
 SIZE (CoinMP-1.8.3.tgz) = 10535972



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606071127.u57BRdf5034048>