Convert LICENSE= "GPLxx # or later" to "GPLxx+"

Approved by:	portmgr blanket

27 files changed, 27 insertions, 27 deletions

diff --git a/misc/apparix/Makefile b/misc/apparix/Makefile
index 9fc51c09be6e..53a6be70f96d 100644
--- a/misc/apparix/Makefile
+++ b/misc/apparix/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}-11-062
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Bookmark directories and apparate inside them
 
-LICENSE=	GPLv2 # or later (code says GPLv3 or later)
+LICENSE=	GPLv2+ # though code says GPLv3 or later
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index e5492c4545d9..5b3b909f3624 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Astrology program for X11 and alpha-numeric terminals
 
 # Swiss Ephemeris GPLv2 licensed, see
 # http://www.astro.com/ftp/swisseph/LICENSE.TXT
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 EPHE=		sweph_00.tar.gz:ephe sweph_06.tar.gz:ephe \
 		sweph_12.tar.gz:ephe sweph_18.tar.gz:ephe \
diff --git a/misc/bb/Makefile b/misc/bb/Makefile
index eabfc3b78d2c..34976dbc592c 100644
--- a/misc/bb/Makefile
+++ b/misc/bb/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/aa-project/${PORTNAME}/${DISTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High quality audio-visual demonstration for text terminal
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libaa.so:${PORTSDIR}/graphics/aalib \
diff --git a/misc/cmatrix/Makefile b/misc/cmatrix/Makefile
index f5bf4902985b..d32889a4fa82 100644
--- a/misc/cmatrix/Makefile
+++ b/misc/cmatrix/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Show a scrolling 'Matrix' like screen
 
-LICENSE=	GPLv1 # or later; COPYING is GPLv2
+LICENSE=	GPLv1+ # though COPYING is GPLv2
 
 USES=		gmake
 GNU_CONFIGURE=	yes
diff --git a/misc/colortail/Makefile b/misc/colortail/Makefile
index 69a0ff0ad1f4..763c562f63fa 100644
--- a/misc/colortail/Makefile
+++ b/misc/colortail/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://joakimandersson.se/files/
 MAINTAINER=	tabthorpe@FreeBSD.org
 COMMENT=	tail(1) replacement with color support
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
diff --git a/misc/cs/Makefile b/misc/cs/Makefile
index 1b6bdd33e5f9..a9c09ed04626 100644
--- a/misc/cs/Makefile
+++ b/misc/cs/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://njhurst.com/programming/cross-stitch/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cross Stitch software
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
 
diff --git a/misc/dtach/Makefile b/misc/dtach/Makefile
index 679f28a6793c..29115d9622cd 100644
--- a/misc/dtach/Makefile
+++ b/misc/dtach/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Emulates the detach feature of screen
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
diff --git a/misc/dvorak7min/Makefile b/misc/dvorak7min/Makefile
index 5751e4dd67e4..8fa71a32c829 100644
--- a/misc/dvorak7min/Makefile
+++ b/misc/dvorak7min/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}_${DISTVERSION}${DISTVERSIONSUFFIX}.orig
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ncurses-based Dvorak typing tutor
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/misc/dvorakng/Makefile b/misc/dvorakng/Makefile
index 65c5082f84c5..fd826abd6b6f 100644
--- a/misc/dvorakng/Makefile
+++ b/misc/dvorakng/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.free.of.pl/n/nopik/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dvorak typing tutor
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		tar:bzip2
diff --git a/misc/fxload/Makefile b/misc/fxload/Makefile
index c662910f1f35..a6e92b5b7d39 100644
--- a/misc/fxload/Makefile
+++ b/misc/fxload/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	uffe@uffe.org
 COMMENT=	Firmware download for Cypress EZ-USB devices
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake
diff --git a/misc/geekcode/Makefile b/misc/geekcode/Makefile
index 02863f4f3c56..74ab62c402ca 100644
--- a/misc/geekcode/Makefile
+++ b/misc/geekcode/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Geek Code Generator
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
diff --git a/misc/gkrellmlaunch2/Makefile b/misc/gkrellmlaunch2/Makefile
index 59a36f3ade0a..6110f118e85b 100644
--- a/misc/gkrellmlaunch2/Makefile
+++ b/misc/gkrellmlaunch2/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX=	2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Application launcher plugin for GKrellM2
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	gkrellm2>0:${PORTSDIR}/sysutils/gkrellm2
 RUN_DEPENDS=	gkrellm2>0:${PORTSDIR}/sysutils/gkrellm2
