From owner-svn-ports-head@FreeBSD.ORG Thu Jul 17 19:55:38 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 54F5F65B; Thu, 17 Jul 2014 19:55:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 27BF02ADC; Thu, 17 Jul 2014 19:55:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6HJtc2O064040; Thu, 17 Jul 2014 19:55:38 GMT (envelope-from pi@svn.freebsd.org) Received: (from pi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6HJtcoD064039; Thu, 17 Jul 2014 19:55:38 GMT (envelope-from pi@svn.freebsd.org) Message-Id: <201407171955.s6HJtcoD064039@svn.freebsd.org> From: Kurt Jaeger Date: Thu, 17 Jul 2014 19:55:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362163 - head/math/coinmp X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jul 2014 19:55:38 -0000 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 .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}