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

Approved by:	portmgr blanket

18 files changed, 18 insertions, 19 deletions

diff --git a/x11/docker-tray/Makefile b/x11/docker-tray/Makefile
index cf92f5e8e595..838a70ebb9ed 100644
--- a/x11/docker-tray/Makefile
+++ b/x11/docker-tray/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX=	-tray
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dockapp with support for GNOME2 and KDE3 tray icons
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_XORG=	x11
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index d298d7dedf90..7b76ce763ef6 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Anti-aliased font support for gtk+
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libXft.so:${PORTSDIR}/x11-fonts/libXft
diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile
index 30249915b67d..3c92e9c98e6d 100644
--- a/x11/gromit/Makefile
+++ b/x11/gromit/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.home.unix-ag.org/simon/gromit/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GRaphics Over Miscellaneous Objects (Gromit)
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		pkgconfig
diff --git a/x11/gskrab/Makefile b/x11/gskrab/Makefile
index fce165928bd2..1220b381dd8c 100644
--- a/x11/gskrab/Makefile
+++ b/x11/gskrab/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	GSKrab-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNUstep Keyboard Grabber
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gnustep
diff --git a/x11/multi-aterm/Makefile b/x11/multi-aterm/Makefile
index 72e63ca99011..2618b5597ea6 100644
--- a/x11/multi-aterm/Makefile
+++ b/x11/multi-aterm/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.nongnu.org/materm/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Multi terminal based on aterm
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_XORG=	xpm
diff --git a/x11/qxkb/Makefile b/x11/qxkb/Makefile
index 69939125eee9..2e71ceeec0ce 100644
--- a/x11/qxkb/Makefile
+++ b/x11/qxkb/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Qt4-based advanced keyboard layout switcher
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libxkbfile.so:${PORTSDIR}/x11/libxkbfile
 
diff --git a/x11/roxterm/Makefile b/x11/roxterm/Makefile
index f09f58b0eb9f..8351883c47cb 100644
--- a/x11/roxterm/Makefile
+++ b/x11/roxterm/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK+ terminal emulator with tabs
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lockfile>0:${PORTSDIR}/devel/py-lockfile \
diff --git a/x11/simdock/Makefile b/x11/simdock/Makefile
index 28e8a92a3c83..4726f2562bf9 100644
--- a/x11/simdock/Makefile
+++ b/x11/simdock/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fast and customizable dockbar
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
diff --git a/x11/temperature.app/Makefile b/x11/temperature.app/Makefile
index 7c0476d07a0b..606525f03d16 100644
--- a/x11/temperature.app/Makefile
+++ b/x11/temperature.app/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	Temperature.app-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dockable WindowMaker applet which displays the local temperature
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
diff --git a/x11/wmappl/Makefile b/x11/wmappl/Makefile
index cdcf2c65ec55..616bef6323ed 100644
--- a/x11/wmappl/Makefile
+++ b/x11/wmappl/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Application launcher dockapp similar to wmbutton
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_XORG=	ice sm x11 xext xpm
diff --git a/x11/wmdrawer/Makefile b/x11/wmdrawer/Makefile
index 76eaa59622ef..537e772c0d0d 100644
--- a/x11/wmdrawer/Makefile
+++ b/x11/wmdrawer/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://people.easter-eggs.org/~valos/wmdrawer/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dockapp which provides a drawer to launch applications
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 USES=		gmake pkgconfig
 USE_GNOME=	gdkpixbuf2
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index 546c7b7447c1..9d8f038042da 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	RSI prevention tool
 
-LICENSE=	GPLv3 # (or later)
+LICENSE=	GPLv3+
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>0:${PORTSDIR}/devel/py-cheetah
 LIB_DEPENDS=	libgdome.so:${PORTSDIR}/textproc/gdome2
diff --git a/x11/xcalib/Makefile b/x11/xcalib/Makefile
index 7d8053a476f6..3b0da944cd25 100644
--- a/x11/xcalib/Makefile
+++ b/x11/xcalib/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}-source-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Program for display calibration of X11-Servers with ICC profiles
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake
diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile
index aeb8b15cbd87..8780cf977ca9 100644
--- a/x11/xcolorsel/Makefile
+++ b/x11/xcolorsel/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X utility to translate rgb values into X color names
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/01-COPYING
 
 LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
diff --git a/x11/xtermcontrol/Makefile b/x11/xtermcontrol/Makefile
index 656b1b9f1400..ced59f012318 100644
--- a/x11/xtermcontrol/Makefile
+++ b/x11/xtermcontrol/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.thrysoee.dk/xtermcontrol/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for dynamic control of xterm properties
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 RUN_DEPENDS=	xterm:${PORTSDIR}/x11/xterm
 
diff --git a/x11/xtrlock/Makefile b/x11/xtrlock/Makefile
index 1e5825c99862..01329c874691 100644
--- a/x11/xtrlock/Makefile
+++ b/x11/xtrlock/Makefile
@@ -11,8 +11,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	freebsd@skysmurf.nl
 COMMENT=	X Transparent Lock
 
-LICENSE=	GPLv2 GPLv3	# GPLv2 or later
-LICENSE_COMB=	dual
+LICENSE=	GPLv2+
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/x11/xvkbd/Makefile b/x11/xvkbd/Makefile
index a563ac767d35..98de0568334f 100644
--- a/x11/xvkbd/Makefile
+++ b/x11/xvkbd/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://homepage3.nifty.com/tsato/xvkbd/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Virtual keyboard for X applications
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 USES=		imake
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
diff --git a/x11/yeahconsole/Makefile b/x11/yeahconsole/Makefile
index 8356c638c580..a384d23322b5 100644
--- a/x11/yeahconsole/Makefile
+++ b/x11/yeahconsole/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://phrat.de/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Terminal wrapper for creating drop-down consoles
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_XORG=	x11