From 5630f4bd975bacbfeac2b8a7c978aedef1ff2778 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sat, 5 Dec 2015 06:53:58 +0100
Subject: [PATCH] Framework: sync with upstream

Taken from: FreeBSD
---
 Mk/Scripts/depends-list.sh | 6 +++---
 Mk/Scripts/do-depends.sh   | 4 ++--
 Mk/bsd.port.mk             | 4 ++--
 UPDATING                   | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Mk/Scripts/depends-list.sh b/Mk/Scripts/depends-list.sh
index 21b7ec10366..4b2d7833070 100644
--- a/Mk/Scripts/depends-list.sh
+++ b/Mk/Scripts/depends-list.sh
@@ -26,12 +26,12 @@ while getopts "rw" FLAG; do
 done
 shift $((OPTIND-1))
 
-validate_env dp_PORTSDIR dp_PKGNAME
+validate_env PORTSDIR dp_PKGNAME
 if [ ${recursive} -eq 1 -o ${requires_wrkdir} -eq 1 ]; then
 	validate_env dp_MAKE
 	# Cache command executions to avoid looking them up again in every
 	# sub-make.
-	MAKE="${dp_MAKE}" PORTSDIR="${dp_PORTSDIR}" export_ports_env >/dev/null
+	MAKE="${dp_MAKE}" export_ports_env >/dev/null
 fi
 
 set -u
@@ -47,7 +47,7 @@ check_dep() {
 
 		case "${2}" in
 			/*) d=${2} ;;
-			*) d=${dp_PORTSDIR}/${2} ;;
+			*) d=${PORTSDIR}/${2} ;;
 		esac
 
 		case " ${checked} " in
diff --git a/Mk/Scripts/do-depends.sh b/Mk/Scripts/do-depends.sh
index abd400b26f0..4bbddccf2a6 100644
--- a/Mk/Scripts/do-depends.sh
+++ b/Mk/Scripts/do-depends.sh
@@ -11,7 +11,7 @@ validate_env dp_RAWDEPENDS dp_DEPTYPE dp_DEPENDS_TARGET dp_DEPENDS_PRECLEAN \
 	dp_DEPENDS_CLEAN dp_DEPENDS_ARGS dp_USE_PACKAGE_DEPENDS \
 	dp_USE_PACKAGE_DEPENDS_ONLY dp_PKG_ADD dp_PKG_INFO dp_WRKDIR \
 	dp_PKGNAME dp_STRICT_DEPENDS dp_LOCALBASE dp_LIB_DIRS dp_SH \
-	dp_SCRIPTSDIR dp_PORTSDIR dp_MAKE
+	dp_SCRIPTSDIR PORTSDIR dp_MAKE
 
 set -u
 
@@ -123,7 +123,7 @@ for _line in ${dp_RAWDEPENDS} ; do
 
 	case "${origin}" in
 	/*) ;;
-	*) origin="${dp_PORTSDIR}/${origin}" ;;
+	*) origin="${PORTSDIR}/${origin}" ;;
 	esac
 
 	depends_args="${dp_DEPENDS_ARGS}"
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 15bfb31aa71..a4aaafe987a 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -4350,7 +4350,7 @@ ${deptype:tl}-depends:
 		dp_LIB_DIRS="${LIB_DIRS}" \
 		dp_SH="${SH}" \
 		dp_SCRIPTSDIR="${SCRIPTSDIR}" \
-		dp_PORTSDIR="${PORTSDIR}" \
+		PORTSDIR="${PORTSDIR}" \
 		dp_MAKE="${MAKE}" \
 		${SH} ${SCRIPTSDIR}/do-depends.sh
 .endif
@@ -4370,7 +4370,7 @@ all-depends-list:
 # usage.
 DEPENDS-LIST= \
 	${SETENV} \
-			dp_PORTSDIR="${PORTSDIR}" \
+			PORTSDIR="${PORTSDIR}" \
 			dp_MAKE="${MAKE}" \
 			dp_PKGNAME="${PKGNAME}" \
 			dp_SCRIPTSDIR="${SCRIPTSDIR}" \
diff --git a/UPDATING b/UPDATING
index 77694c696e5..a08456cc397 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,7 +16,7 @@ you update your ports collection, before attempting any port upgrades.
   qt4-gui's or qt5-gui's pkg-message, please considering removing them and
   using the default settings:
   * kern.ipc.shmall
-  * kern.ipc.shmni
+  * kern.ipc.shmmni
   * kern.ipc.shmseg
   See base r209037 and ports PR 202927 for more context.