From owner-svn-ports-head@FreeBSD.ORG  Mon Oct  7 08:25:12 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
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 C599F7EF;
 Mon,  7 Oct 2013 08:25:12 +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 98E7A2CFE;
 Mon,  7 Oct 2013 08:25:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r978PCYI061109;
 Mon, 7 Oct 2013 08:25:12 GMT (envelope-from gahr@svn.freebsd.org)
Received: (from gahr@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r978PCOC061106;
 Mon, 7 Oct 2013 08:25:12 GMT (envelope-from gahr@svn.freebsd.org)
Message-Id: <201310070825.r978PCOC061106@svn.freebsd.org>
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Mon, 7 Oct 2013 08:25:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r329662 - in head/math: . abacus
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
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Oct 2013 08:25:12 -0000

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>