16 files changed, 74 insertions, 266 deletions
diff --git a/tools/build_snapshots.sh b/tools/build_snapshots.sh
index 50a4b07..1b8793a 100755
--- a/tools/build_snapshots.sh
+++ b/tools/build_snapshots.sh
@@ -6,49 +6,17 @@
 # Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
 # All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
+# http://www.apache.org/licenses/LICENSE-2.0
 #
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgment:
-#    "This product includes software developed by the pfSense Project
-#    for use in the pfSense® software distribution. (http://www.pfsense.org/).
-#
-# 4. The names "pfSense" and "pfSense Project" must not be used to
-#    endorse or promote products derived from this software without
-#    prior written permission. For written permission, please contact
-#    coreteam@pfsense.org.
-#
-# 5. Products derived from this software may not be called "pfSense"
-#    nor may "pfSense" appear in their names without prior written
-#    permission of the Electric Sheep Fencing, LLC.
-#
-# 6. Redistributions of any form whatsoever must retain the following
-#    acknowledgment:
-#
-# "This product includes software developed by the pfSense Project
-# for use in the pfSense software distribution (http://www.pfsense.org/).
-#
-# THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY
-# EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE pfSense PROJECT OR
-# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-# OF THE POSSIBILITY OF SUCH DAMAGE.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 usage() {
 	echo "Usage: $(basename $0) [-l] [-n] [-r] [-u] [-p]"
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 2e606e4..907e734 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -16,49 +16,17 @@
 # and copied from FreeSBIE project
 # All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
+# http://www.apache.org/licenses/LICENSE-2.0
 #
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgment:
-#    "This product includes software developed by the pfSense Project
-#    for use in the pfSense® software distribution. (http://www.pfsense.org/).
-#
-# 4. The names "pfSense" and "pfSense Project" must not be used to
-#    endorse or promote products derived from this software without
-#    prior written permission. For written permission, please contact
-#    coreteam@pfsense.org.
-#
-# 5. Products derived from this software may not be called "pfSense"
-#    nor may "pfSense" appear in their names without prior written
-#    permission of the Electric Sheep Fencing, LLC.
-#
-# 6. Redistributions of any form whatsoever must retain the following
-#    acknowledgment:
-#
-# "This product includes software developed by the pfSense Project
-# for use in the pfSense software distribution (http://www.pfsense.org/).
-#
-# THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY
-# EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE pfSense PROJECT OR
-# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-# OF THE POSSIBILITY OF SUCH DAMAGE.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 if [ -z "${IMAGES_FINAL_DIR}" -o "${IMAGES_FINAL_DIR}" = "/" ]; then
 	echo "IMAGES_FINAL_DIR is not defined"