diff --git a/misc/gkrellweather2/Makefile b/misc/gkrellweather2/Makefile
index e566eb55e918..3711b603a361 100644
--- a/misc/gkrellweather2/Makefile
+++ b/misc/gkrellweather2/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	https://sites.google.com/site/makovick/projects/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Weather plugin for GKrellM
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
diff --git a/misc/hello/Makefile b/misc/hello/Makefile
index ad507444a851..ccc9e084bfb9 100644
--- a/misc/hello/Makefile
+++ b/misc/hello/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	GNU
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utility for saying hello to the world and reading email
 
-LICENSE=	GPLv3 # (or later)
+LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		charsetfix gmake perl5
diff --git a/misc/hotkeys/Makefile b/misc/hotkeys/Makefile
index 4a1c42f578cf..6a6b34924445 100644
--- a/misc/hotkeys/Makefile
+++ b/misc/hotkeys/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	hotkeys_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Allows usage of special keys on internet/multimedia keyboards
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
diff --git a/misc/kcd/Makefile b/misc/kcd/Makefile
index e41e50c1cce8..b774bf499d55 100644
--- a/misc/kcd/Makefile
+++ b/misc/kcd/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Change directory in full-screen visual mode
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gettext ncurses perl5
diff --git a/misc/linm/Makefile b/misc/linm/Makefile
index 7db8092cd842..35f274e9c4c9 100644
--- a/misc/linm/Makefile
+++ b/misc/linm/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}_${DISTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Clone of Mdir, mc-style terminal file manager
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gettext pkgconfig gmake libtool
diff --git a/misc/lv/Makefile b/misc/lv/Makefile
index 9b228dfbcd7f..e61ce416f5ea 100644
--- a/misc/lv/Makefile
+++ b/misc/lv/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	lv451
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Powerful Multilingual File Viewer
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/../GPL.txt
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
diff --git a/misc/mc-light/Makefile b/misc/mc-light/Makefile
index ef2db5507dcf..3b3dc9742d0f 100644
--- a/misc/mc-light/Makefile
+++ b/misc/mc-light/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	mc-${PORTVERSION:S/.p9/-pre9/}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lightweight Midnight Commander clone
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
diff --git a/misc/metalink-checker/Makefile b/misc/metalink-checker/Makefile
index 61df02398c7a..1689c85bc411 100644
--- a/misc/metalink-checker/Makefile
+++ b/misc/metalink-checker/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	checker-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python script to check metalink files and complete a basic download
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 
 USES=		dos2unix python
 NO_BUILD=	yes
diff --git a/misc/metalink-editor/Makefile b/misc/metalink-editor/Makefile
index 7aefc5e052ae..806908ce19ba 100644
--- a/misc/metalink-editor/Makefile
+++ b/misc/metalink-editor/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}editor-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GUI editor to create and edit metalinks
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/license.txt
 
 USES=		dos2unix python zip
diff --git a/misc/metalink-tools/Makefile b/misc/metalink-tools/Makefile
index 44096b197101..f96a99d0b62b 100644
--- a/misc/metalink-tools/Makefile
+++ b/misc/metalink-tools/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX?=	-tools
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Metalink generation tool
 
-LICENSE=	GPLv3 # or later
+LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
diff --git a/misc/nut/Makefile b/misc/nut/Makefile
index a2d8a0fb9888..20500282f27b 100644
--- a/misc/nut/Makefile
+++ b/misc/nut/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	health-
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Nutrition software to record what you eat
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		gmake
diff --git a/misc/pastebinit/Makefile b/misc/pastebinit/Makefile
index 766dc9a9a7f0..ef27e64be2c9 100644
--- a/misc/pastebinit/Makefile
+++ b/misc/pastebinit/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	https://launchpad.net/pastebinit/trunk/${PORTVERSION}/+download/
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Command line utility for pastebing
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}configobj>=4.3.2:${PORTSDIR}/devel/py-configobj
diff --git a/misc/upclient/Makefile b/misc/upclient/Makefile
index 5a7acd82d435..42f63d081d4d 100644
--- a/misc/upclient/Makefile
+++ b/misc/upclient/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Uptimes project client
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gettext
diff --git a/misc/xdelta/Makefile b/misc/xdelta/Makefile
index 20258dfd03fa..a3dda627e748 100644
--- a/misc/xdelta/Makefile
+++ b/misc/xdelta/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Diff/patch utility for binary files
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		libtool pkgconfig
diff --git a/misc/xdelta3/Makefile b/misc/xdelta3/Makefile
index 2fe307a652ec..3b6c2ee1250a 100644
--- a/misc/xdelta3/Makefile
+++ b/misc/xdelta3/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}3-${PORTVERSION}
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	Open-source binary diff, VCDIFF/RFC 3284 delta compression
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 GNU_CONFIGURE=	yes