Date: Tue, 27 May 2014 14:55:03 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r355529 - head/www/serf Message-ID: <201405271455.s4REt3xf053131@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405271455.s4REt3xf053131>