From d6ad3cdd96ba920fd7d14a9242b1810da57ca115 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sat, 12 Mar 2016 09:26:20 +0100
Subject: [PATCH] make: improve previous and add `upgrade' target while at it

---
 Makefile        | 27 ++++++++++++++++++---------
 work/.gitignore |  1 +
 2 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 work/.gitignore

diff --git a/Makefile b/Makefile
index 181eb1482..ad9a03128 100644
--- a/Makefile
+++ b/Makefile
@@ -166,17 +166,26 @@ plist: force
 	@${MAKE} -C ${.CURDIR}/lang plist
 	@${MAKE} -C ${.CURDIR}/src plist
 
-TMPDIR?=	${DESTDIR}/tmp/core-pkg
+WRKDIR?=${.CURDIR}/work
+WRKSRC=	${WRKDIR}/src
+PKGDIR=	${WRKDIR}/pkg
 
 package: force
-	@rm -rf ${TMPDIR}
-	@${MAKE} DESTDIR=${TMPDIR} FLAVOUR=${FLAVOUR} install
-	@${MAKE} DESTDIR=${TMPDIR} scripts
-	@${MAKE} DESTDIR=${TMPDIR} manifest > ${TMPDIR}/+MANIFEST
-	@${MAKE} DESTDIR=${TMPDIR} plist > ${TMPDIR}/plist
-	@${PKG} create -v -m ${TMPDIR} -r ${TMPDIR} -p ${TMPDIR}/plist
-	@ls -lah *.txz
-	@rm -rf ${TMPDIR}
+	@${PKG} info gettext-tools > /dev/null
+	@${PKG} info git > /dev/null
+	@rm -rf ${WRKSRC} ${PKGDIR}
+	@${MAKE} DESTDIR=${WRKSRC} FLAVOUR=${FLAVOUR} install
+	@${MAKE} DESTDIR=${WRKSRC} scripts
+	@${MAKE} DESTDIR=${WRKSRC} manifest > ${WRKSRC}/+MANIFEST
+	@${MAKE} DESTDIR=${WRKSRC} plist > ${WRKSRC}/plist
+	@${PKG} create -v -m ${WRKSRC} -r ${WRKSRC} \
+	    -p ${WRKSRC}/plist -o ${PKGDIR}
+	@echo -n "Sucessfully built "
+	@cd ${PKGDIR}; find . -name "*.txz" | cut -c3-
+
+upgrade: package
+	${PKG} delete -y ${CORE_NAME}
+	${PKG} add ${PKGDIR}/*.txz
 
 lint: force
 	find ${.CURDIR}/src ${.CURDIR}/scripts \
diff --git a/work/.gitignore b/work/.gitignore
new file mode 100644
index 000000000..72e8ffc0d
--- /dev/null
+++ b/work/.gitignore
@@ -0,0 +1 @@
+*