67 files changed, 67 insertions, 67 deletions

diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile
index b9119e145345..3953d32d396f 100644
--- a/audio/alsa-lib/Makefile
+++ b/audio/alsa-lib/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	ALSA/lib \
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	ALSA compatibility library
 
-LICENSE=	LGPL21 # or any later version
+LICENSE=	LGPL21+
 
 USES=		cpe libtool:keepla tar:bzip2
 USE_LDCONFIG=	yes
diff --git a/audio/alsa-plugins/Makefile b/audio/alsa-plugins/Makefile
index 1e08d990be41..d0a2be20d728 100644
--- a/audio/alsa-plugins/Makefile
+++ b/audio/alsa-plugins/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	ALSA/plugins \
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	ALSA compatibility library plugins
 
-LICENSE=	LGPL21 # or any later version
+LICENSE=	LGPL21+
 
 LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
 
diff --git a/audio/alsa-utils/Makefile b/audio/alsa-utils/Makefile
index 3b1c8c0dd089..71ecbd927fc1 100644
--- a/audio/alsa-utils/Makefile
+++ b/audio/alsa-utils/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	ALSA/utils \
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	ALSA compatibility utils
 
-LICENSE=	GPLv2 # or any later version
+LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
 RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
diff --git a/audio/aqualung/Makefile b/audio/aqualung/Makefile
index f67db9410e0a..4375b2cb4208 100644
--- a/audio/aqualung/Makefile
+++ b/audio/aqualung/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Music player with rich features
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
diff --git a/audio/ario/Makefile b/audio/ario/Makefile
index 3d6dd8fa1730..b733c449b310 100644
--- a/audio/ario/Makefile
+++ b/audio/ario/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/ario-player/ario-player/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Ario is a GTK2 client for MPD
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
diff --git a/audio/audiotag/Makefile b/audio/audiotag/Makefile
index bf26a88a65e0..10143fca0eb3 100644
--- a/audio/audiotag/Makefile
+++ b/audio/audiotag/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	GHC
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command-line tool for mass tagging/renaming of audio files
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GITHUB=	yes
diff --git a/audio/cddb-bundle/Makefile b/audio/cddb-bundle/Makefile
index 783f4af8d0d9..7886b1f758a4 100644
--- a/audio/cddb-bundle/Makefile
+++ b/audio/cddb-bundle/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	cdplayer-${CDPLAYER_VERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CDDB client bundle GNUstep
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		tar:bzip2 gnustep
diff --git a/audio/cuetools/Makefile b/audio/cuetools/Makefile
index fbe0c01d0b8e..adf445872897 100644
--- a/audio/cuetools/Makefile
+++ b/audio/cuetools/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	BERLIOS
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities for working with CUE and TOC files
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gmake
diff --git a/audio/cutmp3/Makefile b/audio/cutmp3/Makefile
index f765b961da7d..03e74d71258f 100644
--- a/audio/cutmp3/Makefile
+++ b/audio/cutmp3/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.puchalla-online.de/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small and fast command line MP3 editor
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		tar:bzip2 readline
diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
index dc135aa348c2..d19358d68399 100644
--- a/audio/darkice/Makefile
+++ b/audio/darkice/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	IceCast, IceCast2, and ShoutCast live audio streamer
 
-LICENSE=	GPLv3 # or later
+LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		autoreconf
diff --git a/audio/dir2ogg/Makefile b/audio/dir2ogg/Makefile
index 73351701b582..2f13095ba41c 100644
--- a/audio/dir2ogg/Makefile
+++ b/audio/dir2ogg/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://jak-linux.org/projects/dir2ogg/${PORTVERSION:R}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command-line {wav,mp3,m4a} to ogg converter
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	faad:${PORTSDIR}/audio/faad \
diff --git a/audio/enscribe/Makefile b/audio/enscribe/Makefile
index 96ddd713e8bb..f21da606df74 100644
--- a/audio/enscribe/Makefile
+++ b/audio/enscribe/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.coppercloudmusic.com/enscribe/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Create digital audio watermark images from photographic images
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
diff --git a/audio/gigedit/Makefile b/audio/gigedit/Makefile
index c61142a801ac..15c7c9ac6611 100644
--- a/audio/gigedit/Makefile
+++ b/audio/gigedit/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.linuxsampler.org/packages/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Instrument editor for gig files
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
diff --git a/audio/gmidimonitor/Makefile b/audio/gmidimonitor/Makefile
index e83e1d61a968..139782d9c0ff 100644
--- a/audio/gmidimonitor/Makefile
+++ b/audio/gmidimonitor/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.gna.org/gmidimonitor/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK+ application that shows MIDI events
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
diff --git a/audio/gmpc-alarm/Makefile b/audio/gmpc-alarm/Makefile
index 2c745191cb24..75a315f8d036 100644
--- a/audio/gmpc-alarm/Makefile
+++ b/audio/gmpc-alarm/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Alarm plugin for gmpc
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
diff --git a/audio/gmpc-discogs/Makefile b/audio/gmpc-discogs/Makefile
index 8e2db66d6126..040d86276f6f 100644
--- a/audio/gmpc-discogs/Makefile
+++ b/audio/gmpc-discogs/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Album Image fetcher for gmpc
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
diff --git a/audio/gmpc-extraplaylist/Makefile b/audio/gmpc-extraplaylist/Makefile
index 51e970311086..fdce6f031165 100644
--- a/audio/gmpc-extraplaylist/Makefile
+++ b/audio/gmpc-extraplaylist/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Favorites plugin for gmpc
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
diff --git a/audio/gmpc-lastfm/Makefile b/audio/gmpc-lastfm/Makefile
index 93f1418d887e..e587d6dbf50a 100644
--- a/audio/gmpc-lastfm/Makefile
+++ b/audio/gmpc-lastfm/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	gmpc-last-fm-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Last.FM metadata fetcher plugin for gmpc
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
diff --git a/audio/gmpc-libnotify/Makefile b/audio/gmpc-libnotify/Makefile
index 76c439aa769a..496059c4d029 100644
--- a/audio/gmpc-libnotify/Makefile
+++ b/audio/gmpc-libnotify/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Libnotify for gmpc
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd \
diff --git a/audio/gmpc-lyrics/Makefile b/audio/gmpc-lyrics/Makefile
index 6b626a1ae0e3..1d6889036110 100644
--- a/audio/gmpc-lyrics/Makefile
+++ b/audio/gmpc-lyrics/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lyrics Provider plugin for gmpc
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
diff --git a/audio/gmpc-lyricsplugin/Makefile b/audio/gmpc-lyricsplugin/Makefile
index f734fa98b6b3..b35cd978b813 100644
--- a/audio/gmpc-lyricsplugin/Makefile
+++ b/audio/gmpc-lyricsplugin/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fetch lyrics gmpc plugin
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gmpc.pc:${PORTSDIR}/audio/gmpc
diff --git a/audio/gmpc-lyricwiki/Makefile b/audio/gmpc-lyricwiki/Makefile
index 60fe347bfbac..03911c417f80 100644
--- a/audio/gmpc-lyricwiki/Makefile
+++ b/audio/gmpc-lyricwiki/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lyricswiki Provider plugin for gmpc
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
diff --git a/audio/gmpc-magnatune/Makefile b/audio/gmpc-magnatune/Makefile
index d47b922774d0..61896e767dc0 100644
--- a/audio/gmpc-magnatune/Makefile
+++ b/audio/gmpc-magnatune/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Magnatune plugin lets you preview music from Magnatune
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd \
diff --git a/audio/gmpc-mdcover/Makefile b/audio/gmpc-mdcover/Makefile
index fb6c1cb8384f..73fe0a4af6da 100644
--- a/audio/gmpc-mdcover/Makefile
+++ b/audio/gmpc-mdcover/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Collects metadata for gmpc
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd
diff --git a/audio/gmpc-mserver/Makefile b/audio/gmpc-mserver/Makefile
index c18de3efd6e7..2141fee45b5e 100644
--- a/audio/gmpc-mserver/Makefile
+++ b/audio/gmpc-mserver/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lets you stream music files to your mpd that are not in your database
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd \
diff --git a/audio/gmpc-shout/Makefile b/audio/gmpc-shout/Makefile
index 36f0f3ea04d7..0c69d26b053c 100644
--- a/audio/gmpc-shout/Makefile
+++ b/audio/gmpc-shout/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Shoutcast stream for gmpc
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd \
diff --git a/audio/gmpc-wikipedia/Makefile b/audio/gmpc-wikipedia/Makefile
index 5336f28b9895..043de2d81fdb 100644
--- a/audio/gmpc-wikipedia/Makefile
+++ b/audio/gmpc-wikipedia/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Wikipedia info for gmpc
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmpd.so:${PORTSDIR}/audio/libmpd \
diff --git a/audio/gnupod/Makefile b/audio/gnupod/Makefile
index 9df0f49db31a..cb4f7619304c 100644
--- a/audio/gnupod/Makefile
+++ b/audio/gnupod/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	SAVANNAH \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Set of Perl scripts for using an Apple iPod
 
-LICENSE=	GPLv3 # or later
+LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info \
diff --git a/audio/gnuspeechsa/Makefile b/audio/gnuspeechsa/Makefile
index b2f31ef3a6ff..05b72f9861f1 100644
--- a/audio/gnuspeechsa/Makefile
+++ b/audio/gnuspeechsa/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	GNU/gnuspeech
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Command line, or application-based speech output module of gnuspeech
 
-LICENSE=	GPLv3 # or later
+LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_FreeBSD_9=	does not build
diff --git a/audio/gnustep-cdplayer/Makefile b/audio/gnustep-cdplayer/Makefile
index 77ec7597ac68..40fe066da925 100644
--- a/audio/gnustep-cdplayer/Makefile
+++ b/audio/gnustep-cdplayer/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	gnustep-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNUstep CD player with CDDB support
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcdaudio.so:${PORTSDIR}/audio/libcdaudio \
diff --git a/audio/gogglesmm/Makefile b/audio/gogglesmm/Makefile
index 18e60ee00fc1..5411e841963d 100644
--- a/audio/gogglesmm/Makefile
+++ b/audio/gogglesmm/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	audio
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Music collection manager and player
 
-LICENSE=	GPLv3 # or later
+LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib \
diff --git a/audio/gtkguitune/Makefile b/audio/gtkguitune/Makefile
index 7c41c225dcd9..0220e4c10012 100644
--- a/audio/gtkguitune/Makefile
+++ b/audio/gtkguitune/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	GENTOO \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Guitar (and other instruments) tuner for GTK+2
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/audio/hexter/Makefile b/audio/hexter/Makefile
index af1d06751050..e30660285c12 100644
--- a/audio/hexter/Makefile
+++ b/audio/hexter/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/dssi/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DSSI softsynth that models the sound generation of a Yamaha DX7
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libdssialsacompat.so:${PORTSDIR}/audio/libdssialsacompat \
diff --git a/audio/ksmp3play/Makefile b/audio/ksmp3play/Makefile
index 4b858c9587e3..5dd2bcb6a8be 100644
--- a/audio/ksmp3play/Makefile
+++ b/audio/ksmp3play/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTVERSION:R}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Curses-based MP3 player
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
diff --git a/audio/libgme/Makefile b/audio/libgme/Makefile
index 9a42e623a560..e0d8a15cccf3 100644
--- a/audio/libgme/Makefile
+++ b/audio/libgme/Makefile
@@ -9,7 +9,7 @@ DISTNAME=	game-music-emu-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Collection of video game music emulators
 
