From f2b41fcb5f73b5b43727d7b6a39a212fe940bbee Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 29 Apr 2016 13:14:22 +0200
Subject: [PATCH] Framework: sync with upstream

Taken from: FreeBSD
---
 CHANGES           |  5 +++++
 Mk/Uses/gem.mk    |  6 +++---
 Mk/Uses/python.mk |  6 +++---
 Mk/bsd.ocaml.mk   |  8 ++++----
 Mk/bsd.port.mk    | 13 ++++++++++++-
 5 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/CHANGES b/CHANGES
index 4bcb3eb09bcd..394e8aa39173 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,11 @@ in the release notes and/or placed into UPDATING.
 
 All ports committers are allowed to commit to this file.
 
+20160428
+AUTHOR: mat@FreeBSD.org
+
+  USE_RUBYGEMS has been replaced by USES=gem.
+
 20160426:
 AUTHOR: mat@FreeBSD.org
 
diff --git a/Mk/Uses/gem.mk b/Mk/Uses/gem.mk
index 7ff5ed7e2315..ee47a0eb9e5b 100644
--- a/Mk/Uses/gem.mk
+++ b/Mk/Uses/gem.mk
@@ -3,8 +3,8 @@
 # Support rubygem packages
 #
 # Feature:	gem
-# Usage:	USES=gem[:autoplist]
-# Valid args:	autoplist	Automatically generate packing list
+# Usage:	USES=gem[:noautoplist]
+# Valid args:	noautoplist	Don't generate the plist automatically
 #
 # MAINTAINER: portmgr@FreeBSD.org
 
@@ -12,7 +12,7 @@
 
 _INCLUDE_USES_GEM_MK=        yes
 
-_valid_ARGS=			autoplist noautoplist
+_valid_ARGS=			noautoplist
 
 # Sanity check
 .for arg in ${gem_ARGS}
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
index abd4c1fecf5b..ceb6e8d70b76 100644
--- a/Mk/Uses/python.mk
+++ b/Mk/Uses/python.mk
@@ -225,7 +225,7 @@ _INCLUDE_USES_PYTHON_MK=	yes
 _PYTHON_VERSIONS=		2.7 3.4 3.5 3.3	# preferred first
 _PYTHON_PORTBRANCH=		2.7		# ${_PYTHON_VERSIONS:[1]}
 _PYTHON_BASECMD=		${LOCALBASE}/bin/python
-_PYTHON_RELPORTDIR=		${PORTSDIR}/lang/python
+_PYTHON_RELPORTDIR=		lang/python
 
 # Make each individual feature available as _PYTHON_FEATURE_<FEATURENAME>
 .for var in ${USE_PYTHON}
@@ -396,8 +396,8 @@ PYTHON_REL=		# empty
 PYTHON_ABIVER=		# empty
 PYTHON_PORTSDIR=	${_PYTHON_RELPORTDIR}${PYTHON_SUFFIX}
 # Protect partial checkouts from Mk/Scripts/functions.sh:export_ports_env().
-.if !defined(_PORTS_ENV_CHECK) || exists(${PYTHON_PORTSDIR})
-.include "${PYTHON_PORTSDIR}/Makefile.version"
+.if !defined(_PORTS_ENV_CHECK) || exists(${PORTSDIR}/${PYTHON_PORTSDIR})
+.include "${PORTSDIR}/${PYTHON_PORTSDIR}/Makefile.version"
 .endif
 # Create a 4 integer version string, prefixing 0 to the last token if
 # it's a single character. Only use the the first 3 tokens of
diff --git a/Mk/bsd.ocaml.mk b/Mk/bsd.ocaml.mk
index f78a5f1986c9..fa892b502bee 100644
--- a/Mk/bsd.ocaml.mk
+++ b/Mk/bsd.ocaml.mk
@@ -64,25 +64,25 @@ OCAML_SITELIBDIR?=	${OCAML_LIBDIR}/site-lib
 #
 # OCaml compiler port dependency
 #
-OCAMLC_PORT?=		${PORTSDIR}/lang/ocaml
+OCAMLC_PORT?=		lang/ocaml
 OCAMLC_DEPEND?=		${OCAMLC}:${OCAMLC_PORT}
 
 #
 # OCaml package manager port dependency
 #
-OCAMLFIND_PORT?=	${PORTSDIR}/devel/ocaml-findlib
+OCAMLFIND_PORT?=	devel/ocaml-findlib
 OCAMLFIND_DEPEND?=	${OCAMLFIND}:${OCAMLFIND_PORT}
 
 #
 # OCaml camlp4 port dependency
 #
-CAMLP4_PORT?=		${PORTSDIR}/devel/ocaml-camlp4
+CAMLP4_PORT?=		devel/ocaml-camlp4
 CAMLP4_DEPEND?=		${CAMLP4}:${CAMLP4_PORT}
 
 #
 # OCaml TK bindings dependency
 #
-OCAMLTK_PORT?=		${PORTSDIR}/x11-toolkits/ocaml-labltk
+OCAMLTK_PORT?=		x11-toolkits/ocaml-labltk
 OCAMLTK_DEPENDS?=	${OCAMLTK}:${OCAMLTK_PORT}
 
 #
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index e8fe347f594a..374a68ab6390 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -4328,6 +4328,17 @@ ${deptype:tl}-depends:
 _UNIFIED_DEPENDS=${PKG_DEPENDS} ${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} ${RUN_DEPENDS} ${TEST_DEPENDS}
 _DEPEND_SPECIALS=	${_UNIFIED_DEPENDS:M*\:*\:*:C,^[^:]*:([^:]*):.*$,\1,}
 
+.for d in ${_UNIFIED_DEPENDS:M*\:/*}
+# Fight .for variable interpolation differently for each version of make...
+.if defined(.PARSEDIR)
+_PORTSDIR_STR=	$${PORTSDIR}/
+DEV_WARNING+=	"It looks like the ${d} depends line has an absolute port origin, make sure to remove \$${_PORTSDIR_STR} from it."
+.else
+_PORTSDIR_STR=	$$$${PORTSDIR}/
+DEV_WARNING+=	"It looks like the ${d} depends line has an absolute port origin, make sure to remove \$${_PORTSDIR_STR} from it."
+.endif
+.endfor
+
 all-depends-list:
 	@${ALL-DEPENDS-LIST}
 
@@ -5613,7 +5624,7 @@ show-dev-warnings:
 	@${ECHO_MSG} "/!\\ ${PKGNAME}: Makefile warnings, please consider fixing /!\\"
 	@${ECHO_MSG}
 .for m in ${DEV_WARNING}
-	@${ECHO_MSG} "${m}"
+	@${ECHO_MSG} ${m}
 .endfor
 	@${ECHO_MSG}
 .if defined(DEV_WARNING_FATAL)