From owner-svn-ports-all@FreeBSD.ORG  Sat Jan 25 00:17:32 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 61FDF338;
 Sat, 25 Jan 2014 00:17:32 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 4D2E517B8;
 Sat, 25 Jan 2014 00:17:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0P0HWqO009749;
 Sat, 25 Jan 2014 00:17:32 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0P0HWDj009748;
 Sat, 25 Jan 2014 00:17:32 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201401250017.s0P0HWDj009748@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 25 Jan 2014 00:17:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r340960 - head/devel/stxxl
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Jan 2014 00:17:32 -0000

Author: bapt
Date: Sat Jan 25 00:17:31 2014
New Revision: 340960
URL: http://svnweb.freebsd.org/changeset/ports/340960
QAT: https://qat.redports.org/buildarchive/r340960/

Log:
  Support stage
  Avoid installing .orig file

Modified:
  head/devel/stxxl/Makefile

Modified: head/devel/stxxl/Makefile
==============================================================================
--- head/devel/stxxl/Makefile	Sat Jan 25 00:15:58 2014	(r340959)
+++ head/devel/stxxl/Makefile	Sat Jan 25 00:17:31 2014	(r340960)
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Standard Template Library for Extra Large Data Sets
 
-USE_GMAKE=	yes
+USES=		gmake
 ALL_TARGET=	library_g++
 
 MAKE_ENV+=	COMPILER_GCC="${CXX}" OPT="${CXXFLAGS}" \
@@ -20,14 +20,12 @@ PORTDOCS=	*
 OPTIONS_DEFINE=	DOCS OPTIMIZED_CFLAGS
 OPTIONS_DEFAULT=OPTIMIZED_CFLAGS
 
-.include <bsd.port.options.mk>
+OPTIMIZED_CFLAGS_CXXFLAGS=	-O3
 
-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-CXXFLAGS+=	-O3
-.endif
+.include <bsd.port.options.mk>
 
-.if ${OSVERSION} >= 1000000
 post-patch:
+.if ${OSVERSION} >= 1000000
 	@${REINPLACE_CMD} -i '' -e 's|std::tr1::|std::|' \
 		${WRKSRC}/include/stxxl/bits/compat/type_traits.h \
 		${WRKSRC}/include/stxxl/bits/compat/shared_ptr.h \
@@ -36,13 +34,14 @@ post-patch:
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/lib${PORTNAME}.a ${STAGEDIR}${PREFIX}/lib
-	@cd ${WRKSRC}/include && ${COPYTREE_SHARE} "${PORTNAME} ${PORTNAME}.h" \
+	cd ${WRKSRC}/include && ${COPYTREE_SHARE} "${PORTNAME} ${PORTNAME}.h" \
 		${STAGEDIR}${PREFIX}/include
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${RM} -f ${STAGEDIR}${PREFIX}/include/stxxl/bits/mng/config.h.orig
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 regression-test:
-	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} tests_g++
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} tests_g++
 	cd ${WRKSRC}/misc && ${SH} run-all-tests
 
 .include <bsd.port.mk>