svn commit: r449704 - branches/2017Q3/Mk

[Bryan Drewery]

Author: bdrewery
Date: Tue Sep 12 19:13:34 2017
New Revision: 449704
URL: https://svnweb.freebsd.org/changeset/ports/449704

Log:
  MFH: r446704
  
  Introduce versions of the Mozilla Public License (MPL)
  
  MPL10 - https://opensource.org/licenses/MPL-1.0
  MPL11 - https://opensource.org/licenses/MPL-1.1
  MPL20 - https://opensource.org/licenses/MPL-2.0
  
  More info about the Mozilla Public License:
  https://www.mozilla.org/en-US/MPL/
  
  Reviewed by:	amdmi3, mat
  Approved by:	portmgr (mat)
  Differential Revision:	https://reviews.freebsd.org/D11696
  
  This should fix MP* licenses on the quarterly branch requiring
  acceptance even with BATCH.
  
  Approved by:	portmgr (implicit)

Modified:
  branches/2017Q3/Mk/bsd.licenses.db.mk
  branches/2017Q3/Mk/bsd.sanity.mk
Directory Properties:
  branches/2017Q3/   (props changed)

Modified: branches/2017Q3/Mk/bsd.licenses.db.mk
==============================================================================
--- branches/2017Q3/Mk/bsd.licenses.db.mk	Tue Sep 12 19:04:33 2017	(r449703)
+++ branches/2017Q3/Mk/bsd.licenses.db.mk	Tue Sep 12 19:13:34 2017	(r449704)
@@ -40,7 +40,7 @@ Licenses_db_Include_MAINTAINER=         portmgr at FreeBS
 #
 
 _LICENSE_LIST= 	BSL CDDL CPAL-1.0 ClArtistic EPL GFDL GMGPL \
-				ISCL MIT MPL NCSA OFL10 OFL11 OWL OpenSSL PD PSFL PostgreSQL \
+				ISCL MIT NCSA OFL10 OFL11 OWL OpenSSL PD PSFL PostgreSQL \
 				RUBY WTFPL1 WTFPL ZLIB ZPL21
 
 # GNU family
@@ -72,6 +72,9 @@ _LICENSE_LIST+=	CC0-1.0 \
 				CC-BY-NC-SA-1.0 CC-BY-NC-SA-2.0 CC-BY-NC-SA-2.5 CC-BY-NC-SA-3.0 CC-BY-NC-SA-4.0 \
 				CC-BY-SA-1.0 CC-BY-SA-2.0 CC-BY-SA-2.5 CC-BY-SA-3.0 CC-BY-SA-4.0
 
+# MPL family
+_LICENSE_LIST+= MPL MPL10 MPL11 MPL20
+
 # Others
 _LICENSE_LIST+= NONE
 
@@ -348,6 +351,15 @@ _LICENSE_GROUPS_MIT=	COPYFREE FSF GPL OSI
 
 _LICENSE_NAME_MPL=	Mozilla Public License
 _LICENSE_GROUPS_MPL=	FSF OSI
+
+_LICENSE_NAME_MPL10=	Mozilla Public License version 1.0
+_LICENSE_GROUPS_MPL10=	FSF OSI
+
+_LICENSE_NAME_MPL11=	Mozilla Public License version 1.1
+_LICENSE_GROUPS_MPL11=	FSF OSI
+
+_LICENSE_NAME_MPL20=	Mozilla Public License version 2.0
+_LICENSE_GROUPS_MPL20=	FSF OSI
 
 _LICENSE_NAME_NCSA=	University of Illinois/NCSA Open Source License
 _LICENSE_GROUPS_NCSA=	COPYFREE FSF GPL OSI

Modified: branches/2017Q3/Mk/bsd.sanity.mk
==============================================================================
--- branches/2017Q3/Mk/bsd.sanity.mk	Tue Sep 12 19:04:33 2017	(r449703)
+++ branches/2017Q3/Mk/bsd.sanity.mk	Tue Sep 12 19:13:34 2017	(r449704)
@@ -112,6 +112,9 @@ DEV_ERROR+=	"USE_DOS2UNIX is no longer supported, plea
 .if ${LICENSE:MBSD}
 DEV_WARNING+=	"LICENSE must not contain BSD, instead use BSD[234]CLAUSE"
 .endif
+.if ${LICENSE:MMPL}
+DEV_WARNING+=	"LICENSE must not contain MPL, instead use MPL[10|11|20]"
+.endif
 .else
 DEV_WARNING+=	"Please set LICENSE for this port"
 .endif