From owner-svn-ports-all@freebsd.org Tue Sep 13 12:24:53 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 542FCBD7E3C; Tue, 13 Sep 2016 12:24:53 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 15AD2CF8; Tue, 13 Sep 2016 12:24:53 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8DCOqXa053501; Tue, 13 Sep 2016 12:24:52 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8DCOqZA053498; Tue, 13 Sep 2016 12:24:52 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201609131224.u8DCOqZA053498@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 13 Sep 2016 12:24:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421995 - in head: . Mk games/catesc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Sep 2016 12:24:53 -0000 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@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@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@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