-LICENSE=	LGPL21 # or later
+LICENSE=	LGPL21+
 
 USES=		cmake dos2unix ninja tar:bzip2
 USE_LDCONFIG=	yes
diff --git a/audio/liblscp/Makefile b/audio/liblscp/Makefile
index 5e0d7b0e3478..63d192337b2f 100644
--- a/audio/liblscp/Makefile
+++ b/audio/liblscp/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/qsampler/${PORTNAME}/${PORTVERSION} \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Wrapper around the LSCP network protocol
 
-LICENSE=	LGPL21 # (or later)
+LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		libtool pathfix tar:bzip2
diff --git a/audio/libmpd/Makefile b/audio/libmpd/Makefile
index 2f00bc96c2cb..f612a793a126 100644
--- a/audio/libmpd/Makefile
+++ b/audio/libmpd/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.sarine.nl/Programs/gmpc/${PORTVERSION:R}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Abstraction around libmpdclient
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		libtool pathfix pkgconfig
diff --git a/audio/libworkman/Makefile b/audio/libworkman/Makefile
index c3e2fde2ea2a..a76672501b5b 100644
--- a/audio/libworkman/Makefile
+++ b/audio/libworkman/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-1999-06-20
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Workman library required by some audio apps
 
-LICENSE=	LGPL20 # or later
+LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
 USES=		imake
