From owner-svn-ports-head@FreeBSD.ORG Mon Oct 7 08:44:44 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C72CD415; Mon, 7 Oct 2013 08:44:44 +0000 (UTC) (envelope-from gahr@FreeBSD.org) 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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9B5822F0C; Mon, 7 Oct 2013 08:44:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r978ii0N071428; Mon, 7 Oct 2013 08:44:44 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r978iiue071426; Mon, 7 Oct 2013 08:44:44 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201310070844.r978iiue071426@svn.freebsd.org> From: Pietro Cerutti Date: Mon, 7 Oct 2013 08:44:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329664 - in head/math: . ogdf 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.14 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: Mon, 07 Oct 2013 08:44:44 -0000 Author: gahr Date: Mon Oct 7 08:44:43 2013 New Revision: 329664 URL: http://svnweb.freebsd.org/changeset/ports/329664 Log: - Connect math/ogdf to the build [1] - Convert to new LIB_DEPENDS format - STAGE-clean Reported by: linimon [1] Modified: head/math/Makefile head/math/ogdf/Makefile Modified: head/math/Makefile ============================================================================== --- head/math/Makefile Mon Oct 7 08:25:49 2013 (r329663) +++ head/math/Makefile Mon Oct 7 08:44:43 2013 (r329664) @@ -360,6 +360,7 @@ SUBDIR += octave-forge-video SUBDIR += octave-forge-xraylib SUBDIR += octave-forge-zenity + SUBDIR += ogdf SUBDIR += oleo SUBDIR += open-axiom SUBDIR += openblas Modified: head/math/ogdf/Makefile ============================================================================== --- head/math/ogdf/Makefile Mon Oct 7 08:25:49 2013 (r329663) +++ head/math/ogdf/Makefile Mon Oct 7 08:44:43 2013 (r329664) @@ -12,23 +12,22 @@ DISTNAME= ogdf.v2012.07 MAINTAINER= gahr@FreeBSD.org COMMENT= C++ class library for the automatic layout of diagrams +LICENSE= GPLv2 + OPTIONS_DEFINE= COIN ABACUS COIN_DESC= Use the Coin Open Solver Interface (Osi) ABACUS_DESC= Use the ABACUS branch-and-cut library -LICENSE= GPLv2 - USE_ZIP= yes USE_LDCONFIG= yes USE_PYTHON= build WRKSRC= ${WRKDIR}/${PORTNAME:U} -NO_STAGE= yes .include .if ${PORT_OPTIONS:MCOIN} -LIB_DEPENDS+= Clp:${PORTSDIR}/math/coinmp +LIB_DEPENDS+= libClp.so:${PORTSDIR}/math/coinmp USE_COIN= true .else USE_COIN= false @@ -36,7 +35,7 @@ USE_COIN= false .if ${PORT_OPTIONS:MABACUS} USE_GCC= 4.4+ -LIB_DEPENDS+= abacus-osi:${PORTSDIR}/math/abacus +LIB_DEPENDS+= libabacus-osi.so:${PORTSDIR}/math/abacus USE_ABACUS= true USE_COIN= true .else @@ -55,8 +54,8 @@ do-configure: cd ${WRKSRC} && ${PYTHON_CMD} makeMakefile.py do-install: - ${INSTALL_DATA} ${WRKSRC}/_release/libOGDF.so ${PREFIX}/lib/libOGDF.so.1 - ${LN} -sf libOGDF.so.1 ${PREFIX}/lib/libOGDF.so - cd ${WRKSRC} && ${COPYTREE_SHARE} ogdf ${PREFIX}/include + ${INSTALL_DATA} ${WRKSRC}/_release/libOGDF.so ${STAGEDIR}${PREFIX}/lib/libOGDF.so.1 + ${LN} -sf libOGDF.so.1 ${STAGEDIR}${PREFIX}/lib/libOGDF.so + cd ${WRKSRC} && ${COPYTREE_SHARE} ogdf ${STAGEDIR}${PREFIX}/include .include