aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPo-Chuan Hsieh <sunpoet@FreeBSD.org>2023-08-26 21:03:32 +0000
committerPo-Chuan Hsieh <sunpoet@FreeBSD.org>2023-08-26 21:03:32 +0000
commit7a4777dc53583a897fb8bc1328c6be87bfed8047 (patch)
treeac0a62999320b356d1f5e64d97252e571d454a1e
parent1b456f061f42fa3539a17ea670a5d87624917fe1 (diff)
downloadports-7a4777dc53583a897fb8bc1328c6be87bfed8047.tar.gz
ports-7a4777dc53583a897fb8bc1328c6be87bfed8047.zip
*: Rename GTK+ to GTK
GTK+ has been renamed to GTK since 2019. Reference: https://mail.gnome.org/archives/gtk-devel-list/2019-February/msg00000.html Approved by: portmgr (blanket)
-rw-r--r--Mk/Uses/gnome.mk2
-rw-r--r--Mk/bsd.wx.mk2
-rw-r--r--archivers/xarchive/Makefile2
-rw-r--r--audio/asunder/Makefile2
-rw-r--r--audio/denemo/Makefile2
-rw-r--r--audio/exaile/Makefile2
-rw-r--r--audio/gtkguitune/Makefile2
-rw-r--r--audio/qtractor/Makefile2
-rw-r--r--audio/sweep/Makefile2
-rw-r--r--benchmarks/gtkperf/Makefile2
-rw-r--r--cad/librnd/Makefile2
-rw-r--r--chinese/pcmanx/Makefile2
-rw-r--r--comms/gnocky/Makefile2
-rw-r--r--comms/xdemorse/Makefile2
-rw-r--r--deskutils/clipit/Makefile2
-rw-r--r--deskutils/parcellite/Makefile2
-rw-r--r--deskutils/xfce4-notifyd/Makefile2
-rw-r--r--devel/geany/Makefile2
-rw-r--r--devel/glade/Makefile2
-rw-r--r--devel/goffice/Makefile2
-rw-r--r--editors/leafpad/Makefile2
-rw-r--r--editors/libreoffice/Makefile2
-rw-r--r--emulators/bochs/Makefile2
-rw-r--r--games/eboard/Makefile2
-rw-r--r--games/freeciv/Makefile2
-rw-r--r--games/mt_gtk_client/Makefile2
-rw-r--r--games/xboard/Makefile2
-rw-r--r--graphics/clutter-gtk3/Makefile2
-rw-r--r--graphics/fyre/Makefile2
-rw-r--r--graphics/gcolor2/Makefile2
-rw-r--r--graphics/gdk-pixbuf2/Makefile2
-rw-r--r--graphics/gimageview/Makefile2
-rw-r--r--graphics/goocanvas2/Makefile2
-rw-r--r--graphics/goocanvas3/Makefile2
-rw-r--r--graphics/libexif-gtk/Makefile2
-rw-r--r--graphics/linux-c7-gdk-pixbuf2/Makefile2
-rw-r--r--japanese/libtomoe-gtk/Makefile2
-rw-r--r--korean/imhangul-gtk2/Makefile2
-rw-r--r--korean/imhangul-gtk3/Makefile2
-rw-r--r--mail/claws-mail/Makefile2
-rw-r--r--mail/sylpheed/Makefile2
-rw-r--r--math/grpn/Makefile2
-rw-r--r--math/qalculate-gtk/Makefile2
-rw-r--r--multimedia/celluloid/Makefile2
-rw-r--r--multimedia/handbrake/Makefile2
-rw-r--r--net-im/dino/Makefile2
-rw-r--r--net-im/fractal/Makefile2
-rw-r--r--net-im/gajim/Makefile2
-rw-r--r--net-im/pidgin/Makefile2
-rw-r--r--net-p2p/gtorrentviewer/Makefile2
-rw-r--r--net/dhcpcd-ui/Makefile2
-rw-r--r--net/gspoof/Makefile2
-rw-r--r--net/gtk-vnc/Makefile2
-rw-r--r--net/remmina/Makefile2
-rw-r--r--news/pan/Makefile2
-rw-r--r--security/gonepass/Makefile2
-rw-r--r--security/gtkpasman/Makefile2
-rw-r--r--security/pinentry-gtk2/Makefile2
-rw-r--r--shells/viewglob/Makefile2
-rw-r--r--sysutils/gapcmon/Makefile2
-rw-r--r--sysutils/nvclock/Makefile2
-rw-r--r--textproc/fcitx5-gtk-common/Makefile2
-rw-r--r--textproc/fcitx5-gtk/Makefile2
-rw-r--r--textproc/gspell/Makefile2
-rw-r--r--textproc/gtk-doc/Makefile2
-rw-r--r--textproc/gtkspell/Makefile2
-rw-r--r--textproc/gtkspell3/Makefile2
-rw-r--r--textproc/uim-gtk/Makefile2
-rw-r--r--textproc/uim-gtk3/Makefile2
-rw-r--r--www/badwolf/Makefile2
-rw-r--r--www/bluefish/Makefile2
-rw-r--r--www/castor/Makefile2
-rw-r--r--www/surf/Makefile2
-rw-r--r--www/webkit2-gtk3/Makefile2
-rw-r--r--www/webkit2-gtk4/Makefile2
-rw-r--r--x11-themes/clearlooks/Makefile2
-rw-r--r--x11-themes/gtk-engines2/Makefile2
-rw-r--r--x11-themes/gtk-equinox-engine/Makefile2
-rw-r--r--x11-themes/gtk-gray-theme/Makefile2
-rw-r--r--x11-themes/gtk-lila-theme-extras/Makefile2
-rw-r--r--x11-themes/gtk-lila-theme/Makefile2
-rw-r--r--x11-themes/gtk-murrina-aqua/Makefile2
-rw-r--r--x11-themes/gtk-murrine-engine/Makefile2
-rw-r--r--x11-themes/gtk3-oxygen-engine/Makefile2
-rw-r--r--x11-themes/lxappearance/Makefile2
-rw-r--r--x11-themes/materia-gtk-theme/Makefile2
-rw-r--r--x11-themes/pop-gtk-themes/Makefile2
-rw-r--r--x11-themes/qtcurve-gtk2/Makefile2
-rw-r--r--x11-themes/qtcurve/Makefile2
-rw-r--r--x11-themes/thewidgetfactory/Makefile2
-rw-r--r--x11-toolkits/granite/Makefile2
-rw-r--r--x11-toolkits/gtk-sharp20/Makefile2
-rw-r--r--x11-toolkits/gtk-sharp30/Makefile2
-rw-r--r--x11-toolkits/gtk30/Makefile2
-rw-r--r--x11-toolkits/gtk40/Makefile2
-rw-r--r--x11-toolkits/gtkd/Makefile2
-rw-r--r--x11-toolkits/gtkdatabox/Makefile2
-rw-r--r--x11-toolkits/gtkextra/Makefile2
-rw-r--r--x11-toolkits/gtkglarea2/Makefile2
-rw-r--r--x11-toolkits/gtkglext/Makefile2
-rw-r--r--x11-toolkits/libhandy/Makefile2
-rw-r--r--x11-toolkits/linux-c7-gtk2/Makefile2
-rw-r--r--x11-toolkits/linux-c7-gtk3/Makefile2
-rw-r--r--x11-toolkits/ocaml-lablgtk2/Makefile2
-rw-r--r--x11-toolkits/ocaml-lablgtk3/Makefile2
-rw-r--r--x11-toolkits/qt5-widgets/Makefile2
-rw-r--r--x11-toolkits/rep-gtk2/Makefile2
-rw-r--r--x11-toolkits/scintilla/Makefile2
-rw-r--r--x11-toolkits/wxgtk30/Makefile2
-rw-r--r--x11/gtk-theme-switch2/Makefile2
-rw-r--r--x11/lightdm-gtk-greeter-settings/Makefile2
-rw-r--r--x11/lightdm-gtk-greeter/Makefile2
-rw-r--r--x11/roxterm/Makefile2
-rw-r--r--x11/stjerm/Makefile2
-rw-r--r--x11/tilix/Makefile2
-rw-r--r--x11/wbar/Makefile2
116 files changed, 116 insertions, 116 deletions
diff --git a/Mk/Uses/gnome.mk b/Mk/Uses/gnome.mk
index 81b9d50cff55..70d601ce853d 100644
--- a/Mk/Uses/gnome.mk
+++ b/Mk/Uses/gnome.mk
@@ -326,7 +326,7 @@ IGNORE= cannot install: Unknown component ${component}
_USE_GNOME+= ${${component}_USE_GNOME_IMPL} ${component}
. endfor
-# Setup the GTK+ API version for pixbuf loaders, input method modules,
+# Setup the GTK API version for pixbuf loaders, input method modules,
# and theme engines.
PLIST_SUB+= GTK2_VERSION="${GTK2_VERSION}" \
GTK3_VERSION="${GTK3_VERSION}" \
diff --git a/Mk/bsd.wx.mk b/Mk/bsd.wx.mk
index 209be9829acd..a036ce1284c0 100644
--- a/Mk/bsd.wx.mk
+++ b/Mk/bsd.wx.mk
@@ -55,7 +55,7 @@
# overridden by the user variable WITH_WX_VER if set. It can
# contain multiple versions in order of preference (last ones
# are tried first).
-# WANT_WXGTK_VER - Set to the preferred GTK+ version, "2" or "3", "3" being
+# WANT_WXGTK_VER - Set to the preferred GTK version, "2" or "3", "3" being
# the default (only applicable to wxWidgets 3.0 for now).
#
# The following variables are intended for the user and can be defined in
diff --git a/archivers/xarchive/Makefile b/archivers/xarchive/Makefile
index aebb430f57e6..26c7d195f6f5 100644
--- a/archivers/xarchive/Makefile
+++ b/archivers/xarchive/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= archivers
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
MAINTAINER= mark@mkproductions.org
-COMMENT= GTK+ front end for various archiving tools
+COMMENT= GTK front end for various archiving tools
WWW= http://xarchive.sourceforge.net/
RUN_DEPENDS= bash:shells/bash
diff --git a/audio/asunder/Makefile b/audio/asunder/Makefile
index e7a8051a278b..58c1e63ceab6 100644
--- a/audio/asunder/Makefile
+++ b/audio/asunder/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= audio
MASTER_SITES= http://littlesvr.ca/asunder/releases/
MAINTAINER= frase@frase.id.au
-COMMENT= Lightweight GTK+ CD ripper
+COMMENT= Lightweight GTK CD ripper
WWW= http://littlesvr.ca/asunder/
LICENSE= GPLv2
diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile
index 845053932cef..48d34d2a90bc 100644
--- a/audio/denemo/Makefile
+++ b/audio/denemo/Makefile
@@ -54,7 +54,7 @@ GTK3_USE= gnome=gtk30,gtksourceview3
LILYPOND_DESC= Install LilyPond (Printing)
LILYPOND_RUN_DEPENDS= lilypond:print/lilypond
PDF_CONFIGURE_OFF= --disable-evince
-TOOLKIT_DESC= GTK+ toolkit
+TOOLKIT_DESC= GTK toolkit
.include <bsd.port.options.mk>
diff --git a/audio/exaile/Makefile b/audio/exaile/Makefile
index 793344412a90..1d03071ba93b 100644
--- a/audio/exaile/Makefile
+++ b/audio/exaile/Makefile
@@ -4,7 +4,7 @@ PORTREVISION= 1
CATEGORIES= audio
MAINTAINER= rm@FreeBSD.org
-COMMENT= Full featured python-based music player for GTK+
+COMMENT= Full featured python-based music player for GTK
WWW= https://www.exaile.org/
LICENSE= GPLv2
diff --git a/audio/gtkguitune/Makefile b/audio/gtkguitune/Makefile
index 095223e1731b..121ab9670654 100644
--- a/audio/gtkguitune/Makefile
+++ b/audio/gtkguitune/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES= GENTOO \
http://www.oocities.org/harpin_floh/mysoft/
MAINTAINER= ports@FreeBSD.org
-COMMENT= Guitar (and other instruments) tuner for GTK+2
+COMMENT= Guitar (and other instruments) tuner for GTK 2
WWW= http://www.oocities.com/harpin_floh/kguitune_page.html
LICENSE= GPLv2+
diff --git a/audio/qtractor/Makefile b/audio/qtractor/Makefile
index 895fe85de06b..7cb14b1eabc8 100644
--- a/audio/qtractor/Makefile
+++ b/audio/qtractor/Makefile
@@ -47,7 +47,7 @@ USE_GITHUB= yes
GH_ACCOUNT= rncbc
CMAKE_OFF= CONFIG_CLAP # for audio/clap, but it doesn't install anything
-CMAKE_OFF+= CONFIG_QT6 # breaks with Qt6: Gtk-ERROR **: 21:10:56.939: GTK+ 2.x symbols detected. Using GTK+ 2.x and GTK+ 3 in the same process is not supported
+CMAKE_OFF+= CONFIG_QT6 # breaks with Qt6: Gtk-ERROR **: 21:10:56.939: GTK 2.x symbols detected. Using GTK 2.x and GTK 3 in the same process is not supported
OPTIONS_DEFINE= VST3
OPTIONS_DEFAULT= VST3
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 386c90be7ce8..abf55db88c85 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -6,7 +6,7 @@ CATEGORIES= audio gnome
MASTER_SITES= SF
MAINTAINER= portmaster@BSDforge.com
-COMMENT= Sound editor for the GNOME/GTK+2 desktop
+COMMENT= Sound editor for the GNOME/GTK 2 desktop
WWW= http://www.metadecks.org/software/sweep/
LICENSE= GPLv2
diff --git a/benchmarks/gtkperf/Makefile b/benchmarks/gtkperf/Makefile
index b12fc815ef27..1be6fd9c8d77 100644
--- a/benchmarks/gtkperf/Makefile
+++ b/benchmarks/gtkperf/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
-COMMENT= Measure your system's GTK+ performance
+COMMENT= Measure your system's GTK performance
WWW= http://gtkperf.sourceforge.net
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/cad/librnd/Makefile b/cad/librnd/Makefile
index 8c8b1f016a5b..3f1da8ed6866 100644
--- a/cad/librnd/Makefile
+++ b/cad/librnd/Makefile
@@ -30,7 +30,7 @@ PLIST_SUB= DISTVERSION=${DISTVERSION}
OPTIONS_DEFINE= DOCS GD MOTIF GTK2 GTK2GL GTK4 STROKE WGET
OPTIONS_DEFAULT= GD GTK2 GTK2GL STROKE WGET
OPTIONS_SUB= yes
-GTK2GL_DESC= GTK+ 2 GUI with OpenGL support
+GTK2GL_DESC= GTK 2 GUI with OpenGL support
WGET_DESC= Wget support
GD_LIB_DEPENDS= libgd.so:graphics/gd
diff --git a/chinese/pcmanx/Makefile b/chinese/pcmanx/Makefile
index a91f3f09b536..d87a5b795c6e 100644
--- a/chinese/pcmanx/Makefile
+++ b/chinese/pcmanx/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= https://github.com/pcman-bbs/${PORTNAME}/releases/download/${PORTV
DISTNAME= ${PORTNAME}-gtk2-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
-COMMENT= BBS client using GTK+ 2.x
+COMMENT= BBS client using GTK 2.x
WWW= https://github.com/pcman-bbs/pcmanx
LICENSE= GPLv2+
diff --git a/comms/gnocky/Makefile b/comms/gnocky/Makefile
index 9b57cb544924..2a90616d01fd 100644
--- a/comms/gnocky/Makefile
+++ b/comms/gnocky/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= comms
MASTER_SITES= http://www.gnokii.org/download/gnocky/
MAINTAINER= ports@FreeBSD.org
-COMMENT= Graphical (GTK+2) frontend for gnokii
+COMMENT= Graphical (GTK 2) frontend for gnokii
WWW= http://wiki.gnokii.org/index.php/Gnocky
LIB_DEPENDS= libgnokii.so:comms/gnokii
diff --git a/comms/xdemorse/Makefile b/comms/xdemorse/Makefile
index ab403f437158..b19a5438106d 100644
--- a/comms/xdemorse/Makefile
+++ b/comms/xdemorse/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= comms
MASTER_SITES= https://www.qsl.net/5/5b4az/pkg/morse/xdemorse/
MAINTAINER= yuri@FreeBSD.org
-COMMENT= X/GTK+-3 application for decoding Morse code signals into text
+COMMENT= X/GTK-3 application for decoding Morse code signals into text
WWW= https://www.qsl.net/5b4az/pkg/morse/xdemorse/xdemorse.html
LICENSE= GPLv3
diff --git a/deskutils/clipit/Makefile b/deskutils/clipit/Makefile
index e6df73e01b36..14d9190cbe79 100644
--- a/deskutils/clipit/Makefile
+++ b/deskutils/clipit/Makefile
@@ -5,7 +5,7 @@ PORTREVISION= 1
CATEGORIES= deskutils
MAINTAINER= jrm@FreeBSD.org
-COMMENT= Lightweight GTK+ clipboard manager forked from parcellite
+COMMENT= Lightweight GTK clipboard manager forked from parcellite
WWW= https://github.com/CristianHenzel/ClipIt
LICENSE= GPLv3
diff --git a/deskutils/parcellite/Makefile b/deskutils/parcellite/Makefile
index 7752a468cecc..c14f028bd6ca 100644
--- a/deskutils/parcellite/Makefile
+++ b/deskutils/parcellite/Makefile
@@ -6,7 +6,7 @@ CATEGORIES= deskutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= meta@FreeBSD.org
-COMMENT= Lightweight GTK+ clipboard manager
+COMMENT= Lightweight GTK clipboard manager
WWW= http://parcellite.sourceforge.net
LICENSE= GPLv3
diff --git a/deskutils/xfce4-notifyd/Makefile b/deskutils/xfce4-notifyd/Makefile
index 39c19495bdb7..5357a2e2d4a0 100644
--- a/deskutils/xfce4-notifyd/Makefile
+++ b/deskutils/xfce4-notifyd/Makefile
@@ -1,7 +1,7 @@
#
# !!!NOTE!!! Update of x11-toolkits/gtk30 (specially >= 3.20.x) must be
# accompanied by PORTREVISION bumps of this port.
-# Support of GTK+ is checked at compile time and themes directories too.
+# Support of GTK is checked at compile time and themes directories too.
PORTNAME= xfce4-notifyd
PORTVERSION= 0.8.2
diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index accff1988819..d57ef90a2263 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= devel editors
MASTER_SITES= https://download.geany.org/ SF
MAINTAINER= madpilot@FreeBSD.org
-COMMENT= Fast and lightweight GTK+ IDE
+COMMENT= Fast and lightweight GTK IDE
WWW= https://www.geany.org/
LICENSE= GPLv2+
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 40f3b4be489f..fa9f2165fbb6 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
-COMMENT= User interface builder for GTK+ 3
+COMMENT= User interface builder for GTK 3
WWW= https://glade.gnome.org/
LICENSE= GPLv2+ LGPL21+
diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile
index 67a7b11f43f6..c5ca71a05650 100644
--- a/devel/goffice/Makefile
+++ b/devel/goffice/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= devel gnome
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
-COMMENT= GLib/GTK+ set of document centric objects and utilities
+COMMENT= GLib/GTK set of document centric objects and utilities
WWW= http://live.gnome.org/libgoffice
LICENSE= GPLv2
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index c11f1c136c46..47f4a3edbdc5 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= editors
MASTER_SITES= SAVANNAH
MAINTAINER= jgh@FreeBSD.org
-COMMENT= GTK+ based simple text editor
+COMMENT= GTK based simple text editor
WWW= http://tarot.freeshell.org/leafpad/
LICENSE= GPLv2
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 1cc3830afcf6..6f8c1db1b43b 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -135,7 +135,7 @@ OPTIONS_DEFAULT= CUPS DOCS JAVA MMEDIA PDFIUM QT5
#OPTIONS_EXCLUDE= GTK4
COINMP_DESC= Enable CoinMP (deprecated) math solver
-GTK4_DESC= GTK+ 4 GUI toolkit support (experimental, broken)
+GTK4_DESC= GTK 4 GUI toolkit support (experimental, broken)
JAVA_DESC= Add Java support (XML filters, macros, DB connections)
KF5_DESC= KF5/Qt5 GUI toolkit support (implies QT5)
MMEDIA_DESC= Enable multimedia backend for Impress
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index f0980fb80b71..03e5b17e35b4 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -70,7 +70,7 @@ CONF_MSRS_CONFIGURE_ENABLE= configurable-msrs
DEBUGGER_DESC= Debugger support
DEBUGGER_CONFIGURE_ENABLE= debugger
DEBUGGER_IMPLIES= DISASM
-DEBUGGER_GUI_DESC= GTK+ 2 GUI debugger support
+DEBUGGER_GUI_DESC= GTK 2 GUI debugger support
DEBUGGER_GUI_USES= gnome
DEBUGGER_GUI_USE= GNOME=gtk20
DEBUGGER_GUI_CONFIGURE_ENABLE= debugger-gui
diff --git a/games/eboard/Makefile b/games/eboard/Makefile
index 3f78f9e91874..cdc69da3bff1 100644
--- a/games/eboard/Makefile
+++ b/games/eboard/Makefile
@@ -11,7 +11,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= rhurlin@FreeBSD.org
-COMMENT= GTK+ chess board interface (mainly for FICS and chessd)
+COMMENT= GTK chess board interface (mainly for FICS and chessd)
WWW= https://www.bergo.eng.br/eboard/
LICENSE= GPLv2
diff --git a/games/freeciv/Makefile b/games/freeciv/Makefile
index 256674722117..e3623b040bd5 100644
--- a/games/freeciv/Makefile
+++ b/games/freeciv/Makefile
@@ -46,7 +46,7 @@ OPTIONS_SUB= yes
DB_DESC= Database support
UI_DESC= GUI clients
-GTK4_DESC= GTK+ 4 GUI toolkit support (modpack only)
+GTK4_DESC= GTK 4 GUI toolkit support (modpack only)
GTK2_USES= gnome sdl
GTK2_USE= GNOME=gdkpixbuf2,glib20,gtk20,pango \
diff --git a/games/mt_gtk_client/Makefile b/games/mt_gtk_client/Makefile
index ea0ccff9ed31..40c13985b6ad 100644
--- a/games/mt_gtk_client/Makefile
+++ b/games/mt_gtk_client/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= games
MASTER_SITES= SAVANNAH/maitretarot
MAINTAINER= thierry@FreeBSD.org
-COMMENT= GTK+ client for MaitreTarot, a Tarot card game
+COMMENT= GTK client for MaitreTarot, a Tarot card game
WWW= https://www.nongnu.org/maitretarot/
LICENSE= GPLv2
diff --git a/games/xboard/Makefile b/games/xboard/Makefile
index 4cbdf72bc063..6262818a6cfd 100644
--- a/games/xboard/Makefile
+++ b/games/xboard/Makefile
@@ -35,7 +35,7 @@ PHALANX_DESC= Install phalanx engine
FRONTEND_DESC= Front End
XAW_DESC= Xaw GUI toolkit support (default)
XAW3D_DESC= Xaw3d GUI toolkit support (not fully supported)
-GTK2_DESC= GTK+ 2 GUI toolkit support (experimental)
+GTK2_DESC= GTK 2 GUI toolkit support (experimental)
SOUND_DESC= Sound Output
SOX_DESC= SoX audio support
diff --git a/graphics/clutter-gtk3/Makefile b/graphics/clutter-gtk3/Makefile
index 4d5715387eff..e51ce3d6e876 100644
--- a/graphics/clutter-gtk3/Makefile
+++ b/graphics/clutter-gtk3/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= GNOME
PKGNAMESUFFIX= 3
MAINTAINER= gnome@FreeBSD.org
-COMMENT= GTK+ Integration library for Clutter
+COMMENT= GTK Integration library for Clutter
WWW= https://blogs.gnome.org/clutter/
LICENSE= LGPL21
diff --git a/graphics/fyre/Makefile b/graphics/fyre/Makefile
index 970ef30763fd..4f9cdcce98db 100644
--- a/graphics/fyre/Makefile
+++ b/graphics/fyre/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= graphics
MASTER_SITES= http://releases.navi.cx/fyre/
MAINTAINER= ports@FreeBSD.org
-COMMENT= Chaos map rendering system with GTK+-2 interface
+COMMENT= Chaos map rendering system with GTK-2 interface
WWW= https://fyre.navi.cx/
LICENSE= GPLv2 GPLv3
diff --git a/graphics/gcolor2/Makefile b/graphics/gcolor2/Makefile
index 5bd8eafa5c70..4479ac058017 100644
--- a/graphics/gcolor2/Makefile
+++ b/graphics/gcolor2/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= graphics gnome
MASTER_SITES= SF
MAINTAINER= ps.ports@smyrak.com
-COMMENT= Simple GTK+ 2.0 color selector
+COMMENT= Simple GTK 2.0 color selector
WWW= http://gcolor2.sourceforge.net/
LICENSE= GPLv2
diff --git a/graphics/gdk-pixbuf2/Makefile b/graphics/gdk-pixbuf2/Makefile
index dbfca70f638c..a4579a540177 100644
--- a/graphics/gdk-pixbuf2/Makefile
+++ b/graphics/gdk-pixbuf2/Makefile
@@ -7,7 +7,7 @@ PKGNAMESUFFIX= 2
DIST_SUBDIR= gnome
MAINTAINER= desktop@FreeBSD.org
-COMMENT= Graphic library for GTK+
+COMMENT= Graphic library for GTK
WWW= https://developer.gnome.org/gdk-pixbuf/
LICENSE= LGPL20+
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index 2635195270e7..00cffb5f2569 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= graphics
MASTER_SITES= SF/gtkmmviewer/${PORTNAME}/${PORTVERSION}
MAINTAINER= amdmi3@FreeBSD.org
-COMMENT= Yet another GTK+ based image viewer
+COMMENT= Yet another GTK based image viewer
WWW= http://gtkmmviewer.sourceforge.net/
LICENSE= GPLv2+
diff --git a/graphics/goocanvas2/Makefile b/graphics/goocanvas2/Makefile
index 4b4572113727..882cd35c30d8 100644
--- a/graphics/goocanvas2/Makefile
+++ b/graphics/goocanvas2/Makefile
@@ -7,7 +7,7 @@ PKGNAMESUFFIX= 2
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
-COMMENT= Cairo-based canvas widget for GTK+ 3
+COMMENT= Cairo-based canvas widget for GTK 3
WWW= https://sourceforge.net/projects/goocanvas/
LICENSE= LGPL20
diff --git a/graphics/goocanvas3/Makefile b/graphics/goocanvas3/Makefile
index d64a2e5d0882..df4654f2880e 100644
--- a/graphics/goocanvas3/Makefile
+++ b/graphics/goocanvas3/Makefile
@@ -7,7 +7,7 @@ PKGNAMESUFFIX= 3
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
-COMMENT= Cairo-based canvas widget for GTK+
+COMMENT= Cairo-based canvas widget for GTK
WWW= https://gitlab.gnome.org/GNOME/goocanvas/
LICENSE= LGPL20
diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile
index 3d2656fdd48f..bbd9d29adae3 100644
--- a/graphics/libexif-gtk/Makefile
+++ b/graphics/libexif-gtk/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= graphics
MASTER_SITES= https://github.com/libexif/${PORTNAME}/releases/download/v${PORTVERSION}/
MAINTAINER= fluffy@FreeBSD.org
-COMMENT= GTK+ widgets to display/edit EXIF tags
+COMMENT= GTK widgets to display/edit EXIF tags
WWW= https://sourceforge.net/projects/libexif/
LICENSE= LGPL21
diff --git a/graphics/linux-c7-gdk-pixbuf2/Makefile b/graphics/linux-c7-gdk-pixbuf2/Makefile
index 43310e168d28..be09103ea5fd 100644
--- a/graphics/linux-c7-gdk-pixbuf2/Makefile
+++ b/graphics/linux-c7-gdk-pixbuf2/Makefile
@@ -4,7 +4,7 @@ DISTVERSIONSUFFIX= -3.el7
CATEGORIES= graphics linux
MAINTAINER= emulation@FreeBSD.org
-COMMENT= Graphic library for GTK+ (Linux CentOS ${LINUX_DIST_VER})
+COMMENT= Graphic library for GTK (Linux CentOS ${LINUX_DIST_VER})
WWW= https://developer.gnome.org/gdk-pixbuf/
USES= cpe linux:c7
diff --git a/japanese/libtomoe-gtk/Makefile b/japanese/libtomoe-gtk/Makefile
index 8d0d75f01861..dcca7c898ab2 100644
--- a/japanese/libtomoe-gtk/Makefile
+++ b/japanese/libtomoe-gtk/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= SF/tomoe/tomoe-gtk/tomoe-gtk-${PORTVERSION}
DISTNAME= tomoe-gtk-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
MAINTAINER= ume@FreeBSD.org
-COMMENT= TOMOE GTK+ library
+COMMENT= TOMOE GTK library
WWW= http://tomoe.sourceforge.jp/
LIB_DEPENDS= libtomoe.so:japanese/tomoe
diff --git a/korean/imhangul-gtk2/Makefile b/korean/imhangul-gtk2/Makefile
index 8a3d80fef44a..be4e5a6bf797 100644
--- a/korean/imhangul-gtk2/Makefile
+++ b/korean/imhangul-gtk2/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= korean
PKGNAMESUFFIX= -gtk2
MAINTAINER= jkim@FreeBSD.org
-COMMENT= Hangul input module for GTK+ 2.0
+COMMENT= Hangul input module for GTK 2.0
WWW= http://code.google.com/p/imhangul/
LICENSE= LGPL21+
diff --git a/korean/imhangul-gtk3/Makefile b/korean/imhangul-gtk3/Makefile
index cb0f63b63f35..084c9a7adc79 100644
--- a/korean/imhangul-gtk3/Makefile
+++ b/korean/imhangul-gtk3/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= korean
PKGNAMESUFFIX= -gtk3
MAINTAINER= jkim@FreeBSD.org
-COMMENT= Hangul input module for GTK+ 3.0
+COMMENT= Hangul input module for GTK 3.0
WWW= http://code.google.com/p/imhangul/
LICENSE= LGPL21+
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 45481eaac6af..d12495fbdd29 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,7 +1,7 @@
PORTNAME= claws-mail
CATEGORIES= mail news
-COMMENT= Lightweight and featureful GTK+ based e-mail and news client
+COMMENT= Lightweight and featureful GTK based e-mail and news client
WWW= https://www.claws-mail.org/
LICENSE= GPLv3
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index a91a0433eb37..c62bebb96812 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= http://sylpheed.sraoss.jp/sylpheed/v${PORTVERSION:C/\.[^\.]*$//}/
LOCAL/ehaupt
MAINTAINER= ehaupt@FreeBSD.org
-COMMENT= Lightweight, featureful, and fast GTK+ based e-mail client
+COMMENT= Lightweight, featureful, and fast GTK based e-mail client
WWW= https://sylpheed.sraoss.jp/en/
LICENSE= GPLv2 LGPL21
diff --git a/math/grpn/Makefile b/math/grpn/Makefile
index 1daf528f5d36..b98610a4c7f2 100644
--- a/math/grpn/Makefile
+++ b/math/grpn/Makefile
@@ -5,7 +5,7 @@ PORTREVISION= 1
CATEGORIES= math
MAINTAINER= ports@FreeBSD.org
-COMMENT= GTK+-based reverse polish notation (RPN) calculator
+COMMENT= GTK-based reverse polish notation (RPN) calculator
WWW= https://github.com/utopiabound/grpn
LICENSE= GPLv2
diff --git a/math/qalculate-gtk/Makefile b/math/qalculate-gtk/Makefile
index 8ce860979237..c395747ff1b0 100644
--- a/math/qalculate-gtk/Makefile
+++ b/math/qalculate-gtk/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= math
MASTER_SITES= https://github.com/Qalculate/${PORTNAME}/releases/download/v${PORTVERSION}/
MAINTAINER= jhale@FreeBSD.org
-COMMENT= Multi-purpose desktop calculator (GTK+3 frontend)
+COMMENT= Multi-purpose desktop calculator (GTK 3 frontend)
WWW= https://qalculate.github.io/
LICENSE= GPLv2+
diff --git a/multimedia/celluloid/Makefile b/multimedia/celluloid/Makefile
index 8648871c9666..58efde1d908e 100644
--- a/multimedia/celluloid/Makefile
+++ b/multimedia/celluloid/Makefile
@@ -5,7 +5,7 @@ PORTREVISION= 1
CATEGORIES= multimedia
MAINTAINER= jbeich@FreeBSD.org
-COMMENT= Simple GTK+ frontend for mpv
+COMMENT= Simple GTK frontend for mpv
WWW= https://celluloid-player.github.io/
LICENSE= GPLv3+
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index dd56a9ed7cb8..6a4c24203b1a 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -90,7 +90,7 @@ OPTIONS_SUB= yes
FDK_AAC_DESC= Enable non-free Fraunhofer FDK AAC codec
VPL_DESC= Intel oneVPL (aka Quick Sync Video)
-X11_DESC= Build GTK+3 based GUI program
+X11_DESC= Build GTK 3 based GUI program
FDK_AAC_CONFIGURE_ENABLE= fdk-aac
FDK_AAC_VARS= LICENSE+=FDK_AAC LICENSE_COMB=multi
diff --git a/net-im/dino/Makefile b/net-im/dino/Makefile
index d44a54557eb1..69455ddd4adb 100644
--- a/net-im/dino/Makefile
+++ b/net-im/dino/Makefile
@@ -4,7 +4,7 @@ DISTVERSION= 0.4.3
CATEGORIES= net-im
MAINTAINER= ashish@FreeBSD.org
-COMMENT= Modern XMPP Chat Client using GTK+/Vala
+COMMENT= Modern XMPP Chat Client using GTK/Vala
WWW= https://dino.im
LICENSE= GPLv3
diff --git a/net-im/fractal/Makefile b/net-im/fractal/Makefile
index df28ca47a1cb..ceac9a0198f1 100644
--- a/net-im/fractal/Makefile
+++ b/net-im/fractal/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES= https://gitlab.gnome.org/GNOME/${PORTNAME}/-/archive/${DISTVERSION
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= vishwin@FreeBSD.org
-COMMENT= GTK+ Matrix IM client
+COMMENT= GTK Matrix IM client
WWW= https://wiki.gnome.org/Apps/Fractal
LICENSE= GPLv3+
diff --git a/net-im/gajim/Makefile b/net-im/gajim/Makefile
index 0b4542a2ac9a..1ce8fe4ed2bc 100644
--- a/net-im/gajim/Makefile
+++ b/net-im/gajim/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= net-im
MASTER_SITES= https://gajim.org/downloads/${DISTVERSION:R}/
MAINTAINER= rm@FreeBSD.org
-COMMENT= GTK+ Jabber client
+COMMENT= GTK Jabber client
WWW= https://gajim.org/
LICENSE= GPLv3
diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile
index bb927ded46f0..5fca1cb5e1b2 100644
--- a/net-im/pidgin/Makefile
+++ b/net-im/pidgin/Makefile
@@ -2,7 +2,7 @@ PORTNAME= pidgin
PORTREVISION= 2
MAINTAINER= marcus@FreeBSD.org
-COMMENT= Pidgin multi-protocol messaging client (GTK+ UI)
+COMMENT= Pidgin multi-protocol messaging client (GTK UI)
LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \
libpurple.so:net-im/libpurple
diff --git a/net-p2p/gtorrentviewer/Makefile b/net-p2p/gtorrentviewer/Makefile
index 59e8f9a12ad4..46a01d2f4906 100644
--- a/net-p2p/gtorrentviewer/Makefile
+++ b/net-p2p/gtorrentviewer/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= SF/${PORTNAME}/GTorrentViewer/${PORTVERSION}
DISTNAME= GTorrentViewer-${PORTVERSION}
MAINTAINER= bofh@FreeBSD.org
-COMMENT= GTK+2 viewer and editor for BitTorrent meta files
+COMMENT= GTK 2 viewer and editor for BitTorrent meta files
WWW= http://gtorrentviewer.sourceforge.net/
LICENSE= GPLv2
diff --git a/net/dhcpcd-ui/Makefile b/net/dhcpcd-ui/Makefile
index 3a13d88ce6c0..9658c1055aa1 100644
--- a/net/dhcpcd-ui/Makefile
+++ b/net/dhcpcd-ui/Makefile
@@ -4,7 +4,7 @@ DISTVERSION= 0.7.9
CATEGORIES= net
MAINTAINER= driesm@FreeBSD.org
-COMMENT= GTK+ / Curses interface to dhcpcd
+COMMENT= GTK / Curses interface to dhcpcd
WWW= https://roy.marples.name/projects/dhcpcd-ui
LICENSE= BSD2CLAUSE
diff --git a/net/gspoof/Makefile b/net/gspoof/Makefile
index 208e1d58b4d1..daad3e7e921a 100644
--- a/net/gspoof/Makefile
+++ b/net/gspoof/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/Gspoof-3/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
-COMMENT= Console/GTK+ TCP/IP Packets Forger
+COMMENT= Console/GTK TCP/IP Packets Forger
WWW= http://gspoof.sourceforge.net/
LICENSE= GPLv2
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index 3688ae0fe5da..0b42f6c7297f 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= net gnome
MASTER_SITES= GNOME
MAINTAINER= gnome@FreeBSD.org
-COMMENT= VNC viewer widget for GTK+
+COMMENT= VNC viewer widget for GTK
WWW= http://live.gnome.org/gtk-vnc
LICENSE= LGPL21
diff --git a/net/remmina/Makefile b/net/remmina/Makefile
index d41702de9a57..a9238bb6cc78 100644
--- a/net/remmina/Makefile
+++ b/net/remmina/Makefile
@@ -3,7 +3,7 @@ DISTVERSION= 1.4.31
CATEGORIES= net gnome
MAINTAINER= fernape@FreeBSD.org
-COMMENT= GTK+ Remote Desktop Client
+COMMENT= GTK Remote Desktop Client
WWW= https://www.remmina.org/
LICENSE= GPLv2+
diff --git a/news/pan/Makefile b/news/pan/Makefile
index e178a4a974e7..7be53e785a3b 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= http://pan.rebelbase.com/download/releases/${PORTVERSION}/source/
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= Threaded GTK+ newsreader based on Agent for Windows
+COMMENT= Threaded GTK newsreader based on Agent for Windows
WWW= https://pan.rebelbase.com/
LICENSE= GPLv2
diff --git a/security/gonepass/Makefile b/security/gonepass/Makefile
index ecd2d905c21e..67d6900188ee 100644
--- a/security/gonepass/Makefile
+++ b/security/gonepass/Makefile
@@ -4,7 +4,7 @@ PORTREVISION= 4
CATEGORIES= security
MAINTAINER= ports@FreeBSD.org
-COMMENT= GTK+ 1Password reader
+COMMENT= GTK 1Password reader
WWW= https://github.com/jbreams/gonepass
LICENSE= APACHE20
diff --git a/security/gtkpasman/Makefile b/security/gtkpasman/Makefile
index b10e1146529c..458d79fc90a2 100644
--- a/security/gtkpasman/Makefile
+++ b/security/gtkpasman/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= security
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
-COMMENT= GTK+ passwords manager for system and network administrators
+COMMENT= GTK passwords manager for system and network administrators
WWW= http://gtkpasman.sourceforge.net/
RUN_DEPENDS+= gpgv2:security/gnupg
diff --git a/security/pinentry-gtk2/Makefile b/security/pinentry-gtk2/Makefile
index 095457102912..870428af55e6 100644
--- a/security/pinentry-gtk2/Makefile
+++ b/security/pinentry-gtk2/Makefile
@@ -1,7 +1,7 @@
PORTNAME= pinentry
PORTREVISION= 1
-COMMENT= GTK+ 2.0 version of the GnuPG password dialog
+COMMENT= GTK 2.0 version of the GnuPG password dialog
PINENTRY_GUI= gtk2
diff --git a/shells/viewglob/Makefile b/shells/viewglob/Makefile
index 5ba1531aaf8c..b7e38022cde7 100644
--- a/shells/viewglob/Makefile
+++ b/shells/viewglob/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= shells
MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
-COMMENT= GTK+ add-on to bash and zsh
+COMMENT= GTK add-on to bash and zsh
WWW= http://viewglob.sourceforge.net/
BUILD_DEPENDS= bash:shells/bash
diff --git a/sysutils/gapcmon/Makefile b/sysutils/gapcmon/Makefile
index ff8ae48b0cbe..f5a4bc4d7637 100644
--- a/sysutils/gapcmon/Makefile
+++ b/sysutils/gapcmon/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= sysutils
MASTER_SITES= SF
MAINTAINER= jhale@FreeBSD.org
-COMMENT= Monitor apcupsd with GTK+2 GUI
+COMMENT= Monitor apcupsd with GTK 2 GUI
WWW= http://gapcmon.sourceforge.net/
LICENSE= GPLv2
diff --git a/sysutils/nvclock/Makefile b/sysutils/nvclock/Makefile
index f6ede6c39bf6..81bc37418156 100644
--- a/sysutils/nvclock/Makefile
+++ b/sysutils/nvclock/Makefile
@@ -21,7 +21,7 @@ OPTIONS_DEFINE= NVCONTROL X11 DOCS
OPTIONS_DEFAULT= NVCONTROL X11
NVCONTROL_DESC= NV-CONTROL support (for OpenGL settings)
-X11_DESC= Build GUI program (requires GTK+ 2.x)
+X11_DESC= Build GUI program (requires GTK 2.x)
NVCONTROL_USE= XORG=xext
NVCONTROL_USES= pkgconfig xorg
diff --git a/textproc/fcitx5-gtk-common/Makefile b/textproc/fcitx5-gtk-common/Makefile
index 79e1e775e448..fa98f2fe179f 100644
--- a/textproc/fcitx5-gtk-common/Makefile
+++ b/textproc/fcitx5-gtk-common/Makefile
@@ -1,4 +1,4 @@
-COMMENT= Fcitx support for GTK+ (common files)
+COMMENT= Fcitx support for GTK (common files)
PKGNAMESUFFIX= -common
diff --git a/textproc/fcitx5-gtk/Makefile b/textproc/fcitx5-gtk/Makefile
index 89d82d5e4d1d..3d21617763ea 100644
--- a/textproc/fcitx5-gtk/Makefile
+++ b/textproc/fcitx5-gtk/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= textproc
MASTER_SITES= https://download.fcitx-im.org/fcitx5/${PORTNAME}/
MAINTAINER= khng@FreeBSD.org
-COMMENT?= Fcitx support for GTK+ ${FLAVOR}
+COMMENT?= Fcitx support for GTK ${FLAVOR}
WWW= https://github.com/fcitx/fcitx5-gtk
LICENSE= LGPL21+
diff --git a/textproc/gspell/Makefile b/textproc/gspell/Makefile
index 80cfbf5272c6..b710bfa521f7 100644
--- a/textproc/gspell/Makefile
+++ b/textproc/gspell/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
-COMMENT= Spell checking for GTK+
+COMMENT= Spell checking for GTK
WWW= https://wiki.gnome.org/Projects/gspell
LICENSE= LGPL21
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index 0543c0795d3e..31301113c2a4 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= textproc
MASTER_SITES= GNOME
MAINTAINER= desktop@FreeBSD.org
-COMMENT= Code documentation system, originally for GTK+
+COMMENT= Code documentation system, originally for GTK
WWW= https://www.gtk.org/
LICENSE= GPLv2
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index 762471c409b7..105d2dbe4c8d 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= textproc gnome
MASTER_SITES= LOCAL/marcus
MAINTAINER= gnome@FreeBSD.org
-COMMENT= GTK+ 2 spell checking component
+COMMENT= GTK 2 spell checking component
WWW= http://gtkspell.sourceforge.net/
LIB_DEPENDS= libenchant.so:textproc/enchant
diff --git a/textproc/gtkspell3/Makefile b/textproc/gtkspell3/Makefile
index 78a9a6c64f71..8c3cc201ba45 100644
--- a/textproc/gtkspell3/Makefile
+++ b/textproc/gtkspell3/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= textproc gnome
MASTER_SITES= SF/gtkspell/${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
-COMMENT= GTK+ 3 spell checking component
+COMMENT= GTK 3 spell checking component
WWW= http://gtkspell.sourceforge.net/
LICENSE= GPLv2
diff --git a/textproc/uim-gtk/Makefile b/textproc/uim-gtk/Makefile
index 724e64b7fc5a..1d6ea68e0868 100644
--- a/textproc/uim-gtk/Makefile
+++ b/textproc/uim-gtk/Makefile
@@ -1,7 +1,7 @@
PKGNAMESUFFIX= -gtk
PORTREVISION= 1
-COMMENT= GTK+ modules of uim input method
+COMMENT= GTK modules of uim input method
USE_GNOME= cairo gdkpixbuf2 gtk20
LIB_DEPENDS= libuim.so:textproc/uim \
diff --git a/textproc/uim-gtk3/Makefile b/textproc/uim-gtk3/Makefile
index 4ae095165672..9684ab45372b 100644
--- a/textproc/uim-gtk3/Makefile
+++ b/textproc/uim-gtk3/Makefile
@@ -1,7 +1,7 @@
PKGNAMESUFFIX= -gtk3
PORTREVISION= 1
-COMMENT= GTK+ 3.x modules of uim input method
+COMMENT= GTK 3.x modules of uim input method
USE_GNOME= cairo gdkpixbuf2 gtk30
LIB_DEPENDS= libuim.so:textproc/uim \
diff --git a/www/badwolf/Makefile b/www/badwolf/Makefile
index 69efbf4ca35f..8f414ec8387d 100644
--- a/www/badwolf/Makefile
+++ b/www/badwolf/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= www
MASTER_SITES= https://hacktivis.me/releases/
MAINTAINER= DtxdF@disroot.org
-COMMENT= Minimalist and privacy-oriented WebKitGTK+ browser
+COMMENT= Minimalist and privacy-oriented WebKitGTK browser
WWW= https://hacktivis.me/projects/badwolf
LICENSE= BSD3CLAUSE
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index c5cfd419be0e..8df05d345901 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -37,7 +37,7 @@ OPTIONS_SINGLE= TOOLKIT
OPTIONS_SINGLE_TOOLKIT= GTK2 GTK3
OPTIONS_SUB= yes
-TOOLKIT_DESC= GTK+ toolkit
+TOOLKIT_DESC= GTK toolkit
DEBUG_CONFIGURE_ENABLE= debugging-output
GTK2_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
diff --git a/www/castor/Makefile b/www/castor/Makefile
index c2ba9cdfd910..66b7e0696c95 100644
--- a/www/castor/Makefile
+++ b/www/castor/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= https://git.sr.ht/~julienxx/${PORTNAME}/archive/${DISTVERSIONFULL}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= kraileth@elderlinux.org
-COMMENT= Browser for text-based protocols like Gemini and Gopher using GTK+
+COMMENT= Browser for text-based protocols like Gemini and Gopher using GTK
WWW= https://git.sr.ht/~julienxx/castor
LICENSE= MIT
diff --git a/www/surf/Makefile b/www/surf/Makefile
index 7076ab30ddf1..b5872a0d4bfe 100644
--- a/www/surf/Makefile
+++ b/www/surf/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= http://dl.suckless.org/${PORTNAME}/
PKGNAMESUFFIX= -browser
MAINTAINER= dmgk@FreeBSD.org
-COMMENT= Simple Web browser based on WebKit2/GTK+
+COMMENT= Simple Web browser based on WebKit2/GTK
WWW= https://surf.suckless.org
LICENSE= MIT
diff --git a/www/webkit2-gtk3/Makefile b/www/webkit2-gtk3/Makefile
index c6ca482d4dec..964759938c7b 100644
--- a/www/webkit2-gtk3/Makefile
+++ b/www/webkit2-gtk3/Makefile
@@ -11,7 +11,7 @@ PATCH_SITES= https://github.com/WebKit/WebKit/commit/
PATCHFILES= 06f9978e52a8408ed6c2c8296afb1e7449c2f1ee.patch:-p1 # https://bugs.webkit.org/show_bug.cgi?id=247770
MAINTAINER= gnome@FreeBSD.org
-COMMENT= Opensource browser engine using the GTK+ 3 toolkit
+COMMENT= Opensource browser engine using the GTK 3 toolkit
WWW= https://webkitgtk.org/
LICENSE= GPLv2 BSD2CLAUSE
diff --git a/www/webkit2-gtk4/Makefile b/www/webkit2-gtk4/Makefile
index da784a1303d0..57b66c8b2cd6 100644
--- a/www/webkit2-gtk4/Makefile
+++ b/www/webkit2-gtk4/Makefile
@@ -11,7 +11,7 @@ PATCH_SITES= https://github.com/WebKit/WebKit/commit/
PATCHFILES= 285ff73b5f6d46d6e502aca30061667e41a3114b.diff:-p1
MAINTAINER= gnome@FreeBSD.org
-COMMENT= Opensource browser engine using the GTK+ 4 toolkit
+COMMENT= Opensource browser engine using the GTK 4 toolkit
WWW= https://webkitgtk.org/
LICENSE= BSD2CLAUSE GPLv2
diff --git a/x11-themes/clearlooks/Makefile b/x11-themes/clearlooks/Makefile
index 6df2f411b3fc..7c1370f36386 100644
--- a/x11-themes/clearlooks/Makefile
+++ b/x11-themes/clearlooks/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= x11-themes
MASTER_SITES= SF/clearlooks/clearlooks/clearlooks%20${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
-COMMENT?= GTK+ 2.x engine based on Bluecurve
+COMMENT?= GTK 2.x engine based on Bluecurve
WWW= http://clearlooks.sourceforge.net/
GNU_CONFIGURE= yes
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index f1494624f124..f33ebab30d25 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -7,7 +7,7 @@ DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
-COMMENT= Theme engine for the GTK+-2.0 toolkit
+COMMENT= Theme engine for the GTK-2.0 toolkit
WWW= https://www.gtk.org/
CONFLICTS= gtk-smooth-engine clearlooks
diff --git a/x11-themes/gtk-equinox-engine/Makefile b/x11-themes/gtk-equinox-engine/Makefile
index 198738de5565..b9ba212ff00a 100644
--- a/x11-themes/gtk-equinox-engine/Makefile
+++ b/x11-themes/gtk-equinox-engine/Makefile
@@ -9,7 +9,7 @@ DISTFILES= 121881-${DISTNAME}.tar.gz \
140449-${PORTNAME}-themes-${PORTVERSION}.tar.gz
MAINTAINER= grembo@FreeBSD.org
-COMMENT= Equinox GTK+ 2.x engine and themes
+COMMENT= Equinox GTK 2.x engine and themes
WWW= http://gnome-look.org/content/show.php?content=121881
LICENSE= GPLv2
diff --git a/x11-themes/gtk-gray-theme/Makefile b/x11-themes/gtk-gray-theme/Makefile
index 4bea487c2117..902fc079b5b1 100644
--- a/x11-themes/gtk-gray-theme/Makefile
+++ b/x11-themes/gtk-gray-theme/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= https://BSDforge.com/projects/source/x11-themes/gtk-gray-theme/
DISTNAME= 34132-Gray
MAINTAINER= portmaster@BSDforge.com
-COMMENT= Gray theme for GTK+ 2.0
+COMMENT= Gray theme for GTK 2.0
WWW= http://www.gnome-look.org/content/show.php?content=34132
RUN_DEPENDS= icons-tango>0:x11-themes/icons-tango
diff --git a/x11-themes/gtk-lila-theme-extras/Makefile b/x11-themes/gtk-lila-theme-extras/Makefile
index 64212831921e..3e01a852a5db 100644
--- a/x11-themes/gtk-lila-theme-extras/Makefile
+++ b/x11-themes/gtk-lila-theme-extras/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= SF/lila-theme/lila-gtk-extras/${PORTVERSION}
DISTNAME= lila-gtk-extras-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
-COMMENT= GTK+ 2.0 Lila additional themes
+COMMENT= GTK 2.0 Lila additional themes
WWW= https://lila-center.info/
WRKSRC= ${WRKDIR}/lila-gtk-extras
diff --git a/x11-themes/gtk-lila-theme/Makefile b/x11-themes/gtk-lila-theme/Makefile
index b6ec6e1972c7..7d357f57793a 100644
--- a/x11-themes/gtk-lila-theme/Makefile
+++ b/x11-themes/gtk-lila-theme/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= SF/lila-theme/lila-gtk/${PORTVERSION}
DISTNAME= lila-gtk-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
-COMMENT= GTK+ 2.0 Lila theme
+COMMENT= GTK 2.0 Lila theme
WWW= https://lila-center.info/
WRKSRC= ${WRKDIR}/lila-gtk
diff --git a/x11-themes/gtk-murrina-aqua/Makefile b/x11-themes/gtk-murrina-aqua/Makefile
index 1e2a6f97f342..ffb3a9eb74d5 100644
--- a/x11-themes/gtk-murrina-aqua/Makefile
+++ b/x11-themes/gtk-murrina-aqua/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES= LOCAL/itetcu \
DISTNAME= Murrina-Aqua
MAINTAINER= pneumann@gmail.com
-COMMENT= Murrina Aqua GTK+ 2.x cairo based theme
+COMMENT= Murrina Aqua GTK 2.x cairo based theme
WWW= http://www.gnome-look.org/content/show.php?content=42755
BUILD_DEPENDS= ${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libmurrine.so:x11-themes/gtk-murrine-engine
diff --git a/x11-themes/gtk-murrine-engine/Makefile b/x11-themes/gtk-murrine-engine/Makefile
index 1e8b4abcdd1c..c89b71db9c2c 100644
--- a/x11-themes/gtk-murrine-engine/Makefile
+++ b/x11-themes/gtk-murrine-engine/Makefile
@@ -7,7 +7,7 @@ PKGNAMEPREFIX= gtk-
PKGNAMESUFFIX= -engine
MAINTAINER= pneumann@gmail.com
-COMMENT= Murrine GTK+ 2.x cairo based engine
+COMMENT= Murrine GTK 2.x cairo based engine
WWW= http://www.cimitan.com/murrine
USES= gettext gmake gnome libtool pkgconfig tar:xz xorg
diff --git a/x11-themes/gtk3-oxygen-engine/Makefile b/x11-themes/gtk3-oxygen-engine/Makefile
index 781a0f885c55..888815693035 100644
--- a/x11-themes/gtk3-oxygen-engine/Makefile
+++ b/x11-themes/gtk3-oxygen-engine/Makefile
@@ -8,7 +8,7 @@ PKGNAMESUFFIX= -engine
DISTNAME= ${PORTNAME}-gtk3-${PORTVERSION}
MAINTAINER= rakuco@FreeBSD.org
-COMMENT= Oxygen GTK+ 3 engine and theme
+COMMENT= Oxygen GTK 3 engine and theme
WWW= http://kde-look.org/content/show.php/?content=136216
LICENSE= LGPL21
diff --git a/x11-themes/lxappearance/Makefile b/x11-themes/lxappearance/Makefile
index 855d35c3f7ef..9df54c8b2dd7 100644
--- a/x11-themes/lxappearance/Makefile
+++ b/x11-themes/lxappearance/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= x11-themes gnome
MASTER_SITES= SF/lxde/LXAppearance
MAINTAINER= gnome@FreeBSD.org
-COMMENT= Desktop-independent theme switcher for GTK+
+COMMENT= Desktop-independent theme switcher for GTK
WWW= https://lxde.org/
LICENSE= GPLv2
diff --git a/x11-themes/materia-gtk-theme/Makefile b/x11-themes/materia-gtk-theme/Makefile
index df236bac0f27..1c4725f0439d 100644
--- a/x11-themes/materia-gtk-theme/Makefile
+++ b/x11-themes/materia-gtk-theme/Makefile
@@ -5,7 +5,7 @@ PORTREVISION= 1
CATEGORIES= x11-themes
MAINTAINER= tagattie@FreeBSD.org
-COMMENT= Material Design theme for GNOME/GTK+ based desktop environments
+COMMENT= Material Design theme for GNOME/GTK based desktop environments
WWW= https://github.com/nana-4/materia-theme
LICENSE= GPLv2
diff --git a/x11-themes/pop-gtk-themes/Makefile b/x11-themes/pop-gtk-themes/Makefile
index de25c7ce872b..bac30981cf41 100644
--- a/x11-themes/pop-gtk-themes/Makefile
+++ b/x11-themes/pop-gtk-themes/Makefile
@@ -4,7 +4,7 @@ DISTVERSION= 5.3.1
CATEGORIES= x11-themes
MAINTAINER= Alexander88207@protonmail.com
-COMMENT= System76 Pop GTK+ Theme
+COMMENT= System76 Pop GTK Theme
WWW= https://github.com/pop-os/gtk-theme
LICENSE= GPLv3
diff --git a/x11-themes/qtcurve-gtk2/Makefile b/x11-themes/qtcurve-gtk2/Makefile
index 759c6f1002f3..3498dbf430eb 100644
--- a/x11-themes/qtcurve-gtk2/Makefile
+++ b/x11-themes/qtcurve-gtk2/Makefile
@@ -1,7 +1,7 @@
PORTNAME= qtcurve
PORTREVISION= 1
-COMMENT= QtCurve GTK+ 2.x engine and theme
+COMMENT= QtCurve GTK 2.x engine and theme
QTCURVE_SLAVE= gtk2
diff --git a/x11-themes/qtcurve/Makefile b/x11-themes/qtcurve/Makefile
index 654d8df9a410..83f3ec0db6d6 100644
--- a/x11-themes/qtcurve/Makefile
+++ b/x11-themes/qtcurve/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= KDE/stable/${PORTNAME}
DISTNAME= ${PORTNAME}-${PORTVERSION:R}
MAINTAINER= jhale@FreeBSD.org
-COMMENT?= Widget styles for Qt and GTK+ toolkits
+COMMENT?= Widget styles for Qt and GTK toolkits
WWW= https://invent.kde.org/system/qtcurve
.if !defined(QTCURVE_SLAVE)
diff --git a/x11-themes/thewidgetfactory/Makefile b/x11-themes/thewidgetfactory/Makefile
index 3038aff7f897..841cde1c00cd 100644
--- a/x11-themes/thewidgetfactory/Makefile
+++ b/x11-themes/thewidgetfactory/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES= https://www.stellingwerff.com/TheWidgetFactory/ \
http://freebsd.nsu.ru/distfiles/
MAINTAINER= danfe@FreeBSD.org
-COMMENT= Tool for previewing GTK+ widgets and testing new themes
+COMMENT= Tool for previewing GTK widgets and testing new themes
LICENSE= GPLv2
diff --git a/x11-toolkits/granite/Makefile b/x11-toolkits/granite/Makefile
index 3a2270b0b790..369f3bba06d9 100644
--- a/x11-toolkits/granite/Makefile
+++ b/x11-toolkits/granite/Makefile
@@ -4,7 +4,7 @@ PORTREVISION= 1
CATEGORIES= x11-toolkits
MAINTAINER= desktop@FreeBSD.org
-COMMENT= Extensions of GTK+3 toolkit
+COMMENT= Extensions of GTK 3 toolkit
WWW= https://github.com/elementary/granite
LICENSE= LGPL3
diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile
index cb22bc929141..35cfcba41e3a 100644
--- a/x11-toolkits/gtk-sharp20/Makefile
+++ b/x11-toolkits/gtk-sharp20/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= http://download.mono-project.com/sources/gtk-sharp212/
PKGNAMESUFFIX= 20
MAINTAINER= ports@FreeBSD.org
-COMMENT= GTK+ and GNOME interfaces for the .NET runtime
+COMMENT= GTK and GNOME interfaces for the .NET runtime
WWW= https://www.mono-project.com/Gtk
LICENSE= LGPL21
diff --git a/x11-toolkits/gtk-sharp30/Makefile b/x11-toolkits/gtk-sharp30/Makefile
index c3e83d36db36..9ad083b976e7 100644
--- a/x11-toolkits/gtk-sharp30/Makefile
+++ b/x11-toolkits/gtk-sharp30/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= GNOME
PKGNAMESUFFIX= 30
MAINTAINER= kwm@FreeBSD.org
-COMMENT= GTK+ and GNOME interfaces for the .NET runtime
+COMMENT= GTK and GNOME interfaces for the .NET runtime
WWW= https://www.mono-project.com/Gtk
LICENSE= LGPL20
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 16747419dbef..b0dac7d94fff 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -55,7 +55,7 @@ ATK_BRIDGE_DESC=AT-SPI ATK bridge support
ATK_BRIDGE_CONFIGURE_WITH= atk-bridge
ATK_BRIDGE_LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core
-BROADWAY_DESC= Enable GDK Broadway backend for showing GTK+ in the webbrowser using HTML5 and web sockets.
+BROADWAY_DESC= Enable GDK Broadway backend for showing GTK in the webbrowser using HTML5 and web sockets.
BROADWAY_CONFIGURE_ENABLE= broadway-backend
COLORD_DESC= Color profile support
diff --git a/x11-toolkits/gtk40/Makefile b/x11-toolkits/gtk40/Makefile
index eefea6b5298e..e5c9a4dc9850 100644
--- a/x11-toolkits/gtk40/Makefile
+++ b/x11-toolkits/gtk40/Makefile
@@ -50,7 +50,7 @@ OPTIONS_DEFINE= CUPS COLORD DEBUG BROADWAY GSTREAMER VULKAN WAYLAND X11
OPTIONS_DEFAULT=CUPS COLORD BROADWAY GSTREAMER VULKAN WAYLAND X11
OPTIONS_SUB= yes
-BROADWAY_DESC= Enable GDK Broadway backend for showing GTK+ in the webbrowser using HTML5 and web sockets.
+BROADWAY_DESC= Enable GDK Broadway backend for showing GTK in the webbrowser using HTML5 and web sockets.
BROADWAY_MESON_TRUE= broadway-backend
COLORD_DESC= Color profile support
diff --git a/x11-toolkits/gtkd/Makefile b/x11-toolkits/gtkd/Makefile
index 4c326a5e1a92..90c3db9466b8 100644
--- a/x11-toolkits/gtkd/Makefile
+++ b/x11-toolkits/gtkd/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= https://gtkd.org/Downloads/sources/
DISTNAME= GtkD-${PORTVERSION}
MAINTAINER= romain@FreeBSD.org
-COMMENT= D binding and OO wrapper of GTK+
+COMMENT= D binding and OO wrapper of GTK
WWW= https://gtkd.org/index.html
LICENSE= LGPL3
diff --git a/x11-toolkits/gtkdatabox/Makefile b/x11-toolkits/gtkdatabox/Makefile
index edd427468647..527960c98537 100644
--- a/x11-toolkits/gtkdatabox/Makefile
+++ b/x11-toolkits/gtkdatabox/Makefile
@@ -3,7 +3,7 @@ DISTVERSION= 1.0.0
CATEGORIES= x11-toolkits
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-1
MAINTAINER= eduardo@FreeBSD.org
-COMMENT= GTK+3 widget to display large amounts of numerical data
+COMMENT= GTK 3 widget to display large amounts of numerical data
WWW= https://sourceforge.net/projects/gtkdatabox/
LICENSE= LGPL21+
diff --git a/x11-toolkits/gtkextra/Makefile b/x11-toolkits/gtkextra/Makefile
index e2c456195110..a6ef0ef40e65 100644
--- a/x11-toolkits/gtkextra/Makefile
+++ b/x11-toolkits/gtkextra/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= x11-toolkits
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION:R}
MAINTAINER= danfe@FreeBSD.org
-COMMENT= Useful widget set complementary to GTK+ 2.0
+COMMENT= Useful widget set complementary to GTK 2.0
WWW= http://gtkextra.sourceforge.net/
LICENSE= GPLv2+
diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile
index 5332bb5a2e43..1a7317d426bd 100644
--- a/x11-toolkits/gtkglarea2/Makefile
+++ b/x11-toolkits/gtkglarea2/Makefile
@@ -7,7 +7,7 @@ DISTNAME= gtkglarea-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= ports@FreeBSD.org
-COMMENT= OpenGL widget for the GTK+2 GUI toolkit
+COMMENT= OpenGL widget for the GTK 2 GUI toolkit
WWW= https://www.mono-project.com/archived/gtkglarea/
LICENSE= LGPL20+
diff --git a/x11-toolkits/gtkglext/Makefile b/x11-toolkits/gtkglext/Makefile
index 6b30b8b27fe1..76a49207c197 100644
--- a/x11-toolkits/gtkglext/Makefile
+++ b/x11-toolkits/gtkglext/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= SF
DIST_SUBDIR= gnome2
MAINTAINER= ports@FreeBSD.org
-COMMENT= OpenGL extension to GTK+
+COMMENT= OpenGL extension to GTK
WWW= https://sourceforge.net/projects/gtkglext/ \
https://gitlab.gnome.org/Archive/gtkglext
diff --git a/x11-toolkits/libhandy/Makefile b/x11-toolkits/libhandy/Makefile
index 504888ed5db7..cf7ed9e7b211 100644
--- a/x11-toolkits/libhandy/Makefile
+++ b/x11-toolkits/libhandy/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
-COMMENT= Library with GTK+ widgets for mobile phones
+COMMENT= Library with GTK widgets for mobile phones
WWW= https://gitlab.gnome.org/GNOME/libhandy/
LICENSE= LGPL21
diff --git a/x11-toolkits/linux-c7-gtk2/Makefile b/x11-toolkits/linux-c7-gtk2/Makefile
index 200f5017fa25..b10695199965 100644
--- a/x11-toolkits/linux-c7-gtk2/Makefile
+++ b/x11-toolkits/linux-c7-gtk2/Makefile
@@ -4,7 +4,7 @@ DISTVERSIONSUFFIX= -1.el7
CATEGORIES= x11-toolkits linux
MAINTAINER= emulation@FreeBSD.org
-COMMENT= GTK+ library, version 2.X (Linux CentOS ${LINUX_DIST_VER})
+COMMENT= GTK library, version 2.X (Linux CentOS ${LINUX_DIST_VER})
WWW= https://www.gtk.org/
USES= cpe linux:c7
diff --git a/x11-toolkits/linux-c7-gtk3/Makefile b/x11-toolkits/linux-c7-gtk3/Makefile
index 11e6f3fad8bf..8614ec1b5d46 100644
--- a/x11-toolkits/linux-c7-gtk3/Makefile
+++ b/x11-toolkits/linux-c7-gtk3/Makefile
@@ -5,7 +5,7 @@ PORTREVISION= 4
CATEGORIES= x11-toolkits linux
MAINTAINER= emulation@FreeBSD.org
-COMMENT= GTK+ library, version 3.X (Linux CentOS ${LINUX_DIST_VER})
+COMMENT= GTK library, version 3.X (Linux CentOS ${LINUX_DIST_VER})
WWW= https://www.gtk.org/
RUN_DEPENDS= hicolor-icon-theme>0:misc/hicolor-icon-theme \
diff --git a/x11-toolkits/ocaml-lablgtk2/Makefile b/x11-toolkits/ocaml-lablgtk2/Makefile
index 5ecec15763d7..66ccf024b1b6 100644
--- a/x11-toolkits/ocaml-lablgtk2/Makefile
+++ b/x11-toolkits/ocaml-lablgtk2/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= x11-toolkits
PKGNAMEPREFIX= ocaml-
MAINTAINER= danfe@FreeBSD.org
-COMMENT= Objective Caml interface to GTK+ 2.x
+COMMENT= Objective Caml interface to GTK 2.x
WWW= https://garrigue.github.io/lablgtk/
LICENSE= LGPL21
diff --git a/x11-toolkits/ocaml-lablgtk3/Makefile b/x11-toolkits/ocaml-lablgtk3/Makefile
index 8be4c8cd42b5..128551683944 100644
--- a/x11-toolkits/ocaml-lablgtk3/Makefile
+++ b/x11-toolkits/ocaml-lablgtk3/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= x11-toolkits
PKGNAMEPREFIX= ocaml-
MAINTAINER= madpilot@FreeBSD.org
-COMMENT= Objective Caml interface to GTK+ 3.x
+COMMENT= Objective Caml interface to GTK 3.x
WWW= https://garrigue.github.io/lablgtk/
LICENSE= LGPL21
diff --git a/x11-toolkits/qt5-widgets/Makefile b/x11-toolkits/qt5-widgets/Makefile
index d67e9579e8f2..a22e410ea354 100644
--- a/x11-toolkits/qt5-widgets/Makefile
+++ b/x11-toolkits/qt5-widgets/Makefile
@@ -24,7 +24,7 @@ QT_CONFIG= accessibility accessibility-atspi-bridge xlib
OPTIONS_DEFINE= GTK3
OPTIONS_SUB= YES
-GTK3_DESC= GTK+-based Qt theme
+GTK3_DESC= GTK-based Qt theme
GTK3_USES= gnome
GTK3_USE= GNOME=gtk30 QT=dbus
GTK3_CONFIGURE_ON= -gtk
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index 23a86abf4d3a..284c5701791e 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES= http://download.tuxfamily.org/librep/rep-gtk/
DISTNAME= rep-gtk_${PORTVERSION}
MAINTAINER= bofh@FreeBSD.org
-COMMENT= GTK+-2 bindings for rep Lisp interpreter
+COMMENT= GTK-2 bindings for rep Lisp interpreter
WWW= https://sawfish.tuxfamily.org/
LICENSE= GPLv2
diff --git a/x11-toolkits/scintilla/Makefile b/x11-toolkits/scintilla/Makefile
index b457e2944e34..d6da0ce79876 100644
--- a/x11-toolkits/scintilla/Makefile
+++ b/x11-toolkits/scintilla/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES= SF/scintilla/SciTE/${PORTVERSION}
DISTNAME= scite${PORTVERSION:S/.//g}
MAINTAINER= cyberbotx@cyberbotx.com
-COMMENT= Full-featured free source code editing component for GTK+
+COMMENT= Full-featured free source code editing component for GTK
WWW= https://www.scintilla.org/
LICENSE= SCINTILLA
diff --git a/x11-toolkits/wxgtk30/Makefile b/x11-toolkits/wxgtk30/Makefile
index 625a22fc8deb..f75b0a1116c6 100644
--- a/x11-toolkits/wxgtk30/Makefile
+++ b/x11-toolkits/wxgtk30/Makefile
@@ -8,7 +8,7 @@ PKGNAMESUFFIX= ${_SHORT_WX_VER}-${FLAVOR}
DISTNAME= wxWidgets-${DISTVERSION}
MAINTAINER= desktop@FreeBSD.org
-COMMENT= The wxWidgets GUI toolkit with GTK+ bindings
+COMMENT= The wxWidgets GUI toolkit with GTK bindings
WWW= https://www.wxwidgets.org/
LICENSE= GPLv2+
diff --git a/x11/gtk-theme-switch2/Makefile b/x11/gtk-theme-switch2/Makefile
index 090bcacf327f..6052ab244218 100644
--- a/x11/gtk-theme-switch2/Makefile
+++ b/x11/gtk-theme-switch2/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= x11
MASTER_SITES= http://www.muhri.net/
MAINTAINER= oleg@bsdpower.com
-COMMENT= Command line tool for switching GTK+ 2.0 themes
+COMMENT= Command line tool for switching GTK 2.0 themes
WWW= http://www.muhri.net/nav.php3?node=gts
USES= gmake gnome pkgconfig xorg
diff --git a/x11/lightdm-gtk-greeter-settings/Makefile b/x11/lightdm-gtk-greeter-settings/Makefile
index cba398e61367..b2380d00e536 100644
--- a/x11/lightdm-gtk-greeter-settings/Makefile
+++ b/x11/lightdm-gtk-greeter-settings/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= x11
MASTER_SITES= https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/
MAINTAINER= ports@FreeBSD.org
-COMMENT= Settings editor for LightDM GTK+ Greeter
+COMMENT= Settings editor for LightDM GTK Greeter
WWW= https://launchpad.net/lightdm-gtk-greeter-settings
LICENSE= GPLv3
diff --git a/x11/lightdm-gtk-greeter/Makefile b/x11/lightdm-gtk-greeter/Makefile
index c3e6b01d3273..add3498bac38 100644
--- a/x11/lightdm-gtk-greeter/Makefile
+++ b/x11/lightdm-gtk-greeter/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= x11
MASTER_SITES= https://github.com/Xubuntu/${PORTNAME}/releases/download/${PORTNAME}-${PORTVERSION}/
MAINTAINER= desktop@FreeBSD.org
-COMMENT= GTK+ greeter for LightDM
+COMMENT= GTK greeter for LightDM
WWW= https://github.com/Xubuntu/lightdm-gtk-greeter
LICENSE= GPLv3
diff --git a/x11/roxterm/Makefile b/x11/roxterm/Makefile
index 066d36f39164..37c91fb203cc 100644
--- a/x11/roxterm/Makefile
+++ b/x11/roxterm/Makefile
@@ -4,7 +4,7 @@ PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= nc@FreeBSD.org
-COMMENT= GTK+ terminal emulator with tabs
+COMMENT= GTK terminal emulator with tabs
WWW= https://github.com/realh/roxterm
LICENSE= GPLv2+
diff --git a/x11/stjerm/Makefile b/x11/stjerm/Makefile
index 33ca2ceb4043..de5de1ea734b 100644
--- a/x11/stjerm/Makefile
+++ b/x11/stjerm/Makefile
@@ -5,7 +5,7 @@ PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= lichray@gmail.com
-COMMENT= GTK+-based quake-like terminal emulator
+COMMENT= GTK-based quake-like terminal emulator
WWW= https://github.com/stjerm/stjerm
LICENSE= GPLv2
diff --git a/x11/tilix/Makefile b/x11/tilix/Makefile
index bbbc67a38dd3..4a34d5b98ae9 100644
--- a/x11/tilix/Makefile
+++ b/x11/tilix/Makefile
@@ -4,7 +4,7 @@ PORTREVISION= 1
CATEGORIES= x11
MAINTAINER= romain@FreeBSD.org
-COMMENT= Tiling terminal emulator using GTK+ 3
+COMMENT= Tiling terminal emulator using GTK 3
WWW= https://gnunn1.github.io/tilix-web/
LICENSE= MPL20
diff --git a/x11/wbar/Makefile b/x11/wbar/Makefile
index 7a255d06e822..ff25a3f98cee 100644
--- a/x11/wbar/Makefile
+++ b/x11/wbar/Makefile
@@ -25,7 +25,7 @@ OPTIONS_DEFINE= NLS WBARCONFIG
OPTIONS_DEFAULT= WBARCONFIG
OPTIONS_SUB= yes
-WBARCONFIG_DESC= Build the GTK+ configuration interface
+WBARCONFIG_DESC= Build the GTK configuration interface
NLS_CONFIGURE_ENABLE= nls
NLS_LIBS= -lintl