aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2016-01-12 16:20:31 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2016-01-12 16:20:31 +0000
commitb9398223bd3a2236f02f582d13487e2a02e6a035 (patch)
tree2cea991d70e02cc86565656d596600b0fc2b5790
parentaa20890c922899d9333b5fef5c67bc338a601c4c (diff)
downloadports-b9398223bd3a2236f02f582d13487e2a02e6a035.tar.gz
ports-b9398223bd3a2236f02f582d13487e2a02e6a035.zip
Notes
-rw-r--r--archivers/dact/Makefile2
-rw-r--r--archivers/lbrate/Makefile2
-rw-r--r--archivers/mtf/Makefile2
-rw-r--r--archivers/ucl/Makefile2
-rw-r--r--archivers/xpk/Makefile2
-rw-r--r--astro/gpscorrelate/Makefile2
-rw-r--r--astro/gpsdrive/Makefile2
-rw-r--r--astro/josm/Makefile2
-rw-r--r--astro/libosmpbf/Makefile2
-rw-r--r--astro/planets/Makefile2
-rw-r--r--astro/rmap/Makefile2
-rw-r--r--astro/roadmap/Makefile2
-rw-r--r--audio/alsa-lib/Makefile2
-rw-r--r--audio/alsa-plugins/Makefile2
-rw-r--r--audio/alsa-utils/Makefile2
-rw-r--r--audio/aqualung/Makefile2
-rw-r--r--audio/ario/Makefile2
-rw-r--r--audio/audiotag/Makefile2
-rw-r--r--audio/cddb-bundle/Makefile2
-rw-r--r--audio/cuetools/Makefile2
-rw-r--r--audio/cutmp3/Makefile2
-rw-r--r--audio/darkice/Makefile2
-rw-r--r--audio/dir2ogg/Makefile2
-rw-r--r--audio/enscribe/Makefile2
-rw-r--r--audio/gigedit/Makefile2
-rw-r--r--audio/gmidimonitor/Makefile2
-rw-r--r--audio/gmpc-alarm/Makefile2
-rw-r--r--audio/gmpc-discogs/Makefile2
-rw-r--r--audio/gmpc-extraplaylist/Makefile2
-rw-r--r--audio/gmpc-lastfm/Makefile2
-rw-r--r--audio/gmpc-libnotify/Makefile2
-rw-r--r--audio/gmpc-lyrics/Makefile2
-rw-r--r--audio/gmpc-lyricsplugin/Makefile2
-rw-r--r--audio/gmpc-lyricwiki/Makefile2
-rw-r--r--audio/gmpc-magnatune/Makefile2
-rw-r--r--audio/gmpc-mdcover/Makefile2
-rw-r--r--audio/gmpc-mserver/Makefile2
-rw-r--r--audio/gmpc-shout/Makefile2
-rw-r--r--audio/gmpc-wikipedia/Makefile2
-rw-r--r--audio/gnupod/Makefile2
-rw-r--r--audio/gnuspeechsa/Makefile2
-rw-r--r--audio/gnustep-cdplayer/Makefile2
-rw-r--r--audio/gogglesmm/Makefile2
-rw-r--r--audio/gtkguitune/Makefile2
-rw-r--r--audio/hexter/Makefile2
-rw-r--r--audio/ksmp3play/Makefile2
-rw-r--r--audio/libgme/Makefile2
-rw-r--r--audio/liblscp/Makefile2
-rw-r--r--audio/libmpd/Makefile2
-rw-r--r--audio/libworkman/Makefile2
-rw-r--r--audio/maplay/Makefile2
-rw-r--r--audio/mhwaveedit/Makefile2
-rw-r--r--audio/mixxx/Makefile2
-rw-r--r--audio/moc/Makefile2
-rw-r--r--audio/mp3riot/Makefile2
-rw-r--r--audio/musepack/Makefile2
-rw-r--r--audio/ncmpc/Makefile2
-rw-r--r--audio/nekobee/Makefile2
-rw-r--r--audio/pacpl/Makefile2
-rw-r--r--audio/patchage/Makefile2
-rw-r--r--audio/py-karaoke/Makefile2
-rw-r--r--audio/py-mad/Makefile2
-rw-r--r--audio/py-mpd2/Makefile2
-rw-r--r--audio/py-openal/Makefile2
-rw-r--r--audio/qsampler/Makefile2
-rw-r--r--audio/qsynth/Makefile2
-rw-r--r--audio/quimup/Makefile2
-rw-r--r--audio/raop_play/Makefile2
-rw-r--r--audio/rawrec/Makefile2
-rw-r--r--audio/rioutil/Makefile2
-rw-r--r--audio/rosegarden/Makefile2
-rw-r--r--audio/rplay/Makefile2
-rw-r--r--audio/sidplay/Makefile2
-rw-r--r--audio/slv2/Makefile2
-rw-r--r--audio/streamtranscoder/Makefile2
-rw-r--r--audio/timidity++/Makefile2
-rw-r--r--audio/timidity/Makefile2
-rw-r--r--audio/wavbreaker/Makefile2
-rw-r--r--audio/ximp3/Makefile2
-rw-r--r--benchmarks/autobench/Makefile2
-rw-r--r--benchmarks/stress-ng/Makefile2
-rw-r--r--biology/fastdnaml/Makefile2
-rw-r--r--biology/gff2ps/Makefile2
-rw-r--r--biology/mopac/Makefile2
-rw-r--r--biology/treeviewx/Makefile2
-rw-r--r--cad/admesh/Makefile2
-rw-r--r--cad/atlc/Makefile2
-rw-r--r--cad/geda/Makefile2
-rw-r--r--cad/gerbv/Makefile2
-rw-r--r--cad/pdnmesh/Makefile2
-rw-r--r--cad/qfsm/Makefile2
-rw-r--r--cad/qucs/Makefile2
-rw-r--r--cad/sweethome3d/Makefile2
-rw-r--r--cad/verilog-mode.el/Makefile2
-rw-r--r--chinese/pcmanx/Makefile2
-rw-r--r--chinese/reciteword/Makefile2
-rw-r--r--chinese/scim-array/Makefile2
-rw-r--r--chinese/wordpress-zh_CN/Makefile2
-rw-r--r--chinese/wordpress-zh_TW/Makefile2
-rw-r--r--comms/bforce-kst/Makefile2
-rw-r--r--comms/gpredict/Makefile2
-rw-r--r--comms/ser2net/Makefile2
-rw-r--r--comms/sredird/Makefile2
-rw-r--r--comms/tcpser/Makefile2
-rw-r--r--converters/osm2pgsql/Makefile2
-rw-r--r--converters/uudeview/Makefile2
-rw-r--r--converters/uulib/Makefile2
-rw-r--r--converters/vda2fbd/Makefile2
-rw-r--r--converters/xdeview/Makefile2
-rw-r--r--databases/gnatsweb4/Makefile2
-rw-r--r--databases/grass/Makefile2
-rw-r--r--databases/gtksql/Makefile2
-rw-r--r--databases/libdbi/Makefile2
-rw-r--r--databases/libpbl/Makefile2
-rw-r--r--databases/mysqlsla/Makefile2
-rw-r--r--databases/py-cdb/Makefile2
-rw-r--r--databases/py-rrdtool_lgpl/Makefile2
-rw-r--r--databases/qof/Makefile2
-rw-r--r--databases/rrdtool10/Makefile2
-rw-r--r--databases/sqsh/Makefile2
-rw-r--r--databases/wmjsql/Makefile2
-rw-r--r--deskutils/aspostit/Makefile2
-rw-r--r--deskutils/drivel/Makefile2
-rw-r--r--deskutils/fbreader/Makefile2
-rw-r--r--deskutils/ganyremote/Makefile2
-rw-r--r--deskutils/gkrellm-reminder2/Makefile2
-rw-r--r--deskutils/gnotime/Makefile2
-rw-r--r--deskutils/griffith/Makefile2
-rw-r--r--deskutils/gucharmap/Makefile2
-rw-r--r--deskutils/mdh/Makefile2
-rw-r--r--deskutils/osmo/Makefile2
-rw-r--r--deskutils/py-taskw/Makefile2
-rw-r--r--deskutils/pypanel/Makefile2
-rw-r--r--devel/aifad/Makefile2
-rw-r--r--devel/alabastra/Makefile2
-rw-r--r--devel/argtable/Makefile2
-rw-r--r--devel/cccc/Makefile2
-rw-r--r--devel/cons-test/Makefile2
-rw-r--r--devel/cppcheck/Makefile2
-rw-r--r--devel/cvs/Makefile2
-rw-r--r--devel/cvsbook/Makefile2
-rw-r--r--devel/cvsgraph/Makefile2
-rw-r--r--devel/cxxtools/Makefile2
-rw-r--r--devel/elfio/Makefile2
-rw-r--r--devel/etl/Makefile2
-rw-r--r--devel/gazpacho/Makefile2
-rw-r--r--devel/gengetopt/Makefile2
-rw-r--r--devel/gettext-msghack/Makefile2
-rw-r--r--devel/gitg0/Makefile2
-rw-r--r--devel/gtgt/Makefile2
-rw-r--r--devel/jtag/Makefile2
-rw-r--r--devel/kaptain/Makefile2
-rw-r--r--devel/libafterbase/Makefile2
-rw-r--r--devel/libclaw/Makefile2
-rw-r--r--devel/libdisorder/Makefile2
-rw-r--r--devel/libexplain/Makefile2
-rw-r--r--devel/libghthash/Makefile2
-rw-r--r--devel/libhoard/Makefile2
-rw-r--r--devel/liblouis/Makefile2
-rw-r--r--devel/liblouisxml/Makefile2
-rw-r--r--devel/librcc/Makefile2
-rw-r--r--devel/librcd/Makefile2
-rw-r--r--devel/libsigc++20/Makefile2
-rw-r--r--devel/libthai/Makefile2
-rw-r--r--devel/lpc21isp/Makefile2
-rw-r--r--devel/omniNotify/Makefile2
-rw-r--r--devel/omniORB-4.1/Makefile2
-rw-r--r--devel/onscripter/Makefile2
-rw-r--r--devel/openzz/Makefile2
-rw-r--r--devel/osc/Makefile2
-rw-r--r--devel/phpbt/Makefile2
-rw-r--r--devel/picprog/Makefile2
-rw-r--r--devel/piklab/Makefile2
-rw-r--r--devel/pire/Makefile2
-rw-r--r--devel/ponscripter-sekai/Makefile2
-rw-r--r--devel/poslib/Makefile2
-rw-r--r--devel/ppl/Makefile2
-rw-r--r--devel/premake/Makefile2
-rw-r--r--devel/projectcenter/Makefile2
-rw-r--r--devel/py-fam/Makefile2
-rw-r--r--devel/py-pqueue/Makefile2
-rw-r--r--devel/py-wsgitools/Makefile2
-rw-r--r--devel/rubygem-ditz/Makefile2
-rw-r--r--devel/statsvn/Makefile2
-rw-r--r--devel/synfig/Makefile2
-rw-r--r--devel/tdl/Makefile2
-rw-r--r--devel/vtcl/Makefile2
-rw-r--r--devel/websvn/Makefile2
-rw-r--r--devel/xparam/Makefile2
-rw-r--r--dns/opendd/Makefile2
-rw-r--r--editors/aewan/Makefile2
-rw-r--r--editors/chexedit/Makefile2
-rw-r--r--editors/codelite/Makefile2
-rw-r--r--editors/cream/Makefile2
-rw-r--r--editors/gwrite/Makefile2
-rw-r--r--editors/hnb/Makefile2
-rw-r--r--editors/klat4/Makefile2
-rw-r--r--editors/mp/Makefile2
-rw-r--r--editors/ne/Makefile2
-rw-r--r--editors/plume-creator-devel/Makefile2
-rw-r--r--editors/zoinks/Makefile2
-rw-r--r--emulators/advancemess/Makefile2
-rw-r--r--emulators/gnuboy/Makefile2
-rw-r--r--emulators/hatari/Makefile2
-rw-r--r--emulators/lisaem/Makefile2
-rw-r--r--emulators/loemu/Makefile2
-rw-r--r--emulators/mednafen/Makefile2
-rw-r--r--emulators/ppsspp/Makefile2
-rw-r--r--emulators/snes9express/Makefile2
-rw-r--r--emulators/xsystem35/Makefile2
-rw-r--r--emulators/yabause/Makefile2
-rw-r--r--finance/beanie/Makefile2
-rw-r--r--finance/qhacc/Makefile2
-rw-r--r--finance/trytond28/Makefile2
-rw-r--r--ftp/wget/Makefile2
-rw-r--r--ftp/wzdftpd/Makefile2
-rw-r--r--ftp/yafc/Makefile2
-rw-r--r--games/3dc/Makefile2
-rw-r--r--games/adgali/Makefile2
-rw-r--r--games/agame/Makefile2
-rw-r--r--games/alienblaster/Makefile2
-rw-r--r--games/apoolGL/Makefile2
-rw-r--r--games/aquaria/Makefile2
-rw-r--r--games/armagetron/Makefile2
-rw-r--r--games/arx-libertatis/Makefile2
-rw-r--r--games/asc/Makefile2
-rw-r--r--games/asteroids3d/Makefile2
-rw-r--r--games/atomix/Makefile2
-rw-r--r--games/avanor/Makefile2
-rw-r--r--games/awale/Makefile2
-rw-r--r--games/balazar/Makefile2
-rw-r--r--games/balazarbrothers/Makefile2
-rw-r--r--games/barrage/Makefile2
-rw-r--r--games/bastet/Makefile2
-rw-r--r--games/battletanks/Makefile2
-rw-r--r--games/black-box/Makefile2
-rw-r--r--games/blackshadeselite/Makefile2
-rw-r--r--games/blobwars/Makefile2
-rw-r--r--games/blockout/Makefile2
-rw-r--r--games/blockrage/Makefile2
-rw-r--r--games/blokish/Makefile2
-rw-r--r--games/bombherman/Makefile2
-rw-r--r--games/bomns/Makefile2
-rw-r--r--games/bygfoot/Makefile2
-rw-r--r--games/capicity/Makefile2
-rw-r--r--games/capitalism/Makefile2
-rw-r--r--games/cavezofphear/Makefile2
-rw-r--r--games/chanta/Makefile2
-rw-r--r--games/cheech/Makefile2
-rw-r--r--games/chessx/Makefile2
-rw-r--r--games/columns/Makefile2
-rw-r--r--games/connectagram/Makefile2
-rw-r--r--games/corewars/Makefile2
-rw-r--r--games/crimson/Makefile2
-rw-r--r--games/criticalmass/Makefile2
-rw-r--r--games/csmash/Makefile2
-rw-r--r--games/cuyo/Makefile2
-rw-r--r--games/daimonin/Makefile2
-rw-r--r--games/dhewm3/Makefile2
-rw-r--r--games/dopewars/Makefile2
-rw-r--r--games/duckmaze/Makefile2
-rw-r--r--games/duel/Makefile2
-rw-r--r--games/editss/Makefile2
-rw-r--r--games/endless-sky/Makefile2
-rw-r--r--games/exult/Makefile2
-rw-r--r--games/fishsupper/Makefile2
-rw-r--r--games/flyhard/Makefile2
-rw-r--r--games/formido/Makefile2
-rw-r--r--games/freedroidrpg/Makefile2
-rw-r--r--games/freeminer/Makefile4
-rw-r--r--games/frotz/Makefile2
-rw-r--r--games/gdado/Makefile2
-rw-r--r--games/ggz-gtk-client/Makefile2
-rw-r--r--games/gillo/Makefile2
-rw-r--r--games/glightoff/Makefile2
-rw-r--r--games/glob2/Makefile2
-rw-r--r--games/gma/Makefile2
-rw-r--r--games/gmastermind/Makefile2
-rw-r--r--games/gmines/Makefile2
-rw-r--r--games/gnomekiss/Makefile2
-rw-r--r--games/gnurobots/Makefile2
-rw-r--r--games/gnustep-ladder/Makefile2
-rw-r--r--games/gnustep-sudoku/Makefile2
-rw-r--r--games/gomoku/Makefile2
-rw-r--r--games/gottet/Makefile2
-rw-r--r--games/gracer/Makefile2
-rw-r--r--games/grhino/Makefile2
-rw-r--r--games/grubik/Makefile2
-rw-r--r--games/gshisen/Makefile2
-rw-r--r--games/gtetrinet/Makefile2
-rw-r--r--games/gtkatlantic/Makefile2
-rw-r--r--games/gtkballs/Makefile2
-rw-r--r--games/gtktetcolor/Makefile2
-rw-r--r--games/highmoon/Makefile2
-rw-r--r--games/hinversi/Makefile2
-rw-r--r--games/holotz-castle/Makefile2
-rw-r--r--games/icebreaker/Makefile2
-rw-r--r--games/irrlamb/Makefile2
-rw-r--r--games/jfk/Makefile2
-rw-r--r--games/jigsaw/Makefile2
-rw-r--r--games/jigzo/Makefile2
-rw-r--r--games/joequake/Makefile2
-rw-r--r--games/jools/Makefile2
-rw-r--r--games/jtans/Makefile2
-rw-r--r--games/kajaani-kombat/Makefile2
-rw-r--r--games/kardsgt/Makefile2
-rw-r--r--games/kevedit/Makefile2
-rw-r--r--games/kuklomenos/Makefile2
-rw-r--r--games/lapispuzzle/Makefile2
-rw-r--r--games/lbreakout/Makefile2
-rw-r--r--games/lbreakout2/Makefile2
-rw-r--r--games/lianliankan/Makefile2
-rw-r--r--games/lmarbles/Makefile2
-rw-r--r--games/lordsawar/Makefile2
-rw-r--r--games/lpairs/Makefile2
-rw-r--r--games/lucidlife/Makefile2
-rw-r--r--games/lugaru/Makefile2
-rw-r--r--games/macopix/Makefile5
-rw-r--r--games/mahjong/Makefile2
-rw-r--r--games/masterserver/Makefile2
-rw-r--r--games/maxr/Makefile2
-rw-r--r--games/minetest/Makefile2
-rw-r--r--games/miscom/Makefile2
-rw-r--r--games/monkeybubble/Makefile2
-rw-r--r--games/mopesnake/Makefile2
-rw-r--r--games/mudmagic/Makefile2
-rw-r--r--games/nazghul/Makefile2
-rw-r--r--games/netris/Makefile2
-rw-r--r--games/netspades/Makefile2
-rw-r--r--games/netwalk/Makefile2
-rw-r--r--games/nuclearchess/Makefile2
-rw-r--r--games/numptyphysics/Makefile2
-rw-r--r--games/openbubbles/Makefile2
-rw-r--r--games/opencity/Makefile2
-rw-r--r--games/openglad/Makefile2
-rw-r--r--games/openpref/Makefile2
-rw-r--r--games/pacmanarena/Makefile2
-rw-r--r--games/patapizza-tetris/Makefile2
-rw-r--r--games/peg-e/Makefile2
-rw-r--r--games/phalanx/Makefile2
-rw-r--r--games/pingus/Makefile2
-rw-r--r--games/pioneers/Makefile2
-rw-r--r--games/pipenightdreams/Makefile2
-rw-r--r--games/pipewalker/Makefile2
-rw-r--r--games/plutocracy/Makefile2
-rw-r--r--games/pmars-sdl/Makefile2
-rw-r--r--games/pmars/Makefile2
-rw-r--r--games/poker-engine/Makefile2
-rw-r--r--games/poker-eval/Makefile2
-rw-r--r--games/pongix/Makefile2
-rw-r--r--games/ppracer/Makefile2
-rw-r--r--games/puckman/Makefile2
-rw-r--r--games/py-poker-eval/Makefile2
-rw-r--r--games/pyawale/Makefile2
-rw-r--r--games/pycadia/Makefile2
-rw-r--r--games/pyching/Makefile2
-rw-r--r--games/pyfa/Makefile2
-rw-r--r--games/pythonsudoku/Makefile2
-rw-r--r--games/q2pro/Makefile2
-rw-r--r--games/quakeforge/Makefile2
-rw-r--r--games/rtb/Makefile2
-rw-r--r--games/schiff/Makefile2
-rw-r--r--games/schwarzweiss/Makefile2
-rw-r--r--games/sdl-ball/Makefile2
-rw-r--r--games/secrettower/Makefile2
-rw-r--r--games/simsu/Makefile2
-rw-r--r--games/slump/Makefile2
-rw-r--r--games/spacejunk/Makefile2
-rw-r--r--games/species/Makefile2
-rw-r--r--games/starfighter/Makefile2
-rw-r--r--games/sudoku-sensei/Makefile2
-rw-r--r--games/supertuxkart/Makefile2
-rw-r--r--games/tanglet/Makefile2
-rw-r--r--games/tecnoballz/Makefile2
-rw-r--r--games/thegrind/Makefile2
-rw-r--r--games/tong/Makefile2
-rw-r--r--games/tornado/Makefile2
-rw-r--r--games/traingame/Makefile2
-rw-r--r--games/ttt/Makefile2
-rw-r--r--games/tuxmath/Makefile2
-rw-r--r--games/tuxpaint-config/Makefile2
-rw-r--r--games/tuxpaint-stamps/Makefile2
-rw-r--r--games/tuxpaint/Makefile2
-rw-r--r--games/tuxracer/Makefile2
-rw-r--r--games/tuxtype/Makefile2
-rw-r--r--games/twind/Makefile2
-rw-r--r--games/twitch/Makefile2
-rw-r--r--games/typespeed/Makefile2
-rw-r--r--games/uhexen2/Makefile2
-rw-r--r--games/ultimatestunts/Makefile2
-rw-r--r--games/umark/Makefile2
-rw-r--r--games/vamos/Makefile2
-rw-r--r--games/viruskiller/Makefile2
-rw-r--r--games/vodovod/Makefile2
-rw-r--r--games/wanderer/Makefile2
-rw-r--r--games/wargus/Makefile2
-rw-r--r--games/warzone2100/Makefile2
-rw-r--r--games/widelands/Makefile2
-rw-r--r--games/wizznic/Makefile2
-rw-r--r--games/wmminichess/Makefile2
-rw-r--r--games/wmshuffle/Makefile2
-rw-r--r--games/wyrmgus/Makefile2
-rw-r--r--games/xbl/Makefile2
-rw-r--r--games/xblood/Makefile2
-rw-r--r--games/xbomb/Makefile2
-rw-r--r--games/xbubble/Makefile2
-rw-r--r--games/xconq/Makefile2
-rw-r--r--games/xevil/Makefile2
-rw-r--r--games/xfrisk/Makefile2
-rw-r--r--games/xgalaga-sdl/Makefile2
-rw-r--r--games/xmoto/Makefile2
-rw-r--r--games/xpat2/Makefile2
-rw-r--r--games/xpilot-ng-server/Makefile2
-rw-r--r--games/xpuyopuyo/Makefile2
-rw-r--r--games/xscrabble/Makefile2
-rw-r--r--games/xspringies/Makefile2
-rw-r--r--games/zaz/Makefile2
-rw-r--r--games/znibbles/Makefile2
-rw-r--r--graphics/agave/Makefile2
-rw-r--r--graphics/agg/Makefile2
-rw-r--r--graphics/backfract/Makefile2
-rw-r--r--graphics/camera/Makefile2
-rw-r--r--graphics/chbg/Makefile2
-rw-r--r--graphics/comical/Makefile2
-rw-r--r--graphics/darknock/Makefile2
-rw-r--r--graphics/delaboratory/Makefile2
-rw-r--r--graphics/djvulibre/Makefile2
-rw-r--r--graphics/epix/Makefile2
-rw-r--r--graphics/gdk-pixbuf/Makefile2
-rw-r--r--graphics/gdk-pixbuf2/Makefile2
-rw-r--r--graphics/gimageview/Makefile2
-rw-r--r--graphics/gimp-beautify-plugin/Makefile2
-rw-r--r--graphics/gimp-lensfun-plugin/Makefile2
-rw-r--r--graphics/gimp-resynthesizer/Makefile2
-rw-r--r--graphics/gimp-wavelet-sharpen-plugin/Makefile2
-rw-r--r--graphics/giram/Makefile2
-rw-r--r--graphics/gkrellkam2/Makefile2
-rw-r--r--graphics/gliv/Makefile2
-rw-r--r--graphics/gpsmanshp/Makefile2
-rw-r--r--graphics/graphopt/Makefile2
-rw-r--r--graphics/gthumb/Makefile2
-rw-r--r--graphics/gtimelapse/Makefile2
-rw-r--r--graphics/gtkam/Makefile2
-rw-r--r--graphics/import-pictures/Makefile2
-rw-r--r--graphics/ipe/Makefile2
-rw-r--r--graphics/laternamagica/Makefile2
-rw-r--r--graphics/lib3ds/Makefile2
-rw-r--r--graphics/libafterimage/Makefile2
-rw-r--r--graphics/libpano13/Makefile2
-rw-r--r--graphics/libpcd/Makefile2
-rw-r--r--graphics/libprojectm/Makefile2
-rw-r--r--graphics/libspiro/Makefile2
-rw-r--r--graphics/libvisual/Makefile2
-rw-r--r--graphics/libvisual04/Makefile2
-rw-r--r--graphics/libwmf/Makefile2
-rw-r--r--graphics/pixie/Makefile2
-rw-r--r--graphics/png2html/Makefile2
-rw-r--r--graphics/preview/Makefile2
-rw-r--r--graphics/pygts/Makefile2
-rw-r--r--graphics/quat-gui/Makefile2
-rw-r--r--graphics/quat/Makefile2
-rw-r--r--graphics/rgbpaint/Makefile2
-rw-r--r--graphics/sane-backends/Makefile2
-rw-r--r--graphics/sane-frontends/Makefile2
-rw-r--r--graphics/scale2x/Makefile2
-rw-r--r--graphics/showimage/Makefile2
-rw-r--r--graphics/synfigstudio/Makefile2
-rw-r--r--graphics/tiled/Makefile3
-rw-r--r--graphics/truevision/Makefile2
-rw-r--r--graphics/vcg/Makefile2
-rw-r--r--graphics/wxsvg/Makefile2
-rw-r--r--graphics/zgv/Makefile2
-rw-r--r--irc/gseen.mod/Makefile2
-rw-r--r--irc/psybnc/Makefile2
-rw-r--r--irc/srvx/Makefile2
-rw-r--r--irc/thales/Makefile2
-rw-r--r--japanese/ebview-gtk2/Makefile2
-rw-r--r--japanese/jishyo/Makefile2
-rw-r--r--lang/awka/Makefile2
-rw-r--r--lang/cparser/Makefile2
-rw-r--r--lang/gscheme/Makefile2
-rw-r--r--lang/rexx-regina/Makefile2
-rw-r--r--lang/spl/Makefile2
-rw-r--r--mail/automx/Makefile2
-rw-r--r--mail/avenger/Makefile2
-rw-r--r--mail/bbmail/Makefile2
-rw-r--r--mail/ez-pine-gpg/Makefile2
-rw-r--r--mail/gkrellmmailwatch2/Makefile2
-rw-r--r--mail/mpop/Makefile2
-rw-r--r--mail/pflogstats/Makefile2
-rw-r--r--mail/pop3lite/Makefile2
-rw-r--r--mail/postfix-policyd-weight/Makefile2
-rw-r--r--mail/prepflog/Makefile2
-rw-r--r--mail/py-milter/Makefile2
-rw-r--r--mail/py-notmuch/Makefile2
-rw-r--r--mail/pysieved/Makefile2
-rw-r--r--mail/qmailadmin/Makefile2
-rw-r--r--mail/qsheff/Makefile2
-rw-r--r--mail/raysfilter/Makefile2
-rw-r--r--mail/tmda/Makefile2
-rw-r--r--mail/up-imapproxy/Makefile2
-rw-r--r--mail/wmmaiload/Makefile2
-rw-r--r--math/abacus/Makefile2
-rw-r--r--math/algae/Makefile2
-rw-r--r--math/biggles/Makefile2
-rw-r--r--math/convertall/Makefile2
-rw-r--r--math/ess/Makefile2
-rw-r--r--math/fftw/Makefile2
-rw-r--r--math/gdcalc/Makefile2
-rw-r--r--math/plplot/Makefile2
-rw-r--r--math/tvmet/Makefile2
-rw-r--r--math/xspread/Makefile2
-rw-r--r--misc/apparix/Makefile2
-rw-r--r--misc/astrolog/Makefile2
-rw-r--r--misc/bb/Makefile2
-rw-r--r--misc/cmatrix/Makefile2
-rw-r--r--misc/colortail/Makefile2
-rw-r--r--misc/cs/Makefile2
-rw-r--r--misc/dtach/Makefile2
-rw-r--r--misc/dvorak7min/Makefile2
-rw-r--r--misc/dvorakng/Makefile2
-rw-r--r--misc/fxload/Makefile2
-rw-r--r--misc/geekcode/Makefile2
-rw-r--r--misc/gkrellmlaunch2/Makefile2
-rw-r--r--misc/gkrellweather2/Makefile2
-rw-r--r--misc/hello/Makefile2
-rw-r--r--misc/hotkeys/Makefile2
-rw-r--r--misc/kcd/Makefile2
-rw-r--r--misc/linm/Makefile2
-rw-r--r--misc/lv/Makefile2
-rw-r--r--misc/mc-light/Makefile2
-rw-r--r--misc/metalink-checker/Makefile2
-rw-r--r--misc/metalink-editor/Makefile2
-rw-r--r--misc/metalink-tools/Makefile2
-rw-r--r--misc/nut/Makefile2
-rw-r--r--misc/pastebinit/Makefile2
-rw-r--r--misc/upclient/Makefile2
-rw-r--r--misc/xdelta/Makefile2
-rw-r--r--misc/xdelta3/Makefile2
-rw-r--r--multimedia/atomicparsley/Makefile2
-rw-r--r--multimedia/bino/Makefile2
-rw-r--r--multimedia/camserv/Makefile2
-rw-r--r--multimedia/ffmpegthumbnailer/Makefile2
-rw-r--r--multimedia/gcap/Makefile2
-rw-r--r--multimedia/gmimms/Makefile2
-rw-r--r--multimedia/gnome-subtitles/Makefile2
-rw-r--r--multimedia/grake/Makefile2
-rw-r--r--multimedia/gstreamer-qt4/Makefile2
-rw-r--r--multimedia/kaffeine/Makefile2
-rw-r--r--multimedia/libmtp/Makefile2
-rw-r--r--multimedia/libxine/Makefile2
-rw-r--r--multimedia/mimms/Makefile2
-rw-r--r--multimedia/mjpegtools/Makefile2
-rw-r--r--multimedia/mmpython/Makefile2
-rw-r--r--multimedia/mmsrip/Makefile2
-rw-r--r--multimedia/mp3cd/Makefile2
-rw-r--r--multimedia/oggvideotools/Makefile2
-rw-r--r--multimedia/pHash/Makefile2
-rw-r--r--multimedia/poe/Makefile2
-rw-r--r--multimedia/smplayer/Makefile2
-rw-r--r--multimedia/vdr-plugin-xvdr/Makefile2
-rw-r--r--multimedia/vdr/Makefile2
-rw-r--r--multimedia/x265/Makefile2
-rw-r--r--multimedia/xvid/Makefile2
-rw-r--r--net-im/ayttm/Makefile2
-rw-r--r--net-im/emesene/Makefile2
-rw-r--r--net-im/mbpurple/Makefile2
-rw-r--r--net-im/pidgin-birthday-reminder/Makefile2
-rw-r--r--net-im/toxic/Makefile2
-rw-r--r--net-mgmt/bpft/Makefile2
-rw-r--r--net-mgmt/docsis/Makefile2
-rw-r--r--net-mgmt/ipaudit/Makefile2
-rw-r--r--net-mgmt/netleak/Makefile2
-rw-r--r--net-mgmt/netspoc/Makefile2
-rw-r--r--net-mgmt/phpip/Makefile2
-rw-r--r--net-mgmt/pixilate/Makefile2
-rw-r--r--net-mgmt/portmon/Makefile2
-rw-r--r--net-mgmt/torrus/Makefile2
-rw-r--r--net-p2p/gkremldk/Makefile2
-rw-r--r--net-p2p/gtk-gnutella/Makefile2
-rw-r--r--net-p2p/liberator/Makefile2
-rw-r--r--net-p2p/linuxdcpp/Makefile2
-rw-r--r--net-p2p/minder/Makefile2
-rw-r--r--net/dbeacon/Makefile2
-rw-r--r--net/freeradius2/Makefile2
-rw-r--r--net/g2ipmsg/Makefile2
-rw-r--r--net/hanstunnel/Makefile2
-rw-r--r--net/htpdate/Makefile2
-rw-r--r--net/hupnp/Makefile2
-rw-r--r--net/libsocketcpp/Makefile2
-rw-r--r--net/miredo/Makefile2
-rw-r--r--net/mping/Makefile2
-rw-r--r--net/nast/Makefile2
-rw-r--r--net/net6/Makefile2
-rw-r--r--net/nstxd/Makefile2
-rw-r--r--net/openpgm/Makefile2
-rw-r--r--net/pptpclient/Makefile2
-rw-r--r--net/py-xmlrpc/Makefile2
-rw-r--r--net/qadsl/Makefile2
-rw-r--r--net/remotedesk/Makefile2
-rw-r--r--net/rude/Makefile2
-rw-r--r--net/serveez/Makefile2
-rw-r--r--net/tcptrace/Makefile2
-rw-r--r--net/tcpxd/Makefile2
-rw-r--r--palm/imgvtopgm/Makefile2
-rw-r--r--palm/jpilot-picsnvideos/Makefile2
-rw-r--r--polish/trf/Makefile2
-rw-r--r--print/cups-cloud-print/Makefile2
-rw-r--r--print/foo2zjs/Makefile2
-rw-r--r--print/foomatic-db-hpijs/Makefile2
-rw-r--r--print/foomatic-filters/Makefile2
-rw-r--r--print/gtklp/Makefile2
-rw-r--r--print/hp2xx/Makefile2
-rw-r--r--print/kover/Makefile2
-rw-r--r--print/lout/Makefile2
-rw-r--r--print/min12xxw/Makefile2
-rw-r--r--print/pkipplib/Makefile2
-rw-r--r--russian/emkatic/Makefile2
-rw-r--r--science/avogadro/Makefile2
-rw-r--r--science/checkmol/Makefile2
-rw-r--r--science/ghemical/Makefile2
-rw-r--r--science/gwyddion/Makefile2
-rw-r--r--science/libquantum/Makefile2
-rw-r--r--science/linsmith/Makefile2
-rw-r--r--science/mol2ps/Makefile2
-rw-r--r--science/psychopy/Makefile2
-rw-r--r--science/qcl/Makefile2
-rw-r--r--security/afterglow/Makefile2
-rw-r--r--security/base/Makefile2
-rw-r--r--security/doscan/Makefile2
-rw-r--r--security/fakebo/Makefile2
-rw-r--r--security/fakeident/Makefile2
-rw-r--r--security/hlfl/Makefile2
-rw-r--r--security/kedpm/Makefile2
-rw-r--r--security/keepass/Makefile2
-rw-r--r--security/libgringotts/Makefile2
-rw-r--r--security/libpreludedb/Makefile2
-rw-r--r--security/libzrtpcppcore/Makefile2
-rw-r--r--security/lsh/Makefile2
-rw-r--r--security/massh/Makefile2
-rw-r--r--security/matrixssl/Makefile2
-rw-r--r--security/medusa/Makefile2
-rw-r--r--security/mhash/Makefile2
-rw-r--r--security/opencdk/Makefile2
-rw-r--r--security/openvpn-admin/Makefile2
-rw-r--r--security/parano/Makefile2
-rw-r--r--security/phpdeadlock/Makefile2
-rw-r--r--security/pwman/Makefile2
-rw-r--r--security/py-clamav/Makefile2
-rw-r--r--security/py-mcrypt/Makefile2
-rw-r--r--security/py-mhash/Makefile2
-rw-r--r--security/py-xmlsec/Makefile2
-rw-r--r--security/ranpwd/Makefile2
-rw-r--r--security/slush/Makefile2
-rw-r--r--security/snortsnarf/Makefile2
-rw-r--r--security/sqlninja/Makefile2
-rw-r--r--security/sslsniffer/Makefile2
-rw-r--r--security/symbion-sslproxy/Makefile2
-rw-r--r--security/tinyca/Makefile2
-rw-r--r--security/vinetto/Makefile2
-rw-r--r--shells/ambit/Makefile2
-rw-r--r--shells/lshell/Makefile2
-rw-r--r--sysutils/accountsservice/Makefile2
-rw-r--r--sysutils/batmon/Makefile2
-rw-r--r--sysutils/ccd2iso/Makefile2
-rw-r--r--sysutils/cdargs/Makefile2
-rw-r--r--sysutils/cramfs/Makefile2
-rw-r--r--sysutils/dar/Makefile2
-rw-r--r--sysutils/dim/Makefile2
-rw-r--r--sysutils/dirdiff/Makefile2
-rw-r--r--sysutils/fusefs-mp3fs/Makefile2
-rw-r--r--sysutils/fusefs-simple-mtpfs/Makefile2
-rw-r--r--sysutils/gaffitter/Makefile2
-rw-r--r--sysutils/gosa/Makefile2
-rw-r--r--sysutils/gtk-imonc/Makefile2
-rw-r--r--sysutils/knutclient-kde4/Makefile2
-rw-r--r--sysutils/loganalyzer/Makefile2
-rw-r--r--sysutils/mdf2iso/Makefile2
-rw-r--r--sysutils/nitrogen/Makefile2
-rw-r--r--sysutils/ntfsprogs/Makefile2
-rw-r--r--sysutils/pacman/Makefile2
-rw-r--r--sysutils/pipemeter/Makefile2
-rw-r--r--sysutils/powerman/Makefile2
-rw-r--r--sysutils/procenv/Makefile2
-rw-r--r--sysutils/rdiff-backup-devel/Makefile2
-rw-r--r--sysutils/rsyncbackup/Makefile2
-rw-r--r--sysutils/searchmonkey/Makefile2
-rw-r--r--sysutils/toshctl/Makefile2
-rw-r--r--sysutils/unieject/Makefile2
-rw-r--r--sysutils/wmmemload/Makefile2
-rw-r--r--sysutils/xbattbar/Makefile2
-rw-r--r--textproc/align/Makefile2
-rw-r--r--textproc/apertium/Makefile2
-rw-r--r--textproc/bib2html/Makefile2
-rw-r--r--textproc/chpp/Makefile2
-rw-r--r--textproc/dixit/Makefile2
-rw-r--r--textproc/easydiff/Makefile2
-rw-r--r--textproc/ffe/Makefile2
-rw-r--r--textproc/htdig/Makefile2
-rw-r--r--textproc/humanzip/Makefile2
-rw-r--r--textproc/libextractor/Makefile2
-rw-r--r--textproc/libmrss-php/Makefile2
-rw-r--r--textproc/libmrss/Makefile2
-rw-r--r--textproc/ots/Makefile2
-rw-r--r--textproc/popup/Makefile2
-rw-r--r--textproc/pychm/Makefile2
-rw-r--r--textproc/sagasu/Makefile2
-rw-r--r--textproc/sdcv/Makefile2
-rw-r--r--textproc/sigil/Makefile2
-rw-r--r--textproc/soothsayer/Makefile2
-rw-r--r--textproc/ssddiff/Makefile2
-rw-r--r--textproc/tdhkit/Makefile2
-rw-r--r--textproc/txt2man/Makefile2
-rw-r--r--textproc/unrtf/Makefile2
-rw-r--r--textproc/yould/Makefile2
-rw-r--r--www/anyremote2html/Makefile2
-rw-r--r--www/aria2fe/Makefile2
-rw-r--r--www/bacula-web/Makefile2
-rw-r--r--www/bareos-webui/Makefile2
-rw-r--r--www/boa/Makefile2
-rw-r--r--www/bookmarkbridge/Makefile2
-rw-r--r--www/castget/Makefile2
-rw-r--r--www/cgicc/Makefile2
-rw-r--r--www/cntlm/Makefile2
-rw-r--r--www/erwn/Makefile2
-rw-r--r--www/ffproxy/Makefile2
-rw-r--r--www/flat-frog/Makefile2
-rw-r--r--www/geeklog/Makefile2
-rw-r--r--www/grr/Makefile2
-rw-r--r--www/gurlchecker/Makefile2
-rw-r--r--www/hastymail/Makefile2
-rw-r--r--www/hastymail2-devel/Makefile2
-rw-r--r--www/hastymail2/Makefile2
-rw-r--r--www/htmlpp/Makefile2
-rw-r--r--www/junkbuster/Makefile2
-rw-r--r--www/lightsquid/Makefile2
-rw-r--r--www/man2web/Makefile2
-rw-r--r--www/mknmz-wwwoffle/Makefile2
-rw-r--r--www/mozplugger/Makefile2
-rw-r--r--www/pnews/Makefile2
-rw-r--r--www/quickie/Makefile2
-rw-r--r--www/revive-adserver/Makefile2
-rw-r--r--www/rsstool/Makefile2
-rw-r--r--www/srg/Makefile2
-rw-r--r--www/sventon/Makefile2
-rw-r--r--www/swish++/Makefile2
-rw-r--r--www/template_/Makefile2
-rw-r--r--www/templatelite/Makefile2
-rw-r--r--www/webstats/Makefile2
-rw-r--r--www/wsmake/Makefile2
-rw-r--r--x11-clocks/aclock/Makefile2
-rw-r--r--x11-clocks/buici-clock/Makefile2
-rw-r--r--x11-clocks/rclock/Makefile2
-rw-r--r--x11-clocks/wmclock/Makefile2
-rw-r--r--x11-drivers/xf86-input-wacom/Makefile2
-rw-r--r--x11-fm/krusader2/Makefile2
-rw-r--r--x11-fonts/bdfresize/Makefile2
-rw-r--r--x11-toolkits/fox16/Makefile2
-rw-r--r--x11-toolkits/fxscintilla/Makefile2
-rw-r--r--x11-toolkits/gtkglext/Makefile2
-rw-r--r--x11-toolkits/gtkimageview/Makefile2
-rw-r--r--x11-toolkits/otk/Makefile2
-rw-r--r--x11-toolkits/viewklass/Makefile2
-rw-r--r--x11-toolkits/xmhtml/Makefile2
-rw-r--r--x11-wm/devilspie/Makefile2
-rw-r--r--x11-wm/fluxconf/Makefile2
-rw-r--r--x11-wm/flwm/Makefile2
-rw-r--r--x11-wm/jewel/Makefile2
-rw-r--r--x11-wm/lwm/Makefile2
-rw-r--r--x11-wm/plwm/Makefile2
-rw-r--r--x11-wm/ratpoison/Makefile2
-rw-r--r--x11-wm/windowlab/Makefile2
-rw-r--r--x11-wm/wmakerconf/Makefile2
-rw-r--r--x11/docker-tray/Makefile2
-rw-r--r--x11/gdkxft/Makefile2
-rw-r--r--x11/gromit/Makefile2
-rw-r--r--x11/gskrab/Makefile2
-rw-r--r--x11/multi-aterm/Makefile2
-rw-r--r--x11/qxkb/Makefile2
-rw-r--r--x11/roxterm/Makefile2
-rw-r--r--x11/simdock/Makefile2
-rw-r--r--x11/temperature.app/Makefile2
-rw-r--r--x11/wmappl/Makefile2
-rw-r--r--x11/wmdrawer/Makefile2
-rw-r--r--x11/workrave/Makefile2
-rw-r--r--x11/xcalib/Makefile2
-rw-r--r--x11/xcolorsel/Makefile2
-rw-r--r--x11/xtermcontrol/Makefile2
-rw-r--r--x11/xtrlock/Makefile3
-rw-r--r--x11/xvkbd/Makefile2
-rw-r--r--x11/yeahconsole/Makefile2
791 files changed, 792 insertions, 797 deletions
diff --git a/archivers/dact/Makefile b/archivers/dact/Makefile
index c11b4c4b4c25..283469c9420b 100644
--- a/archivers/dact/Makefile
+++ b/archivers/dact/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.rkeene.org/files/oss/dact/release/
MAINTAINER= ports@FreeBSD.org
COMMENT= Dynamic Adaptive Compression Tool
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libmcrypt.so:${PORTSDIR}/security/libmcrypt \
diff --git a/archivers/lbrate/Makefile b/archivers/lbrate/Makefile
index 0c15dcf3b7e4..c8faeb65f0cc 100644
--- a/archivers/lbrate/Makefile
+++ b/archivers/lbrate/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SUNSITE/utils/compress
MAINTAINER= ports@FreeBSD.org
COMMENT= Extract/decompress CP/M LBR archives
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
MAKE_ARGS= CC="${CC}" CFLAGS="${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
diff --git a/archivers/mtf/Makefile b/archivers/mtf/Makefile
index 1f20b3c314d0..af4e0ab851b8 100644
--- a/archivers/mtf/Makefile
+++ b/archivers/mtf/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SUNSITE/system/backup
MAINTAINER= ports@FreeBSD.org
COMMENT= Unix reader for the Microsoft Tape Format used by NT Backup
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= tar:tgz
diff --git a/archivers/ucl/Makefile b/archivers/ucl/Makefile
index 4a682162f333..96a64dd0943a 100644
--- a/archivers/ucl/Makefile
+++ b/archivers/ucl/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.oberhumer.com/opensource/ucl/download/
MAINTAINER= ports@FreeBSD.org
COMMENT= Data compression library with low memory usage
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
CONFLICTS_INSTALL= libucl
diff --git a/archivers/xpk/Makefile b/archivers/xpk/Makefile
index d43d513c6970..f13614c9460c 100644
--- a/archivers/xpk/Makefile
+++ b/archivers/xpk/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://vesuri.jormas.com/xpk/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= The eXternal PacKer (XPK) library system
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= libtool
diff --git a/astro/gpscorrelate/Makefile b/astro/gpscorrelate/Makefile
index 8b90b5d9affe..e66467010832 100644
--- a/astro/gpscorrelate/Makefile
+++ b/astro/gpscorrelate/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= astro geography
MAINTAINER= ports@FreeBSD.org
COMMENT= Correlate digital camera photos with GPS data in GPX format
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libexiv2.so:${PORTSDIR}/graphics/exiv2 \
diff --git a/astro/gpsdrive/Makefile b/astro/gpsdrive/Makefile
index b4ac29bf4507..b778a0f3b880 100644
--- a/astro/gpsdrive/Makefile
+++ b/astro/gpsdrive/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://www.gpsdrive.de/packages/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= GPS navigation system
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre
diff --git a/astro/josm/Makefile b/astro/josm/Makefile
index 5423ba1ab7a1..afbc4a39d2ca 100644
--- a/astro/josm/Makefile
+++ b/astro/josm/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY= # empty
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Comprehensive editor for OpenStreetMap.org database
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
NO_WRKSUBDIR= yes
diff --git a/astro/libosmpbf/Makefile b/astro/libosmpbf/Makefile
index 5b2748ea4d92..bf0956f4b821 100644
--- a/astro/libosmpbf/Makefile
+++ b/astro/libosmpbf/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= astro geography devel
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Library for handling binary OpenStreetMap data
-LICENSE= LGPL3 # or later
+LICENSE= LGPL3+
LICENSE_FILE= ${WRKSRC}/COPYING.osmpbf
LIB_DEPENDS= libprotobuf.so:${PORTSDIR}/devel/protobuf
diff --git a/astro/planets/Makefile b/astro/planets/Makefile
index d4d7019b3d8d..9e16a8e335d3 100644
--- a/astro/planets/Makefile
+++ b/astro/planets/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= GENTOO \
MAINTAINER= ports@FreeBSD.org
COMMENT= Orbital simulator
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake tar:tgz
diff --git a/astro/rmap/Makefile b/astro/rmap/Makefile
index 7f769165c63a..08146e4fe1a4 100644
--- a/astro/rmap/Makefile
+++ b/astro/rmap/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://rmap.sourceforge.net/
MAINTAINER= ports@FreeBSD.org
COMMENT= Generates images of the Earth centered at a particular location
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd
diff --git a/astro/roadmap/Makefile b/astro/roadmap/Makefile
index ead39ae5aabd..146f19ed787e 100644
--- a/astro/roadmap/Makefile
+++ b/astro/roadmap/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= ports@FreeBSD.org
COMMENT= Vector-based GPS moving map
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2
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
diff --git a/benchmarks/autobench/Makefile b/benchmarks/autobench/Makefile
index 611593340835..93973aaf77ca 100644
--- a/benchmarks/autobench/Makefile
+++ b/benchmarks/autobench/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://www.xenoclast.org/autobench/downloads/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= Automating the process of benchmarking a web server
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENCE
RUN_DEPENDS= httperf:${PORTSDIR}/benchmarks/httperf \
diff --git a/benchmarks/stress-ng/Makefile b/benchmarks/stress-ng/Makefile
index 789748b80dcc..7a35d33724b8 100644
--- a/benchmarks/stress-ng/Makefile
+++ b/benchmarks/stress-ng/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES= http://kernel.ubuntu.com/~cking/tarballs/stress-ng/
MAINTAINER= luca.pizzamiglio@gmail.com
COMMENT= Stress test benchmarks
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
ALL_TARGET= # empty
diff --git a/biology/fastdnaml/Makefile b/biology/fastdnaml/Makefile
index 1d165af42414..69775afa9de2 100644
--- a/biology/fastdnaml/Makefile
+++ b/biology/fastdnaml/Makefile
@@ -11,7 +11,7 @@ DISTNAME= fastDNAml_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Faster DNAML, makes phylogenetic trees using maximum likelihood
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
BUILD_WRKSRC= ${WRKSRC}/source
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}"
diff --git a/biology/gff2ps/Makefile b/biology/gff2ps/Makefile
index 11e06ce17ee4..411d9f05f31e 100644
--- a/biology/gff2ps/Makefile
+++ b/biology/gff2ps/Makefile
@@ -12,7 +12,7 @@ DISTFILES= ${PORTNAME}_v${PORTVERSION}.gz
MAINTAINER= ports@FreeBSD.org
COMMENT= Converts gff-formated genomic data-sets to PostScript
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
RUN_DEPENDS= gawk:${PORTSDIR}/lang/gawk \
bash:${PORTSDIR}/shells/bash
diff --git a/biology/mopac/Makefile b/biology/mopac/Makefile
index 874ec12fb655..faab25b16421 100644
--- a/biology/mopac/Makefile
+++ b/biology/mopac/Makefile
@@ -12,7 +12,7 @@ DISTNAME= mopac7-${MOPAC_SUBVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Semi-empirical (MNDO, etc.) molecular orbital calculation
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
USES= fortran gmake libtool pathfix
GNU_CONFIGURE= yes
diff --git a/biology/treeviewx/Makefile b/biology/treeviewx/Makefile
index 19fbe98144cb..ece2114d27e1 100644
--- a/biology/treeviewx/Makefile
+++ b/biology/treeviewx/Makefile
@@ -11,7 +11,7 @@ DISTNAME= tv-0.5
MAINTAINER= ports@FreeBSD.org
COMMENT= Phylogenetic tree viewer
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_WX= 2.8
diff --git a/cad/admesh/Makefile b/cad/admesh/Makefile
index 6b054b56371a..a2d269a86bc7 100644
--- a/cad/admesh/Makefile
+++ b/cad/admesh/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://launchpadlibrarian.net/67068999/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= Program for processing STL triangulated solid meshes
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
OPTIONS_DEFINE= DOCS
diff --git a/cad/atlc/Makefile b/cad/atlc/Makefile
index 62914230ee7c..5ca0987853ab 100644
--- a/cad/atlc/Makefile
+++ b/cad/atlc/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool to calculate the impedance of transmission lines
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index ccb17a67aed5..1acae6907c1e 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}-gaf-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= GPL Electronic Design Automation tools
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LIB_DEPENDS= libstroke.so:${PORTSDIR}/devel/libstroke \
libguile.so:${PORTSDIR}/lang/guile
diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile
index e320c5ce64ed..49b2d18665a5 100644
--- a/cad/gerbv/Makefile
+++ b/cad/gerbv/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Gerber file viewer
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= autoreconf desktop-file-utils gmake libtool localbase pathfix pkgconfig
diff --git a/cad/pdnmesh/Makefile b/cad/pdnmesh/Makefile
index cd7768dc1a94..e79622468717 100644
--- a/cad/pdnmesh/Makefile
+++ b/cad/pdnmesh/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Mesh generator and solver for Finite Element problems
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LIB_DEPENDS= libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext
diff --git a/cad/qfsm/Makefile b/cad/qfsm/Makefile
index ba694ae16581..ea535b1cb599 100644
--- a/cad/qfsm/Makefile
+++ b/cad/qfsm/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphical tool for designing finite state machines
-LICENSE= GPLv3 # (or later)
+LICENSE= GPLv3+
OPTIONS_DEFINE= GRAPHVIZ DOCS EXAMPLES
diff --git a/cad/qucs/Makefile b/cad/qucs/Makefile
index f014702404ba..d763c4e8c650 100644
--- a/cad/qucs/Makefile
+++ b/cad/qucs/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES= SF
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Graphical circuit design and simulation tool
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_QT4= moc_build uic_build rcc_build linguisttools_build \
diff --git a/cad/sweethome3d/Makefile b/cad/sweethome3d/Makefile
index a569962b57fc..f58a3777a660 100644
--- a/cad/sweethome3d/Makefile
+++ b/cad/sweethome3d/Makefile
@@ -10,7 +10,7 @@ DISTNAME= SweetHome3D-${PORTVERSION}-src
MAINTAINER= matthias@petermann-it.de
COMMENT= Free interior design application
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING.TXT
BUILD_DEPENDS= java3d>=0:${PORTSDIR}/java/java3d
diff --git a/cad/verilog-mode.el/Makefile b/cad/verilog-mode.el/Makefile
index 3d21a29e7480..541972beaf16 100644
--- a/cad/verilog-mode.el/Makefile
+++ b/cad/verilog-mode.el/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX= .gz
MAINTAINER= ports@FreeBSD.org
COMMENT= Emacs lisp modules for the Verilog language
-LICENSE= GPLv3 # (or later)
+LICENSE= GPLv3+
EXTRACT_CMD= ${GZCAT}
EXTRACT_BEFORE_ARGS= #
diff --git a/chinese/pcmanx/Makefile b/chinese/pcmanx/Makefile
index af17c4a1573d..1f2ba338f4f2 100644
--- a/chinese/pcmanx/Makefile
+++ b/chinese/pcmanx/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}-gtk2-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= BBS client using GTK+ 2.x
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_GNOME= gtk20 intlhack
diff --git a/chinese/reciteword/Makefile b/chinese/reciteword/Makefile
index 0dc442760f47..46774314d880 100644
--- a/chinese/reciteword/Makefile
+++ b/chinese/reciteword/Makefile
@@ -14,7 +14,7 @@ DISTFILES= ${DISTNAME}.tar.bz2 \
MAINTAINER= ports@FreeBSD.org
COMMENT= Education software to help people to study English
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libespeak.so:${PORTSDIR}/audio/espeak
diff --git a/chinese/scim-array/Makefile b/chinese/scim-array/Makefile
index 38ef897238ad..ffe88cf416ff 100644
--- a/chinese/scim-array/Makefile
+++ b/chinese/scim-array/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://of.openfoundry.org/download/scimarray/${PORTVERSION}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Array 30 SCIM IMEngine module
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim
diff --git a/chinese/wordpress-zh_CN/Makefile b/chinese/wordpress-zh_CN/Makefile
index 41639495e1aa..811d027fc28e 100644
--- a/chinese/wordpress-zh_CN/Makefile
+++ b/chinese/wordpress-zh_CN/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX= -zh_CN
MAINTAINER= miwi@FreeBSD.org
COMMENT= State-of-the-art semantic personal publishing platform
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/license.txt
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/chinese/wordpress-zh_TW/Makefile b/chinese/wordpress-zh_TW/Makefile
index 4e853120f0c0..d6b4cfe742e7 100644
--- a/chinese/wordpress-zh_TW/Makefile
+++ b/chinese/wordpress-zh_TW/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX= -zh_TW
MAINTAINER= miwi@FreeBSD.org
COMMENT= State-of-the-art semantic personal publishing platform
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/license.txt
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/comms/bforce-kst/Makefile b/comms/bforce-kst/Makefile
index cb5500a6eedd..8c77f92b02b2 100644
--- a/comms/bforce-kst/Makefile
+++ b/comms/bforce-kst/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}-0.22.8.kst7
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple ifcico like Fidonet technology mailer
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/../COPYING
USES= gmake
diff --git a/comms/gpredict/Makefile b/comms/gpredict/Makefile
index 1c5ac6a2b3be..fa50925aaf2a 100644
--- a/comms/gpredict/Makefile
+++ b/comms/gpredict/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/Gpredict/${PORTVERSION}
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Amateur Radio satellite tracking and prediction
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LIB_DEPENDS= libhamlib.so:${PORTSDIR}/comms/hamlib \
libcurl.so:${PORTSDIR}/ftp/curl \
diff --git a/comms/ser2net/Makefile b/comms/ser2net/Makefile
index a1e7dcfb7ef7..9c1f9606806a 100644
--- a/comms/ser2net/Makefile
+++ b/comms/ser2net/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Allows to access serial ports over IP
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_RC_SUBR= ${PORTNAME}
diff --git a/comms/sredird/Makefile b/comms/sredird/Makefile
index 75fd654a0f40..9d04859b856a 100644
--- a/comms/sredird/Makefile
+++ b/comms/sredird/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SUNSITE/system/serial
MAINTAINER= ports@FreeBSD.org
COMMENT= RFC 2217 compliant serial port redirector
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
OPTIONS_DEFINE= DOCS
diff --git a/comms/tcpser/Makefile b/comms/tcpser/Makefile
index 0cd829f342ae..d606b7e018e3 100644
--- a/comms/tcpser/Makefile
+++ b/comms/tcpser/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.jbrain.com/pub/linux/serial/
MAINTAINER= ports@FreeBSD.org
COMMENT= TCPSER turns serial port into an emulated Hayes compatible modem
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LDFLAGS+= -pthread
USES= dos2unix gmake
diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile
index 0a7a52bf2907..f8695e03977b 100644
--- a/converters/osm2pgsql/Makefile
+++ b/converters/osm2pgsql/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= converters geography
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Convert OSM XML data to PostgreSQL database
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libproj.so:${PORTSDIR}/graphics/proj \
diff --git a/converters/uudeview/Makefile b/converters/uudeview/Makefile
index 5bab4875cae2..247c1c94473f 100644
--- a/converters/uudeview/Makefile
+++ b/converters/uudeview/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.fpx.de/fp/Software/UUDeview/download/
MAINTAINER= ports@FreeBSD.org
COMMENT= Program for uu/xx/Base64/BinHex/yEnc de-/encoding
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libuu.so:${PORTSDIR}/converters/uulib
diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile
index 04455b2d3c74..14a5a8553fef 100644
--- a/converters/uulib/Makefile
+++ b/converters/uulib/Makefile
@@ -11,7 +11,7 @@ DISTNAME= uudeview-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Library for uu/xx/Base64/BinHex/yEnc de-/encoding
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/converters/vda2fbd/Makefile b/converters/vda2fbd/Makefile
index 460dac5b74e1..07eb16c5e477 100644
--- a/converters/vda2fbd/Makefile
+++ b/converters/vda2fbd/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.dhondt.de/
MAINTAINER= ports@FreeBSD.org
COMMENT= Add-on converter for CalculiX
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/../LICENSE
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" YACC="${YACC}"
diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile
index 181b677b77e2..ef8173a2c3f4 100644
--- a/converters/xdeview/Makefile
+++ b/converters/xdeview/Makefile
@@ -11,7 +11,7 @@ DISTNAME= uudeview-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= X11 program for uu/xx/Base64/BinHex/yEnc de-/encoding
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libuu.so:${PORTSDIR}/converters/uulib
diff --git a/databases/gnatsweb4/Makefile b/databases/gnatsweb4/Makefile
index 6acd4a6a893c..754fa2e4619f 100644
--- a/databases/gnatsweb4/Makefile
+++ b/databases/gnatsweb4/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= GNU
MAINTAINER= ports@FreeBSD.org
COMMENT= Gnatsweb, a GNATS web interface
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
diff --git a/databases/grass/Makefile b/databases/grass/Makefile
index 1dfdd3e561c7..605b263b37f2 100644
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -22,7 +22,7 @@ MASTER_SITE_SUBDIR= grass64/source
MAINTAINER= ports@FreeBSD.org
COMMENT= Open source Geographical Information System (GIS)
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/GPL.TXT
BUILD_DEPENDS= ${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile
index ecea3722ace5..7ad85d263da4 100644
--- a/databases/gtksql/Makefile
+++ b/databases/gtksql/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-testing/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphical query tool for PostgreSQL/MySQL/SQLite
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LIB_DEPENDS= libscintilla.so:${PORTSDIR}/x11-toolkits/scintilla
RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils
diff --git a/databases/libdbi/Makefile b/databases/libdbi/Makefile
index 0038ce41e5e7..950b597e79c9 100644
--- a/databases/libdbi/Makefile
+++ b/databases/libdbi/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Database Independent Abstraction Layer for C
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= libtool pathfix
diff --git a/databases/libpbl/Makefile b/databases/libpbl/Makefile
index ac11addb448e..eed5373abe0a 100644
--- a/databases/libpbl/Makefile
+++ b/databases/libpbl/Makefile
@@ -10,7 +10,7 @@ DISTNAME= pbl_${PORTVERSION:S/./_/g}
MAINTAINER= ports@FreeBSD.org
COMMENT= Peter Graf's Program Base Library
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
MAKEFILE= makefile
TEST_TARGET= test
diff --git a/databases/mysqlsla/Makefile b/databases/mysqlsla/Makefile
index 82e39df04827..e3a31df88a25 100644
--- a/databases/mysqlsla/Makefile
+++ b/databases/mysqlsla/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= databases
MAINTAINER= ports@FreeBSD.org
COMMENT= Mysqlsla analyzes general, slow, and raw MySQL statement logs
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
RUN_DEPENDS= p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
diff --git a/databases/py-cdb/Makefile b/databases/py-cdb/Makefile
index 78cc92259439..6c91a8bc14cd 100644
--- a/databases/py-cdb/Makefile
+++ b/databases/py-cdb/Makefile
@@ -11,7 +11,7 @@ DISTNAME= python-${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python interface to DJB's constant database library
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= python:2
diff --git a/databases/py-rrdtool_lgpl/Makefile b/databases/py-rrdtool_lgpl/Makefile
index 1c91768aee1a..40f408444b64 100644
--- a/databases/py-rrdtool_lgpl/Makefile
+++ b/databases/py-rrdtool_lgpl/Makefile
@@ -12,7 +12,7 @@ DISTNAME= py-rrdtool-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python interface to RRDTool, the graphing and logging utility
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= librrd.so:${PORTSDIR}/databases/rrdtool
diff --git a/databases/qof/Makefile b/databases/qof/Makefile
index ce460504eab4..a2deb20dcc91 100644
--- a/databases/qof/Makefile
+++ b/databases/qof/Makefile
@@ -9,7 +9,7 @@ DISTNAME= qof_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
COMMENT= Query Object Framework
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
CONFLICTS_INSTALL= gnotime-2.[0-3]* gnotime-2.4.0* gnotime-2.4.1 gnotime-2.4.1_[12]*
diff --git a/databases/rrdtool10/Makefile b/databases/rrdtool10/Makefile
index 81df3ddea928..57a9b9023d99 100644
--- a/databases/rrdtool10/Makefile
+++ b/databases/rrdtool10/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX= 10
MAINTAINER= ports@FreeBSD.org
COMMENT= Round Robin Database Tools
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
MAKE_ENV= PERL=${PERL}
diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index 95ac2e871a80..de05a77776f5 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Interactive tool for querying Sybase database servers
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LIB_DEPENDS= libct.so:${PORTSDIR}/databases/freetds
diff --git a/databases/wmjsql/Makefile b/databases/wmjsql/Makefile
index 4012ded810cf..255c11dc7dda 100644
--- a/databases/wmjsql/Makefile
+++ b/databases/wmjsql/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://freebsd.nsu.ru/distfiles/
MAINTAINER= ports@FreeBSD.org
COMMENT= MySQL server status displaying dockapp
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake
diff --git a/deskutils/aspostit/Makefile b/deskutils/aspostit/Makefile
index 1e32ce505ddf..7df6a11ad5c5 100644
--- a/deskutils/aspostit/Makefile
+++ b/deskutils/aspostit/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= AFTERSTEP/apps/aspostit
MAINTAINER= ports@FreeBSD.org
COMMENT= AfterStep dockable version of XPostIt
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
USE_XORG= xpm xaw xext x11
USES= gmake jpeg
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index bb9cdfc381ca..cf7ff57fc669 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/Drivel%20%28stable%29/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Blog editor for GNOME
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LIB_DEPENDS= libsoup-2.4.so:${PORTSDIR}/devel/libsoup
diff --git a/deskutils/fbreader/Makefile b/deskutils/fbreader/Makefile
index a64b26048566..82cda442bbbd 100644
--- a/deskutils/fbreader/Makefile
+++ b/deskutils/fbreader/Makefile
@@ -10,7 +10,7 @@ CATEGORIES= deskutils
MAINTAINER= ports@FreeBSD.org
COMMENT= Powerful e-book reader
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \
libexpat.so:${PORTSDIR}/textproc/expat2 \
diff --git a/deskutils/ganyremote/Makefile b/deskutils/ganyremote/Makefile
index 73a3ae5b96d8..c1c7d13a9f6d 100644
--- a/deskutils/ganyremote/Makefile
+++ b/deskutils/ganyremote/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/anyremote/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= GNOME frontend for anyRemote
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
RUN_DEPENDS= anyremote:${PORTSDIR}/comms/anyremote
diff --git a/deskutils/gkrellm-reminder2/Makefile b/deskutils/gkrellm-reminder2/Makefile
index dba8dd035904..cd22c5caee50 100644
--- a/deskutils/gkrellm-reminder2/Makefile
+++ b/deskutils/gkrellm-reminder2/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://members.dslextreme.com/users/billw/gkrellm/Plugins/ \
PKGNAMEPREFIX= gkrellm-
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
MAINTAINER= ports@FreeBSD.org
diff --git a/deskutils/gnotime/Makefile b/deskutils/gnotime/Makefile
index 08d3a733ad93..e3fab304021d 100644
--- a/deskutils/gnotime/Makefile
+++ b/deskutils/gnotime/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/gttr/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Time tracker for gnome2
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libqof.so:${PORTSDIR}/databases/qof
diff --git a/deskutils/griffith/Makefile b/deskutils/griffith/Makefile
index 8721417746e7..b9e396d37ed8 100644
--- a/deskutils/griffith/Makefile
+++ b/deskutils/griffith/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://launchpadlibrarian.net/87859599/
MAINTAINER= ports@FreeBSD.org
COMMENT= Lightweight film collection manager
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 0a27a7c501de..19e7567dae5c 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= Unicode/ISO10646 character map and font viewer
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= itstool:${PORTSDIR}/textproc/itstool
diff --git a/deskutils/mdh/Makefile b/deskutils/mdh/Makefile
index b20dc4c3421e..c2abdafcedd4 100644
--- a/deskutils/mdh/Makefile
+++ b/deskutils/mdh/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.gozer.org/programs/gtk/files/
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK2-based toolbar, like a smaller GNOME panel
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
USE_GNOME= gtk20
USES= gmake pkgconfig tar:bzip2
diff --git a/deskutils/osmo/Makefile b/deskutils/osmo/Makefile
index ab260fd419f5..bdae6abe0809 100644
--- a/deskutils/osmo/Makefile
+++ b/deskutils/osmo/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}-pim/${PORTNAME}-pim/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Personal organizer
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libical.so:${PORTSDIR}/devel/libical \
diff --git a/deskutils/py-taskw/Makefile b/deskutils/py-taskw/Makefile
index d2abd91a92a9..04add2f1b18e 100644
--- a/deskutils/py-taskw/Makefile
+++ b/deskutils/py-taskw/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= koobs@FreeBSD.org
COMMENT= Python bindings for your taskwarrior database
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \
diff --git a/deskutils/pypanel/Makefile b/deskutils/pypanel/Makefile
index 8b4d23f2a058..ddf36c1ded2b 100644
--- a/deskutils/pypanel/Makefile
+++ b/deskutils/pypanel/Makefile
@@ -11,7 +11,7 @@ DISTNAME= PyPanel-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Desktop panel written in Python
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \
diff --git a/devel/aifad/Makefile b/devel/aifad/Makefile
index bc83a1b11382..50606d2242e2 100644
--- a/devel/aifad/Makefile
+++ b/devel/aifad/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= devel
MAINTAINER= ports@FreeBSD.org
COMMENT= Machine learning system
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
BUILD_DEPENDS= menhir:${PORTSDIR}/devel/menhir \
ocaml-cfg>0:${PORTSDIR}/devel/ocaml-cfg \
diff --git a/devel/alabastra/Makefile b/devel/alabastra/Makefile
index 6047ade65c8e..b27fdeac328a 100644
--- a/devel/alabastra/Makefile
+++ b/devel/alabastra/Makefile
@@ -11,7 +11,7 @@ DISTNAME= Alabastra-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ editor written with Qt 4
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
WRKSRC= ${WRKDIR}/${DISTNAME}
diff --git a/devel/argtable/Makefile b/devel/argtable/Makefile
index 29e8ab0df654..0fec234bac24 100644
--- a/devel/argtable/Makefile
+++ b/devel/argtable/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION:S/./-/}
MAINTAINER= ports@FreeBSD.org
COMMENT= ANSI C library for parsing GNU style command line arguments
-LICENSE= LGPL20 # or later
+LICENSE= LGPL20+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= libtool
diff --git a/devel/cccc/Makefile b/devel/cccc/Makefile
index 777cc72edb16..330d6c19c42f 100644
--- a/devel/cccc/Makefile
+++ b/devel/cccc/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= C and C++ Code Counter
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
USES= gmake
MAKEFILE= makefile
diff --git a/devel/cons-test/Makefile b/devel/cons-test/Makefile
index 449d1cc07809..30a58e5b71fe 100644
--- a/devel/cons-test/Makefile
+++ b/devel/cons-test/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= http://www.dsmit.com/cons/stable/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= Test bed for `Cons' development
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${LOCALBASE}/bin/cons:${PORTSDIR}/devel/cons
diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
index 81ca761b82b4..9eefaae647d5 100644
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Static analysis of C/C++ code
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libtinyxml2.so:${PORTSDIR}/textproc/tinyxml2
diff --git a/devel/cvs/Makefile b/devel/cvs/Makefile
index c88f37b2230b..71d560430720 100644
--- a/devel/cvs/Makefile
+++ b/devel/cvs/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= LOCAL/eadler
MAINTAINER?= ports@FreeBSD.org
COMMENT?= Version control system
-LICENSE= GPLv2 # or any later version
+LICENSE= GPLv2+
CONFLICTS_INSTALL?= cvs+ipv6-[12]* cvs-devel-[12]*
diff --git a/devel/cvsbook/Makefile b/devel/cvsbook/Makefile
index ee36a788bd5c..7e4fb3206ba7 100644
--- a/devel/cvsbook/Makefile
+++ b/devel/cvsbook/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-all
MAINTAINER= ports@FreeBSD.org
COMMENT= Tutorial and reference for CVS
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
NO_ARCH= yes
diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index 74a44d2d356b..15507a6e4807 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.akhphd.au.dk/~bertho/cvsgraph/release/
MAINTAINER= ports@FreeBSD.org
COMMENT= Graph the life story of a file under CVS or RCS
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd
diff --git a/devel/cxxtools/Makefile b/devel/cxxtools/Makefile
index 351367a4fd88..36c9bdddd628 100644
--- a/devel/cxxtools/Makefile
+++ b/devel/cxxtools/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.tntnet.org/download/
MAINTAINER= ports@FreeBSD.org
COMMENT= Collection of general-purpose C++ classes
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
PATCH_STRIP= -p1
diff --git a/devel/elfio/Makefile b/devel/elfio/Makefile
index 692cb6702260..af73305fab1e 100644
--- a/devel/elfio/Makefile
+++ b/devel/elfio/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME:tu}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ library for reading and generating files in the ELF binary format
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/devel/etl/Makefile b/devel/etl/Makefile
index fa97225e0c64..608cbac3c6d7 100644
--- a/devel/etl/Makefile
+++ b/devel/etl/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ETL-${PORTVERSION}
MAINTAINER= woodsb02@gmail.com
COMMENT= Voria Extended Class and Template Library
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
NO_ARCH= yes
diff --git a/devel/gazpacho/Makefile b/devel/gazpacho/Makefile
index 78f852940f1c..72b1fafaa63f 100644
--- a/devel/gazpacho/Makefile
+++ b/devel/gazpacho/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= GNOME/sources/gazpacho/0.7
MAINTAINER= ports@FreeBSD.org
COMMENT= GUI builder for the GTK+ toolkit
-LICENSE= LGPL21 # or later (source mentions LGPL20+)
+LICENSE= LGPL21+ # source mentions LGPL20+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${LOCALBASE}/bin/kiwi-i18n:${PORTSDIR}/x11-toolkits/py-kiwi
diff --git a/devel/gengetopt/Makefile b/devel/gengetopt/Makefile
index 2ad236ff1ee0..f1b571eadb0b 100644
--- a/devel/gengetopt/Makefile
+++ b/devel/gengetopt/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= GNU
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool for generating a C function which parses command line arguments
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake
diff --git a/devel/gettext-msghack/Makefile b/devel/gettext-msghack/Makefile
index 913a84924eb3..7e612221c071 100644
--- a/devel/gettext-msghack/Makefile
+++ b/devel/gettext-msghack/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= gettext-
MAINTAINER= rene@FreeBSD.org
COMMENT= Alter gettext po files in special ways
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
NO_BUILD= yes
NO_ARCH= yes
diff --git a/devel/gitg0/Makefile b/devel/gitg0/Makefile
index 1adb38cb411d..6913a463bc23 100644
--- a/devel/gitg0/Makefile
+++ b/devel/gitg0/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX= 0
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= GTK-based git repository viewer (gtk2 version)
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= git:${PORTSDIR}/devel/git
diff --git a/devel/gtgt/Makefile b/devel/gtgt/Makefile
index 1077a9115d52..56b633fbefba 100644
--- a/devel/gtgt/Makefile
+++ b/devel/gtgt/Makefile
@@ -12,7 +12,7 @@ COMMENT= General (or GNU) template generation tools
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
-LICENSE= GPLv2 # or later (though COPYING has GPLv3)
+LICENSE= GPLv2+ # though COPYING has GPLv3
USES= shebangfix
NO_BUILD= yes
diff --git a/devel/jtag/Makefile b/devel/jtag/Makefile
index fed9d3506907..8c89faf4f8c4 100644
--- a/devel/jtag/Makefile
+++ b/devel/jtag/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/openwince/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Utility to work with JTAG-aware boards
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
BUILD_DEPENDS= ${OPENWINCE_INCLUDE_DEP}:${PORTSDIR}/devel/openwince-include
RUN_DEPENDS:= ${BUILD_DEPENDS}
diff --git a/devel/kaptain/Makefile b/devel/kaptain/Makefile
index 20573c5eb60a..09ba35669fa5 100644
--- a/devel/kaptain/Makefile
+++ b/devel/kaptain/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool for building/running Qt GUIs for command line programs
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= qmake tar:tgz
diff --git a/devel/libafterbase/Makefile b/devel/libafterbase/Makefile
index 87d25bb6e34a..ae607ae2fdb8 100644
--- a/devel/libafterbase/Makefile
+++ b/devel/libafterbase/Makefile
@@ -11,7 +11,7 @@ DISTNAME= libAfterBase-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= AfterStep basic functionality library
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
USES= desthack
GNU_CONFIGURE= yes
diff --git a/devel/libclaw/Makefile b/devel/libclaw/Makefile
index d9e17faf7ab5..cec665a3a969 100644
--- a/devel/libclaw/Makefile
+++ b/devel/libclaw/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= C++ Library Absolutely Wonderful
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png
diff --git a/devel/libdisorder/Makefile b/devel/libdisorder/Makefile
index e851f94b1786..f53d7dba7f12 100644
--- a/devel/libdisorder/Makefile
+++ b/devel/libdisorder/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://libdisorder.freshdefense.net/releases/
MAINTAINER= kevlo@FreeBSD.org
COMMENT= Simple C library for entropy measurement
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_LDCONFIG= yes
diff --git a/devel/libexplain/Makefile b/devel/libexplain/Makefile
index ff7ffb70ba94..69775ab86053 100644
--- a/devel/libexplain/Makefile
+++ b/devel/libexplain/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:R}
MAINTAINER= ports@FreeBSD.org
COMMENT= Library which may be used to explain Unix and Linux system call errors
-LICENSE= LGPL3 # or later
+LICENSE= LGPL3+
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed
diff --git a/devel/libghthash/Makefile b/devel/libghthash/Makefile
index 26400eafddb1..348b02bdec95 100644
--- a/devel/libghthash/Makefile
+++ b/devel/libghthash/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.ipd.bth.se/ska/sim_home/filer/
MAINTAINER= ports@FreeBSD.org
COMMENT= Generic Hash Table
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= autoreconf libtool
diff --git a/devel/libhoard/Makefile b/devel/libhoard/Makefile
index 14ecd943b1e0..b74aa93b6167 100644
--- a/devel/libhoard/Makefile
+++ b/devel/libhoard/Makefile
@@ -10,7 +10,7 @@ DISTNAME= Hoard-${PORTVERSION}-source
MAINTAINER= uffe@uffe.org
COMMENT= Fast, scalable, and memory-efficient allocator for MP
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/../COPYING
BROKEN_mips= no spin lock implementation is available for this platform
diff --git a/devel/liblouis/Makefile b/devel/liblouis/Makefile
index 5b39b913ad69..636330a99eda 100644
--- a/devel/liblouis/Makefile
+++ b/devel/liblouis/Makefile
@@ -10,7 +10,7 @@ CATEGORIES= devel
MAINTAINER= wen@FreeBSD.org
COMMENT= Open-source Braille Translator And Back-translator
-LICENSE= LGPL3 # or any later version
+LICENSE= LGPL3+
BUILD_DEPENDS= help2man:${PORTSDIR}/misc/help2man
diff --git a/devel/liblouisxml/Makefile b/devel/liblouisxml/Makefile
index c9f951c1dedc..328784dd9bd7 100644
--- a/devel/liblouisxml/Makefile
+++ b/devel/liblouisxml/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= GOOGLE_CODE
MAINTAINER= wen@FreeBSD.org
COMMENT= Library Provide Complete Braille Transcription Services
-LICENSE= LGPL3 GPLv3 # or later
+LICENSE= LGPL3+ GPLv3+
LICENSE_COMB= multi
RUN_DEPENDS= ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
diff --git a/devel/librcc/Makefile b/devel/librcc/Makefile
index 950100ccb82c..078056d1c825 100644
--- a/devel/librcc/Makefile
+++ b/devel/librcc/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://dside.dyndns.org/files/rusxmms/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= Library used by rusxmms for language autodetection
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= librcd.so:${PORTSDIR}/devel/librcd \
diff --git a/devel/librcd/Makefile b/devel/librcd/Makefile
index c8ab1b0bce58..7c4ccf4e2326 100644
--- a/devel/librcd/Makefile
+++ b/devel/librcd/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://dside.dyndns.org/files/rusxmms/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= Library used by rusxmms for autodetection of Russian charset
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile
index 65ee441cd2f1..a85b31f499ed 100644
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
COMMENT= Callback Framework for C++
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/devel/libthai/Makefile b/devel/libthai/Makefile
index 594efabe9a7c..5d2aa8355ee2 100644
--- a/devel/libthai/Makefile
+++ b/devel/libthai/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://linux.thai.net/pub/thailinux/software/libthai/
MAINTAINER= ports@FreeBSD.org
COMMENT= Thai language support library
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libdatrie.so:${PORTSDIR}/devel/libdatrie
diff --git a/devel/lpc21isp/Makefile b/devel/lpc21isp/Makefile
index bf441cd02eea..3ce24f5cda4c 100644
--- a/devel/lpc21isp/Makefile
+++ b/devel/lpc21isp/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION:S/.//}
MAINTAINER= ports@FreeBSD.org
COMMENT= ISP programmer tool for flashing NXP & Analog Devices ARM7 CPUs
-LICENSE= LGPL3 # (or later)
+LICENSE= LGPL3+
USES= gmake
diff --git a/devel/omniNotify/Makefile b/devel/omniNotify/Makefile
index 8c23cf13a314..004c62648297 100644
--- a/devel/omniNotify/Makefile
+++ b/devel/omniNotify/Makefile
@@ -12,7 +12,7 @@ DISTNAME= omniNotify-2-latest
MAINTAINER= ports@FreeBSD.org
COMMENT= CORBA Notification Service (CosNotification) for omniORB
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libomniORB4.so:${PORTSDIR}/devel/omniORB-4.1
diff --git a/devel/omniORB-4.1/Makefile b/devel/omniORB-4.1/Makefile
index 7ca761e0d1f7..223ba2ea5581 100644
--- a/devel/omniORB-4.1/Makefile
+++ b/devel/omniORB-4.1/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX= 41
MAINTAINER= ports@FreeBSD.org
COMMENT= Robust high performance CORBA ORB for C++ and Python
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
CONFLICTS= omniORB-4.2.*
diff --git a/devel/onscripter/Makefile b/devel/onscripter/Makefile
index 78208cf5cd2d..83cba6505725 100644
--- a/devel/onscripter/Makefile
+++ b/devel/onscripter/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES= http://onscripter.sourceforge.jp/
MAINTAINER= jbeich@FreeBSD.org
COMMENT?= Visual novel engine compatible with NScripter
-LICENSE= GPLv2 # or any later version
+LICENSE= GPLv2+
LIB_DEPENDS= libsmpeg.so:${PORTSDIR}/multimedia/smpeg \
libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
diff --git a/devel/openzz/Makefile b/devel/openzz/Makefile
index 1c9d0f4680d7..f64a80784dab 100644
--- a/devel/openzz/Makefile
+++ b/devel/openzz/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-1.0.4-4
MAINTAINER= ports@FreeBSD.org
COMMENT= Interpreted dynamic parser
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
diff --git a/devel/osc/Makefile b/devel/osc/Makefile
index 481057bf43b8..5df32159d8d3 100644
--- a/devel/osc/Makefile
+++ b/devel/osc/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= devel
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Command Line Interface to work with an openSUSE Build Service
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}m2crypto>0:${PORTSDIR}/security/py-m2crypto \
diff --git a/devel/phpbt/Makefile b/devel/phpbt/Makefile
index 5e03df37105e..e41f9cfb826e 100644
--- a/devel/phpbt/Makefile
+++ b/devel/phpbt/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Bug-tracking system developed in PHP
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${LOCALBASE}/share/pear/DB.php:${PORTSDIR}/databases/pear-DB
diff --git a/devel/picprog/Makefile b/devel/picprog/Makefile
index abf4ea90c2dd..191bbd8f3222 100644
--- a/devel/picprog/Makefile
+++ b/devel/picprog/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://hyvatti.iki.fi/~jaakko/pic/
MAINTAINER= erik@bz.bzflag.bz
COMMENT= Serial port pic16c84 programmer
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
OPTIONS_DEFINE= DOCS
diff --git a/devel/piklab/Makefile b/devel/piklab/Makefile
index 319e097cc8e1..c165be27782d 100644
--- a/devel/piklab/Makefile
+++ b/devel/piklab/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= KDE/Qt IDE for microcontroller development
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
DOS2UNIX_FILES= cmake/Piklab.cmake
USE_QT4= corelib gui qt3support qtestlib xml \
diff --git a/devel/pire/Makefile b/devel/pire/Makefile
index a62c438f325d..f5ed3919df00 100644
--- a/devel/pire/Makefile
+++ b/devel/pire/Makefile
@@ -13,7 +13,7 @@ COMMENT= Perl Incompatible Regular Expressions library
USE_GITHUB= yes
GH_ACCOUNT= dprokoptsev
-LICENSE= LGPL3 # or later
+LICENSE= LGPL3+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/devel/ponscripter-sekai/Makefile b/devel/ponscripter-sekai/Makefile
index f58278030270..09ff2b23d40a 100644
--- a/devel/ponscripter-sekai/Makefile
+++ b/devel/ponscripter-sekai/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= devel games
MAINTAINER= jbeich@FreeBSD.org
COMMENT= NScripter-like novel-game interpreter with Unicode support
-LICENSE= GPLv2 # or any later version
+LICENSE= GPLv2+
LIB_DEPENDS= libsmpeg2.so:${PORTSDIR}/multimedia/smpeg2 \
libfreetype.so:${PORTSDIR}/print/freetype2
diff --git a/devel/poslib/Makefile b/devel/poslib/Makefile
index 210a67dbdb42..42c2bb445dac 100644
--- a/devel/poslib/Makefile
+++ b/devel/poslib/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/posadis/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Posadis C++ DNS library
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/devel/ppl/Makefile b/devel/ppl/Makefile
index c737a99d8024..c4bcbebd31f3 100644
--- a/devel/ppl/Makefile
+++ b/devel/ppl/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= ftp://ftp.cs.unipr.it/pub/ppl/releases/${PORTVERSION}/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ library for the manipulation of convex polyhedra
-LICENSE= GPLv3 # (or later)
+LICENSE= GPLv3+
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
LIB_DEPENDS= libglpk.so:${PORTSDIR}/math/glpk \
diff --git a/devel/premake/Makefile b/devel/premake/Makefile
index c6225eef7bbb..d20473ec3e7b 100644
--- a/devel/premake/Makefile
+++ b/devel/premake/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Build script creation tool
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
WRKSRC= ${WRKDIR}/Premake-${PORTVERSION}
diff --git a/devel/projectcenter/Makefile b/devel/projectcenter/Makefile
index 96028a7f298c..20c66da6b6b7 100644
--- a/devel/projectcenter/Makefile
+++ b/devel/projectcenter/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ProjectCenter-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Development environment for GNUstep
-LICENSE= GPLv2 # or later (comment in code; COPYING says GPLv3)
+LICENSE= GPLv2+ # comment in code; COPYING says GPLv3
USES= gnustep
USE_GNUSTEP= back build
diff --git a/devel/py-fam/Makefile b/devel/py-fam/Makefile
index 7c88488c5752..44efe2014c9a 100644
--- a/devel/py-fam/Makefile
+++ b/devel/py-fam/Makefile
@@ -12,7 +12,7 @@ DISTNAME= python-fam-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python Interface to the File Alteration Monitor
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= python fam
diff --git a/devel/py-pqueue/Makefile b/devel/py-pqueue/Makefile
index 916fee873f91..75eb8c93f386 100644
--- a/devel/py-pqueue/Makefile
+++ b/devel/py-pqueue/Makefile
@@ -12,7 +12,7 @@ DISTNAME= PQueue-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Fibonacci-Heap based Priority-Queue Extension for Python
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= python tar:bzip2
diff --git a/devel/py-wsgitools/Makefile b/devel/py-wsgitools/Makefile
index 2c8127023ee9..bdbd0680e8e3 100644
--- a/devel/py-wsgitools/Makefile
+++ b/devel/py-wsgitools/Makefile
@@ -12,7 +12,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= aehlig@linta.de
COMMENT= Useful middlewares and filters for wsgi as well as scgi servers
-LICENSE= GPLv2 # or higher
+LICENSE= GPLv2+
USES= python:2
USE_PYTHON= distutils autoplist
diff --git a/devel/rubygem-ditz/Makefile b/devel/rubygem-ditz/Makefile
index 405409e13076..38de9cdf0d8b 100644
--- a/devel/rubygem-ditz/Makefile
+++ b/devel/rubygem-ditz/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= RG
MAINTAINER= kuriyama@FreeBSD.org
COMMENT= Simple lightweight distributed issue tracker
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= rubygem-trollop>=1.9:${PORTSDIR}/devel/rubygem-trollop
diff --git a/devel/statsvn/Makefile b/devel/statsvn/Makefile
index 7260c9da3061..11536f4192b7 100644
--- a/devel/statsvn/Makefile
+++ b/devel/statsvn/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-source
MAINTAINER= ports@FreeBSD.org
COMMENT= Subversion repository activity report generator
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
RUN_DEPENDS= subversion>=1.3:${PORTSDIR}/devel/subversion
diff --git a/devel/synfig/Makefile b/devel/synfig/Makefile
index 3cf1477c42ed..2f47d1a49057 100644
--- a/devel/synfig/Makefile
+++ b/devel/synfig/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/releases/${PORTVERSION}/source
MAINTAINER= woodsb02@gmail.com
COMMENT= Vector based 2D animation package
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
BUILD_DEPENDS= etl>=0.04.19_1:${PORTSDIR}/devel/etl
LIB_DEPENDS= libboost_program_options.so:${PORTSDIR}/devel/boost-libs \
diff --git a/devel/tdl/Makefile b/devel/tdl/Makefile
index bef3219ea7f9..ebe65f50b351 100644
--- a/devel/tdl/Makefile
+++ b/devel/tdl/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.rpcurnow.force9.co.uk/tdl/
MAINTAINER= ports@FreeBSD.org
COMMENT= To-do list manager
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
CONFLICTS= devtodo-[0-9]*
diff --git a/devel/vtcl/Makefile b/devel/vtcl/Makefile
index a83e84fc4b4b..dd57fcc057e2 100644
--- a/devel/vtcl/Makefile
+++ b/devel/vtcl/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.6.1.a1
MAINTAINER= ports@FreeBSD.org
COMMENT= Application Development Environment for Tcl/Tk
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/devel/websvn/Makefile b/devel/websvn/Makefile
index a8f7c6a9734d..1c078218911c 100644
--- a/devel/websvn/Makefile
+++ b/devel/websvn/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://websvn.tigris.org/files/documents/1380/49056/
MAINTAINER= ychsiao@ychsiao.org
COMMENT= Subversion repository web frontend
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/license.txt
USES= cpe
diff --git a/devel/xparam/Makefile b/devel/xparam/Makefile
index 27e00813afbc..20721e550092 100644
--- a/devel/xparam/Makefile
+++ b/devel/xparam/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= General-purpose tool for parameter handling in C++
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
GNU_CONFIGURE= yes
USES= gmake libtool:build
diff --git a/dns/opendd/Makefile b/dns/opendd/Makefile
index b034f7e6244e..cb283672da7d 100644
--- a/dns/opendd/Makefile
+++ b/dns/opendd/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= DynDNS client
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
OPTIONS_DEFINE= OPENSSL RCNG DOCS
diff --git a/editors/aewan/Makefile b/editors/aewan/Makefile
index a10906aa0dca..4c1bd8cc195d 100644
--- a/editors/aewan/Makefile
+++ b/editors/aewan/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Curses-based program for the creation and editing of ASCII art
-LICENSE= GPLv2 # pr later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/editors/chexedit/Makefile b/editors/chexedit/Makefile
index 7031a2c1bd90..be38793996c6 100644
--- a/editors/chexedit/Makefile
+++ b/editors/chexedit/Makefile
@@ -12,7 +12,7 @@ DISTNAME= hexedit-${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Full screen text mode Hex editor using the [n]curses library
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/editors/codelite/Makefile b/editors/codelite/Makefile
index 8d9ef70777c6..af06ef84274c 100644
--- a/editors/codelite/Makefile
+++ b/editors/codelite/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= GH
MAINTAINER= ports@FreeBSD.org
COMMENT= Open Source IDE for C/C++
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
RUN_DEPENDS= xterm:${PORTSDIR}/x11/xterm
diff --git a/editors/cream/Makefile b/editors/cream/Makefile
index 42feb9e017a5..98cbb182fa20 100644
--- a/editors/cream/Makefile
+++ b/editors/cream/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/Cream/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Gvim extension with many features
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
RUN_DEPENDS= ${LOCALBASE}/bin/gvim:${PORTSDIR}/editors/vim
diff --git a/editors/gwrite/Makefile b/editors/gwrite/Makefile
index 107de6d24f4f..1a3a4364780e 100644
--- a/editors/gwrite/Makefile
+++ b/editors/gwrite/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple HTML format editor
-LICENSE= LGPL3 # (or later)
+LICENSE= LGPL3+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>=2.15:${PORTSDIR}/devel/py-python-distutils-extra \
diff --git a/editors/hnb/Makefile b/editors/hnb/Makefile
index 5652360389d8..61754f521394 100644
--- a/editors/hnb/Makefile
+++ b/editors/hnb/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Hierarchical NoteBook a data organizer
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/../COPYING
ONLY_FOR_ARCHS= i386
diff --git a/editors/klat4/Makefile b/editors/klat4/Makefile
index 27fdcf818519..3ce2beb5516f 100644
--- a/editors/klat4/Makefile
+++ b/editors/klat4/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://klat.algebraical.info/
MAINTAINER= anna.ladilova@gmail.com
COMMENT= LaTeX source editor for KDE4
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
USES= cmake gettext-tools tar:bzip2
USE_KDE4= automoc4 kate kdelibs kdeprefix
diff --git a/editors/mp/Makefile b/editors/mp/Makefile
index 4fc3bfde267e..d1699a1b8cb0 100644
--- a/editors/mp/Makefile
+++ b/editors/mp/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://triptico.com/download/mp/
MAINTAINER= ports@FreeBSD.org
COMMENT= Programming text editor
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= iconv ncurses
diff --git a/editors/ne/Makefile b/editors/ne/Makefile
index d96dc2c83734..057b47682fa7 100644
--- a/editors/ne/Makefile
+++ b/editors/ne/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://ne.di.unimi.it/
MAINTAINER= ports@FreeBSD.org
COMMENT= Nice and powerful editor
-LICENSE= GPLv3 # (or later)
+LICENSE= GPLv3+
#LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_WRKSRC= ${WRKSRC}/src
diff --git a/editors/plume-creator-devel/Makefile b/editors/plume-creator-devel/Makefile
index 1ff58143f46d..b62359db81df 100644
--- a/editors/plume-creator-devel/Makefile
+++ b/editors/plume-creator-devel/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES= http://deponie.yamagi.org/freebsd/distfiles/plume-creator/
MAINTAINER= yamagi@yamagi.org
COMMENT= Open source tool for novelists
-LICENSE= GPLv3 # (or later)
+LICENSE= GPLv3+
DATE= 20150510
diff --git a/editors/zoinks/Makefile b/editors/zoinks/Makefile
index 436ef06418e1..2f9da51d364f 100644
--- a/editors/zoinks/Makefile
+++ b/editors/zoinks/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://zoinks.mikelockwood.com/download/
MAINTAINER= ports@FreeBSD.org
COMMENT= X11 programmer's editor and development environment
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
USE_XORG= xpm
GNU_CONFIGURE= yes
diff --git a/emulators/advancemess/Makefile b/emulators/advancemess/Makefile
index a003052667e7..a7efd52167ee 100644
--- a/emulators/advancemess/Makefile
+++ b/emulators/advancemess/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/advancemame/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= SDL MESS port with advanced TV and monitor video support
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2
diff --git a/emulators/gnuboy/Makefile b/emulators/gnuboy/Makefile
index f9db1e6c15cb..daa4b5cac1e7 100644
--- a/emulators/gnuboy/Makefile
+++ b/emulators/gnuboy/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.sourcefiles.org/Emulators/Videogames/
MAINTAINER= ports@FreeBSD.org
COMMENT= Nintendo GameBoy emulator
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libvga.so:${PORTSDIR}/graphics/svgalib
diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index 049b3b128e24..e12e15e58e28 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://download.tuxfamily.org/hatari/${PORTVERSION}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Atari ST emulator
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio \
libpng.so:${PORTSDIR}/graphics/png
diff --git a/emulators/lisaem/Makefile b/emulators/lisaem/Makefile
index af5cbebfa90b..66bc13bafdf2 100644
--- a/emulators/lisaem/Makefile
+++ b/emulators/lisaem/Makefile
@@ -12,7 +12,7 @@ COMMENT= Apple Lisa 2 Emulator
BUILD_DEPENDS= pngtopnm:${PORTSDIR}/graphics/netpbm
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
USES= tar:bzip2
USE_WX= 2.8
diff --git a/emulators/loemu/Makefile b/emulators/loemu/Makefile
index f8f5987fe3d3..d0b54087845e 100644
--- a/emulators/loemu/Makefile
+++ b/emulators/loemu/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://loemu.pegueroles.com/dists/
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple frontend for various game emulators
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2 \
${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2 \
diff --git a/emulators/mednafen/Makefile b/emulators/mednafen/Makefile
index 1881bd05ddad..067b2f9acb19 100644
--- a/emulators/mednafen/Makefile
+++ b/emulators/mednafen/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://mednafen.fobby.net/releases/files/
MAINTAINER= acm@FreeBSD.org
COMMENT= Portable multi-system emulator
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libcdio.so:${PORTSDIR}/sysutils/libcdio \
diff --git a/emulators/ppsspp/Makefile b/emulators/ppsspp/Makefile
index c641cd11bd93..8635cde5f3c1 100644
--- a/emulators/ppsspp/Makefile
+++ b/emulators/ppsspp/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY= ${DISTFILES:N*\:manpage:C/:.*//}
MAINTAINER= jbeich@FreeBSD.org
COMMENT= PSP emulator in C++ with dynarec JIT for x86, ARM, MIPS
-LICENSE= GPLv2 # or any later version
+LICENSE= GPLv2+
LIB_DEPENDS= libzip.so:${PORTSDIR}/archivers/libzip \
libsnappy.so:${PORTSDIR}/archivers/snappy \
diff --git a/emulators/snes9express/Makefile b/emulators/snes9express/Makefile
index f0331be0c9bd..fd90339eed54 100644
--- a/emulators/snes9express/Makefile
+++ b/emulators/snes9express/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK interface for snes9x
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
RUN_DEPENDS= snes9x:${PORTSDIR}/emulators/snes9x
diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile
index d57fae4934a6..6b4884ae6cdc 100644
--- a/emulators/xsystem35/Makefile
+++ b/emulators/xsystem35/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}_${DISTVERSION}.orig
MAINTAINER= jbeich@FreeBSD.org
COMMENT= AliceSoft System 3.5/3.6/3.8/3.9 on X Window System
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LIB_DEPENDS= libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
libltdl.so:${PORTSDIR}/devel/libltdl \
diff --git a/emulators/yabause/Makefile b/emulators/yabause/Makefile
index 898ab660ea0e..76c59b979e5f 100644
--- a/emulators/yabause/Makefile
+++ b/emulators/yabause/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Sega Saturn system emulator
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
USES= cmake dos2unix openal:soft pkgconfig
DOS2UNIX_FILES= src/qt/YabauseThread.cpp
diff --git a/finance/beanie/Makefile b/finance/beanie/Makefile
index ca45fdcdbeb0..50aa55035a10 100644
--- a/finance/beanie/Makefile
+++ b/finance/beanie/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Open Source accounting system
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= dbow:${PORTSDIR}/databases/dbow
diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index b88564f1f2ef..a13a122cc668 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple Qt-based financial manager
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme \
diff --git a/finance/trytond28/Makefile b/finance/trytond28/Makefile
index 0255f496eaed..3bc779c05392 100644
--- a/finance/trytond28/Makefile
+++ b/finance/trytond28/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX= 28
MAINTAINER= matthias@petermann-it.de
COMMENT= Tryton Application Platform (Server)
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/mx/__init__.py:${PORTSDIR}/lang/py-mx-base \
diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile
index 631bb3cc4fb8..e3aef0c1a8ce 100644
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= GNU
MAINTAINER= vd@FreeBSD.org
COMMENT= Retrieve files from the Net via HTTP(S) and FTP
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= charsetfix cpe gmake makeinfo perl5 tar:xz
diff --git a/ftp/wzdftpd/Makefile b/ftp/wzdftpd/Makefile
index 1337c3f5a21e..69c67fc9c159 100644
--- a/ftp/wzdftpd/Makefile
+++ b/ftp/wzdftpd/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-sources/${PORTNAME}-${PORTVERSION:R}
MAINTAINER= ports@FreeBSD.org
COMMENT= Modular FTP server configurable online using SITE commands
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
OPTIONS_DEFINE= ICONV IPV6 MYSQL PERL PGSQL SQLITE TCL DOCS
OPTIONS_RADIO= TLS ZEROCONF
diff --git a/ftp/yafc/Makefile b/ftp/yafc/Makefile
index 43599666f43a..07522d5eee37 100644
--- a/ftp/yafc/Makefile
+++ b/ftp/yafc/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.yafc-ftp.com/downloads/
MAINTAINER= wg@FreeBSD.org
COMMENT= Yet another ftp client. Similar to ftp(1)
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
OPTIONS_DEFINE= BASH EXAMPLES NLS SSH READLINE
OPTIONS_DEFAULT=BASH NLS SSH
diff --git a/games/3dc/Makefile b/games/3dc/Makefile
index c7dc3d2991cc..13453099ffb5 100644
--- a/games/3dc/Makefile
+++ b/games/3dc/Makefile
@@ -11,7 +11,7 @@ DISTNAME= 3Dc-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= 3-Dimensional Chess for X Window System
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/../GPL
LIB_DEPENDS= libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
diff --git a/games/adgali/Makefile b/games/adgali/Makefile
index 8039cd95e348..0ff42135deed 100644
--- a/games/adgali/Makefile
+++ b/games/adgali/Makefile
@@ -12,7 +12,7 @@ COMMENT= Open source game library useful for 2D game development
BROKEN= unfetchable
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \
diff --git a/games/agame/Makefile b/games/agame/Makefile
index a96873258402..6c9d61ce6532 100644
--- a/games/agame/Makefile
+++ b/games/agame/Makefile
@@ -12,7 +12,7 @@ DISTNAME= game-src-${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Simple Tetris-like game
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
USES= gmake tar:tgz
USE_SDL= sdl image mixer
diff --git a/games/alienblaster/Makefile b/games/alienblaster/Makefile
index 6aac47469cd3..62b9f85cacc6 100644
--- a/games/alienblaster/Makefile
+++ b/games/alienblaster/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.schwardtnet.de/alienblaster/archives/
MAINTAINER= ports@FreeBSD.org
COMMENT= Alien Blaster
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= gmake tar:tgz
diff --git a/games/apoolGL/Makefile b/games/apoolGL/Makefile
index fa834c274dff..6cb95f712d67 100644
--- a/games/apoolGL/Makefile
+++ b/games/apoolGL/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-099-pre22
MAINTAINER= ports@FreeBSD.org
COMMENT= Another billiards simulator
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
USE_SDL= sdl
USE_GL= gl
diff --git a/games/aquaria/Makefile b/games/aquaria/Makefile
index a495c88e6be3..8510c876339b 100644
--- a/games/aquaria/Makefile
+++ b/games/aquaria/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= games
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Underwater 2D fantasy action-adventure (game engine)
-LICENSE= GPLv2 # or any later version
+LICENSE= GPLv2+
BUILD_DEPENDS= ${LOCALBASE}/include/glm/glm.hpp:${PORTSDIR}/math/glm
LIB_DEPENDS= libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
diff --git a/games/armagetron/Makefile b/games/armagetron/Makefile
index 1634cbd2fbc6..96cb6792a1df 100644
--- a/games/armagetron/Makefile
+++ b/games/armagetron/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX= .src.tar.bz2
MAINTAINER= ianthetechie@gmail.com
COMMENT= Multiplayer networked Tron clone in 3D
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake jpeg
diff --git a/games/arx-libertatis/Makefile b/games/arx-libertatis/Makefile
index 753c58576142..cab75141fd68 100644
--- a/games/arx-libertatis/Makefile
+++ b/games/arx-libertatis/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://downloads.sourceforge.net/arx/ \
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Cross-platform port of Arx Fatalis
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/ARX_PUBLIC_LICENSE.txt
LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2
diff --git a/games/asc/Makefile b/games/asc/Makefile
index beb9332e949e..7c7ceb697dc1 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Turn based, multiplayer strategic game with nice graphics
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
diff --git a/games/asteroids3d/Makefile b/games/asteroids3d/Makefile
index 17910c7311de..36e76b5443a8 100644
--- a/games/asteroids3d/Makefile
+++ b/games/asteroids3d/Makefile
@@ -14,7 +14,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
MAINTAINER= ports@FreeBSD.org
COMMENT= First-person shooter blowing up asteroids in 3D space
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
USES= autoreconf tar:bzip2
diff --git a/games/atomix/Makefile b/games/atomix/Makefile
index 471c17c379f1..46361ab79dc8 100644
--- a/games/atomix/Makefile
+++ b/games/atomix/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= Yet another little mind game
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
PORTSCOUT= limitw:1,even
diff --git a/games/avanor/Makefile b/games/avanor/Makefile
index 68941b5f1d21..6751d2d842de 100644
--- a/games/avanor/Makefile
+++ b/games/avanor/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= ports@FreeBSD.org
COMMENT= Rogue-like game with easy ADOM-like user interface
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake tar:bzip2
diff --git a/games/awale/Makefile b/games/awale/Makefile
index b06af916c2f6..ec26317a6859 100644
--- a/games/awale/Makefile
+++ b/games/awale/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= African board game
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= tk:wrapper
diff --git a/games/balazar/Makefile b/games/balazar/Makefile
index 20eeea669f82..054b6be38843 100644
--- a/games/balazar/Makefile
+++ b/games/balazar/Makefile
@@ -11,7 +11,7 @@ DISTNAME= Balazar-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= 3D adventure and roleplaying game
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LIB_DEPENDS= libcal3d.so:${PORTSDIR}/graphics/cal3d \
libfreetype.so:${PORTSDIR}/print/freetype2
diff --git a/games/balazarbrothers/Makefile b/games/balazarbrothers/Makefile
index 0fb14f33e722..f0ed817f9d89 100644
--- a/games/balazarbrothers/Makefile
+++ b/games/balazarbrothers/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME:S/b/B/g}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Free software 3D puzzle game
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libcal3d.so:${PORTSDIR}/graphics/cal3d \
diff --git a/games/barrage/Makefile b/games/barrage/Makefile
index 6f4f977e6957..ca50e66994b3 100644
--- a/games/barrage/Makefile
+++ b/games/barrage/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/lgames/${PORTNAME}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Destroy as many targets as possible
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake
diff --git a/games/bastet/Makefile b/games/bastet/Makefile
index d39282c4b8e2..8890692f0f0d 100644
--- a/games/bastet/Makefile
+++ b/games/bastet/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://fph.altervista.org/prog/files/
MAINTAINER= ports@FreeBSD.org
COMMENT= Ncurses Tetris clone which is harder than every other Tetris
-LICENSE= GPLv3 # (or later)
+LICENSE= GPLv3+
LIB_DEPENDS= libboost_program_options.so:${PORTSDIR}/devel/boost-libs
diff --git a/games/battletanks/Makefile b/games/battletanks/Makefile
index d6ec0c5c9ead..d400745d489e 100644
--- a/games/battletanks/Makefile
+++ b/games/battletanks/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/
MAINTAINER= ports@FreeBSD.org
COMMENT= Fast 2D tank arcade game with multiplayer and split-screen modes
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
diff --git a/games/black-box/Makefile b/games/black-box/Makefile
index 502affd58794..c42f57f2e08b 100644
--- a/games/black-box/Makefile
+++ b/games/black-box/Makefile
@@ -15,7 +15,7 @@ EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Shoot in and watch where the shot leaves the box
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_SDL= sdl image mixer
diff --git a/games/blackshadeselite/Makefile b/games/blackshadeselite/Makefile
index 20f9e1960a01..69f404deeccb 100644
--- a/games/blackshadeselite/Makefile
+++ b/games/blackshadeselite/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://download.gna.org/blackshadeselite/ \
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Psychic Bodyguard FPS - protect the VIP
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis
diff --git a/games/blobwars/Makefile b/games/blobwars/Makefile
index 7272cc3b0309..76d7bbdaa2f2 100644
--- a/games/blobwars/Makefile
+++ b/games/blobwars/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/
MAINTAINER= nemysis@FreeBSD.org
COMMENT= Mission and Objective based 2D Platform Game
-LICENSE= GPLv2 CCbyNCSA3 # GPLv2 or later
+LICENSE= GPLv2+ CCbyNCSA3
LICENSE_COMB= dual
LICENSE_NAME_CCbyNCSA3=Attribution-NonCommercial-ShareAlike 3.0 Unported
LICENSE_FILE= ${WRKSRC}/doc/license
diff --git a/games/blockout/Makefile b/games/blockout/Makefile
index 6be4b84af335..1ff1d2a9913c 100644
--- a/games/blockout/Makefile
+++ b/games/blockout/Makefile
@@ -11,7 +11,7 @@ DISTFILES= bl25-src${EXTRACT_SUFX} bl25-linux-x86${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= BlockOut II is an adaptation of the original Blockout DOS game
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
ONLY_FOR_ARCHS= i386 amd64
diff --git a/games/blockrage/Makefile b/games/blockrage/Makefile
index 4bdc48675c29..9de50a047203 100644
--- a/games/blockrage/Makefile
+++ b/games/blockrage/Makefile
@@ -13,7 +13,7 @@ DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
MAINTAINER= ports@FreeBSD.org
COMMENT= Falling blocks game with 2-player hotseat mode
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_SDL= sdl image mixer
diff --git a/games/blokish/Makefile b/games/blokish/Makefile
index 9dd71d873a8a..20f720f57049 100644
--- a/games/blokish/Makefile
+++ b/games/blokish/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}_v${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Clone of the strategy board game 'Blokus'
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/games/bombherman/Makefile b/games/bombherman/Makefile
index 16e9d8165de3..7f50ab3948b3 100644
--- a/games/bombherman/Makefile
+++ b/games/bombherman/Makefile
@@ -12,7 +12,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
MAINTAINER= ports@FreeBSD.org
COMMENT= Bomberman clone written in C++
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
diff --git a/games/bomns/Makefile b/games/bomns/Makefile
index d1f69264c19f..11c4edfb5ce6 100644
--- a/games/bomns/Makefile
+++ b/games/bomns/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= games
MAINTAINER= ports@FreeBSD.org
COMMENT= Best old-school Deathmatch game ever (only for two players)
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2
diff --git a/games/bygfoot/Makefile b/games/bygfoot/Makefile
index ba71f6bd39a6..55bccdf9e9d4 100644
--- a/games/bygfoot/Makefile
+++ b/games/bygfoot/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-source
MAINTAINER= ports@FreeBSD.org
COMMENT= Football (soccer) management game
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
# needed to save/load games
diff --git a/games/capicity/Makefile b/games/capicity/Makefile
index 5cca6d1a7186..980a3f635ed9 100644
--- a/games/capicity/Makefile
+++ b/games/capicity/Makefile
@@ -11,7 +11,7 @@ DISTNAME= CapiCity_${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Qt client for the Monopd server
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/copying.txt
LIB_DEPENDS= libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
diff --git a/games/capitalism/Makefile b/games/capitalism/Makefile
index 2dd1a4b57b20..296598cc716e 100644
--- a/games/capitalism/Makefile
+++ b/games/capitalism/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX= .tbz
MAINTAINER= ports@FreeBSD.org
COMMENT= Qt client for the Monopd server
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/copying.txt
LIB_DEPENDS= libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
diff --git a/games/cavezofphear/Makefile b/games/cavezofphear/Makefile
index a17417ed3731..e26d761dce1d 100644
--- a/games/cavezofphear/Makefile
+++ b/games/cavezofphear/Makefile
@@ -11,7 +11,7 @@ DISTNAME= phear-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Boulder Dash / Digger-like game written using ncurses
-LICENSE= GPLv3 # (or later)
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_WRKSRC= ${WRKDIR}/${DISTNAME}/src
diff --git a/games/chanta/Makefile b/games/chanta/Makefile
index fec83ae7d650..6c0528078978 100644
--- a/games/chanta/Makefile
+++ b/games/chanta/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.losersjuegos.com.ar/_media/juegos/chanta/descargas/
MAINTAINER= acm@FreeBSD.org
COMMENT= Free 2D jump and run game
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake
diff --git a/games/cheech/Makefile b/games/cheech/Makefile
index 9921d1801473..405ac5f31663 100644
--- a/games/cheech/Makefile
+++ b/games/cheech/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Multiplayer Chinese Checkers game
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libgnet-2.0.so:${PORTSDIR}/net/gnet2
diff --git a/games/chessx/Makefile b/games/chessx/Makefile
index 854394505823..40683773cbf0 100644
--- a/games/chessx/Makefile
+++ b/games/chessx/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
MAINTAINER= yamagi@yamagi.org
COMMENT= Qt 4 chess database application
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= desktop-file-utils qmake shared-mime-info tar:tgz
diff --git a/games/columns/Makefile b/games/columns/Makefile
index 09705b52a7df..a9d88dd0ac81 100644
--- a/games/columns/Makefile
+++ b/games/columns/Makefile
@@ -13,7 +13,7 @@ DISTNAME= Columns-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Nice little implementation of columns game for X Window System
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_SDL= sdl
diff --git a/games/connectagram/Makefile b/games/connectagram/Makefile
index 7ea2d9433024..cbab84314a3b 100644
--- a/games/connectagram/Makefile
+++ b/games/connectagram/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://gottcode.org/connectagram/
MAINTAINER= ports@FreeBSD.org
COMMENT= Word unscrambling game
-LICENSE= GPLv3 # (or later)
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/games/corewars/Makefile b/games/corewars/Makefile
index 3d0eb23bbbd6..166df3d93e2f 100644
--- a/games/corewars/Makefile
+++ b/games/corewars/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20%28stable%2C%20tar.gz%29/${PORTVERSIO
MAINTAINER= ports@FreeBSD.org
COMMENT= Simulation game where the goal is to crash each other's programs
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${LOCALBASE}/lib/libargp.a:${PORTSDIR}/devel/argp-standalone
diff --git a/games/crimson/Makefile b/games/crimson/Makefile
index 464fc85b046c..47e38bce86b3 100644
--- a/games/crimson/Makefile
+++ b/games/crimson/Makefile
@@ -12,7 +12,7 @@ PKGNAMESUFFIX= -fields
MAINTAINER= ports@FreeBSD.org
COMMENT= Tactical war game in the tradition of Battle Isle
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile
index 9e97d6c4d8ad..aaf4655087d6 100644
--- a/games/criticalmass/Makefile
+++ b/games/criticalmass/Makefile
@@ -12,7 +12,7 @@ DISTNAME= CriticalMass-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= SDL/OpenGL space shoot'em up game
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \
diff --git a/games/csmash/Makefile b/games/csmash/Makefile
index 9d105af1c6cf..dbf491beba29 100644
--- a/games/csmash/Makefile
+++ b/games/csmash/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/cannonsmash/CannonSmash/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= 3D tabletennis game
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gettext gmake pkgconfig
diff --git a/games/cuyo/Makefile b/games/cuyo/Makefile
index d32279c5781e..e9337a318fab 100644
--- a/games/cuyo/Makefile
+++ b/games/cuyo/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Nice, innovative, challenging Tetris-like game
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake iconv
diff --git a/games/daimonin/Makefile b/games/daimonin/Makefile
index 1fa4631e96fd..94298032caf7 100644
--- a/games/daimonin/Makefile
+++ b/games/daimonin/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= F/OSS Massively Multiplayer On-line Role-playing Game (MMORPG)
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/../../License
LIB_DEPENDS= libphysfs.so:${PORTSDIR}/devel/physfs \
diff --git a/games/dhewm3/Makefile b/games/dhewm3/Makefile
index 16bb4ed0f5df..f42b8fb6a27a 100644
--- a/games/dhewm3/Makefile
+++ b/games/dhewm3/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Doom 3 GPL source port
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/../COPYING.txt
LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \
diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index 57f67d6db826..a12645b5182d 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= UNIX rewrite of a game originally based on "Drug Wars"
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= cpe gmake gettext
diff --git a/games/duckmaze/Makefile b/games/duckmaze/Makefile
index bac48cfcdc1c..714d1ed318cb 100644
--- a/games/duckmaze/Makefile
+++ b/games/duckmaze/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Game about a duck that is in a maze
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/doc/COPYING.txt
RUN_DEPENDS= ${PYGAME}
diff --git a/games/duel/Makefile b/games/duel/Makefile
index 10d36049403e..33b4bf927199 100644
--- a/games/duel/Makefile
+++ b/games/duel/Makefile
@@ -11,7 +11,7 @@ DISTNAME= lin${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Overhead, OpenGL space shooter
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \
diff --git a/games/editss/Makefile b/games/editss/Makefile
index f5f3d659a68f..5fc626d4fb8a 100644
--- a/games/editss/Makefile
+++ b/games/editss/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= LOCAL/jylefort
MAINTAINER= ports@FreeBSD.org
COMMENT= Editor for XPilot shipshapes
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= imake
diff --git a/games/endless-sky/Makefile b/games/endless-sky/Makefile
index 832f1b20c261..23ad3d186635 100644
--- a/games/endless-sky/Makefile
+++ b/games/endless-sky/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Space exploration and combat game similar to Escape Velocity
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png
diff --git a/games/exult/Makefile b/games/exult/Makefile
index b3aa7097d345..8ac5b4679d9e 100644
--- a/games/exult/Makefile
+++ b/games/exult/Makefile
@@ -13,7 +13,7 @@ COMMENT= Ultima VII engine
BROKEN= unfetchable
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= timidity:${PORTSDIR}/audio/timidity
diff --git a/games/fishsupper/Makefile b/games/fishsupper/Makefile
index 4ea2e332c9c7..a2d217689bc3 100644
--- a/games/fishsupper/Makefile
+++ b/games/fishsupper/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Guide a cat across a series of rivers, jumping from log to log
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${LOCALBASE}/include/boost/bind.hpp:${PORTSDIR}/devel/boost-libs
diff --git a/games/flyhard/Makefile b/games/flyhard/Makefile
index 3c514d199aa8..b60af250e5d2 100644
--- a/games/flyhard/Makefile
+++ b/games/flyhard/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://www.markboyd.me.uk/games/flyhard/ \
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Game resembling Thrust, but with lots of shooting and puzzles
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png
diff --git a/games/formido/Makefile b/games/formido/Makefile
index 7c5a45e86e2d..6400c0df56a3 100644
--- a/games/formido/Makefile
+++ b/games/formido/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://www.mhgames.org/files/formido/ \
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= 2D kill-em all with 3D rendered graphics
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/GPL_license.txt
USE_SDL= sdl mixer image
diff --git a/games/freedroidrpg/Makefile b/games/freedroidrpg/Makefile
index b0fdd35acbea..263961f0503b 100644
--- a/games/freedroidrpg/Makefile
+++ b/games/freedroidrpg/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${SF_NAME}-${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Modification of the classical Freedroid engine into an RPG
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN_sparc64= does not configure
diff --git a/games/freeminer/Makefile b/games/freeminer/Makefile
index d33b28153fd5..59b9ec870d96 100644
--- a/games/freeminer/Makefile
+++ b/games/freeminer/Makefile
@@ -9,9 +9,9 @@ CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Open source sandbox game inspired by Minecraft
-LICENSE= LGPL21 GPLv3 # or later
+LICENSE= LGPL21+ GPLv3+ # source mentions GPLv3+, LICENSE.txt LGPL21+
LICENSE_COMB= multi
-LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING
+LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING # don't remove space
LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3
diff --git a/games/frotz/Makefile b/games/frotz/Makefile
index 60cdcd34f09e..039f2c99ce38 100644
--- a/games/frotz/Makefile
+++ b/games/frotz/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= games
MAINTAINER= ports@FreeBSD.org
COMMENT= Infocom games interpreter
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_GITHUB= yes
diff --git a/games/gdado/Makefile b/games/gdado/Makefile
index 68b418178bff..ae9f82aebd78 100644
--- a/games/gdado/Makefile
+++ b/games/gdado/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/souce%20code/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK2 dice roller
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/games/ggz-gtk-client/Makefile b/games/ggz-gtk-client/Makefile
index bf1e74804604..aac389897d51 100644
--- a/games/ggz-gtk-client/Makefile
+++ b/games/ggz-gtk-client/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= games
MAINTAINER= ports@FreeBSD.org
COMMENT= The GGZ Gaming Zone - GTK+ Frontend
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gettext libtool pkgconfig
diff --git a/games/gillo/Makefile b/games/gillo/Makefile
index 155681539e99..9aab0b869b94 100644
--- a/games/gillo/Makefile
+++ b/games/gillo/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}-src
MAINTAINER= ports@FreeBSD.org
COMMENT= Players are cars throwing a magnetic fuzzy ball into a goal
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${JAM}:${PORTSDIR}/devel/jam \
diff --git a/games/glightoff/Makefile b/games/glightoff/Makefile
index fb0b315c1360..6a51cbd24cbf 100644
--- a/games/glightoff/Makefile
+++ b/games/glightoff/Makefile
@@ -12,7 +12,7 @@ COMMENT= Simple (but not so easy to solve!) puzzle game
BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake iconv pkgconfig
diff --git a/games/glob2/Makefile b/games/glob2/Makefile
index 0e75c70a4552..0c90e9cb622b 100644
--- a/games/glob2/Makefile
+++ b/games/glob2/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SAVANNAH/${PORTNAME}/${PORTVERSION:R}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Globulation 2, free and innovative strategy game
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis \
diff --git a/games/gma/Makefile b/games/gma/Makefile
index 1e928b370ae1..a77a025ffd1e 100644
--- a/games/gma/Makefile
+++ b/games/gma/Makefile
@@ -11,7 +11,7 @@ COMMENT= Go-moku game which learns playing the game from studying its opponent
BROKEN= unfetchable
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
GNU_CONFIGURE= yes
diff --git a/games/gmastermind/Makefile b/games/gmastermind/Makefile
index c13dc09893d9..8f313ef4bfc7 100644
--- a/games/gmastermind/Makefile
+++ b/games/gmastermind/Makefile
@@ -10,7 +10,7 @@ DISTNAME= GMastermind-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Well-known mastermind game
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gnustep
diff --git a/games/gmines/Makefile b/games/gmines/Makefile
index d5d34ca0155e..f0781a77c230 100644
--- a/games/gmines/Makefile
+++ b/games/gmines/Makefile
@@ -10,7 +10,7 @@ DISTNAME= GMines-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Well-known minesweeper game for GNUstep
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
USES= gnustep
USE_GNUSTEP= back build
diff --git a/games/gnomekiss/Makefile b/games/gnomekiss/Makefile
index bb562fa79069..e9d9fa16d1eb 100644
--- a/games/gnomekiss/Makefile
+++ b/games/gnomekiss/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://devel.tlrmx.org/kiss/source/
MAINTAINER= ports@FreeBSD.org
COMMENT= GNOME version of Kisekae Set System
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= lha:${PORTSDIR}/archivers/lha
diff --git a/games/gnurobots/Makefile b/games/gnurobots/Makefile
index 1c2451c9c41c..f14fb12c7668 100644
--- a/games/gnurobots/Makefile
+++ b/games/gnurobots/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= GNU diversion wherein Scheme-coded robots explore a world
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libguile.so:${PORTSDIR}/lang/guile
diff --git a/games/gnustep-ladder/Makefile b/games/gnustep-ladder/Makefile
index e5b17ff73948..81bac1dcae65 100644
--- a/games/gnustep-ladder/Makefile
+++ b/games/gnustep-ladder/Makefile
@@ -12,7 +12,7 @@ DISTNAME= Ladder-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= GNU Go frontend for GNUstep
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING.GPL
RUN_DEPENDS= gnugo:${PORTSDIR}/games/gnugo
diff --git a/games/gnustep-sudoku/Makefile b/games/gnustep-sudoku/Makefile
index 5cce64c0b96a..d6f6f8ad0d63 100644
--- a/games/gnustep-sudoku/Makefile
+++ b/games/gnustep-sudoku/Makefile
@@ -11,7 +11,7 @@ DISTNAME= Sudoku-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Sudoku solver and generator
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
USES= gnustep
USE_GNUSTEP= back build
diff --git a/games/gomoku/Makefile b/games/gomoku/Makefile
index 8481dfe412cc..a152e0cc8fb0 100644
--- a/games/gomoku/Makefile
+++ b/games/gomoku/Makefile
@@ -11,7 +11,7 @@ DISTNAME= Gomoku-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= GNUstep Gomoku game
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
USES= gnustep
USE_GNUSTEP= back build
diff --git a/games/gottet/Makefile b/games/gottet/Makefile
index a909715344bc..3bd57afe1c6b 100644
--- a/games/gottet/Makefile
+++ b/games/gottet/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://gottcode.org/gottet/
MAINTAINER= ports@FreeBSD.org
COMMENT= Tetris clone
-LICENSE= GPLv3 # (or later)
+LICENSE= GPLv3+
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/games/gracer/Makefile b/games/gracer/Makefile
index e9635922eb39..534f610943cd 100644
--- a/games/gracer/Makefile
+++ b/games/gracer/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= 3D motor sport simulator
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
diff --git a/games/grhino/Makefile b/games/grhino/Makefile
index cefd27978b9a..829d267d3faa 100644
--- a/games/grhino/Makefile
+++ b/games/grhino/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/rhino/GRhino/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= GRhino Othello/Reversi Program
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gettext pkgconfig perl5
diff --git a/games/grubik/Makefile b/games/grubik/Makefile
index ccf8a3338eb2..93af7ef6e7a8 100644
--- a/games/grubik/Makefile
+++ b/games/grubik/Makefile
@@ -10,7 +10,7 @@ DISTNAME= GRubik
MAINTAINER= ports@FreeBSD.org
COMMENT= Virtual 3D Rubiks cube for GNUstep
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
USES= tar:tgz gnustep
USE_GNUSTEP= back build
diff --git a/games/gshisen/Makefile b/games/gshisen/Makefile
index 21e92a08a189..8459937f7adc 100644
--- a/games/gshisen/Makefile
+++ b/games/gshisen/Makefile
@@ -11,7 +11,7 @@ DISTNAME= GShisen-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Shisen-sho puzzle game for GNUstep
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
USES= gnustep
USE_GNUSTEP= back build
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index f3315747b37e..29d29cfd3be7 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= ports@FreeBSD.org
COMMENT= Version of the popular TetriNET multiplayer Tetris clone
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= pathfix gettext gmake pkgconfig tar:bzip2
diff --git a/games/gtkatlantic/Makefile b/games/gtkatlantic/Makefile
index 95ee70981d5b..3dfe7b511254 100644
--- a/games/gtkatlantic/Makefile
+++ b/games/gtkatlantic/Makefile
@@ -12,7 +12,7 @@ DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
MAINTAINER= ports@FreeBSD.org
COMMENT= Game like Monopoly(tm)
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= pkgconfig
diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index ae37fdfb44ec..2872acf6078f 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://gtkballs.antex.ru/dist/
MAINTAINER= ports@FreeBSD.org
COMMENT= Lines-like simple logic game for X Window System
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake pkgconfig
diff --git a/games/gtktetcolor/Makefile b/games/gtktetcolor/Makefile
index 40bfd04dc917..a6bdf502f052 100644
--- a/games/gtktetcolor/Makefile
+++ b/games/gtktetcolor/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Game for GNOME that resembles well-known Tetris and Columns
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
diff --git a/games/highmoon/Makefile b/games/highmoon/Makefile
index 782dd56e5877..73e0d0f94d02 100644
--- a/games/highmoon/Makefile
+++ b/games/highmoon/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://highmoon.gerdsmeier.net/
MAINTAINER= ports@FreeBSD.org
COMMENT= Duel in the universe
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
WRKSRC= ${WRKDIR}/HighMoon
diff --git a/games/hinversi/Makefile b/games/hinversi/Makefile
index 3c797bde6772..a9c311bc80cb 100644
--- a/games/hinversi/Makefile
+++ b/games/hinversi/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/latest
MAINTAINER= ports@FreeBSD.org
COMMENT= Reversi/Othello clone
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= libtool pathfix
diff --git a/games/holotz-castle/Makefile b/games/holotz-castle/Makefile
index a54f602b1e76..11c522173416 100644
--- a/games/holotz-castle/Makefile
+++ b/games/holotz-castle/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}-src${EXTRACT_SUFX} \
MAINTAINER= ports@FreeBSD.org
COMMENT= Platform game with high doses of mystery
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
diff --git a/games/icebreaker/Makefile b/games/icebreaker/Makefile
index 9824faaaf760..17159b76d7be 100644
--- a/games/icebreaker/Makefile
+++ b/games/icebreaker/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Game similar to Jezzball or Barrack
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= gmake tar:tgz
diff --git a/games/irrlamb/Makefile b/games/irrlamb/Makefile
index 81cc8b8aef1f..2cdbbc6f9bb7 100644
--- a/games/irrlamb/Makefile
+++ b/games/irrlamb/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= 3D physics-based puzzle game
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
diff --git a/games/jfk/Makefile b/games/jfk/Makefile
index 3489f01616e9..478cb78315e9 100644
--- a/games/jfk/Makefile
+++ b/games/jfk/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://hop.at/jfk/
MAINTAINER= ports@FreeBSD.org
COMMENT= Multiplayer 2D shoot'em up game
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_SDL= image sdl
diff --git a/games/jigsaw/Makefile b/games/jigsaw/Makefile
index 10394b666c59..ff16961258e4 100644
--- a/games/jigsaw/Makefile
+++ b/games/jigsaw/Makefile
@@ -10,7 +10,7 @@ DISTNAME= Jigsaw-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Simulates a jigsaw puzzle and illustrates the use of clipping paths
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
USES= gnustep
USE_GNUSTEP= back build
diff --git a/games/jigzo/Makefile b/games/jigzo/Makefile
index f82869efd23d..fadc028b11e0 100644
--- a/games/jigzo/Makefile
+++ b/games/jigzo/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://www.iua.upf.es/~mdeboer/resorama/jigzo/ \
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= OpenGL jigsaw puzzle game
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/GPL.txt
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png
diff --git a/games/joequake/Makefile b/games/joequake/Makefile
index 3030e069c2d9..d98db557bad9 100644
--- a/games/joequake/Makefile
+++ b/games/joequake/Makefile
@@ -14,7 +14,7 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Improved NQ engine with ZQuake and FuhQuake graphical effects
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png
diff --git a/games/jools/Makefile b/games/jools/Makefile
index b3c00a229032..239be8eea76d 100644
--- a/games/jools/Makefile
+++ b/games/jools/Makefile
@@ -12,7 +12,7 @@ DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
MAINTAINER= ports@FreeBSD.org
COMMENT= Addictive jewel-swapping puzzle game
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${PYGAME}
diff --git a/games/jtans/Makefile b/games/jtans/Makefile
index f1e06f038a04..cd83510d5aa3 100644
--- a/games/jtans/Makefile
+++ b/games/jtans/Makefile
@@ -12,7 +12,7 @@ EXTRACT_SUFX= .jar
MAINTAINER= ports@FreeBSD.org
COMMENT= Ancient puzzle
-LICENSE= GPLv2 # or later; got from website
+LICENSE= GPLv2+ # got from website
NO_WRKSUBDIR= yes
EXTRACT_CMD= ${CP}
diff --git a/games/kajaani-kombat/Makefile b/games/kajaani-kombat/Makefile
index 709b9c61d76e..d5ac08cb2cb7 100644
--- a/games/kajaani-kombat/Makefile
+++ b/games/kajaani-kombat/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://kombat.kajaani.net/dl/
MAINTAINER= ports@FreeBSD.org
COMMENT= Funny multiplayer game... and much more
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2
diff --git a/games/kardsgt/Makefile b/games/kardsgt/Makefile
index be2ebeaf5e3d..95ed595da13f 100644
--- a/games/kardsgt/Makefile
+++ b/games/kardsgt/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Card game suite
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= qmake
diff --git a/games/kevedit/Makefile b/games/kevedit/Makefile
index 9e35d7653ac2..c282d105fda6 100644
--- a/games/kevedit/Makefile
+++ b/games/kevedit/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Modern ZZT editor with necessary features
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= cdrecord:${PORTSDIR}/sysutils/cdrtools
diff --git a/games/kuklomenos/Makefile b/games/kuklomenos/Makefile
index 6f36c793a73f..db414df04afc 100644
--- a/games/kuklomenos/Makefile
+++ b/games/kuklomenos/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://mbays.freeshell.org/kuklomenos/src/
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple but challenging abstract shoot-em-up game
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
diff --git a/games/lapispuzzle/Makefile b/games/lapispuzzle/Makefile
index 8871c05f3df4..65eac24cf19e 100644
--- a/games/lapispuzzle/Makefile
+++ b/games/lapispuzzle/Makefile
@@ -11,7 +11,7 @@ DISTNAME= LapisPuzzle-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Tetris-like game for GNUstep
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gnustep
diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile
index f3401e620fac..9eb8f59319b3 100644
--- a/games/lbreakout/Makefile
+++ b/games/lbreakout/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/lgames/${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Nice clone of classical Breakout game
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_SDL= sdl
diff --git a/games/lbreakout2/Makefile b/games/lbreakout2/Makefile
index dbd48ffec6eb..a09aa18bae9b 100644
--- a/games/lbreakout2/Makefile
+++ b/games/lbreakout2/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/lgames/${PORTNAME}/${PORTVERSION:R}
MAINTAINER= ports@FreeBSD.org
COMMENT= Breakout-style arcade game
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png
diff --git a/games/lianliankan/Makefile b/games/lianliankan/Makefile
index 006942648339..96e33c9eb729 100644
--- a/games/lianliankan/Makefile
+++ b/games/lianliankan/Makefile
@@ -11,7 +11,7 @@ DISTNAME= llk_linux-${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Tile matching game
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
USES= autoreconf libtool pkgconfig
USE_GNOME= gtk20 esound
diff --git a/games/lmarbles/Makefile b/games/lmarbles/Makefile
index 9b4c81c05b13..bc90e3090d66 100644
--- a/games/lmarbles/Makefile
+++ b/games/lmarbles/Makefile
@@ -13,7 +13,7 @@ DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
MAINTAINER= ports@FreeBSD.org
COMMENT= Atomix-like game of moving marbles in puzzles
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake
diff --git a/games/lordsawar/Makefile b/games/lordsawar/Makefile
index e1d9d424bb5e..afa21fe1ebb2 100644
--- a/games/lordsawar/Makefile
+++ b/games/lordsawar/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Warlords II clone
-LICENSE= GPLv3 # (or later)
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= compiler:c++11-lib gettext gmake libarchive pkgconfig
diff --git a/games/lpairs/Makefile b/games/lpairs/Makefile
index a5ebcd204e01..b3dc377a7a27 100644
--- a/games/lpairs/Makefile
+++ b/games/lpairs/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/lgames/${PORTNAME}/
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Classical memory game
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/games/lucidlife/Makefile b/games/lucidlife/Makefile
index 1c2495f07db6..2de680b375ca 100644
--- a/games/lucidlife/Makefile
+++ b/games/lucidlife/Makefile
@@ -12,7 +12,7 @@ COMMENT= GTK2 implementation of Conway's Game of Life
BROKEN= unfetchable
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake pkgconfig
diff --git a/games/lugaru/Makefile b/games/lugaru/Makefile
index a456efff8b3d..c60e319fe5ef 100644
--- a/games/lugaru/Makefile
+++ b/games/lugaru/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-rev${DISTVERSION}-src
MAINTAINER= nemysis@FreeBSD.org
COMMENT= 3D arcade with unique fighting system and anthropomorphic characters
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING.txt
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \
diff --git a/games/macopix/Makefile b/games/macopix/Makefile
index 7c8d03b687dd..5716e2dac987 100644
--- a/games/macopix/Makefile
+++ b/games/macopix/Makefile
@@ -11,15 +11,12 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RESTRICTED_FILES}
MAINTAINER= ports@FreeBSD.org
COMMENT= Window sitter for X11
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \
libtiff.so:${PORTSDIR}/graphics/tiff
-LICENSE= GPLv2 # or later
-LICENSE_FILE= ${WRKSRC}/COPYING
-
RESTRICTED= 'contains commercial character data'
RESTRICTED_FILES= \
diff --git a/games/mahjong/Makefile b/games/mahjong/Makefile
index 8e1a0e74dec3..13246a171e58 100644
--- a/games/mahjong/Makefile
+++ b/games/mahjong/Makefile
@@ -11,7 +11,7 @@ DISTNAME= mj-${PORTVERSION}-src
MAINTAINER= johans@FreeBSD.org
COMMENT= Networked Mah Jong program, together with a computer player
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
USES= gmake perl5 pkgconfig
USE_GNOME= gtk20
diff --git a/games/masterserver/Makefile b/games/masterserver/Makefile
index dbb431d8f6d4..436949a2fd62 100644
--- a/games/masterserver/Makefile
+++ b/games/masterserver/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/lasange-system/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Masterserver for IdSoftware games (D3, EF, H2, Q2, Q3, QW)
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake tar:bzip2
diff --git a/games/maxr/Makefile b/games/maxr/Makefile
index 3da2f94e21cb..4de80489310e 100644
--- a/games/maxr/Makefile
+++ b/games/maxr/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://www.maxr.org/downloads/ \
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Mechanized Assault and Exploration Reloaded
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= localbase
diff --git a/games/minetest/Makefile b/games/minetest/Makefile
index e03b6058146f..af68fda6e915 100644
--- a/games/minetest/Makefile
+++ b/games/minetest/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Infiniminer/Minecraft inspired game
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/doc/lgpl-2.1.txt
LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3
diff --git a/games/miscom/Makefile b/games/miscom/Makefile
index 4abb427a275c..3f740d7668b3 100644
--- a/games/miscom/Makefile
+++ b/games/miscom/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Atari "Missile Command" clone
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
ALL_TARGET= # empty
diff --git a/games/monkeybubble/Makefile b/games/monkeybubble/Makefile
index 80e4ed36fb25..5e49fb102a37 100644
--- a/games/monkeybubble/Makefile
+++ b/games/monkeybubble/Makefile
@@ -11,7 +11,7 @@ DISTNAME= monkey-bubble-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK2 Puzzle Bobble clone with monkeys
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake libtool pathfix pkgconfig
diff --git a/games/mopesnake/Makefile b/games/mopesnake/Makefile
index 575ee2ba4a38..8b00618f5e49 100644
--- a/games/mopesnake/Makefile
+++ b/games/mopesnake/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY= ${PORTNAME}-pc-${DISTVERSION}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Classic snake game in which you attempt to eat all the pain
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/doc/COPYING.txt
RUN_DEPENDS= ${PYGAME}
diff --git a/games/mudmagic/Makefile b/games/mudmagic/Makefile
index dba75c79cbf1..eaeeb1554369 100644
--- a/games/mudmagic/Makefile
+++ b/games/mudmagic/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.mudmagic.com/mud-client/downloads/
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK+ based MUD client
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \
diff --git a/games/nazghul/Makefile b/games/nazghul/Makefile
index 5b2ef1d571fb..35fe745f2a8c 100644
--- a/games/nazghul/Makefile
+++ b/games/nazghul/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Computer role-playing game engine
-LICENSE= GPLv2 # or later (GPLv3 text bundled, but sources mention GPLv2+)
+LICENSE= GPLv2+ # GPLv3 text bundled, but sources mention GPLv2+
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png
diff --git a/games/netris/Makefile b/games/netris/Makefile
index b045653284fb..7d2681fc7293 100644
--- a/games/netris/Makefile
+++ b/games/netris/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= gavin@FreeBSD.org
COMMENT= Network head to head version of T*tris
BROKEN= unfetchable
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= Configure
diff --git a/games/netspades/Makefile b/games/netspades/Makefile
index bf77cb4b3662..2bb596c36a83 100644
--- a/games/netspades/Makefile
+++ b/games/netspades/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= TUCOWS/x11/entertain \
MAINTAINER= ports@FreeBSD.org
COMMENT= Very popular card game for 1-4 players over a network
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
OPTIONS_DEFINE= GTK1 SLANG
OPTIONS_DEFAULT= GTK1 SLANG
diff --git a/games/netwalk/Makefile b/games/netwalk/Makefile
index 3de96b0db03c..00fe1737c256 100644
--- a/games/netwalk/Makefile
+++ b/games/netwalk/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= games
MAINTAINER= nemysis@FreeBSD.org
COMMENT= Game where the object is to connect every terminal to the main server
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_GITHUB= yes
diff --git a/games/nuclearchess/Makefile b/games/nuclearchess/Makefile
index 2ac040ad9ce8..edfa24eda659 100644
--- a/games/nuclearchess/Makefile
+++ b/games/nuclearchess/Makefile
@@ -15,7 +15,7 @@ EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Chess variant designed to be short and fun for all players
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_SDL= sdl image
diff --git a/games/numptyphysics/Makefile b/games/numptyphysics/Makefile
index fc20e40c83ee..87c4d4b6eb9c 100644
--- a/games/numptyphysics/Makefile
+++ b/games/numptyphysics/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://mirror.amdmi3.ru/distfiles/
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Drawing physics-based puzzle game
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= tar:bzip2 desktop-file-utils
diff --git a/games/openbubbles/Makefile b/games/openbubbles/Makefile
index d79bc14a877e..4277a1f43c58 100644
--- a/games/openbubbles/Makefile
+++ b/games/openbubbles/Makefile
@@ -12,7 +12,7 @@ DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
MAINTAINER= ports@FreeBSD.org
COMMENT= Clone of Evan Bailey's game Bubbles
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= tar:bzip2
diff --git a/games/opencity/Makefile b/games/opencity/Makefile
index 25fb271c9fc8..9bf2ab5543ec 100644
--- a/games/opencity/Makefile
+++ b/games/opencity/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}stable
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Free 3D city simulator
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/games/openglad/Makefile b/games/openglad/Makefile
index eefa11b93afe..628fcba4eb6b 100644
--- a/games/openglad/Makefile
+++ b/games/openglad/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/snowstorm/OpenGlad/Openglad-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= SDL port of an old DOS game called Gladiator
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake
diff --git a/games/openpref/Makefile b/games/openpref/Makefile
index 75c226a10a9b..3db225db257e 100644
--- a/games/openpref/Makefile
+++ b/games/openpref/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/OpenPref-Qt4/${PORTNAME}-${PORTVERSION}/
MAINTAINER= annulen@yandex.ru
COMMENT= Preferans game
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= qmake
diff --git a/games/pacmanarena/Makefile b/games/pacmanarena/Makefile
index 2bb65dcd8a03..e88c3d39f29d 100644
--- a/games/pacmanarena/Makefile
+++ b/games/pacmanarena/Makefile
@@ -14,7 +14,7 @@ DISTFILES= ${DISTNAME:S/na/n-a/}.tar.bz2 \
MAINTAINER= nemysis@FreeBSD.org
COMMENT= Pacman clone in full 3D with a few surprises
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
EXTRACT_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
diff --git a/games/patapizza-tetris/Makefile b/games/patapizza-tetris/Makefile
index 133418c1c76e..8069b83465b4 100644
--- a/games/patapizza-tetris/Makefile
+++ b/games/patapizza-tetris/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Unofficial clone of the original Tetris game
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_GITHUB= yes
diff --git a/games/peg-e/Makefile b/games/peg-e/Makefile
index a8497e01a3f5..8d56f75f9453 100644
--- a/games/peg-e/Makefile
+++ b/games/peg-e/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Peg elimination game
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= compiler:c++11-lib qmake tar:bzip2
diff --git a/games/phalanx/Makefile b/games/phalanx/Makefile
index f09b24ddd699..16a935453a38 100644
--- a/games/phalanx/Makefile
+++ b/games/phalanx/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}-XXIV-source
MAINTAINER= johans@FreeBSD.org
COMMENT= Xboard-compatible chess playing program
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
WRKSRC= ${WRKDIR}/${DISTNAME:S/p/P/:S/-source//}
diff --git a/games/pingus/Makefile b/games/pingus/Makefile
index 20f578158ec8..56206bc0739d 100644
--- a/games/pingus/Makefile
+++ b/games/pingus/Makefile
@@ -14,7 +14,7 @@ COMMENT= Free Lemmings-like game
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \
libboost_signals.so:${PORTSDIR}/devel/boost-libs
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= compiler:c++11-lib iconv scons tar:bzip2
diff --git a/games/pioneers/Makefile b/games/pioneers/Makefile
index cb16021808e1..815c9f9e2d8d 100644
--- a/games/pioneers/Makefile
+++ b/games/pioneers/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/pio/Source
MAINTAINER= ports@FreeBSD.org
COMMENT= Internet playable version of the Settlers of Catan
-LICENSE= GPLv2 # or any later version
+LICENSE= GPLv2+
RUN_DEPENDS= yelp:${PORTSDIR}/x11/yelp
diff --git a/games/pipenightdreams/Makefile b/games/pipenightdreams/Makefile
index 659abe4c6f99..5808b41a47de 100644
--- a/games/pipenightdreams/Makefile
+++ b/games/pipenightdreams/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.libsdl.org/projects/pipenightdreams/packages/
MAINTAINER= ports@FreeBSD.org
COMMENT= Puzzle game similar to PipeMania
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake
diff --git a/games/pipewalker/Makefile b/games/pipewalker/Makefile
index 73e5e8660f71..65555aed576e 100644
--- a/games/pipewalker/Makefile
+++ b/games/pipewalker/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX= -src.tar.gz
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Clone of the NetWalk game
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= desktop-file-utils
diff --git a/games/plutocracy/Makefile b/games/plutocracy/Makefile
index 6620bb2cf917..ded23df80228 100644
--- a/games/plutocracy/Makefile
+++ b/games/plutocracy/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://mirror.amdmi3.ru/distfiles/
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Multiplayer 3D economy/trade-based RTS
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png
diff --git a/games/pmars-sdl/Makefile b/games/pmars-sdl/Makefile
index b70124f8d249..75db5d96622b 100644
--- a/games/pmars-sdl/Makefile
+++ b/games/pmars-sdl/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-5
MAINTAINER= ports@FreeBSD.org
COMMENT= Port of pMARS using the Simple Directmedia Library
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
OPTIONS_DEFINE= ICWS94 OPTIMIZED_CFLAGS PERMUTATE SMALLMEM
OPTIONS_DEFAULT= ICWS94 OPTIMIZED_CFLAGS PERMUTATE
diff --git a/games/pmars/Makefile b/games/pmars/Makefile
index 58adc0d861e5..3a585d4998b5 100644
--- a/games/pmars/Makefile
+++ b/games/pmars/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/corewar/pMARS/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Portable corewar system with ICWS'94 extensions
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/../COPYING
WRKSRC= ${WRKDIR}/${DISTNAME}/src
diff --git a/games/poker-engine/Makefile b/games/poker-engine/Makefile
index c7b30224eb9d..393794aa9799 100644
--- a/games/poker-engine/Makefile
+++ b/games/poker-engine/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://download.gna.org/pokersource/sources/
MAINTAINER= ports@FreeBSD.org
COMMENT= Python library that implements poker rules
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${LOCALBASE}/bin/rsync:${PORTSDIR}/net/rsync \
diff --git a/games/poker-eval/Makefile b/games/poker-eval/Makefile
index e6f789a92cbe..3fb38d03a7f6 100644
--- a/games/poker-eval/Makefile
+++ b/games/poker-eval/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:E}.0
MAINTAINER= ports@FreeBSD.org
COMMENT= C library to evaluate poker hands
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/games/pongix/Makefile b/games/pongix/Makefile
index d6a3e0064266..a93581b35103 100644
--- a/games/pongix/Makefile
+++ b/games/pongix/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.losersjuegos.com.ar/_media/juegos/pongix/descargas/
MAINTAINER= ports@FreeBSD.org
COMMENT= Free pong-like game
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake
diff --git a/games/ppracer/Makefile b/games/ppracer/Makefile
index 05fbca81be93..cac4cd0a61ef 100644
--- a/games/ppracer/Makefile
+++ b/games/ppracer/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= BERLIOS \
MAINTAINER= ports@FreeBSD.org
COMMENT= 3D downhill racing game... kind of like TuxRacer Improved
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \
diff --git a/games/puckman/Makefile b/games/puckman/Makefile
index 6ece7d990830..5063eb6c1671 100644
--- a/games/puckman/Makefile
+++ b/games/puckman/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Unofficial clone of the original Pac-Man game
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_GITHUB= yes
diff --git a/games/py-poker-eval/Makefile b/games/py-poker-eval/Makefile
index 7858d0d0096f..9174ade948c6 100644
--- a/games/py-poker-eval/Makefile
+++ b/games/py-poker-eval/Makefile
@@ -12,7 +12,7 @@ DISTNAME= py${PORTNAME}-${PORTVERSION:E}.0
MAINTAINER= ports@FreeBSD.org
COMMENT= Python adaptor for the poker-eval toolkit
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpoker-eval.so:${PORTSDIR}/games/poker-eval
diff --git a/games/pyawale/Makefile b/games/pyawale/Makefile
index 800e579fba7e..1a3581c9e5f0 100644
--- a/games/pyawale/Makefile
+++ b/games/pyawale/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://download.gna.org/pyawale/
MAINTAINER= ports@FreeBSD.org
COMMENT= African board game
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${PYGAME}
diff --git a/games/pycadia/Makefile b/games/pycadia/Makefile
index d006c3c939f2..c41a30273bff 100644
--- a/games/pycadia/Makefile
+++ b/games/pycadia/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR= python
MAINTAINER= ports@FreeBSD.org
COMMENT= Home to vector gaming, Python style
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/doc/COPYING
RUN_DEPENDS= ${PYGAME}
diff --git a/games/pyching/Makefile b/games/pyching/Makefile
index c072a30b0a02..f51a0e01b476 100644
--- a/games/pyching/Makefile
+++ b/games/pyching/Makefile
@@ -12,7 +12,7 @@ COMMENT= Consult a I Ching, an ancient Chinese book of wisdom
BROKEN= unfetchable
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter
diff --git a/games/pyfa/Makefile b/games/pyfa/Makefile
index 65a9556ffd04..ab4d694b2944 100644
--- a/games/pyfa/Makefile
+++ b/games/pyfa/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= games python
MAINTAINER= andrey@bsdnir.info
COMMENT= Fitting tool for EVE Online
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>0:${PORTSDIR}/devel/py-dateutil \
diff --git a/games/pythonsudoku/Makefile b/games/pythonsudoku/Makefile
index 8c2880b4dc3b..36189caaeb3a 100644
--- a/games/pythonsudoku/Makefile
+++ b/games/pythonsudoku/Makefile
@@ -15,7 +15,7 @@ EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Text and graphical program to create or resolve Sudokus
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups-client
diff --git a/games/q2pro/Makefile b/games/q2pro/Makefile
index 322d7723f6cf..faf754ed12a7 100644
--- a/games/q2pro/Makefile
+++ b/games/q2pro/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= LOCAL/alepulver
MAINTAINER= danfe@FreeBSD.org
COMMENT= Quake II engine modification compatible with R1Q2
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/gnu.txt
USES= dos2unix gmake tar:bzip2
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 9c24db686223..10b385f77699 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Cleaned up copy of the GPL'ed Quake 1 source code
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png
diff --git a/games/rtb/Makefile b/games/rtb/Makefile
index 94da3a0b520c..1f82ede64c7f 100644
--- a/games/rtb/Makefile
+++ b/games/rtb/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME}-1.0.x/${PORTNAME}%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Robot programming game for UNIX
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed
diff --git a/games/schiff/Makefile b/games/schiff/Makefile
index adff2a576b17..be99ddccde12 100644
--- a/games/schiff/Makefile
+++ b/games/schiff/Makefile
@@ -15,7 +15,7 @@ EXTRACT_ONLY= # empty
MAINTAINER= ports@FreeBSD.org
COMMENT= Steer your ship(s) with the keyboard
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
RUN_DEPENDS= ${PYGAME}
diff --git a/games/schwarzweiss/Makefile b/games/schwarzweiss/Makefile
index 24900210e4ab..5d14576b2556 100644
--- a/games/schwarzweiss/Makefile
+++ b/games/schwarzweiss/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Tank game for 2 players
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/gpl.txt
RUN_DEPENDS= ${PYGAME}
diff --git a/games/sdl-ball/Makefile b/games/sdl-ball/Makefile
index 740c65faa854..b714d2452c3d 100644
--- a/games/sdl-ball/Makefile
+++ b/games/sdl-ball/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Arkanoid/Breakout clone with pretty graphics
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USES= tar:bzip2 dos2unix gmake
diff --git a/games/secrettower/Makefile b/games/secrettower/Makefile
index ce2c46a0eee0..28de27c6ae16 100644
--- a/games/secrettower/Makefile
+++ b/games/secrettower/Makefile
@@ -10,7 +10,7 @@ DIST_SUBDIR= python
MAINTAINER= ports@FreeBSD.org
COMMENT= Save princess Ericia in this 2D platform game
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${PYGAME}
diff --git a/games/simsu/Makefile b/games/simsu/Makefile
index d9352953dd4a..d22adb1edffa 100644
--- a/games/simsu/Makefile
+++ b/games/simsu/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://gottcode.org/${PORTNAME}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Basic Sudoku game
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/games/slump/Makefile b/games/slump/Makefile
index 6a6f2cbf3075..7cb0a6aeb7df 100644
--- a/games/slump/Makefile
+++ b/games/slump/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.samiam.org/slump/old/slump/
MAINTAINER= ports@FreeBSD.org
COMMENT= Fork of SLIGE that is optimized for making FreeDoom maps
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
OPTIONS_DEFINE= DOCS
diff --git a/games/spacejunk/Makefile b/games/spacejunk/Makefile
index 01c1524ef811..ca47a9a0f8c1 100644
--- a/games/spacejunk/Makefile
+++ b/games/spacejunk/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Video game about traveling in 2D planetary systems
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN_sparc64= Doesn't compile on sparc64
diff --git a/games/species/Makefile b/games/species/Makefile
index f6ec7c345695..c65b50361f56 100644
--- a/games/species/Makefile
+++ b/games/species/Makefile
@@ -11,7 +11,7 @@ DISTNAME= redcoder
MAINTAINER= ports@FreeBSD.org
COMMENT= Corewars evolver - generates warriors using genetic algorithms
-LICENSE= GPLv1 # (or later) # COPYING files mention LGPL21 and GPLv2 instead
+LICENSE= GPLv1+ # though COPYING files mention LGPL21 and GPLv2 instead
USES= gmake dos2unix tar:bzip2
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/games/starfighter/Makefile b/games/starfighter/Makefile
index 9712d4d46021..4e38ec4ec6a2 100644
--- a/games/starfighter/Makefile
+++ b/games/starfighter/Makefile
@@ -15,7 +15,7 @@ EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
MAINTAINER= nemysis@FreeBSD.org
COMMENT= Liberate the universe from the evil company WEAPCO
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/docs/LICENSE
USES= gmake iconv python:2,build shebangfix
diff --git a/games/sudoku-sensei/Makefile b/games/sudoku-sensei/Makefile
index 35226c6e4ce0..15f7ac5adb85 100644
--- a/games/sudoku-sensei/Makefile
+++ b/games/sudoku-sensei/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY= ${PORTNAME}-src-${DISTVERSION:S/./-/}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Enjoy playing with Sudoku boards designed by yourself
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
WRKSRC= ${WRKDIR}/SudokuSenseiSources
diff --git a/games/supertuxkart/Makefile b/games/supertuxkart/Makefile
index 77c291623f39..28890a234ccf 100644
--- a/games/supertuxkart/Makefile
+++ b/games/supertuxkart/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Free 3D kart racing game
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libvorbisfile.so:${PORTSDIR}/audio/libvorbis \
diff --git a/games/tanglet/Makefile b/games/tanglet/Makefile
index 0660aa9ae201..e4b6924be988 100644
--- a/games/tanglet/Makefile
+++ b/games/tanglet/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://gottcode.org/tanglet/
MAINTAINER= ports@FreeBSD.org
COMMENT= Single player word finding game based on Boggle
-LICENSE= GPLv3 # (or later)
+LICENSE= GPLv3+
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/games/tecnoballz/Makefile b/games/tecnoballz/Makefile
index fe6e2f2a836a..5414fdb299a9 100644
--- a/games/tecnoballz/Makefile
+++ b/games/tecnoballz/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://linux.tlk.fr/games/TecnoballZ/download/ \
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Brick breaker (Arkanoid-like game)
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libmikmod.so:${PORTSDIR}/audio/libmikmod \
diff --git a/games/thegrind/Makefile b/games/thegrind/Makefile
index 9fd1b1e36d32..ae33f4a3b869 100644
--- a/games/thegrind/Makefile
+++ b/games/thegrind/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/radius-engine/ld21/
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple game about escaping from work
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/License.txt
BUILD_DEPENDS= ${LOCALBASE}/lib/libradius-engine.a:${PORTSDIR}/graphics/radius-engine
diff --git a/games/tong/Makefile b/games/tong/Makefile
index f407a5c0fe05..fa6f79a3ca20 100644
--- a/games/tong/Makefile
+++ b/games/tong/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.nongnu.org/tong/
MAINTAINER= nemysis@FreeBSD.org
COMMENT= Tetris and Pong in the same place at the same time
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake
diff --git a/games/tornado/Makefile b/games/tornado/Makefile
index b50811cb2469..64543949a184 100644
--- a/games/tornado/Makefile
+++ b/games/tornado/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= https://kiza.eu/media/software/tornado/
MAINTAINER= ports@FreeBSD.org
COMMENT= Ccurses-based game of weather destruction
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gettext gmake ncurses
diff --git a/games/traingame/Makefile b/games/traingame/Makefile
index 9f59694426e7..227afaeefc22 100644
--- a/games/traingame/Makefile
+++ b/games/traingame/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= games
MAINTAINER= nemysis@FreeBSD.org
COMMENT= Game about Trains
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING.txt
LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \
diff --git a/games/ttt/Makefile b/games/ttt/Makefile
index d359e2d02627..f377869dbe56 100644
--- a/games/ttt/Makefile
+++ b/games/ttt/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple one or two player Tic Tac Toe game
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= autoreconf
diff --git a/games/tuxmath/Makefile b/games/tuxmath/Makefile
index 5e17060f25f8..e881f18e3281 100644
--- a/games/tuxmath/Makefile
+++ b/games/tuxmath/Makefile
@@ -16,7 +16,7 @@ COMMENT= Educational arcade game starring Tux
BROKEN= unfetchable
-LICENSE= GPLv3 # (or later)
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/doc/COPYING_GPL3
WRKSRC= ${WRKDIR}/${PORTNAME}_w_fonts-${PORTVERSION}
diff --git a/games/tuxpaint-config/Makefile b/games/tuxpaint-config/Makefile
index b55b2230707d..0a585c6e5709 100644
--- a/games/tuxpaint-config/Makefile
+++ b/games/tuxpaint-config/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/tuxpaint/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphical tool to change TuxPaint settings
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/docs/COPYING.txt
LIB_DEPENDS= libpaper.so:${PORTSDIR}/print/libpaper \
diff --git a/games/tuxpaint-stamps/Makefile b/games/tuxpaint-stamps/Makefile
index 33a585abced2..943cdf04e24f 100644
--- a/games/tuxpaint-stamps/Makefile
+++ b/games/tuxpaint-stamps/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/tuxpaint/${PORTNAME}/${PORTVERSION:S|.|-|g}
MAINTAINER= ports@FreeBSD.org
COMMENT= TuxPaint Stamps
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/docs/COPYING.txt
RUN_DEPENDS= tuxpaint:${PORTSDIR}/games/tuxpaint
diff --git a/games/tuxpaint/Makefile b/games/tuxpaint/Makefile
index 497f8c6da31e..c32ec6f578ad 100644
--- a/games/tuxpaint/Makefile
+++ b/games/tuxpaint/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Drawing program designed for young children
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/docs/COPYING.txt
LIB_DEPENDS= libfribidi.so:${PORTSDIR}/converters/fribidi \
diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile
index 9722c13d68b7..72d1151bc1d5 100644
--- a/games/tuxracer/Makefile
+++ b/games/tuxracer/Makefile
@@ -13,7 +13,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
MAINTAINER= ports@FreeBSD.org
COMMENT= 3D penguin racing game using OpenGL
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_SDL= mixer sdl
diff --git a/games/tuxtype/Makefile b/games/tuxtype/Makefile
index 889479dedcb5..bda207cda0fd 100644
--- a/games/tuxtype/Makefile
+++ b/games/tuxtype/Makefile
@@ -15,7 +15,7 @@ COMMENT= Educational typing tutor starring Tux the Linux Penguin
BROKEN= unfetchable
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= gsed:${PORTSDIR}/textproc/gsed
diff --git a/games/twind/Makefile b/games/twind/Makefile
index a75d4ee65859..81eaff0f0f3d 100644
--- a/games/twind/Makefile
+++ b/games/twind/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
MAINTAINER= nemysis@FreeBSD.org
COMMENT= Match and remove all of the blocks before time runs out
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_SDL= sdl image mixer
diff --git a/games/twitch/Makefile b/games/twitch/Makefile
index 37a7e45d967a..4906e0ae4f83 100644
--- a/games/twitch/Makefile
+++ b/games/twitch/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Overhead 2-d shooter, reminiscent of games like Robotron
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYGAME}
diff --git a/games/typespeed/Makefile b/games/typespeed/Makefile
index dede0b42d6c1..2e9cd13388c2 100644
--- a/games/typespeed/Makefile
+++ b/games/typespeed/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Test your typing speed and get your fingers' CPS
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= ncurses
diff --git a/games/uhexen2/Makefile b/games/uhexen2/Makefile
index b9078d61388a..51dd1bb989fe 100644
--- a/games/uhexen2/Makefile
+++ b/games/uhexen2/Makefile
@@ -15,7 +15,7 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Hexen II source port supporting Linux/FreeBSD/Unix/Windows
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
LIB_DEPENDS= libmad.so:${PORTSDIR}/audio/libmad \
diff --git a/games/ultimatestunts/Makefile b/games/ultimatestunts/Makefile
index 8813cc45208b..6ed43cc30264 100644
--- a/games/ultimatestunts/Makefile
+++ b/games/ultimatestunts/Makefile
@@ -15,7 +15,7 @@ DISTFILES= ${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${EXTRACT_SUFX} \
MAINTAINER= nemysis@FreeBSD.org
COMMENT= Racing game with elaborate stunts
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libvorbisfile.so:${PORTSDIR}/audio/libvorbis
diff --git a/games/umark/Makefile b/games/umark/Makefile
index 9a98715de3ee..55ae9e9849d1 100644
--- a/games/umark/Makefile
+++ b/games/umark/Makefile
@@ -11,7 +11,7 @@ DISTNAME= UMark-for-Linux-v${DISTVERSION:S/.//g}
MAINTAINER= ports@FreeBSD.org
COMMENT= Unreal Tournament 200x series benchmark utility
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= pkgconfig shebangfix
diff --git a/games/vamos/Makefile b/games/vamos/Makefile
index c9c422a74813..c6fc343e1d40 100644
--- a/games/vamos/Makefile
+++ b/games/vamos/Makefile
@@ -13,7 +13,7 @@ DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
MAINTAINER= ports@FreeBSD.org
COMMENT= Automotive simulation framework
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
diff --git a/games/viruskiller/Makefile b/games/viruskiller/Makefile
index 2f9e9d3e182c..83b2936307f6 100644
--- a/games/viruskiller/Makefile
+++ b/games/viruskiller/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= FRUGALWARE/games-extra/${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Arcade game that relies on quick reflexes
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/doc/LICENSE
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/games/vodovod/Makefile b/games/vodovod/Makefile
index 671ff4463b71..ab66352bd53f 100644
--- a/games/vodovod/Makefile
+++ b/games/vodovod/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}-src${EXTRACT_SUFX}
MAINTAINER= nemysis@FreeBSD.org
COMMENT= Cross-platform pipe connecting action puzzle game
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-src
diff --git a/games/wanderer/Makefile b/games/wanderer/Makefile
index 7c011580887f..b52899c9b09e 100644
--- a/games/wanderer/Makefile
+++ b/games/wanderer/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.e271.net/~marina/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= Rogue like adventure game
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
MAKE_ENV= MKDIR="${MKDIR}"
diff --git a/games/wargus/Makefile b/games/wargus/Makefile
index 53534bad5c1a..9bdf0972ab26 100644
--- a/games/wargus/Makefile
+++ b/games/wargus/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Warcraft 2 mod that allows you to play Warcraft 2 with Stratagus
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= stratagus:${PORTSDIR}/games/stratagus \
diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile
index c48d73e07c44..19086f04bff4 100644
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES= SF/${PORTNAME}/releases/${PORTVERSION}/
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Innovative 3D real-time strategy game
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
diff --git a/games/widelands/Makefile b/games/widelands/Makefile
index 4d93d4204308..459afae34807 100644
--- a/games/widelands/Makefile
+++ b/games/widelands/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}-src
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Realtime strategy game inspired by Settlers II
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png
diff --git a/games/wizznic/Makefile b/games/wizznic/Makefile
index 741470c95a94..38f979439c75 100644
--- a/games/wizznic/Makefile
+++ b/games/wizznic/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= SF/${PORTNAME}/Source%20Releases/
MAINTAINER= nemysis@FreeBSD.org
COMMENT= Implementation of the arcade classic Puzznic
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png
diff --git a/games/wmminichess/Makefile b/games/wmminichess/Makefile
index acd8172da109..ec95965037b8 100644
--- a/games/wmminichess/Makefile
+++ b/games/wmminichess/Makefile
@@ -14,7 +14,7 @@ COMMENT= Window Maker chess dockapp game
BROKEN= unfetchable
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
RUN_DEPENDS= ${LOCALBASE}/bin/gnuchess:${PORTSDIR}/games/gnuchess
diff --git a/games/wmshuffle/Makefile b/games/wmshuffle/Makefile
index ded56e6e03d2..14245d86e5eb 100644
--- a/games/wmshuffle/Makefile
+++ b/games/wmshuffle/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://www.linuks.mine.nu/dockapp/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= Dockable Shuffle game for WindowMaker and AfterStep
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_XORG= xpm
diff --git a/games/wyrmgus/Makefile b/games/wyrmgus/Makefile
index 50e56b208a6f..5c14e881c1a3 100644
--- a/games/wyrmgus/Makefile
+++ b/games/wyrmgus/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= games devel
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Modified Stratagus engine for Wyrmsun
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \
diff --git a/games/xbl/Makefile b/games/xbl/Makefile
index 5ea248c75b24..59fd4574c77d 100644
--- a/games/xbl/Makefile
+++ b/games/xbl/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://perso.univ-lyon1.fr/thierry.excoffier/XBL/
MAINTAINER= ports@FreeBSD.org
COMMENT= 3D block-dropping game
-LICENSE= GPLv1 # or later
+LICENSE= GPLv1+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_XORG= x11
diff --git a/games/xblood/Makefile b/games/xblood/Makefile
index e2db07bd5144..769902851597 100644
--- a/games/xblood/Makefile
+++ b/games/xblood/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://kozos.jp/myfreesoft/
MAINTAINER= ports@FreeBSD.org
COMMENT= Makes the root window bloody
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
MAKE_ENV= X11BASE=${LOCALBASE}
diff --git a/games/xbomb/Makefile b/games/xbomb/Makefile
index c7970abf996d..e487cf1a8f8d 100644
--- a/games/xbomb/Makefile
+++ b/games/xbomb/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.gedanken.org.uk/software/xbomb/download/
MAINTAINER= danilo@FreeBSD.org
COMMENT= Minesweeper with a couple of grid types
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= pkgconfig tar:tgz
diff --git a/games/xbubble/Makefile b/games/xbubble/Makefile
index ae79f2b5ba7e..480ab787082a 100644
--- a/games/xbubble/Makefile
+++ b/games/xbubble/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= GENTOO
MAINTAINER= ports@FreeBSD.org
COMMENT= Puzzle Bobble clone for Unix/X11 platforms
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png
diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index 846b5bd13ca9..09d086cb5d3b 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphical multi-player strategy game and game design system
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
OPTIONS_DEFINE= SDL
diff --git a/games/xevil/Makefile b/games/xevil/Makefile
index 47e1b5f2382a..064094fccd38 100644
--- a/games/xevil/Makefile
+++ b/games/xevil/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}src${PORTVERSION:S/.r/r/}
MAINTAINER= ports@FreeBSD.org
COMMENT= Fast-action, networked, anti-social, kill-everything game
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/gpl.txt
NO_WRKSUBDIR= yes
diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile
index 00b5f9211e3d..0fc9dfcf3fec 100644
--- a/games/xfrisk/Makefile
+++ b/games/xfrisk/Makefile
@@ -12,7 +12,7 @@ DISTNAME= XFrisk-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Multi-player networked Risk game for X11
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
diff --git a/games/xgalaga-sdl/Makefile b/games/xgalaga-sdl/Makefile
index 7e4647dc4d19..c5ae0f1c2ba3 100644
--- a/games/xgalaga-sdl/Makefile
+++ b/games/xgalaga-sdl/Makefile
@@ -14,7 +14,7 @@ EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}-sdl${EXTRACT_SUFX}
MAINTAINER= nemysis@FreeBSD.org
COMMENT= Classic single screen vertical shoot em up SDL
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-sdl
diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile
index 2741be4150a1..7ee48bd3e161 100644
--- a/games/xmoto/Makefile
+++ b/games/xmoto/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \
libxdg-basedir.so:${PORTSDIR}/x11/libxdg-basedir
BUILD_DEPENDS= ${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile
index ac200cc02bb6..41fe00a690af 100644
--- a/games/xpat2/Makefile
+++ b/games/xpat2/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= SUNSITE/games/solitaires
MAINTAINER= ports@FreeBSD.org
COMMENT= X11 solitaire game with 14 variations
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
diff --git a/games/xpilot-ng-server/Makefile b/games/xpilot-ng-server/Makefile
index d3109537c71f..c01bf0a0b934 100644
--- a/games/xpilot-ng-server/Makefile
+++ b/games/xpilot-ng-server/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX?= -server
MAINTAINER= ports@FreeBSD.org
COMMENT?= Enhanced version of XPilot (server program)
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index 2fe175d905c7..7a5e658b836b 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://chaos2.org/xpuyopuyo/
MAINTAINER= ports@FreeBSD.org
COMMENT= Puzzle game, somewhat like Tetris
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index 8e9f7de6cb1c..a811cd747678 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -11,7 +11,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}_en${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= X version of the popular board game
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= tar:bzip2 imake
diff --git a/games/xspringies/Makefile b/games/xspringies/Makefile
index 37fa9ff4086b..ebeaa9f149eb 100644
--- a/games/xspringies/Makefile
+++ b/games/xspringies/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
COMMENT= Mass and spring simulation system
-LICENSE= GPLv1 # (or later)
+LICENSE= GPLv1+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_XORG= x11 xext
diff --git a/games/zaz/Makefile b/games/zaz/Makefile
index 6f43750d09a0..04de9e361aad 100644
--- a/games/zaz/Makefile
+++ b/games/zaz/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Puzzle game where the player has to arrange balls in triplets
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \
diff --git a/games/znibbles/Makefile b/games/znibbles/Makefile
index fd558ca908c2..64a42da53c5c 100644
--- a/games/znibbles/Makefile
+++ b/games/znibbles/Makefile
@@ -13,7 +13,7 @@ COMMENT= Multi-player networked nibbles game
BROKEN= unfetchable
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
OPTIONS_DEFINE= GTK1
OPTIONS_DEFAULT= GTK1
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
diff --git a/irc/gseen.mod/Makefile b/irc/gseen.mod/Makefile
index 4911eb86a284..75f76d007b9d 100644
--- a/irc/gseen.mod/Makefile
+++ b/irc/gseen.mod/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}.${PORTVERSION:S/p/dev/}
MAINTAINER= ports@FreeBSD.org
COMMENT= Seen-module for the eggdrop IRC bot
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
EXTRACT_DEPENDS=${NONEXISTENT}:${PORTSDIR}/irc/eggdrop:extract
BUILD_DEPENDS= eggdrop:${PORTSDIR}/irc/eggdrop
diff --git a/irc/psybnc/Makefile b/irc/psybnc/Makefile
index 11fec8094b48..b262893d46d5 100644
--- a/irc/psybnc/Makefile
+++ b/irc/psybnc/Makefile
@@ -11,7 +11,7 @@ DISTNAME= psyBNC-${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Powerful IRC bouncer
-LICENSE= GPLv1 # or later (though COPYING is GPLv2)
+LICENSE= GPLv1+ # though COPYING is GPLv2
USE_OPENSSL= yes
WRKSRC= ${WRKDIR}/psybnc
diff --git a/irc/srvx/Makefile b/irc/srvx/Makefile
index bf708f21bc4e..5c886746f504 100644
--- a/irc/srvx/Makefile
+++ b/irc/srvx/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Services for ircu P10 protocol networks
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= cpe
diff --git a/irc/thales/Makefile b/irc/thales/Makefile
index d117ced4ad05..05da397b81e7 100644
--- a/irc/thales/Makefile
+++ b/irc/thales/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= GNU
MAINTAINER= ports@FreeBSD.org
COMMENT= GNU Thales -- An IRC to MySQL gateway
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/japanese/ebview-gtk2/Makefile b/japanese/ebview-gtk2/Makefile
index be2fdbe953a1..7b4be92e0f8e 100644
--- a/japanese/ebview-gtk2/Makefile
+++ b/japanese/ebview-gtk2/Makefile
@@ -10,7 +10,7 @@ PKGNAMESUFFIX= -gtk2
MAINTAINER= ports@FreeBSD.org
COMMENT= Electronic Book Viewer
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LIB_DEPENDS= libeb.so:${PORTSDIR}/japanese/eb
diff --git a/japanese/jishyo/Makefile b/japanese/jishyo/Makefile
index 03bf0c37a159..c0d585dfc204 100644
--- a/japanese/jishyo/Makefile
+++ b/japanese/jishyo/Makefile
@@ -11,7 +11,7 @@ DISTNAME= Jishyo-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= English to Japanese dictionary for GNUstep
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
PORTSCOUT= skipv:0.2
diff --git a/lang/awka/Makefile b/lang/awka/Makefile
index 755428141279..8d057cccb0c6 100644
--- a/lang/awka/Makefile
+++ b/lang/awka/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://awka.sourceforge.net/
MAINTAINER= ports@FreeBSD.org
COMMENT= Converts the AWK script to C, then compiles it
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/GPL.txt
GNU_CONFIGURE= yes
diff --git a/lang/cparser/Makefile b/lang/cparser/Makefile
index 9846def5da0a..db5928359666 100644
--- a/lang/cparser/Makefile
+++ b/lang/cparser/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= C99 compiler using libFIRM as backend
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libfirm.so:${PORTSDIR}/devel/libfirm
diff --git a/lang/gscheme/Makefile b/lang/gscheme/Makefile
index 7071aa32833d..a95ec86ab6d3 100644
--- a/lang/gscheme/Makefile
+++ b/lang/gscheme/Makefile
@@ -13,7 +13,7 @@ DIST_SUBDIR= repacked
MAINTAINER= ports@FreeBSD.org
COMMENT= GNUstep-aware scheme interpreter
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
USES= gnustep
USE_GNUSTEP= back build
diff --git a/lang/rexx-regina/Makefile b/lang/rexx-regina/Makefile
index bad65c1bee40..ec0ac308e87a 100644
--- a/lang/rexx-regina/Makefile
+++ b/lang/rexx-regina/Makefile
@@ -11,7 +11,7 @@ DISTNAME= Regina-REXX-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Rexx interpreter
-LICENSE= LGPL21 # (or later)
+LICENSE= LGPL21+
USES= gmake iconv tar:bzip2
USE_RC_SUBR= rxstack
diff --git a/lang/spl/Makefile b/lang/spl/Makefile
index b676dea76255..4e945af36179 100644
--- a/lang/spl/Makefile
+++ b/lang/spl/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://shakespearelang.sourceforge.net/download/
MAINTAINER= ports@FreeBSD.org
COMMENT= Shakespeare programming language
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= bison gmake
diff --git a/mail/automx/Makefile b/mail/automx/Makefile
index c2abc5f083e4..d90e984c4c7b 100644
--- a/mail/automx/Makefile
+++ b/mail/automx/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= mail
MAINTAINER= crees@FreeBSD.org
COMMENT= Handles mail account profile requests from mail clients
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
diff --git a/mail/avenger/Makefile b/mail/avenger/Makefile
index 567a5edcd126..0f66ddee170c 100644
--- a/mail/avenger/Makefile
+++ b/mail/avenger/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.mailavenger.org/dist/
MAINTAINER= ports@FreeBSD.org
COMMENT= Anti-spam SMTP server
-LICENSE= GPLv2 # or later (though COPYING is GPLv3)
+LICENSE= GPLv2+ # though COPYING is GPLv3
USE_BDB= 42+
USE_OPENSSL= yes
diff --git a/mail/bbmail/Makefile b/mail/bbmail/Makefile
index ced4e070470e..c240dc1a732e 100644
--- a/mail/bbmail/Makefile
+++ b/mail/bbmail/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/bbtools/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool intended for Blackbox that checks for new mail
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/libbt.pc:${PORTSDIR}/x11-wm/blackbox
diff --git a/mail/ez-pine-gpg/Makefile b/mail/ez-pine-gpg/Makefile
index ca94060d57fb..fa9137ddc56d 100644
--- a/mail/ez-pine-gpg/Makefile
+++ b/mail/ez-pine-gpg/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}_v${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Set of scripts to use gpg with Pine
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg
diff --git a/mail/gkrellmmailwatch2/Makefile b/mail/gkrellmmailwatch2/Makefile
index f29101e2059e..469377caaa78 100644
--- a/mail/gkrellmmailwatch2/Makefile
+++ b/mail/gkrellmmailwatch2/Makefile
@@ -12,7 +12,7 @@ DISTNAME= gkrellm-mailwatch-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= GKrellM mailwatch plugin
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
diff --git a/mail/mpop/Makefile b/mail/mpop/Makefile
index 30911465cbbd..1160c79d152a 100644
--- a/mail/mpop/Makefile
+++ b/mail/mpop/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Small and fast POP3 client
-LICENSE= GPLv3 # (or later)
+LICENSE= GPLv3+
USES= cpe gmake makeinfo pkgconfig tar:xz
CPE_VENDOR= martin_lambers
diff --git a/mail/pflogstats/Makefile b/mail/pflogstats/Makefile
index 44aeee3f9b81..60c7c520e921 100644
--- a/mail/pflogstats/Makefile
+++ b/mail/pflogstats/Makefile
@@ -13,7 +13,7 @@ COMMENT= Postfix Log Statistics Reporter
BROKEN= unfetchable
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
RUN_DEPENDS= p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc \
p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP \
diff --git a/mail/pop3lite/Makefile b/mail/pop3lite/Makefile
index ff11a065aa04..44d4104a2fab 100644
--- a/mail/pop3lite/Makefile
+++ b/mail/pop3lite/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Flexible, modular RFC-compliant POP3 daemon
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/mail/postfix-policyd-weight/Makefile b/mail/postfix-policyd-weight/Makefile
index a39082651db2..4a7cae5dcd68 100644
--- a/mail/postfix-policyd-weight/Makefile
+++ b/mail/postfix-policyd-weight/Makefile
@@ -12,7 +12,7 @@ PKGNAMEPREFIX= postfix-
MAINTAINER= ports@FreeBSD.org
COMMENT= Weighted policy daemon for postfix
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= p5-Net-DNS>=0.72:${PORTSDIR}/dns/p5-Net-DNS \
diff --git a/mail/prepflog/Makefile b/mail/prepflog/Makefile
index d76e7839506a..1c3129d16672 100644
--- a/mail/prepflog/Makefile
+++ b/mail/prepflog/Makefile
@@ -11,7 +11,7 @@ COMMENT= Prepares logfiles in a sanitised format for pflogsumm and awstats
BROKEN= unfetchable
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
USES= perl5 shebangfix tar:tgz
NO_BUILD= yes
diff --git a/mail/py-milter/Makefile b/mail/py-milter/Makefile
index d572b687b533..d77cf990e3f2 100644
--- a/mail/py-milter/Makefile
+++ b/mail/py-milter/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PYPORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python interface to Sendmail milter API
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
.if !exists(/usr/lib/libmilter.so)
diff --git a/mail/py-notmuch/Makefile b/mail/py-notmuch/Makefile
index cea23de15ac7..1dc56dbd4f10 100644
--- a/mail/py-notmuch/Makefile
+++ b/mail/py-notmuch/Makefile
@@ -9,7 +9,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= geier@lostpackets.de
COMMENT= Python binding of the notmuch mail search and indexing library
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/../../COPYING-GPL-3
LIB_DEPENDS= libnotmuch.so:${PORTSDIR}/mail/notmuch
diff --git a/mail/pysieved/Makefile b/mail/pysieved/Makefile
index 4b623dd3416e..7224dc6a8fe8 100644
--- a/mail/pysieved/Makefile
+++ b/mail/pysieved/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://ports.internal.vlink.ru/distfiles/
MAINTAINER= dsh@wizard.volgograd.ru
COMMENT= Python Managesieve Server
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= python tar:bzip2
diff --git a/mail/qmailadmin/Makefile b/mail/qmailadmin/Makefile
index 287b58e651cf..41f452098992 100644
--- a/mail/qmailadmin/Makefile
+++ b/mail/qmailadmin/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION} \
MAINTAINER= ports@FreeBSD.org
COMMENT= CGI program for administering Qmail with vchkpw/vpopmail
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= autorespond:${PORTSDIR}/mail/autorespond \
diff --git a/mail/qsheff/Makefile b/mail/qsheff/Makefile
index 919b3d3e551e..5d58c98478b5 100644
--- a/mail/qsheff/Makefile
+++ b/mail/qsheff/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://www.enderunix.org/qsheff/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= Qmail-queue replacement to filter mail traffic
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${LOCALBASE}/bin/ripmime:${PORTSDIR}/mail/ripmime
diff --git a/mail/raysfilter/Makefile b/mail/raysfilter/Makefile
index b9cfb748ba6a..8c49450ef0e1 100644
--- a/mail/raysfilter/Makefile
+++ b/mail/raysfilter/Makefile
@@ -9,7 +9,7 @@ DISTNAME= rays-filter-${PORTVERSION}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Configurable filter for Sendmail Milter
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/GNU-public-licence.txt
USES= shebangfix
diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index f1ec2e344e47..89058d540ccd 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= ftp://tmda.net/pub/tmda/releases/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= Python-based SPAM reduction system
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= python shebangfix tar:tgz
diff --git a/mail/up-imapproxy/Makefile b/mail/up-imapproxy/Makefile
index 01d6a131905b..5e0c3931721f 100644
--- a/mail/up-imapproxy/Makefile
+++ b/mail/up-imapproxy/Makefile
@@ -12,7 +12,7 @@ DISTNAME= squirrelmail-imap_proxy-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Caching IMAP proxy server
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
OPTIONS_DEFINE= DOVECOT DOCS
diff --git a/mail/wmmaiload/Makefile b/mail/wmmaiload/Makefile
index 4c2e5794ba58..a56b07108009 100644
--- a/mail/wmmaiload/Makefile
+++ b/mail/wmmaiload/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://tnemeth.free.fr/projets/programmes/
MAINTAINER= ports@FreeBSD.org
COMMENT= Incoming mail monitor dockapp with a similar look to wmcpuload
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake localbase pkgconfig tar:bzip2
diff --git a/math/abacus/Makefile b/math/abacus/Makefile
index 2f296da58b4e..d0a9b617dee1 100644
--- a/math/abacus/Makefile
+++ b/math/abacus/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.informatik.uni-koeln.de/abacus/
MAINTAINER= ports@FreeBSD.org
COMMENT= Branch-And-CUt System
-LICENSE= LGPL21 # (or later)
+LICENSE= LGPL21+
LIB_DEPENDS= libClp.so:${PORTSDIR}/math/coinmp
diff --git a/math/algae/Makefile b/math/algae/Makefile
index 353fcd409993..441743691920 100644
--- a/math/algae/Makefile
+++ b/math/algae/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Programming language for numerical analysis
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
BROKEN_ia64= does not compile
diff --git a/math/biggles/Makefile b/math/biggles/Makefile
index 38bfb8900fee..f28b3ec9f25d 100644
--- a/math/biggles/Makefile
+++ b/math/biggles/Makefile
@@ -11,7 +11,7 @@ DISTNAME= python2-${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Create publication-quality 2D scientific plots
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${PYNUMPY}
diff --git a/math/convertall/Makefile b/math/convertall/Makefile
index c4d2dda19d81..54cf64283be1 100644
--- a/math/convertall/Makefile
+++ b/math/convertall/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
MAINTAINER= jhale@FreeBSD.org
COMMENT= Another unit converter
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/doc/LICENSE
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui
diff --git a/math/ess/Makefile b/math/ess/Makefile
index 76dde9293dfa..a62fbe034c8d 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://ess.r-project.org/downloads/ess/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= R support for Emacsen
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= R:${PORTSDIR}/math/R
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index cb4fb3f59eee..5c1a7646cbce 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.fftw.org/pub/fftw/ \
MAINTAINER= ports@FreeBSD.org
COMMENT?= Fast C routines to compute the Discrete Fourier Transform
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
OPTIONS_DEFINE= DOCS
diff --git a/math/gdcalc/Makefile b/math/gdcalc/Makefile
index 8650b4d910c7..3fa5419f4a5a 100644
--- a/math/gdcalc/Makefile
+++ b/math/gdcalc/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://bhepple.freeshell.org/dcalc/unix/
MAINTAINER= ports@FreeBSD.org
COMMENT= Gnome-based scientific calculator
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${LOCALBASE}/bin/gunits:${PORTSDIR}/math/units
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index ebe4542be151..e77f761fade1 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
MAINTAINER= woodsb02@gmail.com
COMMENT= Scientific plotting package
-LICENSE= LGPL21 # (or later)
+LICENSE= LGPL21+
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \
${FREEFONT_DIR}/FreeMono.ttf:${PORTSDIR}/x11-fonts/freefont-ttf
diff --git a/math/tvmet/Makefile b/math/tvmet/Makefile
index 5b1830c396fa..0486b3b1ad4c 100644
--- a/math/tvmet/Makefile
+++ b/math/tvmet/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/Tar.Gz_Bz2%20Archive/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Tiny Vector and Matrix template library
-LICENSE= LGPL21 # (or later)
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
OPTIONS_DEFINE= CPPUNIT DEBUG DOCS EXAMPLES
diff --git a/math/xspread/Makefile b/math/xspread/Makefile
index f3275ed0d246..03c9e7660f28 100644
--- a/math/xspread/Makefile
+++ b/math/xspread/Makefile
@@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
COMMENT= Spreadsheet program for X and terminals
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
OPTIONS_DEFINE= X11 DOCS
diff --git a/misc/apparix/Makefile b/misc/apparix/Makefile
index 9fc51c09be6e..53a6be70f96d 100644
--- a/misc/apparix/Makefile
+++ b/misc/apparix/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}-11-062
MAINTAINER= ports@FreeBSD.org
COMMENT= Bookmark directories and apparate inside them
-LICENSE= GPLv2 # or later (code says GPLv3 or later)
+LICENSE= GPLv2+ # though code says GPLv3 or later
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index e5492c4545d9..5b3b909f3624 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -16,7 +16,7 @@ COMMENT= Astrology program for X11 and alpha-numeric terminals
# Swiss Ephemeris GPLv2 licensed, see
# http://www.astro.com/ftp/swisseph/LICENSE.TXT
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
EPHE= sweph_00.tar.gz:ephe sweph_06.tar.gz:ephe \
sweph_12.tar.gz:ephe sweph_18.tar.gz:ephe \
diff --git a/misc/bb/Makefile b/misc/bb/Makefile
index eabfc3b78d2c..34976dbc592c 100644
--- a/misc/bb/Makefile
+++ b/misc/bb/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/aa-project/${PORTNAME}/${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= High quality audio-visual demonstration for text terminal
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libaa.so:${PORTSDIR}/graphics/aalib \
diff --git a/misc/cmatrix/Makefile b/misc/cmatrix/Makefile
index f5bf4902985b..d32889a4fa82 100644
--- a/misc/cmatrix/Makefile
+++ b/misc/cmatrix/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Show a scrolling 'Matrix' like screen
-LICENSE= GPLv1 # or later; COPYING is GPLv2
+LICENSE= GPLv1+ # though COPYING is GPLv2
USES= gmake
GNU_CONFIGURE= yes
diff --git a/misc/colortail/Makefile b/misc/colortail/Makefile
index 69a0ff0ad1f4..763c562f63fa 100644
--- a/misc/colortail/Makefile
+++ b/misc/colortail/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://joakimandersson.se/files/
MAINTAINER= tabthorpe@FreeBSD.org
COMMENT= tail(1) replacement with color support
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/misc/cs/Makefile b/misc/cs/Makefile
index 1b6bdd33e5f9..a9c09ed04626 100644
--- a/misc/cs/Makefile
+++ b/misc/cs/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://njhurst.com/programming/cross-stitch/
MAINTAINER= ports@FreeBSD.org
COMMENT= Cross Stitch software
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
diff --git a/misc/dtach/Makefile b/misc/dtach/Makefile
index 679f28a6793c..29115d9622cd 100644
--- a/misc/dtach/Makefile
+++ b/misc/dtach/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Emulates the detach feature of screen
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/misc/dvorak7min/Makefile b/misc/dvorak7min/Makefile
index 5751e4dd67e4..8fa71a32c829 100644
--- a/misc/dvorak7min/Makefile
+++ b/misc/dvorak7min/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}_${DISTVERSION}${DISTVERSIONSUFFIX}.orig
MAINTAINER= ports@FreeBSD.org
COMMENT= Ncurses-based Dvorak typing tutor
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/misc/dvorakng/Makefile b/misc/dvorakng/Makefile
index 65c5082f84c5..fd826abd6b6f 100644
--- a/misc/dvorakng/Makefile
+++ b/misc/dvorakng/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.free.of.pl/n/nopik/
MAINTAINER= ports@FreeBSD.org
COMMENT= Dvorak typing tutor
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= tar:bzip2
diff --git a/misc/fxload/Makefile b/misc/fxload/Makefile
index c662910f1f35..a6e92b5b7d39 100644
--- a/misc/fxload/Makefile
+++ b/misc/fxload/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= uffe@uffe.org
COMMENT= Firmware download for Cypress EZ-USB devices
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake
diff --git a/misc/geekcode/Makefile b/misc/geekcode/Makefile
index 02863f4f3c56..74ab62c402ca 100644
--- a/misc/geekcode/Makefile
+++ b/misc/geekcode/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Geek Code Generator
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}"
diff --git a/misc/gkrellmlaunch2/Makefile b/misc/gkrellmlaunch2/Makefile
index 59a36f3ade0a..6110f118e85b 100644
--- a/misc/gkrellmlaunch2/Makefile
+++ b/misc/gkrellmlaunch2/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX= 2
MAINTAINER= ports@FreeBSD.org
COMMENT= Application launcher plugin for GKrellM2
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
BUILD_DEPENDS= gkrellm2>0:${PORTSDIR}/sysutils/gkrellm2
RUN_DEPENDS= gkrellm2>0:${PORTSDIR}/sysutils/gkrellm2
diff --git a/misc/gkrellweather2/Makefile b/misc/gkrellweather2/Makefile
index e566eb55e918..3711b603a361 100644
--- a/misc/gkrellweather2/Makefile
+++ b/misc/gkrellweather2/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= https://sites.google.com/site/makovick/projects/
MAINTAINER= ports@FreeBSD.org
COMMENT= Weather plugin for GKrellM
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
diff --git a/misc/hello/Makefile b/misc/hello/Makefile
index ad507444a851..ccc9e084bfb9 100644
--- a/misc/hello/Makefile
+++ b/misc/hello/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= GNU
MAINTAINER= ports@FreeBSD.org
COMMENT= Utility for saying hello to the world and reading email
-LICENSE= GPLv3 # (or later)
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= charsetfix gmake perl5
diff --git a/misc/hotkeys/Makefile b/misc/hotkeys/Makefile
index 4a1c42f578cf..6a6b34924445 100644
--- a/misc/hotkeys/Makefile
+++ b/misc/hotkeys/Makefile
@@ -11,7 +11,7 @@ DISTNAME= hotkeys_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Allows usage of special keys on internet/multimedia keyboards
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2
diff --git a/misc/kcd/Makefile b/misc/kcd/Makefile
index e41e50c1cce8..b774bf499d55 100644
--- a/misc/kcd/Makefile
+++ b/misc/kcd/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Change directory in full-screen visual mode
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gettext ncurses perl5
diff --git a/misc/linm/Makefile b/misc/linm/Makefile
index 7db8092cd842..35f274e9c4c9 100644
--- a/misc/linm/Makefile
+++ b/misc/linm/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}_${DISTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Clone of Mdir, mc-style terminal file manager
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gettext pkgconfig gmake libtool
diff --git a/misc/lv/Makefile b/misc/lv/Makefile
index 9b228dfbcd7f..e61ce416f5ea 100644
--- a/misc/lv/Makefile
+++ b/misc/lv/Makefile
@@ -11,7 +11,7 @@ DISTNAME= lv451
MAINTAINER= ports@FreeBSD.org
COMMENT= Powerful Multilingual File Viewer
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/../GPL.txt
WRKSRC= ${WRKDIR}/${DISTNAME}/src
diff --git a/misc/mc-light/Makefile b/misc/mc-light/Makefile
index ef2db5507dcf..3b3dc9742d0f 100644
--- a/misc/mc-light/Makefile
+++ b/misc/mc-light/Makefile
@@ -11,7 +11,7 @@ DISTNAME= mc-${PORTVERSION:S/.p9/-pre9/}
MAINTAINER= ports@FreeBSD.org
COMMENT= Lightweight Midnight Commander clone
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= gawk:${PORTSDIR}/lang/gawk
diff --git a/misc/metalink-checker/Makefile b/misc/metalink-checker/Makefile
index 61df02398c7a..1689c85bc411 100644
--- a/misc/metalink-checker/Makefile
+++ b/misc/metalink-checker/Makefile
@@ -11,7 +11,7 @@ DISTNAME= checker-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python script to check metalink files and complete a basic download
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
USES= dos2unix python
NO_BUILD= yes
diff --git a/misc/metalink-editor/Makefile b/misc/metalink-editor/Makefile
index 7aefc5e052ae..806908ce19ba 100644
--- a/misc/metalink-editor/Makefile
+++ b/misc/metalink-editor/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}editor-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= GUI editor to create and edit metalinks
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/license.txt
USES= dos2unix python zip
diff --git a/misc/metalink-tools/Makefile b/misc/metalink-tools/Makefile
index 44096b197101..f96a99d0b62b 100644
--- a/misc/metalink-tools/Makefile
+++ b/misc/metalink-tools/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX?= -tools
MAINTAINER= ports@FreeBSD.org
COMMENT= Metalink generation tool
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \
diff --git a/misc/nut/Makefile b/misc/nut/Makefile
index a2d8a0fb9888..20500282f27b 100644
--- a/misc/nut/Makefile
+++ b/misc/nut/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= health-
MAINTAINER= jhale@FreeBSD.org
COMMENT= Nutrition software to record what you eat
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= gmake
diff --git a/misc/pastebinit/Makefile b/misc/pastebinit/Makefile
index 766dc9a9a7f0..ef27e64be2c9 100644
--- a/misc/pastebinit/Makefile
+++ b/misc/pastebinit/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= https://launchpad.net/pastebinit/trunk/${PORTVERSION}/+download/
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Command line utility for pastebing
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>=4.3.2:${PORTSDIR}/devel/py-configobj
diff --git a/misc/upclient/Makefile b/misc/upclient/Makefile
index 5a7acd82d435..42f63d081d4d 100644
--- a/misc/upclient/Makefile
+++ b/misc/upclient/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
MAINTAINER= ports@FreeBSD.org
COMMENT= Uptimes project client
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gettext
diff --git a/misc/xdelta/Makefile b/misc/xdelta/Makefile
index 20258dfd03fa..a3dda627e748 100644
--- a/misc/xdelta/Makefile
+++ b/misc/xdelta/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= Diff/patch utility for binary files
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= libtool pkgconfig
diff --git a/misc/xdelta3/Makefile b/misc/xdelta3/Makefile
index 2fe307a652ec..3b6c2ee1250a 100644
--- a/misc/xdelta3/Makefile
+++ b/misc/xdelta3/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}3-${PORTVERSION}
MAINTAINER= danilo@FreeBSD.org
COMMENT= Open-source binary diff, VCDIFF/RFC 3284 delta compression
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
GNU_CONFIGURE= yes
diff --git a/multimedia/atomicparsley/Makefile b/multimedia/atomicparsley/Makefile
index 1ae46e61b69a..6a7301fcc4fa 100644
--- a/multimedia/atomicparsley/Makefile
+++ b/multimedia/atomicparsley/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}-source-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Command line program for reading parsing and setting MP4/M4A metadata
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= zip
diff --git a/multimedia/bino/Makefile b/multimedia/bino/Makefile
index 0644d0d33cfa..9067523cef9f 100644
--- a/multimedia/bino/Makefile
+++ b/multimedia/bino/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://download.savannah.nongnu.org/releases/bino/ http://levsha.m
MAINTAINER= i@levsha.me
COMMENT= 3D video player with multi-display support
-LICENSE= GPLv3 # or any later version
+LICENSE= GPLv3+
USES= desktop-file-utils gmake pkgconfig tar:xz
USE_GL= glew
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index e3ebf9f8f5fe..4736b655ef4f 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= SF/cserv/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Free program to do streaming video via the web
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl
diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile
index c38719855a56..244713ec458b 100644
--- a/multimedia/ffmpegthumbnailer/Makefile
+++ b/multimedia/ffmpegthumbnailer/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= LOCAL/riggs/${PORTNAME}
MAINTAINER= clutton@zoho.com
COMMENT= Lightweight video thumbnailer that can be used by file managers
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \
diff --git a/multimedia/gcap/Makefile b/multimedia/gcap/Makefile
index b03d9139ed5a..f4d3eae3befa 100644
--- a/multimedia/gcap/Makefile
+++ b/multimedia/gcap/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= Command line tool for downloading Youtube closed captions
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= p5-Getopt-ArgvFile>=1.11:${PORTSDIR}/devel/p5-Getopt-ArgvFile \
diff --git a/multimedia/gmimms/Makefile b/multimedia/gmimms/Makefile
index 10d1d6f99ac6..3435414470e6 100644
--- a/multimedia/gmimms/Makefile
+++ b/multimedia/gmimms/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Frontend to MiMMS (Multimedia Stream ripper)
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
RUN_DEPENDS= mimms:${PORTSDIR}/multimedia/mimms
diff --git a/multimedia/gnome-subtitles/Makefile b/multimedia/gnome-subtitles/Makefile
index 46b38927b5fc..48bcf043e6a9 100644
--- a/multimedia/gnome-subtitles/Makefile
+++ b/multimedia/gnome-subtitles/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Subtitle editor with video preview
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libenchant.so:${PORTSDIR}/textproc/enchant \
diff --git a/multimedia/grake/Makefile b/multimedia/grake/Makefile
index fa49a63ce7c4..145aea9b22b3 100644
--- a/multimedia/grake/Makefile
+++ b/multimedia/grake/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= GOOGLE_CODE
MAINTAINER= ports@FreeBSD.org
COMMENT= Command line tool for scanning webpages for Youtube links
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= p5-Getopt-ArgvFile>=1.11:${PORTSDIR}/devel/p5-Getopt-ArgvFile \
diff --git a/multimedia/gstreamer-qt4/Makefile b/multimedia/gstreamer-qt4/Makefile
index 1619bbeb489f..5d982e323617 100644
--- a/multimedia/gstreamer-qt4/Makefile
+++ b/multimedia/gstreamer-qt4/Makefile
@@ -12,7 +12,7 @@ DISTNAME= qt-${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Qt4 bindings for GStreamer multimedia library
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libboost_thread.so:${PORTSDIR}/devel/boost-libs
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index cceec78c5022..7c2ea33a5a3a 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/kaffeine/current
MAINTAINER= ports@FreeBSD.org
COMMENT= Multimedia player based on KDE and VLC
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
diff --git a/multimedia/libmtp/Makefile b/multimedia/libmtp/Makefile
index 7d2a5804c5eb..655a9257ec89 100644
--- a/multimedia/libmtp/Makefile
+++ b/multimedia/libmtp/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Media Transfer Protocol (MTP) library
-LICENSE= LGPL21 # or any later version
+LICENSE= LGPL21+
CONFLICTS_INSTALL=libosmo-sccp-[0-9]* # lib/libmtp.a
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index bf94108ad2fc..fc817a96461f 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}-lib-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Libraries for xine multimedia player
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat
diff --git a/multimedia/mimms/Makefile b/multimedia/mimms/Makefile
index 83c2a4c60e72..c8f4aeee5f18 100644
--- a/multimedia/mimms/Makefile
+++ b/multimedia/mimms/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Download streams using the MMS protocol
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libmms.so:${PORTSDIR}/net/libmms
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 4bd09788e717..70489cb5f7f4 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME:S/tools//}/${PORTNAME}/${PORTVERSION}
MAINTAINER= multimedia@FreeBSD.org
COMMENT= Set of tools to record/playback/edit videos in MPEG format
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
BUILD_DEPENDS= v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat
diff --git a/multimedia/mmpython/Makefile b/multimedia/mmpython/Makefile
index 53ad9742a304..8861247a7ab8 100644
--- a/multimedia/mmpython/Makefile
+++ b/multimedia/mmpython/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Retrieves metadata from mp3, ogg, avi, jpg, and other formats
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libdvdread.so:${PORTSDIR}/multimedia/libdvdread
diff --git a/multimedia/mmsrip/Makefile b/multimedia/mmsrip/Makefile
index 6e5e0e6897b6..9d17770831dc 100644
--- a/multimedia/mmsrip/Makefile
+++ b/multimedia/mmsrip/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.sourcefiles.org/Multimedia/Tools/Network/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= MMS ripper - a client for the proprietary protocol mms://
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
GNU_CONFIGURE= yes
diff --git a/multimedia/mp3cd/Makefile b/multimedia/mp3cd/Makefile
index 9b8ccf82a653..52383742a9c2 100644
--- a/multimedia/mp3cd/Makefile
+++ b/multimedia/mp3cd/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://outflux.net/software/pkgs/mp3cd/download/
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl script that burns MP3 to audio CDs
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
BUILD_DEPENDS= p5-Config-Simple>=0:${PORTSDIR}/devel/p5-Config-Simple
RUN_DEPENDS:= ${BUILD_DEPENDS}
diff --git a/multimedia/oggvideotools/Makefile b/multimedia/oggvideotools/Makefile
index 4ef2f2d5a50f..8674f1cd984b 100644
--- a/multimedia/oggvideotools/Makefile
+++ b/multimedia/oggvideotools/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Toolbox for manipulating Ogg video files
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LIB_DEPENDS= libgd.so:${PORTSDIR}/graphics/gd \
libogg.so:${PORTSDIR}/audio/libogg \
diff --git a/multimedia/pHash/Makefile b/multimedia/pHash/Makefile
index 795554abf884..405dd78fcbfc 100644
--- a/multimedia/pHash/Makefile
+++ b/multimedia/pHash/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://phash.org/releases/ \
MAINTAINER= cyberbotx@cyberbotx.com
COMMENT= Open source perceptual hash library
-LICENSE= GPLv3 # or any later version
+LICENSE= GPLv3+
USES= gmake libtool pathfix
GNU_CONFIGURE= yes
diff --git a/multimedia/poe/Makefile b/multimedia/poe/Makefile
index d374017bb173..204ddd8fb32d 100644
--- a/multimedia/poe/Makefile
+++ b/multimedia/poe/Makefile
@@ -10,7 +10,7 @@ DISTNAME= Poe-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Vorbis comment editor for GNUstep
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis
diff --git a/multimedia/smplayer/Makefile b/multimedia/smplayer/Makefile
index aa59e34d69a0..5833abf6ff65 100644
--- a/multimedia/smplayer/Makefile
+++ b/multimedia/smplayer/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/SMPlayer/${PORTVERSION}
MAINTAINER= nemysis@FreeBSD.org
COMMENT= Complete front-end based on Qt4 for mplayer
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/Copying.txt
RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer \
diff --git a/multimedia/vdr-plugin-xvdr/Makefile b/multimedia/vdr-plugin-xvdr/Makefile
index 9bbe4b9afe2e..469e8e1a5d58 100644
--- a/multimedia/vdr-plugin-xvdr/Makefile
+++ b/multimedia/vdr-plugin-xvdr/Makefile
@@ -11,7 +11,7 @@ DISTNAME= pipelka-${PORTNAME}-xvdr-${PORTVERSION}-0-g${GITHASH}
MAINTAINER= ports@FreeBSD.org
COMMENT= Video Disk Recorder - XVDR server plugin
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GITHASH= e4cab47
diff --git a/multimedia/vdr/Makefile b/multimedia/vdr/Makefile
index 36950f32b8fe..5358390a7612 100644
--- a/multimedia/vdr/Makefile
+++ b/multimedia/vdr/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= ftp://ftp.tvdr.de/vdr/Developer/
MAINTAINER= ports@FreeBSD.org
COMMENT= Video Disk Recorder - development version
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= v4l_compat>=1.0.20120501:${PORTSDIR}/multimedia/v4l_compat
diff --git a/multimedia/x265/Makefile b/multimedia/x265/Makefile
index faa5c4a27332..0bd25a8c50fd 100644
--- a/multimedia/x265/Makefile
+++ b/multimedia/x265/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= H.265/High Efficiency Video Coding (HEVC) format
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/../COPYING
BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm
diff --git a/multimedia/xvid/Makefile b/multimedia/xvid/Makefile
index 11d070e9b901..89a1834b6488 100644
--- a/multimedia/xvid/Makefile
+++ b/multimedia/xvid/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}core-${PORTVERSION}
MAINTAINER= riggs@FreeBSD.org
COMMENT= Opensource MPEG-4 codec, based on OpenDivx
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKDIR}/xvidcore/LICENSE
USES= gmake
diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index 8fd3b7976599..1007674f2395 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Chat program that combines AIM, ICQ, and Yahoo! Chat into one
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libaudiofile.so:${PORTSDIR}/audio/libaudiofile \
diff --git a/net-im/emesene/Makefile b/net-im/emesene/Makefile
index c4dfed55716f..54a39401939c 100644
--- a/net-im/emesene/Makefile
+++ b/net-im/emesene/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= net-im python
MAINTAINER= ports@FreeBSD.org
COMMENT= Instant messenging client written in python
-LICENSE= GPLv3 # (or later)
+LICENSE= GPLv3+
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
${PYTHON_PKGNAMEPREFIX}dnspython>0:${PORTSDIR}/dns/py-dnspython \
diff --git a/net-im/mbpurple/Makefile b/net-im/mbpurple/Makefile
index 708cc0ccdf80..ad56c5bc9f87 100644
--- a/net-im/mbpurple/Makefile
+++ b/net-im/mbpurple/Makefile
@@ -13,7 +13,7 @@ COMMENT= Integrate Twitter with Pidgin (AKA microblog-purple)
BUILD_DEPENDS= ${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin
RUN_DEPENDS= ${LOCALBASE}/bin/pidgin:${PORTSDIR}/net-im/pidgin
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake pkgconfig
diff --git a/net-im/pidgin-birthday-reminder/Makefile b/net-im/pidgin-birthday-reminder/Makefile
index eeb5e4f854f9..7628046d51dc 100644
--- a/net-im/pidgin-birthday-reminder/Makefile
+++ b/net-im/pidgin-birthday-reminder/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://launchpadlibrarian.net/56075754/
MAINTAINER= ports@FreeBSD.org
COMMENT= Birthday reminder for Pidgin
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpurple.so:${PORTSDIR}/net-im/libpurple
diff --git a/net-im/toxic/Makefile b/net-im/toxic/Makefile
index a57f729f9335..b50337ceedf3 100644
--- a/net-im/toxic/Makefile
+++ b/net-im/toxic/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= net-im
MAINTAINER= thierry@FreeBSD.org
COMMENT= Console client for Tox
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${LOCALBASE}/lib/libtoxcore.a:${PORTSDIR}/net-im/tox \
diff --git a/net-mgmt/bpft/Makefile b/net-mgmt/bpft/Makefile
index 7b82031a7519..cba6039fba79 100644
--- a/net-mgmt/bpft/Makefile
+++ b/net-mgmt/bpft/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}4-2004-05-06
MAINTAINER= ports@FreeBSD.org
COMMENT= BPF Traffic collector
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING.GNU
CONFLICTS= trafd-3.0.*
diff --git a/net-mgmt/docsis/Makefile b/net-mgmt/docsis/Makefile
index 273224ef8970..792eb79af26d 100644
--- a/net-mgmt/docsis/Makefile
+++ b/net-mgmt/docsis/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Binary configuration file encoder/decoder
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
LIB_DEPENDS= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
diff --git a/net-mgmt/ipaudit/Makefile b/net-mgmt/ipaudit/Makefile
index 5f95d2bf5be4..02bbff49ec3e 100644
--- a/net-mgmt/ipaudit/Makefile
+++ b/net-mgmt/ipaudit/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://ipaudit.sourceforge.net/download/
MAINTAINER= ports@FreeBSD.org
COMMENT= IP traffic summarizer
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= tar:tgz
diff --git a/net-mgmt/netleak/Makefile b/net-mgmt/netleak/Makefile
index 9949ebf66746..3c67bc804e43 100644
--- a/net-mgmt/netleak/Makefile
+++ b/net-mgmt/netleak/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-devel/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool to detect connectivity between network segments
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= p5-Net-PcapUtils>=0:${PORTSDIR}/net/p5-Net-PcapUtils \
diff --git a/net-mgmt/netspoc/Makefile b/net-mgmt/netspoc/Makefile
index 1c20e00a284b..d96913412f2f 100644
--- a/net-mgmt/netspoc/Makefile
+++ b/net-mgmt/netspoc/Makefile
@@ -11,7 +11,7 @@ DISTNAME= Netspoc-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Network Security Policy Compiler
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= perl5
diff --git a/net-mgmt/phpip/Makefile b/net-mgmt/phpip/Makefile
index ce08028423c5..0b5203939c7b 100644
--- a/net-mgmt/phpip/Makefile
+++ b/net-mgmt/phpip/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-4.3.2-build-${SNAPSHOT}
MAINTAINER= ports@FreeBSD.org
COMMENT= Complete IPv4 IPAM (IP address management) suite
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
SNAPSHOT= 200611081420
diff --git a/net-mgmt/pixilate/Makefile b/net-mgmt/pixilate/Makefile
index d1b7299f4433..ff18107b999b 100644
--- a/net-mgmt/pixilate/Makefile
+++ b/net-mgmt/pixilate/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/winfingerprint/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Generates packets to match a list of Cisco PIX access lists
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libnet.so:${PORTSDIR}/net/libnet
diff --git a/net-mgmt/portmon/Makefile b/net-mgmt/portmon/Makefile
index 0a7aa8e9f961..92a58231cfe4 100644
--- a/net-mgmt/portmon/Makefile
+++ b/net-mgmt/portmon/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://voodoo.bawue.com/download/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= Daemon that monitor network services
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/net-mgmt/torrus/Makefile b/net-mgmt/torrus/Makefile
index bc2aa919f19a..a1f90b74ff69 100644
--- a/net-mgmt/torrus/Makefile
+++ b/net-mgmt/torrus/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/torrus/torrus/
MAINTAINER= corsmith@gmail.com
COMMENT= Data Series Processing Framework - think mrtg with xml configs
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= rrdtool>=0:${PORTSDIR}/databases/rrdtool \
diff --git a/net-p2p/gkremldk/Makefile b/net-p2p/gkremldk/Makefile
index b66bf4606b70..11aecded6547 100644
--- a/net-p2p/gkremldk/Makefile
+++ b/net-p2p/gkremldk/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Shows current mldonkey donwload/upload rates and allows setting them
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
BUILD_DEPENDS= ${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm2
diff --git a/net-p2p/gtk-gnutella/Makefile b/net-p2p/gtk-gnutella/Makefile
index 7f2d5809d296..9bac61e1b6b2 100644
--- a/net-p2p/gtk-gnutella/Makefile
+++ b/net-p2p/gtk-gnutella/Makefile
@@ -42,7 +42,7 @@ MASTER_SITES= SF
MAINTAINER= woodsb02@gmail.com
COMMENT= GTK based Gnutella client
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
USES= iconv localbase pkgconfig tar:bzip2
USE_GNOME= glib20 libxml2
diff --git a/net-p2p/liberator/Makefile b/net-p2p/liberator/Makefile
index 4f633c78d6f2..60b134fdf5f5 100644
--- a/net-p2p/liberator/Makefile
+++ b/net-p2p/liberator/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ofcp-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Command line client to FreeNet Network
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= tar:bzip2
diff --git a/net-p2p/linuxdcpp/Makefile b/net-p2p/linuxdcpp/Makefile
index 103ca7d3db90..eb512fa60301 100644
--- a/net-p2p/linuxdcpp/Makefile
+++ b/net-p2p/linuxdcpp/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://launchpadlibrarian.net/69733951/
MAINTAINER= ports@FreeBSD.org
COMMENT= Port of the DC++ Direct Connect client to Unix-like systems
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/License.txt
BUILD_DEPENDS= ${LOCALBASE}/include/boost/version.hpp:${PORTSDIR}/devel/boost-libs
diff --git a/net-p2p/minder/Makefile b/net-p2p/minder/Makefile
index 4d04ecd58fb3..f81165c5bbf9 100644
--- a/net-p2p/minder/Makefile
+++ b/net-p2p/minder/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.alhem.net/project/minder/
MAINTAINER= ports@FreeBSD.org
COMMENT= Small network application for automatic maintenance of peer lists
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LIB_DEPENDS= libSockets.so:${PORTSDIR}/net/Sockets
diff --git a/net/dbeacon/Makefile b/net/dbeacon/Makefile
index 3a23a37df046..b8aad92541a2 100644
--- a/net/dbeacon/Makefile
+++ b/net/dbeacon/Makefile
@@ -11,7 +11,7 @@ COMMENT= Distributed multicast beacon server
BROKEN= unfetchable
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
USES= gmake
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index 7cfc9dc45848..ae73ad40c217 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -14,7 +14,7 @@ DISTNAME= freeradius-server-${DISTVERSION}
MAINTAINER= zi@FreeBSD.org
COMMENT= Free RADIUS server implementation
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libgdbm.so:${PORTSDIR}/databases/gdbm \
diff --git a/net/g2ipmsg/Makefile b/net/g2ipmsg/Makefile
index eaa90dc06847..bf8937ae1852 100644
--- a/net/g2ipmsg/Makefile
+++ b/net/g2ipmsg/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://ipmsg.org/archive/
MAINTAINER= ports@FreeBSD.org
COMMENT= Popup style message communication tool for GNOME2
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
USES= gettext gmake pathfix pkgconfig
USE_GNOME= gnomeprefix intltool libgnomeui
diff --git a/net/hanstunnel/Makefile b/net/hanstunnel/Makefile
index 1b57571dc573..bec61c92cdd6 100644
--- a/net/hanstunnel/Makefile
+++ b/net/hanstunnel/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/hanstunnel/source
MAINTAINER= vsityz@gmail.com
COMMENT= Hans makes it possible to tunnel IPv4 through ICMP
-LICENSE= FPL GPLv3 # or any later version
+LICENSE= FPL GPLv3+
LICENSE_COMB= multi
LICENSE_NAME_FPL=Freeware Public License
LICENSE_FILE_FPL=${WRKSRC}/src/sha1_license.txt
diff --git a/net/htpdate/Makefile b/net/htpdate/Makefile
index ae6e5de54212..101a118a4d53 100644
--- a/net/htpdate/Makefile
+++ b/net/htpdate/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.vervest.org/htp/archive/c/ \
MAINTAINER= jgh@FreeBSD.org
COMMENT= Time synchronization over http utility
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
USES= tar:bzip2
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}"
diff --git a/net/hupnp/Makefile b/net/hupnp/Makefile
index 70592e96f5f2..ef0a0fd98b31 100644
--- a/net/hupnp/Makefile
+++ b/net/hupnp/Makefile
@@ -11,7 +11,7 @@ DISTNAME= herqq-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Library for building UPnP devices and control points
-LICENSE= LGPL3 # or later
+LICENSE= LGPL3+
LICENSE_FILE= ${WRKSRC}/hupnp/LICENSE_LGPLv3.txt
USES= gmake qmake zip
diff --git a/net/libsocketcpp/Makefile b/net/libsocketcpp/Makefile
index b143ed9e40d2..8422c9dfdf38 100644
--- a/net/libsocketcpp/Makefile
+++ b/net/libsocketcpp/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/libsocket/${PORTNAME}-stable/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ wrapper library to the sockets
-LICENSE= LGPL21 # (or later)
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= libtool
diff --git a/net/miredo/Makefile b/net/miredo/Makefile
index 5e255f767964..6d89cc221cf6 100644
--- a/net/miredo/Makefile
+++ b/net/miredo/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.remlab.net/files/miredo/archive/
MAINTAINER= ports@FreeBSD.org
COMMENT= Opensource Teredo (IPv6 tunneling) implementation
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libJudy.so:${PORTSDIR}/devel/judy
diff --git a/net/mping/Makefile b/net/mping/Makefile
index 1354f0506b83..fc3da70dd157 100644
--- a/net/mping/Makefile
+++ b/net/mping/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://mping.uninett.no/
MAINTAINER= ports@FreeBSD.org
COMMENT= Mping network statistics collector
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/net/nast/Makefile b/net/nast/Makefile
index c44c98cec7e4..3227e8ddfc79 100644
--- a/net/nast/Makefile
+++ b/net/nast/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= BERLIOS
MAINTAINER= ports@FreeBSD.org
COMMENT= Packet sniffer
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libnet.so:${PORTSDIR}/net/libnet
diff --git a/net/net6/Makefile b/net/net6/Makefile
index 4c20a05b1ef0..46c3dc2a3eb3 100644
--- a/net/net6/Makefile
+++ b/net/net6/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://releases.0x539.de/net6/
MAINTAINER= ports@FreeBSD.org
COMMENT= Network access framework for IPv4/IPv6
-LICENSE= LGPL20 # or later (COPYING is LGPL21)
+LICENSE= LGPL20+ # though COPYING is LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libsigc-2.0.so:${PORTSDIR}/devel/libsigc++20 \
diff --git a/net/nstxd/Makefile b/net/nstxd/Makefile
index 43766e7c3bc0..25d84dc50acc 100644
--- a/net/nstxd/Makefile
+++ b/net/nstxd/Makefile
@@ -18,7 +18,7 @@ COMMENT= DNS tunnel server
BROKEN= unfetchable
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_RC_SUBR= nstxd
diff --git a/net/openpgm/Makefile b/net/openpgm/Makefile
index a0e551275a07..959fea216372 100644
--- a/net/openpgm/Makefile
+++ b/net/openpgm/Makefile
@@ -11,7 +11,7 @@ DISTNAME= libpgm-${PORTVERSION}
MAINTAINER= vg@FreeBSD.org
COMMENT= Implementation of the PGM reliable multicast protocol
-LICENSE= LGPL21 # and newer
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/net/pptpclient/Makefile b/net/pptpclient/Makefile
index 6735b2c27213..290682f7fd64 100644
--- a/net/pptpclient/Makefile
+++ b/net/pptpclient/Makefile
@@ -11,7 +11,7 @@ DISTNAME= pptp-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= PPTP client for establishing a VPN link with an NT server
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
USES= perl5
MAKE_ARGS= CC="${CC}" OPTIMIZE="${CFLAGS}" DEBUG="" \
diff --git a/net/py-xmlrpc/Makefile b/net/py-xmlrpc/Makefile
index a66c3e098bd2..8d8f0cc06db3 100644
--- a/net/py-xmlrpc/Makefile
+++ b/net/py-xmlrpc/Makefile
@@ -12,7 +12,7 @@ DISTNAME= py-${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Fast implementation of the xmlrpc spec for Python
-LICENSE= LGPL21 # (or later)
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= python
diff --git a/net/qadsl/Makefile b/net/qadsl/Makefile
index 6b30963135a7..7a20412a36fe 100644
--- a/net/qadsl/Makefile
+++ b/net/qadsl/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SAVANNAH/alive
MAINTAINER= ports@FreeBSD.org
COMMENT= Auto login/Keep-alive for Telia AB ADSL, COMHEM Cable, and Tiscali Internet
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_RC_SUBR= qadsl
diff --git a/net/remotedesk/Makefile b/net/remotedesk/Makefile
index 2fb326349376..b1ee4b016f94 100644
--- a/net/remotedesk/Makefile
+++ b/net/remotedesk/Makefile
@@ -10,7 +10,7 @@ DISTNAME= RemoteDesk-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphical interface to rdesktop
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
RUN_DEPENDS= rdesktop:${PORTSDIR}/net/rdesktop
diff --git a/net/rude/Makefile b/net/rude/Makefile
index 7d4f7e226e0e..a5653b2a9a4d 100644
--- a/net/rude/Makefile
+++ b/net/rude/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Rude is a Real-time UDP Data Emitter and Collector (crude)
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/DOC/COPYING
RUN_DEPENDS= p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
diff --git a/net/serveez/Makefile b/net/serveez/Makefile
index badd8e0a6b79..43604275b1e0 100644
--- a/net/serveez/Makefile
+++ b/net/serveez/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= GNU
MAINTAINER= ports@FreeBSD.org
COMMENT= Server framework
-LICENSE= GPLv3 # (or later)
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libguile.so:${PORTSDIR}/lang/guile
diff --git a/net/tcptrace/Makefile b/net/tcptrace/Makefile
index 0ce2342a5825..4e2f05ac8ed8 100644
--- a/net/tcptrace/Makefile
+++ b/net/tcptrace/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.tcptrace.org/download/
MAINTAINER= ports@FreeBSD.org
COMMENT= TCP dump file analysis tool
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/net/tcpxd/Makefile b/net/tcpxd/Makefile
index 59261f34042f..51ab5aed34fb 100644
--- a/net/tcpxd/Makefile
+++ b/net/tcpxd/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://fossies.org/unix/privat/ \
MAINTAINER= olgeni@FreeBSD.org
COMMENT= General purpose TCP/IP relay
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/palm/imgvtopgm/Makefile b/palm/imgvtopgm/Makefile
index 86e9c690b850..f7539f8be805 100644
--- a/palm/imgvtopgm/Makefile
+++ b/palm/imgvtopgm/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://linuxmafia.com/pub/palmos/other-os/
MAINTAINER= ports@FreeBSD.org
COMMENT= Palm Pilot Image Viewer to PGM Converter
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libnetpbm.so:${PORTSDIR}/graphics/netpbm
diff --git a/palm/jpilot-picsnvideos/Makefile b/palm/jpilot-picsnvideos/Makefile
index 63e397ed298f..5c42d620f471 100644
--- a/palm/jpilot-picsnvideos/Makefile
+++ b/palm/jpilot-picsnvideos/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX= jpilot-
MAINTAINER= ports@FreeBSD.org
COMMENT= JPilot plugin to download photos and videos
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= jpilot:${PORTSDIR}/palm/jpilot
diff --git a/polish/trf/Makefile b/polish/trf/Makefile
index 7b327f2b1181..053189a20040 100644
--- a/polish/trf/Makefile
+++ b/polish/trf/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://korzen.org/soft/trf/
MAINTAINER= ports@FreeBSD.org
COMMENT= Billing software for traffic counting working with most Polish ISPs
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
OPTIONS_DEFINE= DOCS
diff --git a/print/cups-cloud-print/Makefile b/print/cups-cloud-print/Makefile
index bd9e45433cd4..d1f88da7d9f5 100644
--- a/print/cups-cloud-print/Makefile
+++ b/print/cups-cloud-print/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= print
MAINTAINER= ports@FreeBSD.org
COMMENT= Print using Google Cloud Print
-LICENSE= GPLv3 # (or later)
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= cups-config:${PORTSDIR}/print/cups-client
diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile
index 1bb793d05301..f994f94af260 100644
--- a/print/foo2zjs/Makefile
+++ b/print/foo2zjs/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= GOOGLE_CODE \
MAINTAINER= ports@FreeBSD.org
COMMENT= Driver for printers that use the ZjStream wire protocol
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client
diff --git a/print/foomatic-db-hpijs/Makefile b/print/foomatic-db-hpijs/Makefile
index d1e722ba3b68..68989616efa8 100644
--- a/print/foomatic-db-hpijs/Makefile
+++ b/print/foomatic-db-hpijs/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= LOCAL/lofi
MAINTAINER= ports@FreeBSD.org
COMMENT= Foomatic data for the HPIJS printer drivers
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${LOCALBASE}/share/foomatic/db/oldprinterids:${PORTSDIR}/print/foomatic-db
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index b94b415b0704..babe33c44b1e 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.openprinting.org/download/foomatic/
MAINTAINER= ports@FreeBSD.org
COMMENT= Foomatic wrapper scripts
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus
diff --git a/print/gtklp/Makefile b/print/gtklp/Makefile
index f5e85e13c7c4..f57b73c9c2d2 100644
--- a/print/gtklp/Makefile
+++ b/print/gtklp/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= GTK interface to cups
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client
diff --git a/print/hp2xx/Makefile b/print/hp2xx/Makefile
index e31a977507c1..ff85a1e2778b 100644
--- a/print/hp2xx/Makefile
+++ b/print/hp2xx/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= GNU
MAINTAINER= ports@FreeBSD.org
COMMENT= HPGL to vector and raster formats converter and previewer for X11
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \
libtiff.so:${PORTSDIR}/graphics/tiff
diff --git a/print/kover/Makefile b/print/kover/Makefile
index 4e6f6c48bd6a..49b48491727d 100644
--- a/print/kover/Makefile
+++ b/print/kover/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= https://lisas.de/kover/
MAINTAINER= ports@FreeBSD.org
COMMENT= WYSIWYG CD cover printer
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libcddb.so:${PORTSDIR}/audio/libcddb \
diff --git a/print/lout/Makefile b/print/lout/Makefile
index c1505c03c4b6..eeb0094111c8 100644
--- a/print/lout/Makefile
+++ b/print/lout/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SAVANNAH
MAINTAINER= danilo@FreeBSD.org
COMMENT= LaTeX like document creation system with PostScript/PDF output
-LICENSE= GPLv3 # (or later)
+LICENSE= GPLv3+
OPTIONS_DEFINE= DOCS
diff --git a/print/min12xxw/Makefile b/print/min12xxw/Makefile
index 943c7169105a..77826ddd1ff0 100644
--- a/print/min12xxw/Makefile
+++ b/print/min12xxw/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://hinterbergen.de/mala/min12xxw/
MAINTAINER= ports@FreeBSD.org
COMMENT= Print driver for the Minolta PagePro 1(2/3/4)xxW printers
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/print/pkipplib/Makefile b/print/pkipplib/Makefile
index c478363313a3..292c4388ee28 100644
--- a/print/pkipplib/Makefile
+++ b/print/pkipplib/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.pykota.com/software/pkipplib/download/tarballs/
MAINTAINER= ports@FreeBSD.org
COMMENT= Create and parse IPP requests
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= python
diff --git a/russian/emkatic/Makefile b/russian/emkatic/Makefile
index c1796ff651e1..7436eedb6a70 100644
--- a/russian/emkatic/Makefile
+++ b/russian/emkatic/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= andrey@bsdnir.info
COMMENT= Emulator of Elektronika RPN programmable calculator series
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING.txt
BUILD_DEPENDS= lazbuild:${PORTSDIR}/editors/lazarus \
diff --git a/science/avogadro/Makefile b/science/avogadro/Makefile
index 945297c5a652..ebf512594398 100644
--- a/science/avogadro/Makefile
+++ b/science/avogadro/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Advanced molecular editor and viewer
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
BUILD_DEPENDS= eigen2>2:${PORTSDIR}/math/eigen2
LIB_DEPENDS= libopenbabel.so:${PORTSDIR}/science/openbabel
diff --git a/science/checkmol/Makefile b/science/checkmol/Makefile
index af0bdabeec53..8d76a73adec3 100644
--- a/science/checkmol/Makefile
+++ b/science/checkmol/Makefile
@@ -11,7 +11,7 @@ EXTRACT_SUFX= .pas
MAINTAINER= ports@FreeBSD.org
COMMENT= Analyze molecules for the presence of functional groups
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
NO_WRKSUBDIR= yes
diff --git a/science/ghemical/Makefile b/science/ghemical/Makefile
index 0346978987dc..a82cd92d82ec 100644
--- a/science/ghemical/Makefile
+++ b/science/ghemical/Makefile
@@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR= release20111012 current
MAINTAINER= ports@FreeBSD.org
COMMENT= Computational chemistry software package
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LIB_DEPENDS= libmopac7.so:${PORTSDIR}/biology/mopac \
libghemical.so:${PORTSDIR}/science/libghemical \
diff --git a/science/gwyddion/Makefile b/science/gwyddion/Makefile
index cc7432f2e58f..b7fdcc10cddd 100644
--- a/science/gwyddion/Makefile
+++ b/science/gwyddion/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Gtk2 based SPM data visualization and analysis tool
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libminizip.so:${PORTSDIR}/archivers/minizip \
diff --git a/science/libquantum/Makefile b/science/libquantum/Makefile
index 50f3b0c2cb65..4ed1cf427c4c 100644
--- a/science/libquantum/Makefile
+++ b/science/libquantum/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.libquantum.de/files/
MAINTAINER= ports@FreeBSD.org
COMMENT= C library for quantum computing and quantum simulation
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/science/linsmith/Makefile b/science/linsmith/Makefile
index 71096654a03d..4258540e1214 100644
--- a/science/linsmith/Makefile
+++ b/science/linsmith/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= hamradio@FreeBSD.org
COMMENT= Smith charting program
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
USES= gettext pkgconfig
USE_GNOME= libgnomeui libxml2
diff --git a/science/mol2ps/Makefile b/science/mol2ps/Makefile
index 139227be6bc6..cb5a6739f31f 100644
--- a/science/mol2ps/Makefile
+++ b/science/mol2ps/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Read molecular structure files and generate Postscript output
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
NO_WRKSUBDIR= yes
diff --git a/science/psychopy/Makefile b/science/psychopy/Makefile
index 81eac5cd0d2f..301032d183c7 100644
--- a/science/psychopy/Makefile
+++ b/science/psychopy/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= GH
MAINTAINER= ports@FreeBSD.org
COMMENT= Psychophysics toolkit for Python
-LICENSE= GPLv3 # (or later)
+LICENSE= GPLv3+
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:${PORTSDIR}/devel/py-lxml \
${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \
diff --git a/science/qcl/Makefile b/science/qcl/Makefile
index 7c756a47e685..2e55b55212c7 100644
--- a/science/qcl/Makefile
+++ b/science/qcl/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://tph.tuwien.ac.at/~oemer/tgz/
MAINTAINER= ports@FreeBSD.org
COMMENT= Quantum computer simulator
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
USES= bison gmake readline tar:tgz
diff --git a/security/afterglow/Makefile b/security/afterglow/Makefile
index 1da4e34500d1..9a3f8ffc7536 100644
--- a/security/afterglow/Makefile
+++ b/security/afterglow/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/AfterGlow%201.x/${PORTVERSION}
MAINTAINER= bofh@FreeBSD.org
COMMENT= Collection of graph-generating scripts
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/GPL
RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz \
diff --git a/security/base/Makefile b/security/base/Makefile
index 53e5e0d709d1..a6b85b5a5e51 100644
--- a/security/base/Makefile
+++ b/security/base/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/secureideas/BASE/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Basic Analysis and Security Engine - analyzing Snort alerts
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/docs/GPL
RUN_DEPENDS= ${ADODB_DIR}/adodb.inc.php:${PORTSDIR}/databases/adodb5 \
diff --git a/security/doscan/Makefile b/security/doscan/Makefile
index 70964e38b202..418f7147b1df 100644
--- a/security/doscan/Makefile
+++ b/security/doscan/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://static.enyo.de/fw/releases/doscan/
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool to quickly scan your network for machines listening on a TCP port
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre
diff --git a/security/fakebo/Makefile b/security/fakebo/Makefile
index 3e05fd3586c1..407976c0685a 100644
--- a/security/fakebo/Makefile
+++ b/security/fakebo/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}
MAINTAINER= ports@FreeBSD.org
COMMENT= Fake BackOrifice client emulator
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
diff --git a/security/fakeident/Makefile b/security/fakeident/Makefile
index 6a9116eed021..e30281fe8e0a 100644
--- a/security/fakeident/Makefile
+++ b/security/fakeident/Makefile
@@ -12,7 +12,7 @@ EXTRACT_ONLY= # empty
MAINTAINER= dean@odyssey.apana.org.au
COMMENT= Tool that replies with a standard answer to incoming identd requests
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
PLIST_FILES= sbin/identd
USE_RC_SUBR= fakeidentd
diff --git a/security/hlfl/Makefile b/security/hlfl/Makefile
index 9a0a97a76864..45d31473b01f 100644
--- a/security/hlfl/Makefile
+++ b/security/hlfl/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= ftp://ftp.cusae.com/pub/hlfl/
MAINTAINER= ports@FreeBSD.org
COMMENT= High Level Firewall Language
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/security/kedpm/Makefile b/security/kedpm/Makefile
index 9446afd25477..906ac2cd977d 100644
--- a/security/kedpm/Makefile
+++ b/security/kedpm/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple application for managing personal data
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto
diff --git a/security/keepass/Makefile b/security/keepass/Makefile
index bf175dbf374e..8320561c6d94 100644
--- a/security/keepass/Makefile
+++ b/security/keepass/Makefile
@@ -11,7 +11,7 @@ DISTNAME= KeePass-${PORTVERSION}-Source
MAINTAINER= woodsb02@gmail.com
COMMENT= Light-weight and easy-to-use password manager
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
BUILD_DEPENDS= icotool:${PORTSDIR}/graphics/icoutils
LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \
diff --git a/security/libgringotts/Makefile b/security/libgringotts/Makefile
index d6d0e88c3dde..92251dd091f3 100644
--- a/security/libgringotts/Makefile
+++ b/security/libgringotts/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= BERLIOS/gringotts.berlios
MAINTAINER= ports@FreeBSD.org
COMMENT= Library for encapsulating/safekeeping data in encrypted/compressed form
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libmcrypt.so:${PORTSDIR}/security/libmcrypt \
diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile
index ff968a7be819..dbe11c5d9f6d 100644
--- a/security/libpreludedb/Makefile
+++ b/security/libpreludedb/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= https://www.prelude-ids.org/attachments/download/287/
MAINTAINER= ports@FreeBSD.org
COMMENT= Framework library for access to Prelude NIDS database
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl \
diff --git a/security/libzrtpcppcore/Makefile b/security/libzrtpcppcore/Makefile
index 70fe9efc612f..87c11b5f5f28 100644
--- a/security/libzrtpcppcore/Makefile
+++ b/security/libzrtpcppcore/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= security
MAINTAINER= ports@FreeBSD.org
COMMENT= GNU ZRTP library
-LICENSE= LGPL3 # or later
+LICENSE= LGPL3+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_GITHUB= yes
diff --git a/security/lsh/Makefile b/security/lsh/Makefile
index f2e752e34a3a..f35c71b17094 100644
--- a/security/lsh/Makefile
+++ b/security/lsh/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= GNU
MAINTAINER= johans@FreeBSD.org
COMMENT= Secure (encrypted) remote shell compatible with ssh 2
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= liboop.so:${PORTSDIR}/devel/liboop \
diff --git a/security/massh/Makefile b/security/massh/Makefile
index 4a36969f655b..f4d32346b7ad 100644
--- a/security/massh/Makefile
+++ b/security/massh/Makefile
@@ -14,7 +14,7 @@ COMMENT= Parallel ssh command execution and file transfer on multiple hosts
BROKEN= mismatch in distfile checksum
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
ambit:${PORTSDIR}/shells/ambit
diff --git a/security/matrixssl/Makefile b/security/matrixssl/Makefile
index a3565072d993..d8adaf6741af 100644
--- a/security/matrixssl/Makefile
+++ b/security/matrixssl/Makefile
@@ -12,7 +12,7 @@ DISTNAME= Crypt-MatrixSSL3-3.3.0.1
MAINTAINER= ports@FreeBSD.org
COMMENT= Small alternative SSL implementation
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
OPTIONS_DEFINE= DOCS EXAMPLES
diff --git a/security/medusa/Makefile b/security/medusa/Makefile
index 90699c3138c9..2bb8b1c96a1e 100644
--- a/security/medusa/Makefile
+++ b/security/medusa/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://www.foofus.net/~jmk/tools/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= Speedy, massively parallel, modular, login brute-forcer
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libssh2.so:${PORTSDIR}/security/libssh2
diff --git a/security/mhash/Makefile b/security/mhash/Makefile
index 743746fe4246..40d966cf9473 100644
--- a/security/mhash/Makefile
+++ b/security/mhash/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Easy-to-use library for strong hashes such as MD5 and SHA1
-LICENSE= LGPL20 # or later
+LICENSE= LGPL20+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= libtool tar:bzip2
diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile
index 0d26ac951a36..a59fa78ef183 100644
--- a/security/opencdk/Makefile
+++ b/security/opencdk/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://josefsson.org/gnutls/releases/opencdk/
MAINTAINER= novel@FreeBSD.org
COMMENT= Open Crypto Development Kit
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt
diff --git a/security/openvpn-admin/Makefile b/security/openvpn-admin/Makefile
index c2d200a4a789..1f87427fcec1 100644
--- a/security/openvpn-admin/Makefile
+++ b/security/openvpn-admin/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= GUI frontend to openvpn
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= openvpn:${PORTSDIR}/security/openvpn
diff --git a/security/parano/Makefile b/security/parano/Makefile
index d6809d4ff3e4..fea35ea7369f 100644
--- a/security/parano/Makefile
+++ b/security/parano/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= BERLIOS
MAINTAINER= ports@FreeBSD.org
COMMENT= Gnome program to deal with hashfiles
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USE_GNOME= pygnome2 intltool
diff --git a/security/phpdeadlock/Makefile b/security/phpdeadlock/Makefile
index d54bc5cca683..e3be513b4bcf 100644
--- a/security/phpdeadlock/Makefile
+++ b/security/phpdeadlock/Makefile
@@ -11,7 +11,7 @@ DISTNAME= Deadlock-${PORTVERSION}-Stable
MAINTAINER= ports@FreeBSD.org
COMMENT= Web-based user authentication/password protection system
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING.txt
WRKSRC= ${WRKDIR}/Deadlock-1.01
diff --git a/security/pwman/Makefile b/security/pwman/Makefile
index d0e699b2464e..ed223f08fc65 100644
--- a/security/pwman/Makefile
+++ b/security/pwman/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Console password management application based on gpg(me)
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= gpgv:${PORTSDIR}/security/gnupg1
diff --git a/security/py-clamav/Makefile b/security/py-clamav/Makefile
index 437175bedbc2..905e2a6ac0cf 100644
--- a/security/py-clamav/Makefile
+++ b/security/py-clamav/Makefile
@@ -12,7 +12,7 @@ DISTNAME= py${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python binding to libclamav written in C
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/gpl.txt
BROKEN= unfetchable
diff --git a/security/py-mcrypt/Makefile b/security/py-mcrypt/Makefile
index 219f7fa5eba1..2cd5d8f0dbe8 100644
--- a/security/py-mcrypt/Makefile
+++ b/security/py-mcrypt/Makefile
@@ -12,7 +12,7 @@ DISTNAME= python-mcrypt-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Comprehensive Python interface to the mcrypt library
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libmcrypt.so:${PORTSDIR}/security/libmcrypt
diff --git a/security/py-mhash/Makefile b/security/py-mhash/Makefile
index 8f93beb98a33..6b50227fdcec 100644
--- a/security/py-mhash/Makefile
+++ b/security/py-mhash/Makefile
@@ -12,7 +12,7 @@ DISTNAME= python-mhash-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python mhash module
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libmhash.so:${PORTSDIR}/security/mhash
diff --git a/security/py-xmlsec/Makefile b/security/py-xmlsec/Makefile
index b34fba341018..63d0229b0c32 100644
--- a/security/py-xmlsec/Makefile
+++ b/security/py-xmlsec/Makefile
@@ -12,7 +12,7 @@ DISTNAME= py${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Python bindings for XML Security Library
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libxmlsec1.so:${PORTSDIR}/security/xmlsec1
diff --git a/security/ranpwd/Makefile b/security/ranpwd/Makefile
index f56c5e9660f7..b2a4b0cfbab6 100644
--- a/security/ranpwd/Makefile
+++ b/security/ranpwd/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES= http://artfiles.org/kernel.org/pub/software/utils/admin/ranpwd/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool to generate random passwords
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
USES= gmake
GNU_CONFIGURE= yes
diff --git a/security/slush/Makefile b/security/slush/Makefile
index 5fcdaaed820e..e348e0af678a 100644
--- a/security/slush/Makefile
+++ b/security/slush/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= PACKETSTORM/crypt/SSL/slush
MAINTAINER= ports@FreeBSD.org
COMMENT= Telnet-like application which uses a secure SSL channel
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYRIGHT.GPL
GNU_CONFIGURE= yes
diff --git a/security/snortsnarf/Makefile b/security/snortsnarf/Makefile
index 89852f519914..a2144d50abe0 100644
--- a/security/snortsnarf/Makefile
+++ b/security/snortsnarf/Makefile
@@ -12,7 +12,7 @@ DISTNAME= SnortSnarf-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Generate HTML report summaries from snort incident alerts
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules
diff --git a/security/sqlninja/Makefile b/security/sqlninja/Makefile
index f994a17037bf..b47a60d4705f 100644
--- a/security/sqlninja/Makefile
+++ b/security/sqlninja/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Sql Server exploit toolkit
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
diff --git a/security/sslsniffer/Makefile b/security/sslsniffer/Makefile
index dbdfe86961c0..a1a9f58619bd 100644
--- a/security/sslsniffer/Makefile
+++ b/security/sslsniffer/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://crypto.stanford.edu/~eujin/sslsniffer/
MAINTAINER= ports@FreeBSD.org
COMMENT= SSLv3/TLS and SSLv2 sniffer
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/security/symbion-sslproxy/Makefile b/security/symbion-sslproxy/Makefile
index 830111455c77..5d618e87377a 100644
--- a/security/symbion-sslproxy/Makefile
+++ b/security/symbion-sslproxy/Makefile
@@ -10,7 +10,7 @@ DISTNAME= sslproxy-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= SSL proxy for securing insecure connections
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
USES= gmake tar:tgz
USE_OPENSSL= yes
diff --git a/security/tinyca/Makefile b/security/tinyca/Makefile
index 5cfba543c522..d36a5131aee1 100644
--- a/security/tinyca/Makefile
+++ b/security/tinyca/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://opsec.eu/src/${PORTNAME}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple graphical interface to manage a small Certification Authority
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
RUN_DEPENDS= p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
p5-Locale-gettext>=0:${PORTSDIR}/devel/p5-Locale-gettext \
diff --git a/security/vinetto/Makefile b/security/vinetto/Makefile
index 3d7bfca32fae..f52e4ee7b2d2 100644
--- a/security/vinetto/Makefile
+++ b/security/vinetto/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-beta-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Forensics tool to examine Thumbs.db files
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow
diff --git a/shells/ambit/Makefile b/shells/ambit/Makefile
index 73605ddb9c71..602f3ec07baa 100644
--- a/shells/ambit/Makefile
+++ b/shells/ambit/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Extended bash brace expansion to expand hostnames or commands
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
diff --git a/shells/lshell/Makefile b/shells/lshell/Makefile
index 248aa3e21526..b62e000092b2 100644
--- a/shells/lshell/Makefile
+++ b/shells/lshell/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Shell environment to limited sets of commands to users
-LICENSE= GPLv3 # (or later)
+LICENSE= GPLv3+
USES= python
USE_PYTHON= distutils
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
diff --git a/textproc/align/Makefile b/textproc/align/Makefile
index 47a2b0dce317..b4ae999260fd 100644
--- a/textproc/align/Makefile
+++ b/textproc/align/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.cs.indiana.edu/~kinzler/align/ \
MAINTAINER= jharris@widomaker.com
COMMENT= Text column alignment filter
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
NO_BUILD= yes
diff --git a/textproc/apertium/Makefile b/textproc/apertium/Makefile
index b40588244058..28297b580d31 100644
--- a/textproc/apertium/Makefile
+++ b/textproc/apertium/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}
MAINTAINER= ports@FreeBSD.org
COMMENT= Toolbox to build shallow-transfer machine translation systems
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash
LIB_DEPENDS= liblttoolbox3.so:${PORTSDIR}/textproc/lttoolbox \
diff --git a/textproc/bib2html/Makefile b/textproc/bib2html/Makefile
index 4c24661a717d..e83999808081 100644
--- a/textproc/bib2html/Makefile
+++ b/textproc/bib2html/Makefile
@@ -14,7 +14,7 @@ COMMENT= BibTeX to HTML Translator
BROKEN= unfetchable
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/../COPYING
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C/-[0-9]$//}/src
diff --git a/textproc/chpp/Makefile b/textproc/chpp/Makefile
index a444b7b644f1..b46bc99f90f7 100644
--- a/textproc/chpp/Makefile
+++ b/textproc/chpp/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= http://www.complang.tuwien.ac.at/schani/chpp/files/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= Non-intrusive full-featured text preprocessor
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libgc.so:${PORTSDIR}/devel/boehm-gc
diff --git a/textproc/dixit/Makefile b/textproc/dixit/Makefile
index 07e18869b68d..c31805a41322 100644
--- a/textproc/dixit/Makefile
+++ b/textproc/dixit/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY= ${DISTNAME}.tgz
MAINTAINER= ports@FreeBSD.org
COMMENT= Romanian dictionaries databases and query application
-LICENSE= GPLv3 # (or later)
+LICENSE= GPLv3+
USES= qmake
USE_QT4= corelib gui network moc_build rcc_build
diff --git a/textproc/easydiff/Makefile b/textproc/easydiff/Makefile
index 5c182b2e00fe..b4b5dadb38bd 100644
--- a/textproc/easydiff/Makefile
+++ b/textproc/easydiff/Makefile
@@ -10,7 +10,7 @@ DISTNAME= EasyDiff-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= GNUstep graphical diff
-LICENSE= GPLv2 # or later; COPYING has GPLv3
+LICENSE= GPLv2+ # COPYING has GPLv3
USES= gnustep
USE_GNUSTEP= back build
diff --git a/textproc/ffe/Makefile b/textproc/ffe/Makefile
index 6785b22723bc..90d19a6d5793 100644
--- a/textproc/ffe/Makefile
+++ b/textproc/ffe/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/ff-extractor/ff-extractor/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Flat file extractor
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= makeinfo
diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile
index 7cd188638371..26a6181b65ec 100644
--- a/textproc/htdig/Makefile
+++ b/textproc/htdig/Makefile
@@ -11,7 +11,7 @@ DISTNAME= htdig-3.2.0b6
MAINTAINER= ports@FreeBSD.org
COMMENT= WWW indexing and searching system
-LICENSE= LGPL20 # or later
+LICENSE= LGPL20+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/textproc/humanzip/Makefile b/textproc/humanzip/Makefile
index 67906c06e1e5..c0a481a0b6f2 100644
--- a/textproc/humanzip/Makefile
+++ b/textproc/humanzip/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Compresses text to human readable output
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
PORTDOCS= CHANGELOG README TODO
diff --git a/textproc/libextractor/Makefile b/textproc/libextractor/Makefile
index 74bc2be357aa..4bccbfeca61d 100644
--- a/textproc/libextractor/Makefile
+++ b/textproc/libextractor/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= GNU
MAINTAINER= ports@FreeBSD.org
COMMENT= Library for keyword extraction
-LICENSE= GPLv3 # (or later)
+LICENSE= GPLv3+
LIB_DEPENDS= libltdl.so:${PORTSDIR}/devel/libltdl
diff --git a/textproc/libmrss-php/Makefile b/textproc/libmrss-php/Makefile
index 5d35797a49a5..7a47bf9e29c7 100644
--- a/textproc/libmrss-php/Makefile
+++ b/textproc/libmrss-php/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX= -php
MAINTAINER= ports@FreeBSD.org
COMMENT= PHP library for parsing, writing, and creating RSS
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/../COPYING
LIB_DEPENDS= libmrss.so:${PORTSDIR}/textproc/libmrss
diff --git a/textproc/libmrss/Makefile b/textproc/libmrss/Makefile
index 58837d9d19ba..0b2db141de49 100644
--- a/textproc/libmrss/Makefile
+++ b/textproc/libmrss/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.autistici.org/bakunin/libmrss/
MAINTAINER= ports@FreeBSD.org
COMMENT= C library for parsing, writing, and creating RSS
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \
diff --git a/textproc/ots/Makefile b/textproc/ots/Makefile
index 3e6d765f2c5c..3c5581ef4315 100644
--- a/textproc/ots/Makefile
+++ b/textproc/ots/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/lib${PORTNAME}/lib${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Open Text Summarizer
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt
diff --git a/textproc/popup/Makefile b/textproc/popup/Makefile
index b2b56a8616d9..252a34828414 100644
--- a/textproc/popup/Makefile
+++ b/textproc/popup/Makefile
@@ -10,7 +10,7 @@ DISTNAME= Popup-${PORTVERSION}pre1
MAINTAINER= ports@FreeBSD.org
COMMENT= Interactive learning aid for pairs of words
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
USES= gnustep
USE_GNUSTEP= back build
diff --git a/textproc/pychm/Makefile b/textproc/pychm/Makefile
index 4222065081e4..7d539349484c 100644
--- a/textproc/pychm/Makefile
+++ b/textproc/pychm/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/gnochm/${PORTNAME}/${PORTVERSION}
MAINTAINER= cpm@fbsd.es
COMMENT= Bindings for CHMLIB library
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libchm.so:${PORTSDIR}/misc/chmlib
diff --git a/textproc/sagasu/Makefile b/textproc/sagasu/Makefile
index 8c9f77109c34..cadbef38c3c5 100644
--- a/textproc/sagasu/Makefile
+++ b/textproc/sagasu/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://perso.b2b2c.ca/sarrazip/dev/
MAINTAINER= ports@FreeBSD.org
COMMENT= GNOME tool to find strings in a set of files
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
USES= pathfix pkgconfig gettext gmake
USE_GNOME= libgnomeui
diff --git a/textproc/sdcv/Makefile b/textproc/sdcv/Makefile
index 99e64e47f719..f579b3c7caa5 100644
--- a/textproc/sdcv/Makefile
+++ b/textproc/sdcv/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Text-based utility for work with dictionaries in StarDict's format
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/textproc/sigil/Makefile b/textproc/sigil/Makefile
index 3febab7bb59d..9ab239e13766 100644
--- a/textproc/sigil/Makefile
+++ b/textproc/sigil/Makefile
@@ -8,7 +8,7 @@ CATEGORIES= textproc
MAINTAINER= ports@FreeBSD.org
COMMENT= WYSIWYG ePub editor
-LICENSE= GPLv3 # or any later version
+LICENSE= GPLv3+
LIB_DEPENDS= libminizip.so:${PORTSDIR}/archivers/minizip \
libpcre.so:${PORTSDIR}/devel/pcre \
diff --git a/textproc/soothsayer/Makefile b/textproc/soothsayer/Makefile
index b003dc2bad01..f75dd860e10f 100644
--- a/textproc/soothsayer/Makefile
+++ b/textproc/soothsayer/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/presage/${PORTNAME}/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Intelligent predictive text entry platform
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
BUILD_DEPENDS= help2man:${PORTSDIR}/misc/help2man
diff --git a/textproc/ssddiff/Makefile b/textproc/ssddiff/Makefile
index e7fad1082902..58199a47873e 100644
--- a/textproc/ssddiff/Makefile
+++ b/textproc/ssddiff/Makefile
@@ -12,7 +12,7 @@ COMMENT= Diff application for semistructured data such as XML files
BROKEN= unfetchable
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
GNU_CONFIGURE= yes
USES= autoreconf pkgconfig tar:bzip2
diff --git a/textproc/tdhkit/Makefile b/textproc/tdhkit/Makefile
index 7401a8cb9f44..3be2c9c3d54b 100644
--- a/textproc/tdhkit/Makefile
+++ b/textproc/tdhkit/Makefile
@@ -12,7 +12,7 @@ COMMENT= Set of programs for working with tabular ASCII data
BROKEN= unfetchable
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
OPTIONS_DEFINE= CHRON DOCS
OPTIONS_SUB= yes
diff --git a/textproc/txt2man/Makefile b/textproc/txt2man/Makefile
index 9fcd5aa04009..c3befe9fdde6 100644
--- a/textproc/txt2man/Makefile
+++ b/textproc/txt2man/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://mvertes.free.fr/download/
MAINTAINER= ports@FreeBSD.org
COMMENT= Converts flat ASCII text to man page format
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk
diff --git a/textproc/unrtf/Makefile b/textproc/unrtf/Makefile
index 92d97e1829ad..e40a903254e3 100644
--- a/textproc/unrtf/Makefile
+++ b/textproc/unrtf/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= GNU
MAINTAINER= bf@FreeBSD.org
COMMENT= Converter from RTF to several formats, including HTML and LaTeX
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= cpe gmake iconv
diff --git a/textproc/yould/Makefile b/textproc/yould/Makefile
index 7d63b0043922..ed9d51ad05eb 100644
--- a/textproc/yould/Makefile
+++ b/textproc/yould/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= CHEESESHOP/source/y/${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Pronounceable word generator
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= python
diff --git a/www/anyremote2html/Makefile b/www/anyremote2html/Makefile
index d71fc25d4ef6..a7b109c15786 100644
--- a/www/anyremote2html/Makefile
+++ b/www/anyremote2html/Makefile
@@ -11,7 +11,7 @@ COMMENT= Web interface for anyRemote
RUN_DEPENDS= anyremote:${PORTSDIR}/comms/anyremote
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/www/aria2fe/Makefile b/www/aria2fe/Makefile
index ac73d24b3ac1..fde91fcabf55 100644
--- a/www/aria2fe/Makefile
+++ b/www/aria2fe/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Aria2 Qt front-end
-LICENSE= GPLv3 # (or later)
+LICENSE= GPLv3+
RUN_DEPENDS= aria2c:${PORTSDIR}/www/aria2 \
xterm:${PORTSDIR}/x11/xterm
diff --git a/www/bacula-web/Makefile b/www/bacula-web/Makefile
index a24265a00643..2220da469b8f 100644
--- a/www/bacula-web/Makefile
+++ b/www/bacula-web/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.bacula-web.org/files/bacula-web.org/downloads/
MAINTAINER= dan@langille.org
COMMENT= Bacula-web provides a summarized output of Bacula jobs
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/DOCS/COPYING
USES= tar:tgz
diff --git a/www/bareos-webui/Makefile b/www/bareos-webui/Makefile
index 746857b030ae..bb3c8d2952ac 100644
--- a/www/bareos-webui/Makefile
+++ b/www/bareos-webui/Makefile
@@ -14,7 +14,7 @@ GH_TAGNAME= c826a4cbd4ff7340fb9b020ca824c9c48bd52948
MAINTAINER= acm@FreeBSD.org
COMMENT= A PHP-Frontend to manage Bareos over the web
-LICENSE= AGPLv3 # or later
+LICENSE= AGPLv3+
LICENSE_FILE= ${WRKSRC}/LICENSE
USES= tar:tgz
diff --git a/www/boa/Makefile b/www/boa/Makefile
index 3c49d84ce060..21d4fc4cfeec 100644
--- a/www/boa/Makefile
+++ b/www/boa/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.boa.org/
MAINTAINER= ports@FreeBSD.org
COMMENT= High performance single-tasking web server
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= cpe gmake makeinfo tar:bzip2
diff --git a/www/bookmarkbridge/Makefile b/www/bookmarkbridge/Makefile
index 14247ba52a4b..41452dcb973d 100644
--- a/www/bookmarkbridge/Makefile
+++ b/www/bookmarkbridge/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Synchronize bookmarks between multiple browsers
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= autoreconf gmake perl5 pkgconfig shebangfix
diff --git a/www/castget/Makefile b/www/castget/Makefile
index 7bcfd60f38a7..34ea92713ec5 100644
--- a/www/castget/Makefile
+++ b/www/castget/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Command-line podcast downloader
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING.LIB
LIB_DEPENDS= libid3.so:${PORTSDIR}/audio/id3lib \
diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile
index 4912c58c5e52..ca545271cfa8 100644
--- a/www/cgicc/Makefile
+++ b/www/cgicc/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= GNU
MAINTAINER= bofh@FreeBSD.org
COMMENT= C++ class library for writing CGI applications
-LICENSE= LGPL3 # (or later)
+LICENSE= LGPL3+
OPTIONS_DEFINE= DOCS
diff --git a/www/cntlm/Makefile b/www/cntlm/Makefile
index 27e351736eda..dd333267b476 100644
--- a/www/cntlm/Makefile
+++ b/www/cntlm/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= NTLM / NTLM Session Response / NTLMv2 authenticating HTTP proxy
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
USE_RC_SUBR= cntlm
diff --git a/www/erwn/Makefile b/www/erwn/Makefile
index 3d85ed5dd111..06a9498f845f 100644
--- a/www/erwn/Makefile
+++ b/www/erwn/Makefile
@@ -11,7 +11,7 @@ DISTNAME= erwin-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple GTK+-2 HTML editor
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= pathfix pkgconfig gmake
diff --git a/www/ffproxy/Makefile b/www/ffproxy/Makefile
index ac874a2b3f28..0249fdac943d 100644
--- a/www/ffproxy/Makefile
+++ b/www/ffproxy/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES= http://${PORTNAME}.sourceforge.net/${PORTNAME}/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= Filtering HTTP proxy server
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/www/flat-frog/Makefile b/www/flat-frog/Makefile
index 761128d3bd4f..408b07c927c8 100644
--- a/www/flat-frog/Makefile
+++ b/www/flat-frog/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/flatfrog/flatfrog/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Templating engine working in php
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
NO_BUILD= yes
diff --git a/www/geeklog/Makefile b/www/geeklog/Makefile
index 14cb70c1cfb5..b832c45fea8c 100644
--- a/www/geeklog/Makefile
+++ b/www/geeklog/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.geeklog.net/filemgmt/upload_dir/
MAINTAINER= ports@FreeBSD.org
COMMENT= Web content management system
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
USES= cpe
diff --git a/www/grr/Makefile b/www/grr/Makefile
index 17652fb4d854..d7bfd4fadf2d 100644
--- a/www/grr/Makefile
+++ b/www/grr/Makefile
@@ -10,7 +10,7 @@ DISTNAME= Grr-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Rss reader for GNUstep
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libRSSKit.so:${PORTSDIR}/www/rsskit
diff --git a/www/gurlchecker/Makefile b/www/gurlchecker/Makefile
index a3175f26106b..b93efab1f0cc 100644
--- a/www/gurlchecker/Makefile
+++ b/www/gurlchecker/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://labs.libre-entreprise.org/frs/download.php/547/
MAINTAINER= ports@FreeBSD.org
COMMENT= Gnome program to check a page/website for broken links
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libgnet-2.0.so:${PORTSDIR}/net/gnet2
diff --git a/www/hastymail/Makefile b/www/hastymail/Makefile
index 4c1f74663322..a83ec107ceb5 100644
--- a/www/hastymail/Makefile
+++ b/www/hastymail/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= Small, fast and secure yet powerful IMAP webmail
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
NO_BUILD= yes
diff --git a/www/hastymail2-devel/Makefile b/www/hastymail2-devel/Makefile
index 21dd32e53a9d..d4599230a123 100644
--- a/www/hastymail2-devel/Makefile
+++ b/www/hastymail2-devel/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-devel-${HASTYMAIL_REV}
MAINTAINER= graudeejs@gmail.com
COMMENT= Small, fast and secure yet powerful IMAP webmail
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
NO_BUILD= yes
diff --git a/www/hastymail2/Makefile b/www/hastymail2/Makefile
index 256f1f6a7599..dd6aff6706f0 100644
--- a/www/hastymail2/Makefile
+++ b/www/hastymail2/Makefile
@@ -12,7 +12,7 @@ DISTNAME= hastymail2_${WIKEDVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Small, fast and secure yet powerful IMAP webmail
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
NO_BUILD= yes
diff --git a/www/htmlpp/Makefile b/www/htmlpp/Makefile
index 66ec4cc9aab9..6a0cf2269505 100644
--- a/www/htmlpp/Makefile
+++ b/www/htmlpp/Makefile
@@ -11,7 +11,7 @@ DISTNAME= htmlp42a
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl script to allow easy creation of HTML from template files
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
USES= perl5 shebangfix tar:tgz
SHEBANG_FILES= htmlpp
diff --git a/www/junkbuster/Makefile b/www/junkbuster/Makefile
index e10e31af7746..2a23b4559aef 100644
--- a/www/junkbuster/Makefile
+++ b/www/junkbuster/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ijb-zlib-11
MAINTAINER= ports@FreeBSD.org
COMMENT= HTTP proxy server that eliminates ads
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
USES= tar:tgz
ALL_TARGET= # yes, an empty target.
diff --git a/www/lightsquid/Makefile b/www/lightsquid/Makefile
index 0cb0aca0dd5b..374052e075a0 100644
--- a/www/lightsquid/Makefile
+++ b/www/lightsquid/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Light and fast web based squid proxy traffic analyser
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/doc/gnugpl.txt
USES= perl5 shebangfix tar:tgz
diff --git a/www/man2web/Makefile b/www/man2web/Makefile
index 6787d28b4c96..417a0c5181ee 100644
--- a/www/man2web/Makefile
+++ b/www/man2web/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Convert man pages to HTML
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/doc/GPL
GNU_CONFIGURE= yes
diff --git a/www/mknmz-wwwoffle/Makefile b/www/mknmz-wwwoffle/Makefile
index 13527f6d72ec..2c5b2ea90f47 100644
--- a/www/mknmz-wwwoffle/Makefile
+++ b/www/mknmz-wwwoffle/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.naney.org/comp/distrib/mknmz-wwwoffle/archive/
MAINTAINER= ports@FreeBSD.org
COMMENT= WWWOFFLE cache indexer for full-text search system Namazu
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
RUN_DEPENDS= ${LOCALBASE}/bin/wwwoffle:${PORTSDIR}/www/wwwoffle
diff --git a/www/mozplugger/Makefile b/www/mozplugger/Makefile
index b6abe5be49d6..95b9fe32e1ab 100644
--- a/www/mozplugger/Makefile
+++ b/www/mozplugger/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://mozplugger.mozdev.org/files/
MAINTAINER= ports@FreeBSD.org
COMMENT= Framework for loading web content in external viewers
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/www/pnews/Makefile b/www/pnews/Makefile
index a7197e779e1a..ad0950ffc403 100644
--- a/www/pnews/Makefile
+++ b/www/pnews/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
MAINTAINER= ports@FreeBSD.org
COMMENT= PHP Web-based News Reader
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
USES= tar:tgz
USE_PHP= yes
diff --git a/www/quickie/Makefile b/www/quickie/Makefile
index 82877b0f727b..1e69098bb21d 100644
--- a/www/quickie/Makefile
+++ b/www/quickie/Makefile
@@ -13,7 +13,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
COMMENT= Small footprint, fast Wiki engine written in C++
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
USES= alias perl5
USE_PERL5= build patch
diff --git a/www/revive-adserver/Makefile b/www/revive-adserver/Makefile
index 3630461c46fd..9b736030c1bf 100644
--- a/www/revive-adserver/Makefile
+++ b/www/revive-adserver/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://download.revive-adserver.org/
MAINTAINER= meritus@innervision.pl
COMMENT= Free, opensource ad server in PHP
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
NO_BUILD= yes
diff --git a/www/rsstool/Makefile b/www/rsstool/Makefile
index f148eb528b9c..97ad0434e267 100644
--- a/www/rsstool/Makefile
+++ b/www/rsstool/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= ports@FreeBSD.org
COMMENT= Read, parse, merge and write RSS and Atom feeds
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
USES= iconv gmake
USE_GNOME= libxml2
diff --git a/www/srg/Makefile b/www/srg/Makefile
index 8b9d6fdf7ab8..71a55d041cb5 100644
--- a/www/srg/Makefile
+++ b/www/srg/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
MAINTAINER= ports@FreeBSD.org
COMMENT= Squid Report Generator
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= tar:bzip2
diff --git a/www/sventon/Makefile b/www/sventon/Makefile
index 1d27db820c1d..0199b977f222 100644
--- a/www/sventon/Makefile
+++ b/www/sventon/Makefile
@@ -9,7 +9,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-bin-svnkit
MAINTAINER= ports@FreeBSD.org
COMMENT= Web client for browsing Subversion repositories
-LICENSE= GPLv3 # or later
+LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/gpl.txt
USES= zip
diff --git a/www/swish++/Makefile b/www/swish++/Makefile
index 923c1d6e52d1..f0296ddb82bd 100644
--- a/www/swish++/Makefile
+++ b/www/swish++/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/swishplusplus/swishplusplus/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple Web Indexing System for Humans: C++ version
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/Copying
RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget
diff --git a/www/template_/Makefile b/www/template_/Makefile
index 8c32c580ef30..34d27c93d17a 100644
--- a/www/template_/Makefile
+++ b/www/template_/Makefile
@@ -10,7 +10,7 @@ DISTNAME= Template_.2.2.3
MAINTAINER= ports@FreeBSD.org
COMMENT= High performance PHP compiling template engine
-LICENSE= LGPL20 # or later
+LICENSE= LGPL20+
WRKSRC= ${WRKDIR}
FETCH_ARGS+= -o ${DISTNAME}.tar.gz
diff --git a/www/templatelite/Makefile b/www/templatelite/Makefile
index e3692a98c237..960379b7babe 100644
--- a/www/templatelite/Makefile
+++ b/www/templatelite/Makefile
@@ -10,7 +10,7 @@ DISTNAME= template_lite_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Smaller, faster alternative to the Smarty template engine
-LICENSE= LGPL21 # pr later
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
NO_BUILD= yes
diff --git a/www/webstats/Makefile b/www/webstats/Makefile
index 2929ca163056..b5abe066846b 100644
--- a/www/webstats/Makefile
+++ b/www/webstats/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= kevin@caomhin.demon.co.uk
COMMENT= Automated log file processing
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/GPL
RUN_DEPENDS= analog:${PORTSDIR}/www/analog \
diff --git a/www/wsmake/Makefile b/www/wsmake/Makefile
index df2937727c29..d8955ddc1d80 100644
--- a/www/wsmake/Makefile
+++ b/www/wsmake/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= Software for production and maintenance of web sites
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gmake tar:bzip2
diff --git a/x11-clocks/aclock/Makefile b/x11-clocks/aclock/Makefile
index 375621b59d90..0d75bb42ce61 100644
--- a/x11-clocks/aclock/Makefile
+++ b/x11-clocks/aclock/Makefile
@@ -11,7 +11,7 @@ DISTNAME= AClock-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Analog Clock for GNUstep
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= gnustep
diff --git a/x11-clocks/buici-clock/Makefile b/x11-clocks/buici-clock/Makefile
index 1f1986288b93..680fb6c8e6d8 100644
--- a/x11-clocks/buici-clock/Makefile
+++ b/x11-clocks/buici-clock/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Xlib implementation of an attractive, configurable clock
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo
diff --git a/x11-clocks/rclock/Makefile b/x11-clocks/rclock/Makefile
index dd574c2735db..48747835dd1b 100644
--- a/x11-clocks/rclock/Makefile
+++ b/x11-clocks/rclock/Makefile
@@ -11,7 +11,7 @@ DISTNAME= rxvt-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Analog clock for X w/appointment reminder and mail notification
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
USE_XORG= x11 xau xdmcp ice xpm xv
GNU_CONFIGURE= yes
diff --git a/x11-clocks/wmclock/Makefile b/x11-clocks/wmclock/Makefile
index 7bb23f790687..97a5af864891 100644
--- a/x11-clocks/wmclock/Makefile
+++ b/x11-clocks/wmclock/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
MAINTAINER= ports@FreeBSD.org
COMMENT= Dockable clock applet for Window Maker
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
WRKSRC= ${WRKDIR}/dockapps-daaf3aa
diff --git a/x11-drivers/xf86-input-wacom/Makefile b/x11-drivers/xf86-input-wacom/Makefile
index b04b0cc7d463..68d97df7cc32 100644
--- a/x11-drivers/xf86-input-wacom/Makefile
+++ b/x11-drivers/xf86-input-wacom/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES= SF/linuxwacom/${PORTNAME}
MAINTAINER= jbeich@FreeBSD.org
COMMENT= X.Org Wacom tablet driver
-LICENSE= GPLv2 # or any later version
+LICENSE= GPLv2+
BUILD_DEPENDS= v4l_compat>=1.0.20110603:${PORTSDIR}/multimedia/v4l_compat
RUN_DEPENDS= webcamd>=3.1.0.1:${PORTSDIR}/multimedia/webcamd
diff --git a/x11-fm/krusader2/Makefile b/x11-fm/krusader2/Makefile
index ee5f61205f98..7f2a1eabfb55 100644
--- a/x11-fm/krusader2/Makefile
+++ b/x11-fm/krusader2/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}/
MAINTAINER= ports@FreeBSD.org
COMMENT= Twin panel file manager for KDE, like midnight or norton commander
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= cmake:outsource gettext tar:bzip2
diff --git a/x11-fonts/bdfresize/Makefile b/x11-fonts/bdfresize/Makefile
index fb1c5fb6d2bd..a14f567b8049 100644
--- a/x11-fonts/bdfresize/Makefile
+++ b/x11-fonts/bdfresize/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/efont/dist/tools/bdfresize/
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool for resizing BDF format font
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/fox16/Makefile b/x11-toolkits/fox16/Makefile
index 02cdf18345d3..f2f5aef194ea 100644
--- a/x11-toolkits/fox16/Makefile
+++ b/x11-toolkits/fox16/Makefile
@@ -12,7 +12,7 @@ PKGNAMESUFFIX= ${PORTVERSION:R:S/.//}
MAINTAINER= ports@FreeBSD.org
COMMENT= Fast and extensive C++ GUI toolkit -- ver.1.6
-LICENSE= LGPL3 # (or later)
+LICENSE= LGPL3+
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \
libtiff.so:${PORTSDIR}/graphics/tiff
diff --git a/x11-toolkits/fxscintilla/Makefile b/x11-toolkits/fxscintilla/Makefile
index 9ac48da2eadf..1bba49d81ae0 100644
--- a/x11-toolkits/fxscintilla/Makefile
+++ b/x11-toolkits/fxscintilla/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Fox toolkit reimplementation of Scintilla editing widget
-LICENSE= LGPL21 # (or later)
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libFOX-1.6.so:${PORTSDIR}/x11-toolkits/fox16
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index 129a8accacf8..58928dc59573 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR= gnome2
MAINTAINER= ports@FreeBSD.org
COMMENT= OpenGL extension to GTK+
-LICENSE= LGPL21 # or later
+LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING.LIB
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/gtkimageview/Makefile b/x11-toolkits/gtkimageview/Makefile
index fd13c8e2b896..997d0766272f 100644
--- a/x11-toolkits/gtkimageview/Makefile
+++ b/x11-toolkits/gtkimageview/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES= LOCAL/kwm
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple image viewer widget
-LICENSE= LGPL21 # or later; source says LGPL20+ though
+LICENSE= LGPL21+ # source says LGPL20+ though
LICENSE_FILE= ${WRKSRC}/COPYING
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/otk/Makefile b/x11-toolkits/otk/Makefile
index 87dd38c8c5ff..912dd84527cf 100644
--- a/x11-toolkits/otk/Makefile
+++ b/x11-toolkits/otk/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ${PORTNAME}_lib_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Widget library based on OpenGL
-LICENSE= LGPL20 # or later
+LICENSE= LGPL20+
WRKSRC= ${WRKDIR}/${PORTNAME}_lib
diff --git a/x11-toolkits/viewklass/Makefile b/x11-toolkits/viewklass/Makefile
index 421a80a0c9af..d83b1a834356 100644
--- a/x11-toolkits/viewklass/Makefile
+++ b/x11-toolkits/viewklass/Makefile
@@ -11,7 +11,7 @@ DISTNAME= ViewKlass-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= C++ Framework for Motif
-LICENSE= LGPL20 # (or later)
+LICENSE= LGPL20+
GNU_CONFIGURE= yes
USES= imake:env motif
diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile
index b6d937d47366..c613751bb7ac 100644
--- a/x11-toolkits/xmhtml/Makefile
+++ b/x11-toolkits/xmhtml/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME:tl}
MAINTAINER= ports@FreeBSD.org
COMMENT= Motif widget set for displaying HTML 3.2 documents
-LICENSE= LGPL20 # (or later)
+LICENSE= LGPL20+
LICENSE_FILE= ${WRKSRC}/COPYING.LIB
LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png
diff --git a/x11-wm/devilspie/Makefile b/x11-wm/devilspie/Makefile
index b33d41c71ef8..a8e807be9088 100644
--- a/x11-wm/devilspie/Makefile
+++ b/x11-wm/devilspie/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.burtonini.com/computing/
MAINTAINER= w.schwarzenfeld@utanet.at
COMMENT= Window manipulation tool
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libwnck-3.so:${PORTSDIR}/x11-toolkits/libwnck3
diff --git a/x11-wm/fluxconf/Makefile b/x11-wm/fluxconf/Makefile
index f15faceae58d..891fac3d4ef2 100644
--- a/x11-wm/fluxconf/Makefile
+++ b/x11-wm/fluxconf/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://devaux.fabien.free.fr/flux/
MAINTAINER= alfredoj69@gmail.com
COMMENT= Fluxbox window manager configuration program
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
USES= pkgconfig
diff --git a/x11-wm/flwm/Makefile b/x11-wm/flwm/Makefile
index 89bf8bcc30f2..bd29a46850c8 100644
--- a/x11-wm/flwm/Makefile
+++ b/x11-wm/flwm/Makefile
@@ -9,7 +9,7 @@ CATEGORIES= x11-wm
MAINTAINER= ports@FreeBSD.org
COMMENT= The Fast Light Window Manager
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LIB_DEPENDS= libfltk.so:${PORTSDIR}/x11-toolkits/fltk-devel
diff --git a/x11-wm/jewel/Makefile b/x11-wm/jewel/Makefile
index a1225c7da480..fa9b9bd95b0f 100644
--- a/x11-wm/jewel/Makefile
+++ b/x11-wm/jewel/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= http://mjr.towers.org.uk/comp/
MAINTAINER= ports@FreeBSD.org
COMMENT= Window manager based on aewm++
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
ALL_TARGET= all
diff --git a/x11-wm/lwm/Makefile b/x11-wm/lwm/Makefile
index 03f94e42b29c..dcc433a4fa8f 100644
--- a/x11-wm/lwm/Makefile
+++ b/x11-wm/lwm/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= http://www.jfc.org.uk/files/lwm/
MAINTAINER= ports@FreeBSD.org
COMMENT= Lightweight window manager
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
OPTIONS_DEFINE= DOCS
diff --git a/x11-wm/plwm/Makefile b/x11-wm/plwm/Makefile
index 6680d62be2f4..25c57e7dba52 100644
--- a/x11-wm/plwm/Makefile
+++ b/x11-wm/plwm/Makefile
@@ -10,7 +10,7 @@ DISTNAME= ${PORTNAME:tu}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Window manager construction kit
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xlib>0:${PORTSDIR}/x11-toolkits/py-xlib
diff --git a/x11-wm/ratpoison/Makefile b/x11-wm/ratpoison/Makefile
index 7e1cd9c43d69..f18855a2933e 100644
--- a/x11-wm/ratpoison/Makefile
+++ b/x11-wm/ratpoison/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES= SAVANNAH
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple window manager with no fat library dependencies
-LICENSE= GPLv2 # (or later)
+LICENSE= GPLv2+
USES= pkgconfig
USE_XORG= ice x11 xext xinerama xtst
diff --git a/x11-wm/windowlab/Makefile b/x11-wm/windowlab/Makefile
index 1ed000029cc3..5d73c25884e6 100644
--- a/x11-wm/windowlab/Makefile
+++ b/x11-wm/windowlab/Makefile
@@ -11,7 +11,7 @@ DIST_SUBDIR= repacked
MAINTAINER= ports@FreeBSD.org
COMMENT= Small window manager for X11
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENCE
USES= gmake tar
diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index 12bf0b673eeb..405c3a3a9a9e 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -12,7 +12,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Configuration tool for Window Maker
-LICENSE= GPLv2 # or later
+LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libWINGs.so:${PORTSDIR}/x11-wm/windowmaker
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