svn commit: r329662 - in head/math: . abacus

[Pietro Cerutti]

Author: gahr
Date: Mon Oct  7 08:25:11 2013
New Revision: 329662
URL: http://svnweb.freebsd.org/changeset/ports/329662

Log:
  - Connect math/abacus to the build [1]
  - Convert to new LIB_DEPENDS format
  - STAGE-clean
  
  Reported by:	linimon [1]

Modified:
  head/math/Makefile
  head/math/abacus/Makefile

Modified: head/math/Makefile
==============================================================================
--- head/math/Makefile	Mon Oct  7 07:50:36 2013	(r329661)
+++ head/math/Makefile	Mon Oct  7 08:25:11 2013	(r329662)
@@ -44,6 +44,7 @@
     SUBDIR += R-cran-xts
     SUBDIR += R-cran-zoo
     SUBDIR += aamath
+    SUBDIR += abacus
     SUBDIR += abakus
     SUBDIR += abs
     SUBDIR += add

Modified: head/math/abacus/Makefile
==============================================================================
--- head/math/abacus/Makefile	Mon Oct  7 07:50:36 2013	(r329661)
+++ head/math/abacus/Makefile	Mon Oct  7 08:25:11 2013	(r329662)
@@ -11,7 +11,7 @@ COMMENT=	A Branch-And-CUt System
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	Clp:${PORTSDIR}/math/coinmp
+LIB_DEPENDS=	libClp.so:${PORTSDIR}/math/coinmp
 
 USE_GCC=	4.4+
 USES=		gmake perl5
@@ -21,7 +21,6 @@ ALL_TARGET=	abacus
 
 WRKSRC=		${WRKDIR}
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e '\
 	    s|%%LOCALBASE%%|${LOCALBASE}|g; \
@@ -30,9 +29,9 @@ post-patch:
 	    ${WRKSRC}/Makefile
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/lib/linux20-gcc44/libabacus-osi.a ${PREFIX}/lib/libabacus-osi.a
-	${INSTALL_DATA} ${WRKSRC}/lib/linux20-gcc44/libabacus-osi.so ${PREFIX}/lib/libabacus-osi.so.1
-	${LN} -sf libabacus-osi.so.1 ${PREFIX}/lib/libabacus-osi.so
-	cd ${WRKSRC}/Include && ${COPYTREE_SHARE} abacus ${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/lib/linux20-gcc44/libabacus-osi.a ${STAGEDIR}${PREFIX}/lib/libabacus-osi.a
+	${INSTALL_DATA} ${WRKSRC}/lib/linux20-gcc44/libabacus-osi.so ${STAGEDIR}${PREFIX}/lib/libabacus-osi.so.1
+	${LN} -sf libabacus-osi.so.1 ${STAGEDIR}${PREFIX}/lib/libabacus-osi.so
+	cd ${WRKSRC}/Include && ${COPYTREE_SHARE} abacus ${STAGEDIR}${PREFIX}/include
 
 .include <bsd.port.mk>