@@ -173,20 +141,20 @@ core_pkg_create() {
 	local _portname=$(sed '/^name: /!d; s,^[^"]*",,; s,",,' ${_metadir}/+MANIFEST)
 	local _licenses_dir="/usr/local/share/licenses/${_portname}-${_version}"
 	mkdir -p ${_root}${_licenses_dir}
-	cp ${BUILDER_ROOT}/license.txt ${_root}${_licenses_dir}/ESF
-	echo "This package has a single license: ESF (Electric Sheep Fencing License)." \
+	cp ${BUILDER_ROOT}/LICENSE ${_root}${_licenses_dir}/APACHE20
+	echo "This package has a single license: APACHE20 (Apache License 2.0)." \
 		> ${_root}${_licenses_dir}/LICENSE
 	cat <<EOF >${_root}${_licenses_dir}/catalog.mk
-_LICENSE=ESF
-_LICENSE_NAME=Electric Sheep Fencing License
+_LICENSE=APACHE20
+_LICENSE_NAME=Apache License 2.0
 _LICENSE_PERMS=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-_LICENSE_GROUPS=
+_LICENSE_GROUPS=FSF OSI
 _LICENSE_DISTFILES=
 EOF
 	cat <<EOF >>${_plist}
 ${_licenses_dir}/catalog.mk
 ${_licenses_dir}/LICENSE
-${_licenses_dir}/ESF
+${_licenses_dir}/APACHE20
 EOF
 
 	mkdir -p ${CORE_PKG_REAL_PATH}/All
@@ -902,7 +870,7 @@ ova_setup_ovf_template() {
 		-e "s,%%PRODUCT_URL%%,${PRODUCT_URL},g" \
 		-e "s#%%VENDOR_NAME%%#${VENDOR_NAME}#g" \
 		-e "s#%%OVF_INFO%%#${OVF_INFO}#g" \
-		-e "/^%%PRODUCT_LICENSE%%/r ${BUILDER_ROOT}/license.txt" \
+		-e "/^%%PRODUCT_LICENSE%%/r ${BUILDER_ROOT}/LICENSE" \
 		-e "/^%%PRODUCT_LICENSE%%/d" \
 		${OVFTEMPLATE} > ${OVA_TMP}/${PRODUCT_NAME}.ovf
 }
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh
index 5705213..23d3e78 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -6,49 +6,17 @@
 # Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
 # All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
+# http://www.apache.org/licenses/LICENSE-2.0
 #
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgment:
-#    "This product includes software developed by the pfSense Project
-#    for use in the pfSense® software distribution. (http://www.pfsense.org/).
-#
-# 4. The names "pfSense" and "pfSense Project" must not be used to
-#    endorse or promote products derived from this software without
-#    prior written permission. For written permission, please contact
-#    coreteam@pfsense.org.
-#
-# 5. Products derived from this software may not be called "pfSense"
-#    nor may "pfSense" appear in their names without prior written
-#    permission of the Electric Sheep Fencing, LLC.
-#
-# 6. Redistributions of any form whatsoever must retain the following
-#    acknowledgment:
-#
-# "This product includes software developed by the pfSense Project
-# for use in the pfSense software distribution (http://www.pfsense.org/).
-#
-# THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY
-# EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE pfSense PROJECT OR
-# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-# OF THE POSSIBILITY OF SUCH DAMAGE.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 ###########################################
 # Product builder configuration file      #
@@ -115,7 +83,7 @@ export XML_ROOTOBJ=${XML_ROOTOBJ:-$(echo "${PRODUCT_NAME}" | tr '[[:upper:]]' '[
 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
+	cat ${BUILDER_ROOT}/LICENSE
 	exit 1
 fi
 
diff --git a/tools/scripts/clean.sh b/tools/scripts/clean.sh
index ddcb4a1..e0b601a 100755
--- a/tools/scripts/clean.sh
+++ b/tools/scripts/clean.sh
@@ -6,49 +6,17 @@
 # Copyright (c) 2015-2016 Electric Sheep Fencing, LLC
 # All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
+# http://www.apache.org/licenses/LICENSE-2.0
 #
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgment:
-#    "This product includes software developed by the pfSense Project
-#    for use in the pfSense® software distribution. (http://www.pfsense.org/).
-#
-# 4. The names "pfSense" and "pfSense Project" must not be used to
-#    endorse or promote products derived from this software without
-#    prior written permission. For written permission, please contact
-#    coreteam@pfsense.org.
-#
-# 5. Products derived from this software may not be called "pfSense"
-#    nor may "pfSense" appear in their names without prior written
-#    permission of the Electric Sheep Fencing, LLC.
-#
-# 6. Redistributions of any form whatsoever must retain the following
-#    acknowledgment:
-#
-# "This product includes software developed by the pfSense Project
-# for use in the pfSense software distribution (http://www.pfsense.org/).
-#
-# THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY
-# EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE pfSense PROJECT OR
-# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-# OF THE POSSIBILITY OF SUCH DAMAGE.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 sed -i '' 's/> </></g' $1 ;
 sed -i '' 's/    /	/g' $1 ;
diff --git a/tools/scripts/generate-privdefs.php b/tools/scripts/generate-privdefs.php
index 3501c55..bc94843 100755
--- a/tools/scripts/generate-privdefs.php
+++ b/tools/scripts/generate-privdefs.php
@@ -7,49 +7,17 @@
  * Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgment:
- *    "This product includes software developed by the pfSense Project
- *    for use in the pfSense® software distribution. (http://www.pfsense.org/).
- *
- * 4. The names "pfSense" and "pfSense Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    coreteam@pfsense.org.
- *
- * 5. Products derived from this software may not be called "pfSense"
- *    nor may "pfSense" appear in their names without prior written
- *    permission of the Electric Sheep Fencing, LLC.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *
- * "This product includes software developed by the pfSense Project
- * for use in the pfSense software distribution (http://www.pfsense.org/).
- *
- * THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE pfSense PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /*
diff --git a/tools/scripts/update_pot.sh b/tools/scripts/update_pot.sh
index dd72947..cffd6e1 100755
--- a/tools/scripts/update_pot.sh
+++ b/tools/scripts/update_pot.sh
@@ -6,49 +6,17 @@
 # Copyright (c) 2004-2016 Electric Sheep Fencing, LLC
 # All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# 1. Redistributions of source code must retain the above copyright notice,
-#    this list of conditions and the following disclaimer.
+# http://www.apache.org/licenses/LICENSE-2.0
 #
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-#
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgment:
-#    "This product includes software developed by the pfSense Project
-#    for use in the pfSense® software distribution. (http://www.pfsense.org/).
-#
-# 4. The names "pfSense" and "pfSense Project" must not be used to
-#    endorse or promote products derived from this software without
-#    prior written permission. For written permission, please contact
-#    coreteam@pfsense.org.
-#
-# 5. Products derived from this software may not be called "pfSense"
-#    nor may "pfSense" appear in their names without prior written
-#    permission of the Electric Sheep Fencing, LLC.
-#
-# 6. Redistributions of any form whatsoever must retain the following
-#    acknowledgment:
-#
-# "This product includes software developed by the pfSense Project
-# for use in the pfSense software distribution (http://www.pfsense.org/).
-#
-# THIS SOFTWARE IS PROVIDED BY THE pfSense PROJECT ``AS IS'' AND ANY
-# EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE pfSense PROJECT OR
-# ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-# OF THE POSSIBILITY OF SUCH DAMAGE.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 # Verify if user defined a custom path for xgettext
 if [ -n "$XGETTEXT" ]; then
diff --git a/tools/templates/core_pkg/_license/LICENSE b/tools/templates/core_pkg/_license/LICENSE
index 2c0fee8..8aca294 100644
--- a/tools/templates/core_pkg/_license/LICENSE
+++ b/tools/templates/core_pkg/_license/LICENSE
@@ -1 +1 @@
-This package has a single license: ESF (Electric Sheep Fencing License).
+This package has a single license: APACHE20 (Apache License 2.0).
diff --git a/tools/templates/core_pkg/_license/catalog.mk b/tools/templates/core_pkg/_license/catalog.mk
index 11fba36..e7dfe65 100644
--- a/tools/templates/core_pkg/_license/catalog.mk
+++ b/tools/templates/core_pkg/_license/catalog.mk
@@ -1,5 +1,5 @@
-_LICENSE=ESF
-_LICENSE_NAME=Electric Sheep Fencing License
+_LICENSE=APACHE20
+_LICENSE_NAME=Apache License 2.0
 _LICENSE_PERMS=dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-_LICENSE_GROUPS=
+_LICENSE_GROUPS=FSF OSI
 _LICENSE_DISTFILES=
diff --git a/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST b/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST
index bbda096..19229a3 100644
--- a/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST
+++ b/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST
@@ -12,5 +12,5 @@ deps: {
 }
 categories [ security,  ]
 licenselogic: single
-licenses: [ ESF,  ]
+licenses: [ APACHE20,  ]
 options: {  }
diff --git a/tools/templates/core_pkg/base/metadir/+MANIFEST b/tools/templates/core_pkg/base/metadir/+MANIFEST
index 5e61ae7..3e0a111 100644
--- a/tools/templates/core_pkg/base/metadir/+MANIFEST
+++ b/tools/templates/core_pkg/base/metadir/+MANIFEST
@@ -12,5 +12,5 @@ deps: {
 }
 categories [ security,  ]
 licenselogic: single
-licenses: [ ESF,  ]
+licenses: [ APACHE20,  ]
 options: {  }
diff --git a/tools/templates/core_pkg/default-config-serial/metadir/+MANIFEST b/tools/templates/core_pkg/default-config-serial/metadir/+MANIFEST
index aca3abd..ce87ff0 100644
--- a/tools/templates/core_pkg/default-config-serial/metadir/+MANIFEST
+++ b/tools/templates/core_pkg/default-config-serial/metadir/+MANIFEST
@@ -11,5 +11,5 @@ deps: {
 }
 categories [ security,  ]
 licenselogic: single
-licenses: [ ESF,  ]
+licenses: [ APACHE20,  ]
 options: {  }
diff --git a/tools/templates/core_pkg/default-config/metadir/+MANIFEST b/tools/templates/core_pkg/default-config/metadir/+MANIFEST
index 8809948..71b79ab 100644
--- a/tools/templates/core_pkg/default-config/metadir/+MANIFEST
+++ b/tools/templates/core_pkg/default-config/metadir/+MANIFEST
@@ -11,5 +11,5 @@ deps: {
 }
 categories [ security,  ]
 licenselogic: single
-licenses: [ ESF,  ]
+licenses: [ APACHE20,  ]
 options: {  }
diff --git a/tools/templates/core_pkg/kernel-debug/metadir/+MANIFEST b/tools/templates/core_pkg/kernel-debug/metadir/+MANIFEST
index 6830977..b06ce61 100644
--- a/tools/templates/core_pkg/kernel-debug/metadir/+MANIFEST
+++ b/tools/templates/core_pkg/kernel-debug/metadir/+MANIFEST
@@ -11,5 +11,5 @@ deps: {
 }
 categories [ security,  ]
 licenselogic: single
-licenses: [ ESF,  ]
+licenses: [ APACHE20,  ]
 options: {  }
diff --git a/tools/templates/core_pkg/kernel/metadir/+MANIFEST b/tools/templates/core_pkg/kernel/metadir/+MANIFEST
index 2961d9a..fd40278 100644
--- a/tools/templates/core_pkg/kernel/metadir/+MANIFEST
+++ b/tools/templates/core_pkg/kernel/metadir/+MANIFEST
@@ -11,5 +11,5 @@ deps: {
 }
 categories [ security,  ]
 licenselogic: single
-licenses: [ ESF,  ]
+licenses: [ APACHE20,  ]
 options: {  }
diff --git a/tools/templates/core_pkg/rc/metadir/+MANIFEST b/tools/templates/core_pkg/rc/metadir/+MANIFEST
index f42208a..163361f 100644
--- a/tools/templates/core_pkg/rc/metadir/+MANIFEST
+++ b/tools/templates/core_pkg/rc/metadir/+MANIFEST
@@ -11,5 +11,5 @@ deps: {
 }
 categories [ security,  ]
 licenselogic: single
-licenses: [ ESF,  ]
+licenses: [ APACHE20,  ]
 options: {  }
diff --git a/tools/templates/core_pkg/repo/metadir/+MANIFEST b/tools/templates/core_pkg/repo/metadir/+MANIFEST
index 944c084..bcec7f2 100644
--- a/tools/templates/core_pkg/repo/metadir/+MANIFEST
+++ b/tools/templates/core_pkg/repo/metadir/+MANIFEST
@@ -11,5 +11,5 @@ deps: {
 }
 categories [ security,  ]
 licenselogic: single
-licenses: [ ESF,  ]
+licenses: [ APACHE20,  ]
 options: {  }