svn commit: r421995 - in head: . Mk games/catesc
Dmitry Marakasov
amdmi3 at FreeBSD.org
Tue Sep 13 12:24:53 UTC 2016
Author: amdmi3
Date: Tue Sep 13 12:24:51 2016
New Revision: 421995
URL: https://svnweb.freebsd.org/changeset/ports/421995
Log:
Add all Creative Commons licenses
Approved by: portmgr (mat)
Differential Revision: D7852
Modified:
head/CHANGES
head/Mk/bsd.licenses.db.mk
head/games/catesc/Makefile
Modified: head/CHANGES
==============================================================================
--- head/CHANGES Tue Sep 13 11:41:21 2016 (r421994)
+++ head/CHANGES Tue Sep 13 12:24:51 2016 (r421995)
@@ -10,6 +10,13 @@ in the release notes and/or placed into
All ports committers are allowed to commit to this file.
+20160911:
+AUTHOR: amdmi3 at FreeBSD.org
+
+ Support has been added for complete set of Creative Commons licenses
+
+ CC-(BY|BY-ND|BY-NC|BY-NC-ND|BY-NC-SA|BY-SA)-(1.0|2.0|2.5|3.0|4.0)
+
20160909:
AUTHOR: amdmi3 at FreeBSD.org
Modified: head/Mk/bsd.licenses.db.mk
==============================================================================
--- head/Mk/bsd.licenses.db.mk Tue Sep 13 11:41:21 2016 (r421994)
+++ head/Mk/bsd.licenses.db.mk Tue Sep 13 12:24:51 2016 (r421995)
@@ -39,7 +39,7 @@ Licenses_db_Include_MAINTAINER=
# _LICENSE_LIST_GROUPS - List of defined license groups
#
-_LICENSE_LIST= BSL CC0-1.0 CDDL CPAL-1.0 ClArtistic EPL GFDL GMGPL \
+_LICENSE_LIST= BSL CDDL CPAL-1.0 ClArtistic EPL GFDL GMGPL \
ISCL MIT MPL NCSA OFL10 OFL11 OWL OpenSSL PD PSFL PostgreSQL \
RUBY ZLIB ZPL21
@@ -63,7 +63,16 @@ _LICENSE_LIST+= ART10 ARTPERL10 ART20
# PHP family
_LICENSE_LIST+= PHP202 PHP30 PHP301
-# Extras
+# Creative Commons family
+_LICENSE_LIST+= CC0-1.0 \
+ CC-BY-1.0 CC-BY-2.0 CC-BY-2.5 CC-BY-3.0 CC-BY-4.0 \
+ CC-BY-ND-1.0 CC-BY-ND-2.0 CC-BY-ND-2.5 CC-BY-ND-3.0 CC-BY-ND-4.0 \
+ CC-BY-NC-1.0 CC-BY-NC-2.0 CC-BY-NC-2.5 CC-BY-NC-3.0 CC-BY-NC-4.0 \
+ CC-BY-NC-ND-1.0 CC-BY-NC-ND-2.0 CC-BY-NC-ND-2.5 CC-BY-NC-ND-3.0 CC-BY-NC-ND-4.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
+
+# Others
_LICENSE_LIST+= NONE
# List of groups (only names must be present)
@@ -138,6 +147,111 @@ _LICENSE_GROUPS_BSL= FSF OSI COPYFREE
_LICENSE_NAME_CC0-1.0= Creative Commons Zero v1.0 Universal
_LICENSE_GROUPS_CC0-1.0= FSF GPL COPYFREE
+_LICENSE_NAME_CC-BY-1.0= Creative Commons Attribution 1.0
+_LICENSE_GROUPS_CC-BY-1.0= # empty
+
+_LICENSE_NAME_CC-BY-2.0= Creative Commons Attribution 2.0
+_LICENSE_GROUPS_CC-BY-2.0= # empty
+
+_LICENSE_NAME_CC-BY-2.5= Creative Commons Attribution 2.5
+_LICENSE_GROUPS_CC-BY-2.5= # empty
+
+_LICENSE_NAME_CC-BY-3.0= Creative Commons Attribution 3.0
+_LICENSE_GROUPS_CC-BY-3.0= # empty
+
+_LICENSE_NAME_CC-BY-4.0= Creative Commons Attribution 4.0
+_LICENSE_GROUPS_CC-BY-4.0= # empty
+
+_LICENSE_NAME_CC-BY-ND-1.0= Creative Commons Attribution No Derivatives 1.0
+_LICENSE_GROUPS_CC-BY-ND-1.0= # empty
+
+_LICENSE_NAME_CC-BY-ND-2.0= Creative Commons Attribution No Derivatives 2.0
+_LICENSE_GROUPS_CC-BY-ND-2.0= # empty
+
+_LICENSE_NAME_CC-BY-ND-2.5= Creative Commons Attribution No Derivatives 2.5
+_LICENSE_GROUPS_CC-BY-ND-2.5= # empty
+
+_LICENSE_NAME_CC-BY-ND-3.0= Creative Commons Attribution No Derivatives 3.0
+_LICENSE_GROUPS_CC-BY-ND-3.0= # empty
+
+_LICENSE_NAME_CC-BY-ND-4.0= Creative Commons Attribution No Derivatives 4.0
+_LICENSE_GROUPS_CC-BY-ND-4.0= # empty
+
+_LICENSE_NAME_CC-BY-NC-1.0= Creative Commons Attribution Non Commercial 1.0
+_LICENSE_GROUPS_CC-BY-NC-1.0= # empty
+_LICENSE_PERMS_CC-BY-NC-1.0= dist-mirror pkg-mirror auto-accept
+
+_LICENSE_NAME_CC-BY-NC-2.0= Creative Commons Attribution Non Commercial 2.0
+_LICENSE_GROUPS_CC-BY-NC-2.0= # empty
+_LICENSE_PERMS_CC-BY-NC-2.0= dist-mirror pkg-mirror auto-accept
+
+_LICENSE_NAME_CC-BY-NC-2.5= Creative Commons Attribution Non Commercial 2.5
+_LICENSE_GROUPS_CC-BY-NC-2.5= # empty
+_LICENSE_PERMS_CC-BY-NC-2.5= dist-mirror pkg-mirror auto-accept
+
+_LICENSE_NAME_CC-BY-NC-3.0= Creative Commons Attribution Non Commercial 3.0
+_LICENSE_GROUPS_CC-BY-NC-3.0= # empty
+_LICENSE_PERMS_CC-BY-NC-3.0= dist-mirror pkg-mirror auto-accept
+
+_LICENSE_NAME_CC-BY-NC-4.0= Creative Commons Attribution Non Commercial 4.0
+_LICENSE_GROUPS_CC-BY-NC-4.0= # empty
+_LICENSE_PERMS_CC-BY-NC-4.0= dist-mirror pkg-mirror auto-accept
+
+_LICENSE_NAME_CC-BY-NC-ND-1.0= Creative Commons Attribution Non Commercial No Derivatives 1.0
+_LICENSE_GROUPS_CC-BY-NC-ND-1.0= # empty
+_LICENSE_PERMS_CC-BY-NC-ND-1.0= dist-mirror pkg-mirror auto-accept
+
+_LICENSE_NAME_CC-BY-NC-ND-2.0= Creative Commons Attribution Non Commercial No Derivatives 2.0
+_LICENSE_GROUPS_CC-BY-NC-ND-2.0= # empty
+_LICENSE_PERMS_CC-BY-NC-ND-2.0= dist-mirror pkg-mirror auto-accept
+
+_LICENSE_NAME_CC-BY-NC-ND-2.5= Creative Commons Attribution Non Commercial No Derivatives 2.5
+_LICENSE_GROUPS_CC-BY-NC-ND-2.5= # empty
+_LICENSE_PERMS_CC-BY-NC-ND-2.5= dist-mirror pkg-mirror auto-accept
+
+_LICENSE_NAME_CC-BY-NC-ND-3.0= Creative Commons Attribution Non Commercial No Derivatives 3.0
+_LICENSE_GROUPS_CC-BY-NC-ND-3.0= # empty
+_LICENSE_PERMS_CC-BY-NC-ND-3.0= dist-mirror pkg-mirror auto-accept
+
+_LICENSE_NAME_CC-BY-NC-ND-4.0= Creative Commons Attribution Non Commercial No Derivatives 4.0
+_LICENSE_GROUPS_CC-BY-NC-ND-4.0= # empty
+_LICENSE_PERMS_CC-BY-NC-ND-4.0= dist-mirror pkg-mirror auto-accept
+
+_LICENSE_NAME_CC-BY-NC-SA-1.0= Creative Commons Attribution Non Commercial Share Alike 1.0
+_LICENSE_GROUPS_CC-BY-NC-SA-1.0= # empty
+_LICENSE_PERMS_CC-BY-NC-SA-1.0= dist-mirror pkg-mirror auto-accept
+
+_LICENSE_NAME_CC-BY-NC-SA-2.0= Creative Commons Attribution Non Commercial Share Alike 2.0
+_LICENSE_GROUPS_CC-BY-NC-SA-2.0= # empty
+_LICENSE_PERMS_CC-BY-NC-SA-2.0= dist-mirror pkg-mirror auto-accept
+
+_LICENSE_NAME_CC-BY-NC-SA-2.5= Creative Commons Attribution Non Commercial Share Alike 2.5
+_LICENSE_GROUPS_CC-BY-NC-SA-2.5= # empty
+_LICENSE_PERMS_CC-BY-NC-SA-2.5= dist-mirror pkg-mirror auto-accept
+
+_LICENSE_NAME_CC-BY-NC-SA-3.0= Creative Commons Attribution Non Commercial Share Alike 3.0
+_LICENSE_GROUPS_CC-BY-NC-SA-3.0= # empty
+_LICENSE_PERMS_CC-BY-NC-SA-3.0= dist-mirror pkg-mirror auto-accept
+
+_LICENSE_NAME_CC-BY-NC-SA-4.0= Creative Commons Attribution Non Commercial Share Alike 4.0
+_LICENSE_GROUPS_CC-BY-NC-SA-4.0= # empty
+_LICENSE_PERMS_CC-BY-NC-SA-4.0= dist-mirror pkg-mirror auto-accept
+
+_LICENSE_NAME_CC-BY-SA-1.0= Creative Commons Attribution Share Alike 1.0
+_LICENSE_GROUPS_CC-BY-SA-1.0= # empty
+
+_LICENSE_NAME_CC-BY-SA-2.0= Creative Commons Attribution Share Alike 2.0
+_LICENSE_GROUPS_CC-BY-SA-2.0= # empty
+
+_LICENSE_NAME_CC-BY-SA-2.5= Creative Commons Attribution Share Alike 2.5
+_LICENSE_GROUPS_CC-BY-SA-2.5= # empty
+
+_LICENSE_NAME_CC-BY-SA-3.0= Creative Commons Attribution Share Alike 3.0
+_LICENSE_GROUPS_CC-BY-SA-3.0= # empty
+
+_LICENSE_NAME_CC-BY-SA-4.0= Creative Commons Attribution Share Alike 4.0
+_LICENSE_GROUPS_CC-BY-SA-4.0= # empty
+
_LICENSE_NAME_CDDL= Common Development and Distribution License
_LICENSE_GROUPS_CDDL= FSF OSI
Modified: head/games/catesc/Makefile
==============================================================================
--- head/games/catesc/Makefile Tue Sep 13 11:41:21 2016 (r421994)
+++ head/games/catesc/Makefile Tue Sep 13 12:24:51 2016 (r421995)
@@ -8,14 +8,8 @@ CATEGORIES= games
MAINTAINER= amdmi3 at FreeBSD.org
COMMENT= Escape of the cat - hardcore oldschool platformer
-LICENSE= CCbySA30 CCbySA40
-LICENSE_COMB= multi
-LICENSE_NAME_CCbySA30= Creative Commons Attribution-ShareAlike 3.0 Unported license
-LICENSE_NAME_CCbySA40= Creative Commons Attribution-ShareAlike 4.0 International Public License
-LICENSE_TEXT_CCbySA30= https://creativecommons.org/licenses/by-sa/3.0/legalcode
-LICENSE_TEXT_CCbySA40= https://creativecommons.org/licenses/by-sa/4.0/legalcode
-LICENSE_PERMS_CCbySA30= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-LICENSE_PERMS_CCbySA40= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE= CC-BY-SA-3.0 CC-BY-SA-4.0
+LICENSE_COMB= multi
RUN_DEPENDS= instead:games/instead
More information about the svn-ports-all
mailing list