Index: Mk/bsd.port.mk
===================================================================
--- Mk/bsd.port.mk
+++ Mk/bsd.port.mk
@@ -1271,6 +1271,23 @@
 PORTDIRNAME?=	${_PORTDIRNAME}
 PKGORIGIN?=		${PKGCATEGORY}/${PORTDIRNAME}
 
+# Now that PKGORIGIN is set, look for origin-specific variables.
+# These are typically set in a make.conf, in the form:
+#
+# category_portname_VARS= varname=value othervar+=value
+#
+# e.g.  devel_llvm10_VARS= make_jobs_number=2
+#
+# (the varname is always converted to uppercase)
+
+.for var in ${${PKGORIGIN:S/\//_/}_VARS:C/=.*//:O:u}
+. if ${var:M*+}
+${var:C/.$//:tu}+=	${${PKGORIGIN:S/\//_/}_VARS:M${var}=*:C/[^+]*\+=//:C/^"(.*)"$$/\1/}
+. else
+${var:tu}=		${${PKGORIGIN:S/\//_/}_VARS:M${var}=*:C/[^=]*=//:C/^"(.*)"$$/\1/}
+. endif
+.endfor
+
 # where 'make config' records user configuration options
 PORT_DBDIR?=	/var/db/ports