From owner-svn-ports-head@FreeBSD.ORG  Tue May 27 14:55:03 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 44953D48;
 Tue, 27 May 2014 14:55:03 +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 31F512292;
 Tue, 27 May 2014 14:55:03 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4REt3K0053132;
 Tue, 27 May 2014 14:55:03 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4REt3xf053131;
 Tue, 27 May 2014 14:55:03 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201405271455.s4REt3xf053131@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 27 May 2014 14:55:03 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r355529 - head/www/serf
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.18
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: Tue, 27 May 2014 14:55:03 -0000

Author: bapt
Date: Tue May 27 14:55:02 2014
New Revision: 355529
URL: http://svnweb.freebsd.org/changeset/ports/355529
QAT: https://qat.redports.org/buildarchive/r355529/

Log:
  Convert to USES=scons
  In this port scons refuses every argument it doesn't know about hence we cannot completly rely on USES=scons and have to redefine do-build and do-install

Modified:
  head/www/serf/Makefile

Modified: head/www/serf/Makefile
==============================================================================
--- head/www/serf/Makefile	Tue May 27 14:47:44 2014	(r355528)
+++ head/www/serf/Makefile	Tue May 27 14:55:02 2014	(r355529)
@@ -13,8 +13,7 @@ LICENSE=	APACHE20
 
 LIB_DEPENDS+=	libapr-1.so:${PORTSDIR}/devel/apr1
 
-USE_SCONS=	yes
-USES=		tar:bzip2
+USES=		scons tar:bzip2
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
 
@@ -22,15 +21,13 @@ SUB_FILES=	libserf-1.la
 
 OPTIONS_DEFINE=	DOCS GSSAPI
 
-SCONS_ENV=	# empty
-SCONS_BUILDENV=	# empty
 SCONS_ARGS=	APR=${LOCALBASE}/bin/apr-1-config
 SCONS_ARGS+=	APU=${LOCALBASE}/bin/apu-1-config
 SCONS_ARGS+=	OPENSSL=${OPENSSLBASE}
 SCONS_ARGS+=	PREFIX=${PREFIX}
 SCONS_ARGS+=	CC=${CC}
 SCONS_ARGS+=	CFLAGS="${CFLAGS}"
-SCONS_INSTALL_TARGET=	install --install-sandbox=${STAGEDIR}
+INSTALL_TARGET=	install --install-sandbox=${STAGEDIR}
 
 .include <bsd.port.options.mk>
 
@@ -38,6 +35,12 @@ SCONS_INSTALL_TARGET=	install --install-
 SCONS_ARGS+=	GSSAPI="/usr"
 .endif
 
+do-build:
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_CMD} ${SCONS_ARGS}
+
+do-install:
+	@cd ${WRKSRC}; ${SENTENV} ${MAKE_CMD} ${SCONS_ARGS} ${INSTALL_TARGET}
+
 post-patch:
 	@${REINPLACE_CMD} -e '/^Requires.private/d' ${WRKSRC}/build/serf.pc.in
 
@@ -48,6 +51,6 @@ post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libserf-1.so.1.3.0
 
 regression-test check: build
-	@(cd ${WRKSRC} && ${SCONS_BIN} check)
+	@(cd ${WRKSRC} && ${MAKE_CMD} check)
 
 .include <bsd.port.mk>