config: replace fallbacks if needed for 21.1 and onwards

In normal build operations the variables are populated by the
environment already so the templated fallbacks are never used.

Makefile

@@ -29,7 +29,7 @@ STEPS=		arm base boot chroot clean compress confirm core distfiles \
 		skim test update upload verify vga vm xtools
 SCRIPTS=	batch hotfix nightly
 
-.PHONY:		${STEPS} ${SCRIPTS}
+.PHONY:		${STEPS} ${SCRIPTS} make.conf
 
 PAGER?=		less
 
@@ -133,6 +133,7 @@ VERBOSE_HIDDEN=	@
 
 .for _VERSION in LUA PERL PHP PYTHON RUBY
 VERSIONS+=	PRODUCT_${_VERSION}=${${_VERSION}}
+VERSIONS_SED+=	-e "s:%%${_VERSION}%%:${${_VERSION}}:g"
 .endfor
 
 # Expand build steps to launch into the selected
@@ -160,3 +161,6 @@ ${SCRIPT}: lint-composite
 	${VERBOSE_HIDDEN} cd ${.CURDIR} && FLAVOUR="${FLAVOUR}" \
 	    sh ${VERBOSE_FLAGS} ./composite/${SCRIPT}.sh ${${SCRIPT}_ARGS}
 .endfor
+
+make.conf:
+	@sed ${VERSIONS_SED} ${TOOLSDIR}/config/${SETTINGS}/make.conf

README.md

@@ -353,6 +353,15 @@ There's also the posh way to boot a final image using bhyve(8):
 Please note that the system does not have working networking after
 bootup and login is only possible via the Nano and Serial images.
 
+Generating a make.conf for use in running OPNsense
+--------------------------------------------------
+
+A ports tree in a running OPNsense can be used to build packages
+not published on the mirrors.  To generate the make.conf contents
+for standalone use on the host use:
+
+    # make make.conf
+
 Reading and modifying version numbers of build sets and images
 --------------------------------------------------------------
 

config/21.1/make.conf

@@ -17,16 +17,18 @@ _PRODUCT_PHP!=		${PRODUCT_PHPBIN} -v
 PRODUCT_PHP?=		${_PRODUCT_PHP:[2]:S/./ /g:[1..2]:tW:S/ //}
 .endif
 
-# XXX hardcoded for now (include build.conf maybe)
-PRODUCT_LUA?=		5.3
-PRODUCT_PERL?=		5.32
-PRODUCT_PHP?=		73
-PRODUCT_PYTHON?=	37
-PRODUCT_RUBY?=		26
+# fallbacks for standard builds using opnsense-code
+
+PRODUCT_LUA?=		%%LUA%%
+PRODUCT_PERL?=		%%PERL%%
+PRODUCT_PHP?=		%%PHP%%
+PRODUCT_PYTHON?=	%%PYTHON%%
+PRODUCT_RUBY?=		%%RUBY%%
 
 PRODUCT_GSSAPI?=	GSSAPI_MIT
 
 # global options
+
 OPTIONS_UNSET=		DBUS DOCS EXAMPLES GCC GSSAPI_BASE NLS OPENGL WAYLAND X11
 DEFAULT_VERSIONS=	python=${PRODUCT_PYTHON:C/^./&./}
 DEFAULT_VERSIONS+=	mysql=5.6 # LibreSSL requirement