From 5db335e02ee6f4a7d9c9a5571bdfc1c14a89f849 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sat, 11 Apr 2020 10:52:18 +0200
Subject: [PATCH] pkg: "make upgrade" can be difficult in dev situations

Auto-detect PHP if possible, change FLAVOUR behaviour while at it.
---
 Makefile       | 10 +++++-----
 Mk/defaults.mk | 19 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 1738a0f0d..7ec5415b7 100644
--- a/Makefile
+++ b/Makefile
@@ -54,12 +54,12 @@ CORE_SYSLOGD?=	# empty
 CORE_SYSLOGNG?=	3.25
 CORE_UPDATE?=	# empty
 
-.if "${FLAVOUR}" == OpenSSL || "${FLAVOUR}" == ""
+.if "${CORE_FLAVOUR}" == OpenSSL
 CORE_REPOSITORY?=	${CORE_ABI}/latest
-.elif "${FLAVOUR}" == LibreSSL
+.elif "${CORE_FLAVOUR}" == LibreSSL
 CORE_REPOSITORY?=	${CORE_ABI}/libressl
 .else
-CORE_REPOSITORY?=	${FLAVOUR}
+CORE_REPOSITORY?=	unsupported/${CORE_FLAVOUR:tl}
 .endif
 
 CORE_MESSAGE?=		Carry on my wayward son
@@ -286,10 +286,10 @@ package: plist-check package-check clean-wrksrc
 	@if ! ${PKG} info ${CORE_DEPEND} > /dev/null; then ${PKG} install -yfA ${CORE_DEPEND}; fi
 .endfor
 	@echo -n ">>> Generating metadata for ${CORE_NAME}-${CORE_PKGVERSION}..."
-	@${MAKE} DESTDIR=${WRKSRC} FLAVOUR=${FLAVOUR} metadata
+	@${MAKE} DESTDIR=${WRKSRC} CORE_FLAVOUR=${CORE_FLAVOUR} metadata
 	@echo " done"
 	@echo -n ">>> Staging files for ${CORE_NAME}-${CORE_PKGVERSION}..."
-	@${MAKE} DESTDIR=${WRKSRC} FLAVOUR=${FLAVOUR} install
+	@${MAKE} DESTDIR=${WRKSRC} CORE_FLAVOUR=${CORE_FLAVOUR} install
 	@echo " done"
 	@echo ">>> Packaging files for ${CORE_NAME}-${CORE_PKGVERSION}:"
 	@PORTSDIR=${.CURDIR} ${PKG} create -f ${PKG_FORMAT} -v -m ${WRKSRC} \
diff --git a/Mk/defaults.mk b/Mk/defaults.mk
index 79b74cd00..49317e812 100644
--- a/Mk/defaults.mk
+++ b/Mk/defaults.mk
@@ -28,8 +28,25 @@ PAGER?=		less
 
 OPENSSL?=	${LOCALBASE}/bin/openssl
 
-_FLAVOUR!=	if [ -f ${OPENSSL} ]; then ${OPENSSL} version; fi
+.if exists(${OPENSSL})
+_FLAVOUR!=	${OPENSSL} version
 FLAVOUR?=	${_FLAVOUR:[1]}
+.else
+FLAVOUR?=	Base # not supported without OpenSSL port
+.endif
+
+PHPBIN?=	${LOCALBASE}/bin/php
+
+.if exists(${PHPBIN})
+_CORE_PHP!=	${PHPBIN} -v
+CORE_PHP?=	${_CORE_PHP:[2]:S/./ /g:[1..2]:tW:S/ //}
+.endif
+
+VERSIONBIN?=	${LOCALBASE}/sbin/opnsense-version
+
+.if exists(${VERSIONBIN})
+CORE_ABI!=	${VERSIONBIN} -a
+.endif
 
 PKG!=		which pkg || echo true
 GIT!=		which git || echo true