From owner-svn-ports-all@FreeBSD.ORG Wed Feb 25 12:01:53 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9FEC8487; Wed, 25 Feb 2015 12:01:53 +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 8BBC8C6E; Wed, 25 Feb 2015 12:01:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1PC1rVg066999; Wed, 25 Feb 2015 12:01:53 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1PC1r9W066998; Wed, 25 Feb 2015 12:01:53 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201502251201.t1PC1r9W066998@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Wed, 25 Feb 2015 12:01:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379903 - head/science/bddsolve X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Feb 2015 12:01:53 -0000 Author: marino Date: Wed Feb 25 12:01:52 2015 New Revision: 379903 URL: https://svnweb.freebsd.org/changeset/ports/379903 QAT: https://qat.redports.org/buildarchive/r379903/ Log: science/bddsolve: Set environment, use CXXFLAGS, cleanup This port had two main problems: 1) failure to set the enviroment in the build target 2) failure to use CXXFLAGS with CXX While fixing those, clean up a bit: 3) remove
, by using BROKEN_powerpc instead
    4) use CFLAGS+= to augment CFLAGS
    5) use LDFLAGS+= to augment LDFLAGS
    6) simplify do-build target accordingly
  
  Approved by:	just fix it

Modified:
  head/science/bddsolve/Makefile

Modified: head/science/bddsolve/Makefile
==============================================================================
--- head/science/bddsolve/Makefile	Wed Feb 25 11:46:23 2015	(r379902)
+++ head/science/bddsolve/Makefile	Wed Feb 25 12:01:52 2015	(r379903)
@@ -16,18 +16,14 @@ LIB_DEPENDS+=	libbdd.so:${PORTSDIR}/scie
 
 USES=		zip
 NO_WRKSUBDIR=	yes
+CFLAGS+=	-I${LOCALBASE}/include -I${WRKSRC}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lbdd -lboost_program_options
+BROKEN_powerpc=	Does not compile due to running out of virtual memory
 
 OPTIONS_DEFINE=	EXAMPLES
 
-.include 
-
-.if ${ARCH} == "powerpc"
-BROKEN=		Does not compile on powerpc: runs out of virtual memory
-.endif
-
 do-build:
-	${CXX} ${CFLAGS} -I${LOCALBASE}/include -I${WRKSRC}/include \
-		${LDFLAGS} -L${LOCALBASE}/lib -lbdd -lboost_program_options \
+	${SETENV} ${MAKE_ENV} ${CXX} ${CXXFLAGS} ${LDFLAGS} \
 		-o ${WRKSRC}/bddsolve ${WRKSRC}/src/bddsolve.cpp
 
 do-install:
@@ -36,4 +32,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/example/reach.b ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/example/sat.b ${STAGEDIR}${EXAMPLESDIR}
 
-.include 
+.include