Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Jul 2014 19:55:38 +0000 (UTC)
From:      Kurt Jaeger <pi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r362163 - head/math/coinmp
Message-ID:  <201407171955.s6HJtcoD064039@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pi
Date: Thu Jul 17 19:55:37 2014
New Revision: 362163
URL: http://svnweb.freebsd.org/changeset/ports/362163
QAT: https://qat.redports.org/buildarchive/r362163/

Log:
  math/coinmp: some fixes
  
  - Clean-up Makefile
  - Fix stage-qa error
  - Unbreak GLPK option
  
  PR:		187487
  Submitted by:	cjpugmed@gmail.com (maintainer)

Modified:
  head/math/coinmp/Makefile

Modified: head/math/coinmp/Makefile
==============================================================================
--- head/math/coinmp/Makefile	Thu Jul 17 19:27:43 2014	(r362162)
+++ head/math/coinmp/Makefile	Thu Jul 17 19:55:37 2014	(r362163)
@@ -3,6 +3,7 @@
 
 PORTNAME=	CoinMP
 PORTVERSION=	1.7.6
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.coin-or.org/download/source/CoinMP/
 
@@ -22,14 +23,15 @@ USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS+=	PKG_CONFIG_PATH=${STAGEDIR}${PREFIX}/libdata/pkgconfig
 
-OPTIONS_DEFINE=	DEBUG DOCS
+OPTIONS_DEFINE=	DEBUG DOCS GLPK
+
+GLPK_DESC=	GNU Linear Programming Kit support
 
 PORTDOCS=	*
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGLPK}
-BROKEN =	the GLPK option requires math/glpk headers that are not currently installed by that port
 CONFIGURE_ARGS+=	--with-gmpl-incdir=${LOCALBASE}/include	\
 		--with-gmpl-lib="-L${LOCALBASE}/lib -lglpk"
 LIB_DEPENDS+=	libglpk.so:${PORTSDIR}/math/glpk
@@ -43,14 +45,10 @@ CXXFLAGS+=	-fomit-frame-pointer
 .endif
 
 post-patch::
-	@${REINPLACE_CMD} -e \
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
-		${WRKSRC}/Clp/Makefile.in ${WRKSRC}/Osi/Makefile.in \
-		${WRKSRC}/Cbc/Makefile.in ${WRKSRC}/Cgl/Makefile.in \
-		${WRKSRC}/CoinUtils/Makefile.in ${WRKSRC}/CoinMP/Makefile.in \
-		${WRKSRC}/Data/Sample/Makefile.in
-	@${REINPLACE_CMD} -e 's|$$(DESTDIR)$$(addlibsdir)|$$(addlibsdir)|g' \
-		${WRKSRC}/CoinMP/Makefile.in
+		-e 's|$$(DESTDIR)$$(addlibsdir)|$$(addlibsdir)|g' \
+		-e 's|addlibs_DATA = examples/Makefile examples/example.c||g'
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/share/coin/doc ${STAGEDIR}${DOCSDIR}



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