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

10 files changed, 25 insertions, 50 deletions

diff --git a/games/blobwars/Makefile b/games/blobwars/Makefile
index 76d7bbdaa2f2..fa7feaed7f1b 100644
--- a/games/blobwars/Makefile
+++ b/games/blobwars/Makefile
@@ -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
diff --git a/games/cataclysm-dda/Makefile b/games/cataclysm-dda/Makefile
index 8b5a2bd33001..e2f6a0662798 100644
--- a/games/cataclysm-dda/Makefile
+++ b/games/cataclysm-dda/Makefile
@@ -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
diff --git a/games/cretan-hubris/Makefile b/games/cretan-hubris/Makefile
index 874f6b08eaf1..2ff16544add8 100644
--- a/games/cretan-hubris/Makefile
+++ b/games/cretan-hubris/Makefile
@@ -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 \
diff --git a/games/epiar/Makefile b/games/epiar/Makefile
index 6ee20beeed03..d6b34c25010d 100644
--- a/games/epiar/Makefile
+++ b/games/epiar/Makefile
@@ -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 \
diff --git a/games/fbg2/Makefile b/games/fbg2/Makefile
index 1ad6d77d2b9c..546864055058 100644
--- a/games/fbg2/Makefile
+++ b/games/fbg2/Makefile
@@ -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 \
diff --git a/games/openalchemist/Makefile b/games/openalchemist/Makefile
index 38f4cb89642e..65823b15d541 100644
--- a/games/openalchemist/Makefile
+++ b/games/openalchemist/Makefile
@@ -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 \
diff --git a/games/opensurge/Makefile b/games/opensurge/Makefile
index 556ad3891b4b..5375bc1172b8 100644
--- a/games/opensurge/Makefile
+++ b/games/opensurge/Makefile
@@ -13,12 +13,10 @@ DISTFILES=	${PORTNAME}-src-build${SVN_REV}${EXTRACT_SUFX} \
 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 \
diff --git a/games/plee-the-bear/Makefile b/games/plee-the-bear/Makefile
index 12a60d692c8c..9c0933dadf32 100644
--- a/games/plee-the-bear/Makefile
+++ b/games/plee-the-bear/Makefile
@@ -10,11 +10,9 @@ MASTER_SITES=	SF/${PORTNAME}/Plee%20the%20Bear/${PORTVERSION:R}
 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 \
diff --git a/games/popstar/Makefile b/games/popstar/Makefile
index dd3b9d3ca5ce..14c35605d5cc 100644
--- a/games/popstar/Makefile
+++ b/games/popstar/Makefile
@@ -14,11 +14,9 @@ EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 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
diff --git a/games/ufoai-data/Makefile b/games/ufoai-data/Makefile
index ca32ca1cbcb0..96403a3707fa 100644
--- a/games/ufoai-data/Makefile
+++ b/games/ufoai-data/Makefile
@@ -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