diff --git a/audio/maplay/Makefile b/audio/maplay/Makefile
index aa4f100cd6a0..dc362873b0d6 100644
--- a/audio/maplay/Makefile
+++ b/audio/maplay/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/./_/}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MPEG audio player/decoder decoding layer I and II MPEG audio streams
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 NO_WRKSUBDIR=	yes
diff --git a/audio/mhwaveedit/Makefile b/audio/mhwaveedit/Makefile
index ffca404fbbb1..becafef93091 100644
--- a/audio/mhwaveedit/Makefile
+++ b/audio/mhwaveedit/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.gna.org/mhwaveedit/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical program for editing sound files
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		pathfix pkgconfig tar:bzip2
diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
index 57730e4c019c..cde1dc864507 100644
--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://downloads.mixxx.org/${PORTNAME}-${PORTVERSION}/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DJ mixing application
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
diff --git a/audio/moc/Makefile b/audio/moc/Makefile
index c5516c39a3c6..e2b6acb37067 100644
--- a/audio/moc/Makefile
+++ b/audio/moc/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://ftp.daper.net/pub/soft/moc/stable/
 MAINTAINER=	rzinkov@gmail.com
 COMMENT=	Console audio player designed to be powerful and easy to use
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libltdl.so:${PORTSDIR}/devel/libltdl
diff --git a/audio/mp3riot/Makefile b/audio/mp3riot/Makefile
index 665e892fc367..3c5f6d37afa5 100644
--- a/audio/mp3riot/Makefile
+++ b/audio/mp3riot/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.linuxsecure.de/f2html/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mp3riot creates mp3 playlists, HTML files, etc
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info
diff --git a/audio/musepack/Makefile b/audio/musepack/Makefile
index edbcdcb53bb2..20d08159927b 100644
--- a/audio/musepack/Makefile
+++ b/audio/musepack/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}_src_r475
 MAINTAINER=	shoesoft@gmx.net
 COMMENT=	Decoder, encoder, and replaygain for musepack (mpc)
 
