svn commit: r329664 - in head/math: . ogdf

[Pietro Cerutti]

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 at 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 <bsd.port.options.mk>
 
 .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 <bsd.port.mk>