Infrastructure: sync with upstream

Taken from: FreeBSD

MOVED

@@ -7464,3 +7464,5 @@ www/rubygem-form_data|www/rubygem-http-form_data|2015-04-07|Has expired: Use www
 www/typo345||2015-04-07|Has expired: Upgrade to www/typo3 or www/typo3-lts
 multimedia/mediabrowser|multimedia/emby-server|2015-04-08|Project renamed
 deskutils/preferencepanes|deskutils/systempreferences|2015-04-08|preferencepanes merged into systempreferences
+games/airstrike||2015-04-10|Has expired: never completed, alpha quality, dev site and repo do not resolve
+www/trac-batchmodify||2015-04-10|Has expired: This functionality was merged into Trac since version 1.0

Mk/Scripts/actual-package-depends.sh

@@ -50,7 +50,8 @@ find_dep() {
 	pattern=$1
 	case ${pattern} in
 	*\>*|*\<*|*=*)
-		${PKG_BIN} info -Eg "${pattern}" 2>/dev/null
+		${PKG_BIN} info -Eg "${pattern}" 2>/dev/null ||
+			echo "actual-package-depends: dependency on ${pattern} not registered" >&2
 		return
 		;;
 	/*)

Mk/Scripts/find-lib.sh

@@ -14,25 +14,6 @@ fi
 lib=$1
 dirs="${LIB_DIRS} `cat ${LOCALBASE}/libdata/ldconfig/* 2>/dev/null || :`"
 
-absolute_path() {
-	local file myifs target
-	file=$1
-
-	myifs=${IFS}
-	IFS='/'
-	set -- ${file}
-	IFS=${myifs}
-	for el; do
-		case $el in
-		.) continue ;;
-		'') continue ;;
-		..) target=${target%/*} ;;
-		*) target="${target}/${el}" ;;
-		esac
-	done
-	echo ${target}
-}
-
 for libdir in ${dirs} ; do
 	test -f ${libdir}/${lib} || continue
 	libfile=${libdir}/${lib}

Mk/Uses/ninja.mk

@@ -27,6 +27,8 @@ CMAKE_ARGS+=	-GNinja
 MAKEFILE=
 MAKE_CMD=	ninja
 MAKE_FLAGS=
+# Set a minimal job of 1
+_MAKE_JOBS=	-j${MAKE_JOBS_NUMBER}
 _DESTDIR_VIA_ENV=	yes
 
 .endif

Mk/bsd.port.mk

@@ -513,7 +513,7 @@ FreeBSD_MAINTAINER=	[email protected]
 # BUNDLE_LIBS	  Teach pkg(8) to not automatically add all shared libraries
 # 				  installed by a port as a "provided" shared libraries provided
 # 				  for other packages (prevent them from being exposed in the
-# 				  solver). This has to be used for ports that bundles third
+# 				  solver). This has to be used for ports that bundle third
 # 				  party libraries for internal usage.
 # MASTERDIR		- Where the port finds patches, package files, etc.  Define
 #				  this is you have two or more ports that share most of the
@@ -2039,7 +2039,7 @@ ${lang}FLAGS+=	${${lang}FLAGS_${ARCH}}
 
 # Multiple make jobs support
 .if defined(DISABLE_MAKE_JOBS) || defined(MAKE_JOBS_UNSAFE)
-_MAKE_JOBS=		#
+_MAKE_JOBS?=		#
 MAKE_JOBS_NUMBER=	1
 .else
 .if defined(MAKE_JOBS_NUMBER)