-LICENSE=	BSD3CLAUSE GPLv2 LGPL21 #or later for the (L)GPL'ed part
+LICENSE=	BSD3CLAUSE GPLv2+ LGPL21+
 LICENSE_COMB=	multi
 
 USES=		autoreconf libtool
diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile
index 3fb0a277f067..b71e6cdc8c6c 100644
--- a/audio/ncmpc/Makefile
+++ b/audio/ncmpc/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://www.musicpd.org/download/ncmpc/0/
 MAINTAINER=	henrik@affekt.org
 COMMENT=	Ncurses client for the musicpd
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmpdclient.so:${PORTSDIR}/audio/libmpdclient
diff --git a/audio/nekobee/Makefile b/audio/nekobee/Makefile
index 30a8d4fca12a..dfdb9fd5f107 100644
--- a/audio/nekobee/Makefile
+++ b/audio/nekobee/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	audio
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DSSI plugin that emulates the sound of the TB-303 Bassline
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	${LOCALBASE}/include/dssi.h:${PORTSDIR}/audio/dssi
 LIB_DEPENDS=	libdssialsacompat.so:${PORTSDIR}/audio/libdssialsacompat \
diff --git a/audio/pacpl/Makefile b/audio/pacpl/Makefile
index 894b22abe75c..c8d1d4401a25 100644
--- a/audio/pacpl/Makefile
+++ b/audio/pacpl/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl Audio Converter
 
