29 files changed, 29 insertions, 29 deletions

diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile
index e4a913205da1..a36552d052f7 100644
--- a/sysutils/accountsservice/Makefile
+++ b/sysutils/accountsservice/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.freedesktop.org/software/${PORTNAME}/
 MAINTAINER=	kwm@FreeBSD.org
 COMMENT=	D-Bus interface for user account query and manipulation
 
-LICENSE=	GPLv3 # or later
+LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
diff --git a/sysutils/batmon/Makefile b/sysutils/batmon/Makefile
index 2f59a3975384..243fa75ef0d2 100644
--- a/sysutils/batmon/Makefile
+++ b/sysutils/batmon/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	SAVANNAH/gap
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNUstep battery monitor for laptops
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 
 USES=		gnustep
 USE_GNUSTEP=	back build
diff --git a/sysutils/ccd2iso/Makefile b/sysutils/ccd2iso/Makefile
index 7440713f2175..eaf588ac9ff7 100644
--- a/sysutils/ccd2iso/Makefile
+++ b/sysutils/ccd2iso/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	CloneCD to ISO converter
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 PLIST_FILES=	bin/ccd2iso
diff --git a/sysutils/cdargs/Makefile b/sysutils/cdargs/Makefile
index 5bd1039d20d5..d7a4dba26214 100644
--- a/sysutils/cdargs/Makefile
+++ b/sysutils/cdargs/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.skamphausen.de/downloads/cdargs/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Navigate the filesystem using a menu interface or a bookmark system
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
diff --git a/sysutils/cramfs/Makefile b/sysutils/cramfs/Makefile
index 73638ea961a2..24ad15f3671a 100644
--- a/sysutils/cramfs/Makefile
+++ b/sysutils/cramfs/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Linux Compressed ROM FileSystem
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake
diff --git a/sysutils/dar/Makefile b/sysutils/dar/Makefile
index 4a9f37aec886..d6fa9ec51cba 100644
--- a/sysutils/dar/Makefile
+++ b/sysutils/dar/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Command-line backup tool, aimed for disks
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 USES=		compiler:c++11-lang libtool shebangfix
 SHEBANG_FILES=	doc/samples/dar_backup doc/samples/*.bash doc/samples/*.sh
diff --git a/sysutils/dim/Makefile b/sysutils/dim/Makefile
index ea2b3e38aa85..6a8b3212623b 100644
--- a/sysutils/dim/Makefile
+++ b/sysutils/dim/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tar
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Directory lister which sorts the file list in 2D
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
diff --git a/sysutils/dirdiff/Makefile b/sysutils/dirdiff/Makefile
index 28949bead8d4..532d131c1005 100644
--- a/sysutils/dirdiff/Makefile
+++ b/sysutils/dirdiff/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	ftp://ftp.samba.org/pub/paulus/
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Graphical diff tool
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES+=		tk
diff --git a/sysutils/fusefs-mp3fs/Makefile b/sysutils/fusefs-mp3fs/Makefile
index e0edce0e6dea..f6de6fa1cd76 100644
--- a/sysutils/fusefs-mp3fs/Makefile
+++ b/sysutils/fusefs-mp3fs/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	fusefs-
 MAINTAINER=	stefan.rumetshofer@drei.at
 COMMENT=	FUSE-based filesystem for transcoding flac to mp3 on the fly
 
-LICENSE=	GPLv3 # or later
+LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame \
diff --git a/sysutils/fusefs-simple-mtpfs/Makefile b/sysutils/fusefs-simple-mtpfs/Makefile
index 17d396fc8716..e70a72fd39b9 100644
--- a/sysutils/fusefs-simple-mtpfs/Makefile
+++ b/sysutils/fusefs-simple-mtpfs/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX=	fusefs-
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Simple MTP fuse filesystem driver
 
-LICENSE=	GPLv2 # or any later version
+LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libmtp.so:${PORTSDIR}/multimedia/libmtp
 
diff --git a/sysutils/gaffitter/Makefile b/sysutils/gaffitter/Makefile
index f2bf1256e083..923497d40b07 100644
--- a/sysutils/gaffitter/Makefile
+++ b/sysutils/gaffitter/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Binary packing utility that uses a genetic algorithm
 
-LICENSE=	GPLv3 # or later
+LICENSE=	GPLv3+
 
 USES=		gmake tar:bzip2	# parallel builds (-jX) are broken with BSD make(1)
 
diff --git a/sysutils/gosa/Makefile b/sysutils/gosa/Makefile
index 1f7303c6f101..fcc5d287340d 100644
--- a/sysutils/gosa/Makefile
+++ b/sysutils/gosa/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://oss.gonicus.de/pub/gosa/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Web Based LDAP Administration Program
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	p5-Crypt-SmbHash>=0.12:${PORTSDIR}/security/p5-Crypt-SmbHash \
diff --git a/sysutils/gtk-imonc/Makefile b/sysutils/gtk-imonc/Makefile
index 0649549926da..c0d020a4ea63 100644
--- a/sysutils/gtk-imonc/Makefile
+++ b/sysutils/gtk-imonc/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://stefan-strigler.de/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK2-based imond-client to control an on(e) disc fli4l router
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 GNU_CONFIGURE=	yes
 USES=		pkgconfig gettext iconv
diff --git a/sysutils/knutclient-kde4/Makefile b/sysutils/knutclient-kde4/Makefile
index 11ae0ff54a51..a2dc5e2259e6 100644
--- a/sysutils/knutclient-kde4/Makefile
+++ b/sysutils/knutclient-kde4/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.buzuluk.cz/pub/alo/knutclient/stable/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Visual client for UPS system NUT
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libqimageblitz.so:${PORTSDIR}/x11/qimageblitz
diff --git a/sysutils/loganalyzer/Makefile b/sysutils/loganalyzer/Makefile
index 00b4c90d8d29..c46a830c7bf3 100644
--- a/sysutils/loganalyzer/Makefile
+++ b/sysutils/loganalyzer/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://download.adiscon.com/loganalyzer/
 MAINTAINER=	cristianorolim@outlook.com
 COMMENT=	Web based Syslog browsing and analysis
 
-LICENSE=	GPLv3 # or later
+LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 DEPRECATED=	PHP 5.4 EOL reached
diff --git a/sysutils/mdf2iso/Makefile b/sysutils/mdf2iso/Makefile
index 8b76038bee99..ceae53477ce6 100644
--- a/sysutils/mdf2iso/Makefile
+++ b/sysutils/mdf2iso/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://BSDforge.com/projects/source/sysutils/mdf2iso/
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Alcohol 120% to ISO converter
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 USES=		tar:xz
 
diff --git a/sysutils/nitrogen/Makefile b/sysutils/nitrogen/Makefile
index 49206f5ebf3e..d775f3588746 100644
--- a/sysutils/nitrogen/Makefile
+++ b/sysutils/nitrogen/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://projects.l3ib.org/nitrogen/files/
 MAINTAINER=	corentin@ralite.com
 COMMENT=	Background browser and setter for X windows
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 RUN_DEPENDS=	gnome-icon-theme>0:${PORTSDIR}/misc/gnome-icon-theme \
diff --git a/sysutils/ntfsprogs/Makefile b/sysutils/ntfsprogs/Makefile
index b9f09afc5ff9..34a8e1444ee9 100644
--- a/sysutils/ntfsprogs/Makefile
+++ b/sysutils/ntfsprogs/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/linux-ntfs/NTFS%20Tools%20and%20Library/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities and library to manipulate NTFS partitions
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 DEPRECATED=	Superseded by sysutils/fusefs-ntfs
diff --git a/sysutils/pacman/Makefile b/sysutils/pacman/Makefile
index 032d64c972b9..e9fe82bc6be8 100644
--- a/sysutils/pacman/Makefile
+++ b/sysutils/pacman/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	ftp://ftp.archlinux.org/other/pacman/ \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Package manager from ArchLinux
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
diff --git a/sysutils/pipemeter/Makefile b/sysutils/pipemeter/Makefile
index 4fc5f4229049..0e1045342a54 100644
--- a/sysutils/pipemeter/Makefile
+++ b/sysutils/pipemeter/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://launchpadlibrarian.net/57215122/ \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Tool for displaying pipe status information
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 GNU_CONFIGURE=	yes
diff --git a/sysutils/powerman/Makefile b/sysutils/powerman/Makefile
index 5edff3c6d5a2..4ba7e379b113 100644
--- a/sysutils/powerman/Makefile
+++ b/sysutils/powerman/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	https://github.com/chaos/powerman/releases/download/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for doing remote power control
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
diff --git a/sysutils/procenv/Makefile b/sysutils/procenv/Makefile
index 8db50d73823e..8fcd098dbab2 100644
--- a/sysutils/procenv/Makefile
+++ b/sysutils/procenv/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	https://launchpad.net/procenv/trunk/${PORTVERSION}/+download/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utility to show process environment
 
-LICENSE=	GPLv3 # or later
+LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	xmlwf:${PORTSDIR}/textproc/expat2
diff --git a/sysutils/rdiff-backup-devel/Makefile b/sysutils/rdiff-backup-devel/Makefile
index d7fe2a3030ab..770a72df7e4d 100644
--- a/sysutils/rdiff-backup-devel/Makefile
+++ b/sysutils/rdiff-backup-devel/Makefile
@@ -12,7 +12,7 @@ PKGNAMESUFFIX=	-devel
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Local/remote mirroring+incremental backup
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	librsync.so:${PORTSDIR}/net/librsync
diff --git a/sysutils/rsyncbackup/Makefile b/sysutils/rsyncbackup/Makefile
index 2fc4113ca493..b201688e3b8c 100644
--- a/sysutils/rsyncbackup/Makefile
+++ b/sysutils/rsyncbackup/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	rsyncbackup
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Rsync frontend written in Perl
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 
 RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync
 
diff --git a/sysutils/searchmonkey/Makefile b/sysutils/searchmonkey/Makefile
index ee8b321e004c..03280e297f96 100644
--- a/sysutils/searchmonkey/Makefile
+++ b/sysutils/searchmonkey/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}_v${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Search using regexes for file names and text
 
-LICENSE=	GPLv3 # (or later)
+LICENSE=	GPLv3+
 
 USES=		qmake dos2unix zip
 DOS2UNIX_GLOB=	*.cpp *.h
diff --git a/sysutils/toshctl/Makefile b/sysutils/toshctl/Makefile
index 01a078c643ab..59e418afd779 100644
--- a/sysutils/toshctl/Makefile
+++ b/sysutils/toshctl/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://freebie.miraclenet.co.th/notebook/toshctl/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command-line tool to access parts of the Toshiba hardware interface
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 WRKSRC=		${WRKDIR}/toshctl
 
diff --git a/sysutils/unieject/Makefile b/sysutils/unieject/Makefile
index 6f701eaa7eb2..dfc45a540b91 100644
--- a/sysutils/unieject/Makefile
+++ b/sysutils/unieject/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Eject(1) replacement
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libconfuse.so:${PORTSDIR}/devel/libconfuse \
diff --git a/sysutils/wmmemload/Makefile b/sysutils/wmmemload/Makefile
index f7336f20cacc..dd40d7fa55a5 100644
--- a/sysutils/wmmemload/Makefile
+++ b/sysutils/wmmemload/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	https://dev.gentoo.org/~voyageur/distfiles/
 MAINTAINER=	mbeis@xs4all.nl
 COMMENT=	Dockapp for monitoring memory and swap usage
 
-LICENSE=	GPLv2 # or any later version
+LICENSE=	GPLv2+
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf
diff --git a/sysutils/xbattbar/Makefile b/sysutils/xbattbar/Makefile
index ce26d5a47f38..63ee8a509eae 100644
--- a/sysutils/xbattbar/Makefile
+++ b/sysutils/xbattbar/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple battery meter
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		imake