13 files changed, 14 insertions, 12 deletions

diff --git a/benchmarks/gsbench/pkg-descr b/benchmarks/gsbench/pkg-descr
index ca96ac3b7637..5317a4d5d9c4 100644
--- a/benchmarks/gsbench/pkg-descr
+++ b/benchmarks/gsbench/pkg-descr
@@ -3,6 +3,6 @@ NEXTSTEP. I rewrote the entire application for version 0.5 in order to have an
 open architecture which allows the integration of other benchmarks by using
 bundles.
 
-LICENSE: GPL2+
+LICENSE: GPL2 or later
 
 WWW: http://www.nice.ch/~phip/softcorner.html
diff --git a/deskutils/gworkspace-clipbook/pkg-descr b/deskutils/gworkspace-clipbook/pkg-descr
index ee3cfc982986..bf5a94c52a0d 100644
--- a/deskutils/gworkspace-clipbook/pkg-descr
+++ b/deskutils/gworkspace-clipbook/pkg-descr
@@ -1,5 +1,5 @@
 ClipBook for GNUstep workspace manager (GWorkspace)
 
-LICENSE: GPL2+
+LICENSE: GPL2 or later
 
 WWW: http://www.gnustep.it/enrico/gworkspace/
diff --git a/deskutils/gworkspace-gwmetadata/pkg-descr b/deskutils/gworkspace-gwmetadata/pkg-descr
index 53a3dafd5a01..12ccff46f839 100644
--- a/deskutils/gworkspace-gwmetadata/pkg-descr
+++ b/deskutils/gworkspace-gwmetadata/pkg-descr
@@ -7,6 +7,6 @@ Bundles:      AbiwordExtractor HtmlExtractor JpegExtractor
 Libraries:    SQLite
 Tools:        gmds mdextractor
 
-LICENSE: GPL2+
+LICENSE: GPL2 or later
 
 WWW: http://www.gnustep.it/enrico/gworkspace/
diff --git a/deskutils/gworkspace/pkg-descr b/deskutils/gworkspace/pkg-descr
index b43b5cacc9f9..929af32b3f6b 100644
--- a/deskutils/gworkspace/pkg-descr
+++ b/deskutils/gworkspace/pkg-descr
@@ -4,6 +4,6 @@ probably one of the most useful and usable workspace managers available on
 any platform, owing to its well-designed interface and the natural,
 consistent design that it inherits from the GNUstep framework.
 
-LICENSE: GPL2+
+LICENSE: GPL2 or later
 
 WWW: http://www.gnustep.it/enrico/gworkspace/
diff --git a/deskutils/helpviewer/pkg-descr b/deskutils/helpviewer/pkg-descr
index 28c476fc0f4d..f5adc018327f 100644
--- a/deskutils/helpviewer/pkg-descr
+++ b/deskutils/helpviewer/pkg-descr
@@ -1,5 +1,5 @@
 HelpViewer is an online help viewer for GNUstep programs
 
-LICENSE: GPL2+
+LICENSE: GPL2 or later
 
 WWW: http://www.roard.com/helpviewer/
diff --git a/games/grubik/pkg-descr b/games/grubik/pkg-descr
index da8af351364b..0898a3359a43 100644
--- a/games/grubik/pkg-descr
+++ b/games/grubik/pkg-descr
@@ -7,4 +7,4 @@ variety of programming techniques.
 
 Left-click for clockwise, right-click for counterclockwise rotation.
 
-LICENSE: GPL2+
+LICENSE: GPL2 or later
diff --git a/games/jigsaw/pkg-descr b/games/jigsaw/pkg-descr
index f034ad1ce496..540d15885de5 100644
--- a/games/jigsaw/pkg-descr
+++ b/games/jigsaw/pkg-descr
@@ -6,6 +6,6 @@ Ctrl-left-click and drag to connect knobs to slots.
 Right-click to disassemble a cluster.
 Ctrl-right-click to extract a piece from a cluster.
 
-LICENSE: GPL2+
+LICENSE: GPL2 or later
 
 WWW: http://www.gnustep.it/marko/GPuzzle2/
diff --git a/irc/iroffer/Makefile b/irc/iroffer/Makefile
index b1dc6be17bc3..6a3b89b61b3c 100644
--- a/irc/iroffer/Makefile
+++ b/irc/iroffer/Makefile
@@ -15,6 +15,8 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	dinoex@FreeBSD.ORG
 COMMENT=	An IRC "bot" that makes sharing files via DCC extremely easy
 
+LICENSE=	GPLv2
+
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
 CONFLICTS=	iroffer-lamm-1.* iroffer-dinoex-3.*
diff --git a/japanese/jishyo/pkg-descr b/japanese/jishyo/pkg-descr
index 0edc2535fd56..088fbbea49b5 100644
--- a/japanese/jishyo/pkg-descr
+++ b/japanese/jishyo/pkg-descr
@@ -4,6 +4,6 @@ queries, as well as multi-radical lookups for kanji. Jishyo is based in
 large part on code from Jim Breen's xjdic. It also uses the dictionary
 data from the same software.
 
-LICENSE: GPL2+
+LICENSE: GPL2 or later
 
 WWW: http://www.eskimo.com/~pburns/Dictionaries/
diff --git a/lang/gscheme/pkg-descr b/lang/gscheme/pkg-descr
index a654600b3d4a..430b80eafda9 100644
--- a/lang/gscheme/pkg-descr
+++ b/lang/gscheme/pkg-descr
@@ -5,6 +5,6 @@ GScheme is fully tail recursive. The garbage collector bypasses GNUstep's
 retain/release mechanism in order to deal with circular data structures.
 GScheme is document-based and you can edit more than one file at the same time.
 
-LICENSE: GPL2+
+LICENSE: GPL2 or later
 
 WWW: http://www.gnustep.it/marko/GScheme/index.html
diff --git a/net-im/grouch/pkg-descr b/net-im/grouch/pkg-descr
index b7db23b5d6e9..bb8021b19381 100644
--- a/net-im/grouch/pkg-descr
+++ b/net-im/grouch/pkg-descr
@@ -1,5 +1,5 @@
 This is a graphical AOL and ICQ Instant Messenger client for GNUstep.
 
-LICENSE: GPL2+
+LICENSE: GPL2 or later
 
 WWW: http://mail.rochester.edu/~asveikau/grouch/
diff --git a/shells/gscommander/pkg-descr b/shells/gscommander/pkg-descr
index dea963c254bd..bf4a9cc6b011 100644
--- a/shells/gscommander/pkg-descr
+++ b/shells/gscommander/pkg-descr
@@ -1,5 +1,5 @@
 GSCommander is a simple unix command monitor for GNUstep. 
 
-LICENSE: GPL2+
+LICENSE: GPL2 or later
 
 WWW: http://www.nice.ch/~phip/softcorner.html#cmdr
diff --git a/x11/innerspace/pkg-descr b/x11/innerspace/pkg-descr
index b2f18d360de4..f270df3f97ec 100644
--- a/x11/innerspace/pkg-descr
+++ b/x11/innerspace/pkg-descr
@@ -4,6 +4,6 @@ Innerspace is a screensaver which is compatible with BackSpace
 from the NeXTSTEP era. It can, with few changes to the module,
 run old BackSpace modules. 
 
-LICENSE: GPL2+
+LICENSE: GPL2 or later
 
 WWW: http://www.nongnu.org/gap/innerspace/index.html