pkg: proper argument for flavour replacement

Makefile

@@ -18,6 +18,12 @@ CORE_COMMIT!=	${.CURDIR}/scripts/version.sh
 CORE_VERSION=	${CORE_COMMIT:C/-.*$//1}
 CORE_HASH=	${CORE_COMMIT:C/^.*-//1}
 
+.if "${FLAVOUR}" == LibreSSL
+CORE_REPOSITORY=libressl
+.else
+CORE_REPOSITORY=latest
+.endif
+
 CORE_NAME?=		opnsense-devel
 CORE_ORIGIN?=		opnsense/${CORE_NAME}
 CORE_COMMENT?=		OPNsense development package
@@ -132,16 +138,19 @@ scripts: force
 	    ${DESTDIR}/+POST_INSTALL
 
 install: force
-	@make -C ${.CURDIR}/pkg install
-	@make -C ${.CURDIR}/lang install
-	@make -C ${.CURDIR}/contrib install
+	@${MAKE} -C ${.CURDIR}/pkg install DESTDIR=${DESTDIR}
+	# XXX don't want to pass down, but also don't want clutter
+	sed -i '' -e "s/%%CORE_REPOSITORY%%/${CORE_REPOSITORY}/g" \
+	    ${DESTDIR}/usr/local/etc/pkg/repos/origin.conf
+	@${MAKE} -C ${.CURDIR}/lang install DESTDIR=${DESTDIR}
+	@${MAKE} -C ${.CURDIR}/contrib install DESTDIR=${DESTDIR}
 	@mkdir -p ${DESTDIR}/usr/local
 	@cp -vr ${.CURDIR}/src/* ${DESTDIR}/usr/local
 
 plist: force
-	@make -C ${.CURDIR}/pkg plist
-	@make -C ${.CURDIR}/lang plist
-	@make -C ${.CURDIR}/contrib plist
+	@${MAKE} -C ${.CURDIR}/pkg plist
+	@${MAKE} -C ${.CURDIR}/lang plist
+	@${MAKE} -C ${.CURDIR}/contrib plist
 	@(cd ${.CURDIR}/src; find * -type f) | while read FILE; do \
 		if [ $${FILE%%.sample} != $${FILE} ]; then \
 			echo "@sample /usr/local/$${FILE}"; \

lang/Makefile

 all:
 
-XGETTEXT=	xgettext -L PHP --from-code=UTF-8 -F --strict --debug
-MSGFMT=		msgfmt --strict
+_XGETTEXT!=	which xgettext || echo true
+XGETTEXT=	${_XGETTEXT} -L PHP --from-code=UTF-8 -F --strict --debug
+_MSGFMT!=	which msgfmt || echo true
+MSGFMT=		${_MSGFMT} --strict
 
 LOCALEDIR=	/usr/local/share/locale/%%LANG%%/LC_MESSAGES
 

pkg/repos/origin.conf

 OPNsense: {
   fingerprints: "/usr/local/etc/pkg/fingerprints/OPNsense",
-  url: "pkg+http://pkg.opnsense.org/${ABI}/%%REPO_FLAVOUR%%",
+  url: "pkg+http://pkg.opnsense.org/${ABI}/%%CORE_REPOSITORY%%",
   signature_type: "fingerprints",
   mirror_type: "srv",
   priority: 11,