From 46f33ce5992dd884060a0e46065958fdc04e3d85 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Tue, 25 Aug 2015 12:23:58 -0300
Subject: Remove pfSense definitions from default config and move check after
 PRODUCT_NAME is set

---
 build.conf.sample         |  1 +
 tools/builder_defaults.sh | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/build.conf.sample b/build.conf.sample
index b9677c1..2cb6e84 100644
--- a/build.conf.sample
+++ b/build.conf.sample
@@ -49,6 +49,7 @@
 # Name of the product you are building, only ESF can build and distribute
 # pfSense® software
 export PRODUCT_NAME="nonSense"
+export PRODUCT_URL="https://PRODUCT_URL/"
 
 # Define FreeBSD repository, branch and specific commit
 #export FREEBSD_REPO_BASE=https://github.com/freebsd/freebsd.git
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh
index 5f04f4b..dc8666d 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -81,13 +81,6 @@ if [ -f ${BUILD_CONF} ]; then
 	. ${BUILD_CONF}
 fi
 
-if [ "${PRODUCT_NAME}" = "pfSense" -a "${BUILD_AUTHORIZED_BY_ELECTRIC_SHEEP_FENCING}" != yes ]; then
-	echo ">>>ERROR: According the following license, only Electric Sheep Fencing can build genuine pfSense® software"
-	echo ""
-	cat ${BUILDER_ROOT}/license.txt
-	exit 1
-fi
-
 # Make sure pkg will not be interactive
 export ASSUME_ALWAYS_YES=true
 
@@ -111,10 +104,17 @@ if [ ! -d ${SCRATCHDIR} ]; then
 fi
 
 # Product details
-export PRODUCT_NAME=${PRODUCT_NAME:-"pfSense"}
-export PRODUCT_URL=${PRODUCT_VERSION:-"https://www.pfsense.org/"}
+export PRODUCT_NAME=${PRODUCT_NAME:-"nonSense"}
+export PRODUCT_URL=${PRODUCT_VERSION:-""}
 export PRODUCT_SRC=${PRODUCT_SRC:-"${BUILDER_ROOT}/src"}
 
+if [ "${PRODUCT_NAME}" = "pfSense" -a "${BUILD_AUTHORIZED_BY_ELECTRIC_SHEEP_FENCING}" != "yes" ]; then
+	echo ">>>ERROR: According the following license, only Electric Sheep Fencing can build genuine pfSense® software"
+	echo ""
+	cat ${BUILDER_ROOT}/license.txt
+	exit 1
+fi
+
 if [ -z "${PRODUCT_VERSION}" ]; then
 	if [ ! -f ${PRODUCT_SRC}/etc/version ]; then
 		echo ">>> ERROR: PRODUCT_VERSION is not defined and ${PRODUCT_SRC}/etc/version was not found"
-- 
cgit v1.1