Date: Wed, 28 Sep 2016 06:38:00 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422850 - in head: games/blobwars games/cataclysm-dda games/cretan-hubris games/epiar games/fbg2 games/openalchemist games/opensurge games/plee-the-bear games/popstar games/ufoai-data s... Message-ID: <201609280638.u8S6c05u008619@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Sep 28 06:38:00 2016 New Revision: 422850 URL: https://svnweb.freebsd.org/changeset/ports/422850 Log: Convert CC license names to r421995 spellings While here fix common mistakes such as: - Missing "or (at your option) any later version" bit - LICENSE_FILE with LICENSE_COMB != single - LICENSE_COMB = dual for code + assets - Copy-pasting undocumented NC/SA restriction Modified: head/games/blobwars/Makefile (contents, props changed) head/games/cataclysm-dda/Makefile (contents, props changed) head/games/cretan-hubris/Makefile (contents, props changed) head/games/epiar/Makefile (contents, props changed) head/games/fbg2/Makefile (contents, props changed) head/games/openalchemist/Makefile (contents, props changed) head/games/opensurge/Makefile (contents, props changed) head/games/plee-the-bear/Makefile (contents, props changed) head/games/popstar/Makefile (contents, props changed) head/games/ufoai-data/Makefile (contents, props changed) head/science/py-pyaixi/Makefile (contents, props changed) head/sysutils/amtc/Makefile (contents, props changed) head/textproc/nl-hunspell/Makefile (contents, props changed) head/www/lighttpd-mod_h264_streaming/Makefile (contents, props changed) head/www/pligg/Makefile (contents, props changed) head/x11-themes/cursor-ardoise-theme/Makefile (contents, props changed) head/x11-themes/cursor-dmz-aa-theme/Makefile (contents, props changed) head/x11-themes/cursor-dmz-theme/Makefile (contents, props changed) Modified: head/games/blobwars/Makefile ============================================================================== --- head/games/blobwars/Makefile Wed Sep 28 06:08:49 2016 (r422849) +++ head/games/blobwars/Makefile Wed Sep 28 06:38:00 2016 (r422850) @@ -9,12 +9,9 @@ MASTER_SITES= SF/${PORTNAME}/ MAINTAINER= nemysis@FreeBSD.org COMMENT= Mission and Objective based 2D Platform Game -LICENSE= GPLv2+ CCbyNCSA3 -LICENSE_COMB= dual -LICENSE_NAME_CCbyNCSA3=Attribution-NonCommercial-ShareAlike 3.0 Unported -LICENSE_FILE= ${WRKSRC}/doc/license -LICENSE_TEXT_CCbyNCSA3=CC-BY 3.0 -LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror auto-accept +LICENSE= GPLv2+ CC-BY-3.0 CC-BY-SA-3.0 +LICENSE_COMB= multi +LICENSE_FILE_GPLv2+ = ${WRKSRC}/doc/license USES= gmake pkgconfig USE_SDL= image2 mixer2 net2 sdl2 ttf2 Modified: head/games/cataclysm-dda/Makefile ============================================================================== --- head/games/cataclysm-dda/Makefile Wed Sep 28 06:08:49 2016 (r422849) +++ head/games/cataclysm-dda/Makefile Wed Sep 28 06:38:00 2016 (r422850) @@ -9,10 +9,8 @@ CATEGORIES= games MAINTAINER= ports@FreeBSD.org COMMENT= Fork/variant of Cataclysm Roguelike by Whales -LICENSE= CCPL.BY-SA.30 -LICENSE_NAME= Creative Commons Attribution-ShareAlike 3.0 Unported License +LICENSE= CC-BY-SA-3.0 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= alias compiler:c++11-lib execinfo gmake shebangfix SHEBANG_FILES= lang/*.sh Modified: head/games/cretan-hubris/Makefile ============================================================================== --- head/games/cretan-hubris/Makefile Wed Sep 28 06:08:49 2016 (r422849) +++ head/games/cretan-hubris/Makefile Wed Sep 28 06:38:00 2016 (r422850) @@ -10,12 +10,9 @@ MASTER_SITES= SF/radius-engine/egp/ MAINTAINER= ports@FreeBSD.org COMMENT= Maze on the Isle of Crete -LICENSE= GPLv2 CCbyNCSA3 -LICENSE_COMB= dual -LICENSE_NAME_CCbyNCSA3=Attribution-NonCommercial-ShareAlike 3.0 Unported -LICENSE_FILE= ${WRKSRC}/License.txt -LICENSE_FILE_CCbyNCSA3=${WRKSRC}/License.txt -LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror auto-accept +LICENSE= GPLv2+ CC-BY-SA-3.0 +LICENSE_COMB= multi +LICENSE_FILE_GPLv2+ = ${WRKSRC}/License.txt BUILD_DEPENDS= ${LOCALBASE}/lib/libradius-engine.a:graphics/radius-engine LIB_DEPENDS= liblua-5.1.so:lang/lua51 \ Modified: head/games/epiar/Makefile ============================================================================== --- head/games/epiar/Makefile Wed Sep 28 06:08:49 2016 (r422849) +++ head/games/epiar/Makefile Wed Sep 28 06:38:00 2016 (r422850) @@ -9,11 +9,9 @@ CATEGORIES= games MAINTAINER= ports@FreeBSD.org COMMENT= Space trading/exploring sim with RPG elements -LICENSE= GPLv2 CCbyNCSA3 -LICENSE_COMB= dual -LICENSE_NAME_CCbyNCSA3=Attribution-NonCommercial-ShareAlike 3.0 Unported -LICENSE_FILE_CCbyNCSA3=${WRKSRC}/LICENSE.music -LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror auto-accept +LICENSE= GPLv2 CC-BY-NC-SA-3.0 +LICENSE_COMB= multi +LICENSE_FILE_CC-BY-NC-SA-3.0= ${WRKSRC}/LICENSE.music LIB_DEPENDS= libfreetype.so:print/freetype2 \ libftgl.so:graphics/ftgl \ Modified: head/games/fbg2/Makefile ============================================================================== --- head/games/fbg2/Makefile Wed Sep 28 06:08:49 2016 (r422849) +++ head/games/fbg2/Makefile Wed Sep 28 06:38:00 2016 (r422850) @@ -10,12 +10,9 @@ MASTER_SITES= SF/fbg/ MAINTAINER= ports@FreeBSD.org COMMENT= Classic block-stacking arcade game -LICENSE= GPLv2 CCbyNCSA3 -LICENSE_COMB= dual -LICENSE_NAME_CCbyNCSA3=Attribution-NonCommercial-ShareAlike 3.0 Unported -LICENSE_FILE= ${WRKSRC}/License.txt -LICENSE_FILE_CCbyNCSA3=${WRKSRC}/License.txt -LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror auto-accept +LICENSE= GPLv2+ CC-BY-SA-3.0 +LICENSE_COMB= multi +LICENSE_FILE_GPLv2+ = ${WRKSRC}/License.txt BUILD_DEPENDS= ${LOCALBASE}/lib/libradius-engine.a:graphics/radius-engine LIB_DEPENDS= liblua-5.1.so:lang/lua51 \ Modified: head/games/openalchemist/Makefile ============================================================================== --- head/games/openalchemist/Makefile Wed Sep 28 06:08:49 2016 (r422849) +++ head/games/openalchemist/Makefile Wed Sep 28 06:38:00 2016 (r422850) @@ -11,11 +11,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= martymac@FreeBSD.org COMMENT= Tetris-like game -LICENSE= GPLv2 CCbySA +LICENSE= GPLv2 CC-BY-SA-2.0 LICENSE_COMB= multi -LICENSE_NAME_CCbySA= Creative Commons Attribution-ShareAlike -LICENSE_FILE_CCbySA= ${WRKSRC}/GRAPHICS-LICENSE -LICENSE_PERMS_CCbySA= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept BUILD_DEPENDS= zip:archivers/zip LIB_DEPENDS= libclanCore.so:devel/clanlib1 \ Modified: head/games/opensurge/Makefile ============================================================================== --- head/games/opensurge/Makefile Wed Sep 28 06:08:49 2016 (r422849) +++ head/games/opensurge/Makefile Wed Sep 28 06:38:00 2016 (r422850) @@ -13,12 +13,10 @@ DISTFILES= ${PORTNAME}-src-build${SVN_RE MAINTAINER= nemysis@FreeBSD.org COMMENT= Game based on the Sonic the Hedgehog universe -LICENSE= GPLv2 CCbyNCSA3 -LICENSE_COMB= dual -LICENSE_NAME_CCbyNCSA3=Attribution-NonCommercial-ShareAlike 3.0 Unported -LICENSE_FILE= ${WRKSRC}/license.txt -LICENSE_FILE_CCbyNCSA3=${WRKSRC}/licenses/CC-BY-SA-3.0.txt -LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror auto-accept +LICENSE= GPLv2+ CC-BY-SA-3.0 +LICENSE_COMB= multi +LICENSE_FILE_GPLv2+ = ${WRKSRC}/licenses/GPLv2.txt +LICENSE_FILE_CC-BY-SA-3.0= ${WRKSRC}/licenses/CC-BY-SA-3.0.txt BUILD_DEPENDS= ${LOCALBASE}/lib/libaldmb.a:audio/dumb-allegro \ ${LOCALBASE}/include/alfont.h:x11-fonts/alfont \ Modified: head/games/plee-the-bear/Makefile ============================================================================== --- head/games/plee-the-bear/Makefile Wed Sep 28 06:08:49 2016 (r422849) +++ head/games/plee-the-bear/Makefile Wed Sep 28 06:38:00 2016 (r422850) @@ -10,11 +10,9 @@ MASTER_SITES= SF/${PORTNAME}/Plee%20the% MAINTAINER= amdmi3@FreeBSD.org COMMENT= 2D platform jump and run game -LICENSE= GPLv2 CCbySA3 -LICENSE_COMB= dual -LICENSE_NAME_CCbySA3= Attribution-ShareAlike 3.0 Unported -LICENSE_FILE_CCbySA3= ${WRKSRC}/CCPL -LICENSE_PERMS_CCbySA3= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +LICENSE= GPLv2 CC-BY-SA-3.0 +LICENSE_COMB= multi +LICENSE_FILE_CC-BY-SA-3.0= ${WRKSRC}/CCPL BUILD_DEPENDS= docbook-to-man:textproc/docbook-to-man LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ Modified: head/games/popstar/Makefile ============================================================================== --- head/games/popstar/Makefile Wed Sep 28 06:08:49 2016 (r422849) +++ head/games/popstar/Makefile Wed Sep 28 06:38:00 2016 (r422850) @@ -14,11 +14,9 @@ EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Simple puzzle game involving floating stars -LICENSE= GPLv2 CCbyNCSA3 -LICENSE_COMB= dual -LICENSE_NAME_CCbyNCSA3=Attribution-NonCommercial-ShareAlike 3.0 Unported -LICENSE_FILE_CCbyNCSA3=${WRKSRC}/docs/COPYING-CC-Attrib30.txt -LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror auto-accept +LICENSE= GPLv2+ CC-BY-SA-2.5 CC-BY-3.0 +LICENSE_COMB= multi +LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/docs/COPYING-CC-Attrib30.txt USES= gmake USE_SDL= image mixer sdl Modified: head/games/ufoai-data/Makefile ============================================================================== --- head/games/ufoai-data/Makefile Wed Sep 28 06:08:49 2016 (r422849) +++ head/games/ufoai-data/Makefile Wed Sep 28 06:38:00 2016 (r422850) @@ -14,11 +14,8 @@ MAINTAINER= m.tsatsenko@gmail.com COMMENT= UFO alien invasion data files # See http://ufoai.org/wiki/License -LICENSE= GPLv2 CCbySA3 +LICENSE= GPLv2 CC-BY-SA-3.0 LICENSE_COMB= multi -LICENSE_NAME_CCbySA3= Creative Commons Attribution-ShareAlike 3.0 Unported -LICENSE_TEXT_CCbySA3= See http://creativecommons.org/licenses/by-sa/3.0/ -LICENSE_PERMS_CCbySA3= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept EXTRACT_DEPENDS= ${UNZIP_CMD}:archivers/unzip Modified: head/science/py-pyaixi/Makefile ============================================================================== --- head/science/py-pyaixi/Makefile Wed Sep 28 06:08:49 2016 (r422849) +++ head/science/py-pyaixi/Makefile Wed Sep 28 06:38:00 2016 (r422850) @@ -10,11 +10,8 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= johannes@perceivon.net COMMENT= Implementation of the MC-AIXI-CTW AI algorithm -LICENSE= CCbySA -LICENSE_NAME= Creative Commons Attribution-ShareAlike 3.0 \ - Unported License +LICENSE= CC-BY-SA-3.0 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= dos2unix python:2 USE_PYTHON= distutils autoplist Modified: head/sysutils/amtc/Makefile ============================================================================== --- head/sysutils/amtc/Makefile Wed Sep 28 06:08:49 2016 (r422849) +++ head/sysutils/amtc/Makefile Wed Sep 28 06:38:00 2016 (r422850) @@ -7,10 +7,7 @@ CATEGORIES= sysutils MAINTAINER= tony.li@tony.li COMMENT= Threaded Intel AMT/vPro mass management tool -LICENSE= CC3.0 -LICENSE_NAME= Creative Commons Attribution 3.0 Unported -LICENSE_TEXT= http://creativecommons.org/licenses/by/3.0/ -LICENSE_PERMS= auto-accept pkg-sell pkg-mirror dist-sell dist-mirror +LICENSE= CC-BY-3.0 BUILD_DEPENDS= xxd:editors/vim-lite LIB_DEPENDS+= libgcrypt.so:security/libgcrypt \ Modified: head/textproc/nl-hunspell/Makefile ============================================================================== --- head/textproc/nl-hunspell/Makefile Wed Sep 28 06:08:49 2016 (r422849) +++ head/textproc/nl-hunspell/Makefile Wed Sep 28 06:38:00 2016 (r422850) @@ -13,11 +13,8 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= office@FreeBSD.org COMMENT= Dutch hunspell dictionaries -LICENSE= BSD2CLAUSE CCbyNCSA3 +LICENSE= BSD2CLAUSE CC-BY-3.0 LICENSE_COMB= dual -LICENSE_NAME_CCbyNCSA3=Attribution-NonCommercial-ShareAlike 3.0 Unported -LICENSE_TEXT_CCbyNCSA3=http://creativecommons.org/licenses/by/3.0/legalcode -LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror auto-accept NO_ARCH= yes NO_BUILD= yes Modified: head/www/lighttpd-mod_h264_streaming/Makefile ============================================================================== --- head/www/lighttpd-mod_h264_streaming/Makefile Wed Sep 28 06:08:49 2016 (r422849) +++ head/www/lighttpd-mod_h264_streaming/Makefile Wed Sep 28 06:38:00 2016 (r422850) @@ -8,11 +8,8 @@ DISTNAME= lighttpd-${PORTVERSION} COMMENT= H264 streaming module for lighttpd -LICENSE= CCPL.BY-NC-SA.30 -LICENSE_NAME= Creative Commons Attribution-NonCommercial-ShareAlike 3.0 \ - Unported License +LICENSE= CC-BY-NC-SA-3.0 LICENSE_FILE= ${FILESDIR}/COPYING.mod_h264_streaming -LICENSE_PERMS= dist-mirror pkg-mirror LICENSE_DISTFILES= ${PATCHFILES} BUILD_DEPENDS= ${LOCALBASE}/sbin/lighttpd:www/lighttpd Modified: head/www/pligg/Makefile ============================================================================== --- head/www/pligg/Makefile Wed Sep 28 06:08:49 2016 (r422849) +++ head/www/pligg/Makefile Wed Sep 28 06:38:00 2016 (r422850) @@ -9,10 +9,8 @@ CATEGORIES= www MAINTAINER= ports@FreeBSD.org COMMENT= Open Source Web2.0 CMS -LICENSE= CCA30 -LICENSE_NAME= Creative Commons Attribution 3.0 Unported Copyright +LICENSE= CC-BY-3.0 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= cpe CPE_PRODUCT= pligg_cms Modified: head/x11-themes/cursor-ardoise-theme/Makefile ============================================================================== --- head/x11-themes/cursor-ardoise-theme/Makefile Wed Sep 28 06:08:49 2016 (r422849) +++ head/x11-themes/cursor-ardoise-theme/Makefile Wed Sep 28 06:38:00 2016 (r422850) @@ -15,11 +15,7 @@ DIST_SUBDIR= ${PKGBASE}/${PORTVERSION} MAINTAINER= lightside@gmx.com COMMENT= Ardoise X cursor theme -LICENSE= CCBYNCSAv3 -LICENSE_NAME= Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported license -LICENSE_TEXT= The license: ${LICENSE} (${LICENSE_NAME}) is standard, please read from the web:\ - http://creativecommons.org/licenses/by-nc-sa/3.0/ -LICENSE_PERMS= dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept +LICENSE= CC-BY-NC-SA-3.0 NO_ARCH= yes NO_BUILD= yes Modified: head/x11-themes/cursor-dmz-aa-theme/Makefile ============================================================================== --- head/x11-themes/cursor-dmz-aa-theme/Makefile Wed Sep 28 06:08:49 2016 (r422849) +++ head/x11-themes/cursor-dmz-aa-theme/Makefile Wed Sep 28 06:38:00 2016 (r422850) @@ -9,10 +9,7 @@ DISTNAME= dmz-cursor-theme_${PORTVERSION MAINTAINER= ports@FreeBSD.org COMMENT= DMZ AA style neutral scalable cursor theme -LICENSE= CCbySA3 -LICENSE_NAME= Creative Commons Attribution-ShareAlike 3.0 Unported -LICENSE_TEXT= See http://creativecommons.org/licenses/by-sa/3.0/ -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +LICENSE= CC-BY-SA-3.0 BUILD_DEPENDS= xcursorgen:x11/xcursorgen Modified: head/x11-themes/cursor-dmz-theme/Makefile ============================================================================== --- head/x11-themes/cursor-dmz-theme/Makefile Wed Sep 28 06:08:49 2016 (r422849) +++ head/x11-themes/cursor-dmz-theme/Makefile Wed Sep 28 06:38:00 2016 (r422850) @@ -9,10 +9,7 @@ DISTNAME= dmz-cursor-theme_${PORTVERSION MAINTAINER= ports@FreeBSD.org COMMENT= DMZ style neutral scalable cursor theme -LICENSE= CCbySA3 -LICENSE_NAME= Creative Commons Attribution-ShareAlike 3.0 Unported -LICENSE_TEXT= See http://creativecommons.org/licenses/by-sa/3.0/ -LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +LICENSE= CC-BY-SA-3.0 BUILD_DEPENDS= xcursorgen:x11/xcursorgen
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609280638.u8S6c05u008619>