Index: Makefile.inc1
===================================================================
--- Makefile.inc1
+++ Makefile.inc1
@@ -552,6 +552,13 @@
 SOURCE_DATE_EPOCH=	${PKG_TIMESTAMP}
 .endif
 
+PKG_NAME_PREFIX?=	FreeBSD
+PKG_MAINTAINER?=	re@FreeBSD.org
+PKG_WWW?=		https://www.FreeBSD.org
+.export PKG_NAME_PREFIX
+.export PKG_MAINTAINER
+.export PKG_WWW
+
 .if !defined(_MKSHOWCONFIG)
 _CPUTYPE!=	MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} -f /dev/null \
 		-m ${.CURDIR}/share/mk MK_AUTO_OBJ=no -V CPUTYPE
@@ -1828,18 +1835,17 @@
 
 real-update-packages: stage-packages .PHONY
 	${_+_}${MAKE} -C ${.CURDIR} create-packages
-# TODO: Replace FreeBSD- by PKG_PREFIX at some point
 	@echo "==> Checking for new packages"
-	@for pkg in ${REPODIR}/${PKG_ABI}/${PKG_VERSION_FROM}/FreeBSD-*; do \
-	  pkgname=$$(pkg query -F $${pkg} '%n' | sed 's/FreeBSD-\(.*\)/\1/') ; \
-	  newpkgname=FreeBSD-$${pkgname}-${PKG_VERSION}.${PKG_FORMAT} ; \
+	@for pkg in ${REPODIR}/${PKG_ABI}/${PKG_VERSION_FROM}/${PKG_NAME_PREFIX}-*; do \
+	  pkgname=$$(pkg query -F $${pkg} '%n' | sed 's/${PKG_NAME_PREFIX}-\(.*\)/\1/') ; \
+	  newpkgname=${PKG_NAME_PREFIX}-$${pkgname}-${PKG_VERSION}.${PKG_FORMAT} ; \
 	  oldsum=$$(pkg query -F $${pkg} '%Fs' | sha256) ; \
 	  if [ ! -f ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} ]; then \
 	    continue; \
 	  fi ; \
 	  newsum=$$(pkg query -F ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} '%Fs' | sha256) ; \
 	  if [ "$${oldsum}" == "$${newsum}" ]; then \
-	   echo "==> Keeping old FreeBSD-$${pkgname}-${PKG_VERSION_FROM}.${PKG_FORMAT}" ; \
+	   echo "==> Keeping old ${PKG_NAME_PREFIX}-$${pkgname}-${PKG_VERSION_FROM}.${PKG_FORMAT}" ; \
 	   rm ${REPODIR}/${PKG_ABI}/${PKG_VERSION}/$${newpkgname} ; \
 	   cp $${pkg} ${REPODIR}/${PKG_ABI}/${PKG_VERSION} ; \
 	  else \
@@ -1938,6 +1944,9 @@
 		-e "s/%COMMENT%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \
 		-e "s/%DESC%/FreeBSD ${INSTALLKERNEL} kernel ${flavor}/" \
 		-e "s/ %VCS_REVISION%/${VCS_REVISION}/" \
+		-e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \
+		-e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \
+		-e "s/%PKG_WWW%/${PKG_WWW}/" \
 		${SRCDIR}/release/packages/kernel.ucl \
 		> ${KSTAGEDIR}/${DISTDIR}/kernel.${INSTALLKERNEL}${flavor}.ucl ; \
 	awk -F\" ' \
@@ -1971,6 +1980,9 @@
 		-e "s/%COMMENT%/FreeBSD ${_kernel} kernel ${flavor}/" \
 		-e "s/%DESC%/FreeBSD ${_kernel} kernel ${flavor}/" \
 		-e "s/ %VCS_REVISION%/${VCS_REVISION}/" \