-LICENSE=	GPLv3 # (or later)
+LICENSE=	GPLv3+
 
 RUN_DEPENDS=	p5-Audio-FLAC-Header>0:${PORTSDIR}/audio/p5-Audio-FLAC-Header \
 		p5-Audio-Scan>0:${PORTSDIR}/audio/p5-Audio-Scan \
diff --git a/audio/patchage/Makefile b/audio/patchage/Makefile
index f7a4161460ed..17e384c24b53 100644
--- a/audio/patchage/Makefile
+++ b/audio/patchage/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://download.drobilla.net/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modular patch bay for Jack
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack \
diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index 044e81101c2a..5d7c5a8916a1 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	py${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python karaoke application (Plays CD+G, MP3+G, OGG+G files)
 
-LICENSE=	LGPL21 # (or later)
+LICENSE=	LGPL21+
 
 BUILD_DEPENDS=	${PYGAME}
 LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
diff --git a/audio/py-mad/Makefile b/audio/py-mad/Makefile
index fcd16cd4ebb9..ba0959fba2ee 100644
--- a/audio/py-mad/Makefile
+++ b/audio/py-mad/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python module that provides the MPEG Audio Decoder interface
 
-LICENSE=	LGPL20 # or later
+LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
diff --git a/audio/py-mpd2/Makefile b/audio/py-mpd2/Makefile
index c64598dc0013..5a9a1ad0cc2c 100644
--- a/audio/py-mpd2/Makefile
+++ b/audio/py-mpd2/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fork of the Python MPD client library
 
-LICENSE=	LGPL3 # or later
+LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USE_GITHUB=	yes
diff --git a/audio/py-openal/Makefile b/audio/py-openal/Makefile
index deeec24efb2d..6d14978495b4 100644
--- a/audio/py-openal/Makefile
+++ b/audio/py-openal/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	python
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	PyOpenAL is a binding of OpenAL for Python
 
-LICENSE=	LGPL21 # or later
+LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
diff --git a/audio/qsampler/Makefile b/audio/qsampler/Makefile
index 071e5e58fa14..9bdf697c27ba 100644
--- a/audio/qsampler/Makefile
+++ b/audio/qsampler/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Qt-based front end to LinuxSampler
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libgig.so:${PORTSDIR}/audio/libgig \
 		liblscp.so:${PORTSDIR}/audio/liblscp
diff --git a/audio/qsynth/Makefile b/audio/qsynth/Makefile
index fcb43c69a3f5..27d2c249784d 100644
--- a/audio/qsynth/Makefile
+++ b/audio/qsynth/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Qt fluidsynth front-end application
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 #LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
diff --git a/audio/quimup/Makefile b/audio/quimup/Makefile
index 06bf3d37f242..ae96114f89c5 100644
--- a/audio/quimup/Makefile
+++ b/audio/quimup/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}_src
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Qt4 client for MPD (the Music Player Daemon)
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libmpdclient.so:${PORTSDIR}/audio/libmpdclient \
 		libtag.so:${PORTSDIR}/audio/taglib
