Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 4 Nov 2017 13:14:01 +0000 (UTC)
From:      "Danilo G. Baio" <dbaio@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r453460 - in head: Mk Templates/Licenses audio/taglib textproc/es-hunspell
Message-ID:  <201711041314.vA4DE10u062437@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dbaio
Date: Sat Nov  4 13:14:01 2017
New Revision: 453460
URL: https://svnweb.freebsd.org/changeset/ports/453460

Log:
  Remove MPL (without version) license
  
  All ports now are using MPL[10|11|20] license.
  
  Approved by:	portmgr (rene)
  Differential Revision:	D12940

Deleted:
  head/Templates/Licenses/MPL
Modified:
  head/Mk/bsd.licenses.db.mk
  head/Mk/bsd.sanity.mk
  head/audio/taglib/Makefile
  head/textproc/es-hunspell/Makefile

Modified: head/Mk/bsd.licenses.db.mk
==============================================================================
--- head/Mk/bsd.licenses.db.mk	Sat Nov  4 13:08:28 2017	(r453459)
+++ head/Mk/bsd.licenses.db.mk	Sat Nov  4 13:14:01 2017	(r453460)
@@ -75,7 +75,7 @@ _LICENSE_LIST+=	CC0-1.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
+_LICENSE_LIST+= MPL10 MPL11 MPL20
 
 # Others
 _LICENSE_LIST+= NONE
@@ -350,9 +350,6 @@ _LICENSE_PERMS_LPPL13c=	dist-mirror dist-sell
 
 _LICENSE_NAME_MIT=	MIT license / X11 license
 _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

Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk	Sat Nov  4 13:08:28 2017	(r453459)
+++ head/Mk/bsd.sanity.mk	Sat Nov  4 13:14:01 2017	(r453460)
@@ -112,9 +112,6 @@ 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

Modified: head/audio/taglib/Makefile
==============================================================================
--- head/audio/taglib/Makefile	Sat Nov  4 13:08:28 2017	(r453459)
+++ head/audio/taglib/Makefile	Sat Nov  4 13:14:01 2017	(r453460)
@@ -12,7 +12,7 @@ COMMENT=	Library for manipulating ID3 tags and Ogg com
 LICENSE=	LGPL21 MPL11
 LICENSE_COMB=	dual
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING.LGPL
-LICENSE_FILE_MPL=	${WRKSRC}/COPYING.MPL
+LICENSE_FILE_MPL11=	${WRKSRC}/COPYING.MPL
 
 USES=		cmake cpe pathfix
 CMAKE_ARGS=	-DWITH_ASF:BOOL=ON \

Modified: head/textproc/es-hunspell/Makefile
==============================================================================
--- head/textproc/es-hunspell/Makefile	Sat Nov  4 13:08:28 2017	(r453459)
+++ head/textproc/es-hunspell/Makefile	Sat Nov  4 13:14:01 2017	(r453460)
@@ -16,7 +16,7 @@ LICENSE=	GPLv3 LGPL3 MPL11
 LICENSE_COMB=	dual
 LICENSE_FILE_GPLv3=	${WRKSRC}/GPLv3.txt
 LICENSE_FILE_LGPL3=	${WRKSRC}/LGPLv3.txt
-LICENSE_FILE_MPL=	${WRKSRC}/MPL-1.1.txt
+LICENSE_FILE_MPL11=	${WRKSRC}/MPL-1.1.txt
 
 NO_ARCH=	yes
 NO_BUILD=	yes



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711041314.vA4DE10u062437>