svn commit: r329140 - in head: . Mk Mk/Uses

[Baptiste Daroussin]

Author: bapt
Date: Thu Oct  3 06:25:13 2013
New Revision: 329140
URL: http://svnweb.freebsd.org/changeset/ports/329140

Log:
  Introduce the new "scons" USES. The goal is to replace the old bsd.scons.mk
  Instead of redifining the building target, let's just reuse the existing ones.
  Bonus, MAKE_JOBS is now respected

Added:
  head/Mk/Uses/scons.mk   (contents, props changed)
Modified:
  head/CHANGES
  head/Mk/bsd.sanity.mk

Modified: head/CHANGES
==============================================================================
--- head/CHANGES	Thu Oct  3 06:04:23 2013	(r329139)
+++ head/CHANGES	Thu Oct  3 06:25:13 2013	(r329140)
@@ -10,6 +10,12 @@ in the release notes and/or placed into 
 
 All ports committers are allowed to commit to this file.
 
+20131003:
+AUTHOR: bapt at FreeBSD.org
+
+  New USES: scons, to handle properly the scons building system, this
+  this also gives the scons packages user the ability to respect MAKE_JOBS.
+
 20130924:
 AUTHOR: bapt at FreeBSD.org
 

Added: head/Mk/Uses/scons.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/Mk/Uses/scons.mk	Thu Oct  3 06:25:13 2013	(r329140)
@@ -0,0 +1,30 @@
+# $FreeBSD$
+#
+# Provide support to use the scons
+#
+# MAINTAINER: python at FreeBSD.org
+#
+# Feature:		scons
+# Usage:		USES=scons
+#
+
+.if !defined(_INCLUDE_USES_SCONS_MK)
+_INCLUDE_USES_SCONS_MK=	yes
+
+.if defined(scons_ARGS)
+IGNORE=	Incorrect 'USES+= scons:${scons_ARGS}' scons takes no arguments
+.endif
+
+MAKEFILE=		#
+MAKE_FLAGS=		#
+ALL_TARGET=		#
+LIBPATH?=		${LOCALBASE}/lib
+CPPPATH?=		${LOCALBASE}/include
+SCONS=			${LOCALBASE}/bin/scons
+BUILD_DEPENDS+=		${SCONS}:${PORTSDIR}/devel/scons
+MAKE_CMD?=		${SCONS}
+MAKE_ENV+=		PKGCONFIGDIR="${PKGCONFIGDIR}" \
+			CCFLAGS="${CFLAGS}" LINKFLAGS="${LDFLAGS}" \
+			LIBPATH="${LIBPATH}" CPPPATH="${CPPPATH}"
+
+.endif

Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk	Thu Oct  3 06:04:23 2013	(r329139)
+++ head/Mk/bsd.sanity.mk	Thu Oct  3 06:25:13 2013	(r329140)
@@ -100,6 +100,10 @@ DEV_WARNING+=	"Please use the new format
 DEV_WARNING+=	"USE_TCL and USE_TK are deprecated, please use USES=tcl or USES=tk"
 .endif
 
+.if defined(USE_SCONS)
+DEV_WARNING+=	"USE_SCONS=yes is deprecated, please use USES=scons"
+.endif
+
 .if !defined(NO_STAGE)
 .for a in 1 2 3 4 5 6 7 8 9 L N
 .if defined(MAN${a})