+		-e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \
+		-e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \
+		-e "s/%PKG_WWW%/${PKG_WWW}/" \
 		${SRCDIR}/release/packages/kernel.ucl \
 		> ${KSTAGEDIR}/kernel.${_kernel}/kernel.${_kernel}${flavor}.ucl ; \
 	awk -F\" ' \
Index: release/packages/binutils.ucl
===================================================================
--- release/packages/binutils.ucl
+++ release/packages/binutils.ucl
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ GPLv2 ]
Index: release/packages/caroot.ucl
===================================================================
--- release/packages/caroot.ucl
+++ release/packages/caroot.ucl
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = %PKG_MAINTAINER%
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
Index: release/packages/clang.ucl
===================================================================
--- release/packages/clang.ucl
+++ release/packages/clang.ucl
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ NCSA ]
Index: release/packages/gdb.ucl
===================================================================
--- release/packages/gdb.ucl
+++ release/packages/gdb.ucl
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ GPLv2 ]
Index: release/packages/generate-ucl.sh
===================================================================
--- release/packages/generate-ucl.sh
+++ release/packages/generate-ucl.sh
@@ -147,6 +147,9 @@
 		-e "s/%COMMENT%/${comment}/" \
 		-e "s/%DESC%/${desc}/" \
 		-e "s/%CAP_MKDB_ENDIAN%/${cap_arg}/g" \
+		-e "s/%PKG_NAME_PREFIX%/${PKG_NAME_PREFIX}/" \
+		-e "s/%PKG_WWW%/${PKG_WWW}/" \
+		-e "s/%PKG_MAINTAINER%/${PKG_MAINTAINER}/" \
 		${uclfile}
 	return 0
 }
Index: release/packages/groff.ucl
===================================================================
--- release/packages/groff.ucl
+++ release/packages/groff.ucl
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ GPLv2 ]
Index: release/packages/jail.ucl
===================================================================
--- release/packages/jail.ucl
+++ release/packages/jail.ucl
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 vital = true
 licenselogic = "single"
Index: release/packages/kernel.ucl
===================================================================
--- release/packages/kernel.ucl
+++ release/packages/kernel.ucl
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
Index: release/packages/lld.ucl
===================================================================
--- release/packages/lld.ucl
+++ release/packages/lld.ucl
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ NCSA ]
Index: release/packages/lldb.ucl
===================================================================
--- release/packages/lldb.ucl
+++ release/packages/lldb.ucl
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ NCSA ]
Index: release/packages/runtime.ucl
===================================================================
--- release/packages/runtime.ucl
+++ release/packages/runtime.ucl
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 vital = true
 licenselogic = "single"
Index: release/packages/ssh.ucl
===================================================================
--- release/packages/ssh.ucl
+++ release/packages/ssh.ucl
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ ISCL ]
Index: release/packages/svn.ucl
===================================================================
--- release/packages/svn.ucl
+++ release/packages/svn.ucl
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ APACHE20 ]
Index: release/packages/template.ucl
===================================================================
--- release/packages/template.ucl
+++ release/packages/template.ucl
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ BSD2CLAUSE ]
Index: release/packages/unbound.ucl
===================================================================
--- release/packages/unbound.ucl
+++ release/packages/unbound.ucl
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT%"
 categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 licenselogic = "single"
 licenses = [ BSD4CLAUSE ]
Index: release/packages/utilities.ucl
===================================================================
--- release/packages/utilities.ucl
+++ release/packages/utilities.ucl
@@ -2,13 +2,13 @@
 # $FreeBSD$
 #
 
-name = "FreeBSD-%PKGNAME%"
+name = "%PKG_NAME_PREFIX%-%PKGNAME%"
 origin = "base"
 version = "%VERSION%"
 comment = "%COMMENT% %VCS_REVISION%"
 categories = [ base ]
-maintainer = "re@FreeBSD.org"
-www = "https://www.FreeBSD.org"
+maintainer = "%PKG_MAINTAINER%"
+www = "%PKG_WWW%"
 prefix = "/"
 vital = true
 licenselogic = "single"