aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES9
-rw-r--r--Mk/bsd.licenses.mk4
2 files changed, 11 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 668f97ae197a..5f79a2e73ead 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,15 @@ in the release notes and/or placed into UPDATING.
All ports committers are allowed to commit to this file.
+20100524:
+AUTHOR: alepulver@FreeBSD.org
+
+ * The license support files (bsd.licenses.mk and bsd.licenses.db.mk) from
+ GSoc 2008/2009 have been committed. A new PH entry will be available
+ soon, but for the moment look at:
+ http://wiki.freebsd.org/PortsLicenseInfrastructure
+ Or, alternatively, the comments at the beginning of the mentioned files.
+
20090906:
AUTHOR: flz@FreeBSD.org
diff --git a/Mk/bsd.licenses.mk b/Mk/bsd.licenses.mk
index 03af74932c58..3461107407d6 100644
--- a/Mk/bsd.licenses.mk
+++ b/Mk/bsd.licenses.mk
@@ -216,7 +216,7 @@ _LICENSE_TYPE= known
_LICENSE_ERROR?= redefining LICENSE_${var} is not allowed for known licenses, to define a custom license try another LICENSE name like ${_LICENSE}-variant
. endif
. if !defined(_LICENSE_${var}_${lic})
-_LICENGE_ERROR?= ERROR: missing _LICENSE_${var}_${lic} in bsd.licenses.db.mk
+_LICENSE_ERROR?= ERROR: missing _LICENSE_${var}_${lic} in bsd.licenses.db.mk
. else
_LICENSE_${var}= ${_LICENSE_${var}_${lic}}
. endif
@@ -293,7 +293,7 @@ _LICENSE_TYPE_${lic}= known
_LICENSE_ERROR?= redefining LICENSE_${var}_${lic} is not allowed for known licenses, to define a custom license try another LICENSE name for ${lic} like ${lic}-variant
. endif
. if !defined(_LICENSE_${var}_${lic})
-_LICENGE_ERROR?= ERROR: missing _LICENSE_${var}_${lic} in bsd.licenses.db.mk
+_LICENSE_ERROR?= ERROR: missing _LICENSE_${var}_${lic} in bsd.licenses.db.mk
. endif
. endfor
# Check for LICENSE_FILE or at least LICENSE_TEXT (which simulates it)