diff --git a/audio/raop_play/Makefile b/audio/raop_play/Makefile
index 620beba97805..c212a858ae0d 100644
--- a/audio/raop_play/Makefile
+++ b/audio/raop_play/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/raop-play/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Music file player for Apple Airport Express
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate \
diff --git a/audio/rawrec/Makefile b/audio/rawrec/Makefile
index 853534ce1703..d51004f06d12 100644
--- a/audio/rawrec/Makefile
+++ b/audio/rawrec/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	SUNSITE/apps/sound/recorders \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utility to record and playback raw audio data
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKDIR}/${DISTNAME}/copyright
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
diff --git a/audio/rioutil/Makefile b/audio/rioutil/Makefile
index 8d71e2b2e6eb..95669d7df1a7 100644
--- a/audio/rioutil/Makefile
+++ b/audio/rioutil/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Program to interface with the Rio600, Rio800, and psa[play devices
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		autoreconf gmake libtool
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index 7bc645edb2a9..89dea84fd15d 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	General purpose music editor and sequencer suite
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	dssi_osc_update:${PORTSDIR}/audio/dssi \
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index b342e547e8fe..20b9a82ed705 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://rplay.doit.org/dist/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Network audio player
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm
diff --git a/audio/sidplay/Makefile b/audio/sidplay/Makefile
index e90ce07554e9..1bddf73b347a 100644
--- a/audio/sidplay/Makefile
+++ b/audio/sidplay/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Commodore SID-chip emulator that plays SID music files
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libsidplay.so:${PORTSDIR}/audio/libsidplay
 
diff --git a/audio/slv2/Makefile b/audio/slv2/Makefile
index 381dc5259919..066d6526ced3 100644
--- a/audio/slv2/Makefile
+++ b/audio/slv2/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.drobilla.net/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	LV2 Application Support Library
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/lv2.h:${PORTSDIR}/audio/lv2core
diff --git a/audio/streamtranscoder/Makefile b/audio/streamtranscoder/Makefile
index a31d21b50781..543aae7d2ce3 100644
--- a/audio/streamtranscoder/Makefile
+++ b/audio/streamtranscoder/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://BSDforge.com/projects/source/audio/streamtranscoder/
 MAINTAINER=	mark@mkproductions.org
 COMMENT=	Transcode and stream audio to a SHOUTcast/Icecast/Peercast server
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg \
diff --git a/audio/timidity++/Makefile b/audio/timidity++/Makefile
index fe29146ccac0..3492f7dc822b 100644
--- a/audio/timidity++/Makefile
+++ b/audio/timidity++/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	TiMidity++-${PORTVERSION}
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	Software MIDI player
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 .if !defined(PKGNAMESUFFIX)
 LIB_DEPENDS=	libarc.so:${PORTSDIR}/archivers/libarc \
diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile
index 1c31c3c10497..090ebf49fcd2 100644
--- a/audio/timidity/Makefile
+++ b/audio/timidity/Makefile
@@ -13,7 +13,7 @@ COMMENT=	MIDI to PCM software synthesizer
 
 CONFLICTS=	timidity++-2.*
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		alias
diff --git a/audio/wavbreaker/Makefile b/audio/wavbreaker/Makefile
index 084e2c78a83f..4cf4b14779a6 100644
--- a/audio/wavbreaker/Makefile
+++ b/audio/wavbreaker/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Tool to split and merge wav files
 
-LICENSE=	GPLv2 # or any later version
+LICENSE=	GPLv2+
 
 OPTIONS_DEFINE=	PULSEAUDIO NLS
 OPTIONS_SUB=	yes
diff --git a/audio/ximp3/Makefile b/audio/ximp3/Makefile
index 598ff9cf474c..a6b47c25195a 100644
--- a/audio/ximp3/Makefile
+++ b/audio/ximp3/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SUNSITE/apps/sound/players/mp3
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Simple console MP3 player
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes