54 files changed, 54 insertions, 55 deletions

diff --git a/graphics/agave/Makefile b/graphics/agave/Makefile
index e89f3f02ed64..829537bc7246 100644
--- a/graphics/agave/Makefile
+++ b/graphics/agave/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://download.gna.org/colorscheme/releases/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Color scheme builder for the GNOME desktop
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libboost_thread.so:${PORTSDIR}/devel/boost-libs \
 		libglademm-2.4.so:${PORTSDIR}/devel/libglademm24
diff --git a/graphics/agg/Makefile b/graphics/agg/Makefile
index 67460a796309..2f7bffc90b2c 100644
--- a/graphics/agg/Makefile
+++ b/graphics/agg/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://distfiles.alpinelinux.org/distfiles/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	High Quality Rendering Engine for C++
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/copying
 
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
diff --git a/graphics/backfract/Makefile b/graphics/backfract/Makefile
index e3c6ea90bbd9..8b6b2e34f070 100644
--- a/graphics/backfract/Makefile
+++ b/graphics/backfract/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.igoweb.org/~wms/comp/backfract/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fractal image animated wallpaper program
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
diff --git a/graphics/camera/Makefile b/graphics/camera/Makefile
index 566c9b3671d0..d65b20199563 100644
--- a/graphics/camera/Makefile
+++ b/graphics/camera/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	Camera-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNUstep application for digital still cameras
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/Documentation/COPYING
 
 LIB_DEPENDS=	libgphoto2_port.so:${PORTSDIR}/graphics/libgphoto2
diff --git a/graphics/chbg/Makefile b/graphics/chbg/Makefile
index 92f6397effaf..45e3a4f29c4d 100644
--- a/graphics/chbg/Makefile
+++ b/graphics/chbg/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Change Background Picture with time period
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
diff --git a/graphics/comical/Makefile b/graphics/comical/Makefile
index a4b3c421881a..cd5bdcd1df1a 100644
--- a/graphics/comical/Makefile
+++ b/graphics/comical/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Sequential image viewer
 
 LIB_DEPENDS=	libunrar.so:${PORTSDIR}/archivers/libunrar
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 MAKE_JOBS_UNSAFE=	yes
diff --git a/graphics/darknock/Makefile b/graphics/darknock/Makefile
index 898687e44bb0..07ae3be3ef6d 100644
--- a/graphics/darknock/Makefile
+++ b/graphics/darknock/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Program that can detect edges in images
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/graphics/delaboratory/Makefile b/graphics/delaboratory/Makefile
index d6332fc3c56e..1db6e04584e5 100644
--- a/graphics/delaboratory/Makefile
+++ b/graphics/delaboratory/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Unique image postprocessing application
 
-LICENSE=	GPLv3 # or later
+LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		compiler:c++11-lib gmake
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index ad774caf41c7..baa84b8bd04e 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/djvu/DjVuLibre/${PORTVERSION:R}
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	DjVu base libraries and utilities
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
diff --git a/graphics/epix/Makefile b/graphics/epix/Makefile
index 73102cb1f57e..8eb9e34b12cd 100644
--- a/graphics/epix/Makefile
+++ b/graphics/epix/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	http://mathcs.holycross.edu/~ahwang/epix/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Creates math plots and line figures using easy-to-learn syntax
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 20fb3e45edc0..0cf4c719bcfe 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR=	gnome
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Graphic library for GTK+
 
-LICENSE=	LGPL20 # or later
+LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING.LIB
 
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index b4690061ada9..51f7426a7f29 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Graphic library for GTK+
 
-LICENSE=	LGPL20 # or later
+LICENSE=	LGPL20+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_XORG=	xt xi x11
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index 401ec7318765..eed767c2d7e5 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/gtkmmviewer/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yet another GTK+ based image viewer
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
diff --git a/graphics/gimp-beautify-plugin/Makefile b/graphics/gimp-beautify-plugin/Makefile
index 788921b8a9c3..b53449534282 100644
--- a/graphics/gimp-beautify-plugin/Makefile
+++ b/graphics/gimp-beautify-plugin/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX=	-plugin
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GIMP plug-ins to both quickly and easily beautify photo
 
-LICENSE=	GPLv3 # or later
+LICENSE=	GPLv3+
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/fontconfig.pc:${PORTSDIR}/x11-fonts/fontconfig \
 		${LOCALBASE}/libdata/pkgconfig/freetype2.pc:${PORTSDIR}/print/freetype2 \
diff --git a/graphics/gimp-lensfun-plugin/Makefile b/graphics/gimp-lensfun-plugin/Makefile
index eac81c8ed217..674a6978ab45 100644
--- a/graphics/gimp-lensfun-plugin/Makefile
+++ b/graphics/gimp-lensfun-plugin/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX=	-plugin
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gimp plugin to correct lens distortion using the lensfun library
 
-LICENSE=	GPLv3 # or later
+LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/exiv2.pc:${PORTSDIR}/graphics/exiv2 \
diff --git a/graphics/gimp-resynthesizer/Makefile b/graphics/gimp-resynthesizer/Makefile
index 13915624676a..5f22388e0b17 100644
--- a/graphics/gimp-resynthesizer/Makefile
+++ b/graphics/gimp-resynthesizer/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	gimp-
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Gimp plug-in for texture synthesis
 
-LICENSE=	GPLv2 # or later (COPYING has GPLv3)
+LICENSE=	GPLv2+ # though COPYING has GPLv3
 
 RUN_DEPENDS=	${LOCALBASE}/libexec/gimp/2.2/python/gimpfu.py:${PORTSDIR}/graphics/py-gimp
 BUILD_DEPENDS=	intltool-extract:${PORTSDIR}/textproc/intltool
diff --git a/graphics/gimp-wavelet-sharpen-plugin/Makefile b/graphics/gimp-wavelet-sharpen-plugin/Makefile
index 980f663b573d..0a7fda023221 100644
--- a/graphics/gimp-wavelet-sharpen-plugin/Makefile
+++ b/graphics/gimp-wavelet-sharpen-plugin/Makefile
@@ -12,7 +12,7 @@ PKGNAMESUFFIX=	-plugin
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GIMP plugin to sharpen by increasing contrast in high frequency space
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:${PORTSDIR}/graphics/gimp-app
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index fc22f5067e16..4f2f6462bfa2 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://freebsd.nsu.ru/distfiles/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	POV-Ray oriented modeller
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	lib3ds.so:${PORTSDIR}/graphics/lib3ds
diff --git a/graphics/gkrellkam2/Makefile b/graphics/gkrellkam2/Makefile
index 69ed49b732eb..6cf0dfb70b4a 100644
--- a/graphics/gkrellkam2/Makefile
+++ b/graphics/gkrellkam2/Makefile
@@ -12,7 +12,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GKrellM plugin that display thumbnails of periodically updated images
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	gkrellm2>0:${PORTSDIR}/sysutils/gkrellm2
 RUN_DEPENDS=	gkrellm2>0:${PORTSDIR}/sysutils/gkrellm2
diff --git a/graphics/gliv/Makefile b/graphics/gliv/Makefile
index 8c44f6a7781d..ffdb3c8cd7f0 100644
--- a/graphics/gliv/Makefile
+++ b/graphics/gliv/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://guichaz.free.fr/gliv/files/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Image viewer that uses Gdk-Pixbuf and OpenGL
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
diff --git a/graphics/gpsmanshp/Makefile b/graphics/gpsmanshp/Makefile
index 4b6aba6ab8a0..d110abd44799 100644
--- a/graphics/gpsmanshp/Makefile
+++ b/graphics/gpsmanshp/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Shapelib support for gpsman
 
-LICENSE=	GPLv3 # (or later)
+LICENSE=	GPLv3+
 
 LIB_DEPENDS=	libshp.so:${PORTSDIR}/devel/shapelib
 RUN_DEPENDS=	gpsman:${PORTSDIR}/astro/gpsman
diff --git a/graphics/graphopt/Makefile b/graphics/graphopt/Makefile
index 9f1036eca388..f57851a31afe 100644
--- a/graphics/graphopt/Makefile
+++ b/graphics/graphopt/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graph layout optimizer
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 10ee5240ec23..2ef65d211ef4 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Image viewer and browser for the GNOME 3 environment
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	gsettings-desktop-schemas>0:${PORTSDIR}/devel/gsettings-desktop-schemas \
 		itstool:${PORTSDIR}/textproc/itstool
diff --git a/graphics/gtimelapse/Makefile b/graphics/gtimelapse/Makefile
index 05677efde696..6fccde5831ea 100644
--- a/graphics/gtimelapse/Makefile
+++ b/graphics/gtimelapse/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/Relase	# yes, this is not a typo (here)
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Application for capturing images to generate timelapse videos
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
diff --git a/graphics/gtkam/Makefile b/graphics/gtkam/Makefile
index 6d9f9663f80c..328325436d16 100644
--- a/graphics/gtkam/Makefile
+++ b/graphics/gtkam/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/gphoto/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Download and view files from various digital cameras
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libexif-gtk.so:${PORTSDIR}/graphics/libexif-gtk \
 		libgphoto2.so:${PORTSDIR}/graphics/libgphoto2
diff --git a/graphics/import-pictures/Makefile b/graphics/import-pictures/Makefile
index 69402eb41fc6..235e1ac8cb73 100644
--- a/graphics/import-pictures/Makefile
+++ b/graphics/import-pictures/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Utility to copy/move pictures from a directory
 
 BROKEN=		unfetchable
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool \
diff --git a/graphics/ipe/Makefile b/graphics/ipe/Makefile
index 7c5714d9d149..2e2215bc339d 100644
--- a/graphics/ipe/Makefile
+++ b/graphics/ipe/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Extensible vector graphics editor with LaTeX support
 
 BROKEN=		unfetchable
 
-LICENSE=	GPLv3 # (or later)
+LICENSE=	GPLv3+
 
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils
 
diff --git a/graphics/laternamagica/Makefile b/graphics/laternamagica/Makefile
index ed70f122d83b..21d8a3f3d71a 100644
--- a/graphics/laternamagica/Makefile
+++ b/graphics/laternamagica/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	LaternaMagica-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Image viewer and slideshow application
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 
 USES=		gnustep
 USE_GNUSTEP=	back build
diff --git a/graphics/lib3ds/Makefile b/graphics/lib3ds/Makefile
index 32b0aa1d02d0..030fd6586fdf 100644
--- a/graphics/lib3ds/Makefile
+++ b/graphics/lib3ds/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for handling 3DS (3D Studio) files
 
-LICENSE=	LGPL21 # (or later)
+LICENSE=	LGPL21+
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/graphics/libafterimage/Makefile b/graphics/libafterimage/Makefile
index 0d5fea859689..4a8ca5cc864c 100644
--- a/graphics/libafterimage/Makefile
+++ b/graphics/libafterimage/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	libAfterImage-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generic imaging library originally designed for AfterStep
 
-LICENSE=	LGPL21 # or later
+LICENSE=	LGPL21+
 
 LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib \
 		libpng.so:${PORTSDIR}/graphics/png \
diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile
index f23eba3a55f4..410bd098e897 100644
--- a/graphics/libpano13/Makefile
+++ b/graphics/libpano13/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/panotools/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	grog@FreeBSD.org
 COMMENT=	Cross-platform library behind Panorama Tools and other photo stitchers
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng16.so:${PORTSDIR}/graphics/png \
diff --git a/graphics/libpcd/Makefile b/graphics/libpcd/Makefile
index 5e7d209592c2..fc9ebc796354 100644
--- a/graphics/libpcd/Makefile
+++ b/graphics/libpcd/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for reading PhotoCD images
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 
diff --git a/graphics/libprojectm/Makefile b/graphics/libprojectm/Makefile
index f65240ff3f9d..3aafc865d733 100644
--- a/graphics/libprojectm/Makefile
+++ b/graphics/libprojectm/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	${PORTNAME:S/lib//}-${DISTVERSION}-Source
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Awesome music visualiser
 
-LICENSE=	LGPL21 # or later
+LICENSE=	LGPL21+
 
 LIB_DEPENDS=	libftgl.so:${PORTSDIR}/graphics/ftgl \
 		libfreetype.so:${PORTSDIR}/print/freetype2
diff --git a/graphics/libspiro/Makefile b/graphics/libspiro/Makefile
index 6daabdd65d62..898b7d401c45 100644
--- a/graphics/libspiro/Makefile
+++ b/graphics/libspiro/Makefile
@@ -9,7 +9,7 @@ CATEGORIES=	graphics
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Library to convert clothoid splines into Bezier splines
 
-LICENSE=	GPLv3 # or later
+LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GITHUB=	yes
diff --git a/graphics/libvisual/Makefile b/graphics/libvisual/Makefile
index e080dd3eaeab..900fb8612d5a 100644
--- a/graphics/libvisual/Makefile
+++ b/graphics/libvisual/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Abstraction library that sits between apps and visual plugin
 
-LICENSE=	LGPL21 # or any later version
+LICENSE=	LGPL21+
 
 PORTSCOUT=	limit:^0\.2\.
 
diff --git a/graphics/libvisual04/Makefile b/graphics/libvisual04/Makefile
index 90f1df0fb74f..32cd1b9b8c9e 100644
--- a/graphics/libvisual04/Makefile
+++ b/graphics/libvisual04/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX=	04
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Abstraction library that sits between apps and visual plugin
 
-LICENSE=	LGPL21 # or any later version
+LICENSE=	LGPL21+
 
 USES=		gettext libtool:keepla pathfix pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile
index c084c15c8e86..7f77870f2c4b 100644
--- a/graphics/libwmf/Makefile
+++ b/graphics/libwmf/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/wvware/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	junovitch@FreeBSD.org
 COMMENT=	Tools and library for converting Microsoft WMF (windows metafile)
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index b73bb8caf00a..5ce0ca97d528 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	Pixie-src-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Photorealistic renderer with Pixar's RenderMan-like interface
 
-LICENSE=	LGPL21 # (or later)
+LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
diff --git a/graphics/png2html/Makefile b/graphics/png2html/Makefile
index 7b7300d34459..72aa9f4b9218 100644
--- a/graphics/png2html/Makefile
+++ b/graphics/png2html/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://www.engr.mun.ca/~holden/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Takes a PNG image and transforms it into HTML
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libgd.so:${PORTSDIR}/graphics/gd
diff --git a/graphics/preview/Makefile b/graphics/preview/Makefile
index 44b1978ca431..c85a3f0e35a7 100644
--- a/graphics/preview/Makefile
+++ b/graphics/preview/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	Preview-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple image viewer
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		gnustep
diff --git a/graphics/pygts/Makefile b/graphics/pygts/Makefile
index 8815e7e374bd..68ea0fc80869 100644
--- a/graphics/pygts/Makefile
+++ b/graphics/pygts/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python binding for GNU Triangulated Surface(GTS) Library
 
-LICENSE=	GPLv2 # or later
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYNUMPY}
diff --git a/graphics/quat-gui/Makefile b/graphics/quat-gui/Makefile
index 1701ce9f2317..2c35b3519c7b 100644
--- a/graphics/quat-gui/Makefile
+++ b/graphics/quat-gui/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Three-dimensional fractal creator (X11 GUI)
 
 BROKEN=		unfetchable
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk
 
diff --git a/graphics/quat/Makefile b/graphics/quat/Makefile
index 77922aae3705..f007fbf8599d 100644
--- a/graphics/quat/Makefile
+++ b/graphics/quat/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Three-dimensional fractal creator (command line only)
 
 BROKEN=		unfetchable
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 OPTIONS_DEFINE=	OPTIMIZED_CFLAGS DOCS
 
diff --git a/graphics/rgbpaint/Makefile b/graphics/rgbpaint/Makefile
index 214a6f24903d..99b9e92800e4 100644
--- a/graphics/rgbpaint/Makefile
+++ b/graphics/rgbpaint/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/mtpaint/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Very basic painting program
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 USES=		gettext pkgconfig tar:bzip2
 USE_GNOME=	gtk20
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index d953df1e3358..fd7c06bb0e42 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	https://alioth.debian.org/frs/download.php/file/4146/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	API for access to scanners, digitals camera, frame grabbers etc
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
 
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 61af7d9ed2dc..9481a6c6420f 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	http://alioth.debian.org/frs/download.php/1140/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tools for access to scanners, digitals camera, frame grabbers etc
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libsane.so:${PORTSDIR}/graphics/sane-backends
 
diff --git a/graphics/scale2x/Makefile b/graphics/scale2x/Makefile
index fdc9fd5fb4c6..8301446274fb 100644
--- a/graphics/scale2x/Makefile
+++ b/graphics/scale2x/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Real-time graphics effect able to increase the size of small bitmaps
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
diff --git a/graphics/showimage/Makefile b/graphics/showimage/Makefile
index c72a0beee596..0b7f4d828853 100644
--- a/graphics/showimage/Makefile
+++ b/graphics/showimage/Makefile
@@ -10,7 +10,7 @@ DISTNAME=	143977-${PORTNAME}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple KDE based image viewer
 
-LICENSE=	GPLv3 # or later
+LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cmake:outsource tar:bzip2
diff --git a/graphics/synfigstudio/Makefile b/graphics/synfigstudio/Makefile
index 81f81f57062f..729486777c7f 100644
--- a/graphics/synfigstudio/Makefile
+++ b/graphics/synfigstudio/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/synfig/releases/${PORTVERSION}/source
 MAINTAINER=	woodsb02@gmail.com
 COMMENT=	Vector-based 2D animation software package
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	etl>=0.04.19_1:${PORTSDIR}/devel/etl
 LIB_DEPENDS=	libsynfig.so:${PORTSDIR}/devel/synfig
diff --git a/graphics/tiled/Makefile b/graphics/tiled/Makefile
index 7d80e2d82b87..9a53e44bc096 100644
--- a/graphics/tiled/Makefile
+++ b/graphics/tiled/Makefile
@@ -9,8 +9,7 @@ CATEGORIES=	graphics editors games
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	General purpose tile map editor
 
-LICENSE=	GPLv2 # or later
-LICENSE+=	BSD2CLAUSE BSD3CLAUSE
+LICENSE=	BSD2CLAUSE BSD3CLAUSE GPLv2+
 LICENSE_COMB=	multi
 
 USE_GITHUB=	yes
diff --git a/graphics/truevision/Makefile b/graphics/truevision/Makefile
index a8de6444c07c..77013e8de94c 100644
--- a/graphics/truevision/Makefile
+++ b/graphics/truevision/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20sources/${PORTVERSION:R}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNOME 3D modeler
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
 
diff --git a/graphics/vcg/Makefile b/graphics/vcg/Makefile
index 1b470f94092c..6a491d87a1f8 100644
--- a/graphics/vcg/Makefile
+++ b/graphics/vcg/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	${PORTNAME}.20050204
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Visualization Tool for compiler graphs
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION}
 
diff --git a/graphics/wxsvg/Makefile b/graphics/wxsvg/Makefile
index 9f9f74b917e7..a7b1cf0a718d 100644
--- a/graphics/wxsvg/Makefile
+++ b/graphics/wxsvg/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	C++ library to create, manipulate, and render SVG files
 
-LICENSE=	LGPL21 # (or later)
+LICENSE=	LGPL21+
 
 LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
 		libexpat.so:${PORTSDIR}/textproc/expat2
diff --git a/graphics/zgv/Makefile b/graphics/zgv/Makefile
index a66eae499862..f4a2589c7636 100644
--- a/graphics/zgv/Makefile
+++ b/graphics/zgv/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SUNSITE/apps/graphics/viewers/svga
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphics viewer for SVGAlib
 
-LICENSE=	GPLv2 # (or later)
+LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libtiff.so:${PORTSDIR}/graphics/tiff