<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7459497706f0907b32d25c59fda7d7d638f89ee6">https://github.com/macports/macports-ports/commit/7459497706f0907b32d25c59fda7d7d638f89ee6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 7459497706f gtk2 ports: switch to path-style dependency
</span>7459497706f is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 7459497706f0907b32d25c59fda7d7d638f89ee6
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat Oct 16 15:31:32 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    gtk2 ports: switch to path-style dependency
</span>---
 audio/libcanberra/Portfile                   | 2 +-
 audio/lv2/Portfile                           | 2 +-
 audio/tagtool/Portfile                       | 2 +-
 cad/gaw/Portfile                             | 2 +-
 cad/gerbv/Portfile                           | 2 +-
 cad/gtkwave/Portfile                         | 2 +-
 cad/xgsch2pcb/Portfile                       | 2 +-
 comms/gnokii/Portfile                        | 2 +-
 comms/libinfinity/Portfile                   | 2 +-
 comms/xlog/Portfile                          | 2 +-
 databases/postgis2/Portfile                  | 2 +-
 devel/codeblocks/Portfile                    | 2 +-
 devel/geany/Portfile                         | 2 +-
 devel/gecko-sharp2/Portfile                  | 2 +-
 devel/geoclue/Portfile                       | 2 +-
 devel/glade3/Portfile                        | 2 +-
 devel/gpsim/Portfile                         | 2 +-
 devel/gtk-osx-application/Portfile           | 4 ++--
 devel/gtk2hs/Portfile                        | 2 +-
 devel/gtkglext/Portfile                      | 2 +-
 devel/gtkimageview/Portfile                  | 6 +++---
 devel/gwenhywfar4/Portfile                   | 2 +-
 devel/gwenhywfar5/Portfile                   | 2 +-
 devel/libdivecomputer/Portfile               | 2 +-
 devel/libextractor/Portfile                  | 2 +-
 devel/libiodbc/Portfile                      | 2 +-
 editors/cssed/Portfile                       | 2 +-
 editors/leafpad/Portfile                     | 2 +-
 editors/minimumprofit/Portfile               | 2 +-
 editors/scite/Portfile                       | 2 +-
 editors/vim/Portfile                         | 2 +-
 emulators/basiliskii-devel/Portfile          | 2 +-
 emulators/basiliskii/Portfile                | 2 +-
 emulators/nonpareil/Portfile                 | 2 +-
 emulators/qemu/Portfile                      | 2 +-
 emulators/sheepshaver/Portfile               | 2 +-
 games/cannonsmash/Portfile                   | 2 +-
 games/crack-attack/Portfile                  | 2 +-
 games/dopewars/Portfile                      | 2 +-
 games/eboard/Portfile                        | 2 +-
 games/freeciv/Portfile                       | 2 +-
 games/gdash/Portfile                         | 2 +-
 games/gnubg/Portfile                         | 6 +++---
 games/kanatest/Portfile                      | 2 +-
 games/mindless/Portfile                      | 2 +-
 games/xboard/Portfile                        | 2 +-
 games/xmj/Portfile                           | 2 +-
 games/xqf/Portfile                           | 2 +-
 games/xscorch/Portfile                       | 2 +-
 gnome/cog/Portfile                           | 2 +-
 gnome/dia/Portfile                           | 2 +-
 gnome/gdl/Portfile                           | 2 +-
 gnome/gdmap/Portfile                         | 2 +-
 gnome/genius/Portfile                        | 2 +-
 gnome/gnome-mud/Portfile                     | 2 +-
 gnome/gnome-themes-extra/Portfile            | 2 +-
 gnome/gnomeicu/Portfile                      | 2 +-
 gnome/gnotify/Portfile                       | 2 +-
 gnome/gnotime/Portfile                       | 2 +-
 gnome/goffice/Portfile                       | 2 +-
 gnome/goocanvas/Portfile                     | 2 +-
 gnome/grisbi/Portfile                        | 2 +-
 gnome/gstreamer010-gst-plugins-base/Portfile | 2 +-
 gnome/gtk-quartz-engine/Portfile             | 2 +-
 gnome/gtk2-aurora/Portfile                   | 2 +-
 gnome/gtk2-murrine/Portfile                  | 2 +-
 gnome/gtksourceview/Portfile                 | 2 +-
 gnome/gtksourceview2/Portfile                | 2 +-
 gnome/keybinder/Portfile                     | 2 +-
 gnome/libbonoboui/Portfile                   | 2 +-
 gnome/libglade2/Portfile                     | 2 +-
 gnome/libgnomecanvas/Portfile                | 2 +-
 gnome/libgnomeprintui/Portfile               | 2 +-
 gnome/libgtkhtml/Portfile                    | 2 +-
 gnome/libgtkhtml3/Portfile                   | 2 +-
 gnome/libunique/Portfile                     | 2 +-
 gnome/libwnck/Portfile                       | 2 +-
 gnome/linsmith/Portfile                      | 2 +-
 gnome/oxygen-gtk2/Portfile                   | 2 +-
 gnome/planner/Portfile                       | 2 +-
 gnome/virt-manager/Portfile                  | 2 +-
 gnome/vte-gtk2-compat/Portfile               | 2 +-
 graphics/g3data/Portfile                     | 2 +-
 graphics/gegl-0.3/Portfile                   | 2 +-
 graphics/gimp2-devel/Portfile                | 2 +-
 graphics/gimp2/Portfile                      | 2 +-
 graphics/gpick/Portfile                      | 2 +-
 graphics/gqview/Portfile                     | 2 +-
 graphics/graphviz-devel/Portfile             | 4 ++--
 graphics/graphviz/Portfile                   | 4 ++--
 graphics/mtpaint/Portfile                    | 2 +-
 graphics/nip2/Portfile                       | 2 +-
 graphics/osm-gps-map-gtk2/Portfile           | 2 +-
 graphics/pdf2svg/Portfile                    | 2 +-
 graphics/qiv/Portfile                        | 2 +-
 graphics/rawstudio/Portfile                  | 2 +-
 graphics/ufraw/Portfile                      | 6 +++---
 graphics/wxWidgets-2.8/Portfile              | 2 +-
 graphics/wxWidgets-3.0/Portfile              | 2 +-
 graphics/xsane/Portfile                      | 2 +-
 irc/hexchat/Portfile                         | 2 +-
 java/gnu-classpath/Portfile                  | 2 +-
 kde/qtcurve/Portfile                         | 2 +-
 lang/eiffelstudio/Portfile                   | 2 +-
 lang/falcon/Portfile                         | 2 +-
 lang/gauche-gtk/Portfile                     | 2 +-
 lang/gst/Portfile                            | 2 +-
 lang/kaffe/Portfile                          | 2 +-
 lang/mdk/Portfile                            | 2 +-
 lang/pike/Portfile                           | 2 +-
 mail/claws-mail/Portfile                     | 2 +-
 mail/sylpheed/Portfile                       | 2 +-
 math/fyre/Portfile                           | 2 +-
 math/gfm/Portfile                            | 2 +-
 math/gtkdatabox/Portfile                     | 2 +-
 math/tiemu3/Portfile                         | 2 +-
 math/tilp2/Portfile                          | 2 +-
 multimedia/hdhomerun_gui/Portfile            | 4 ++--
 multimedia/mjpegtools/Portfile               | 2 +-
 multimedia/mlt/Portfile                      | 2 +-
 net/avahi/Portfile                           | 2 +-
 net/gajim/Portfile                           | 2 +-
 net/gftp/Portfile                            | 2 +-
 net/gq/Portfile                              | 2 +-
 net/gtk-gnutella/Portfile                    | 2 +-
 net/jigdo/Portfile                           | 2 +-
 net/logjam/Portfile                          | 2 +-
 net/pidgin/Portfile                          | 2 +-
 net/tsclient/Portfile                        | 2 +-
 net/wireshark22/Portfile                     | 2 +-
 net/yersinia/Portfile                        | 2 +-
 news/pan2/Portfile                           | 4 ++--
 palm/jpilot/Portfile                         | 2 +-
 perl/p5-gtk2/Portfile                        | 2 +-
 php/php-gtk/Portfile                         | 4 ++--
 print/gutenprint/Portfile                    | 2 +-
 python/py-goocanvas/Portfile                 | 2 +-
 python/py-pygtk-devel/Portfile               | 2 +-
 python/py-pygtk/Portfile                     | 2 +-
 science/chemtool/Portfile                    | 2 +-
 science/crystfel/Portfile                    | 2 +-
 science/geda-gaf/Portfile                    | 2 +-
 science/gfsview/Portfile                     | 4 ++--
 science/ggobi/Portfile                       | 2 +-
 science/ghemical/Portfile                    | 2 +-
 science/gildas/Portfile                      | 2 +-
 science/grig/Portfile                        | 2 +-
 science/gwyddion/Portfile                    | 2 +-
 science/playerstage-player/Portfile          | 2 +-
 science/viking/Portfile                      | 2 +-
 science/wcalc/Portfile                       | 2 +-
 science/xmedcon/Portfile                     | 2 +-
 security/gnomint/Portfile                    | 2 +-
 security/hydra/Portfile                      | 2 +-
 security/pinentry/Portfile                   | 2 +-
 security/putty/Portfile                      | 2 +-
 sysutils/dvdisaster/Portfile                 | 2 +-
 sysutils/gkrellm/Portfile                    | 2 +-
 textproc/bibledit/Portfile                   | 2 +-
 textproc/stardict/Portfile                   | 2 +-
 textproc/xmlroff/Portfile                    | 2 +-
 www/uzbl/Portfile                            | 2 +-
 www/w3m/Portfile                             | 2 +-
 www/webkit-gtk-2.0/Portfile                  | 2 +-
 www/webkit-gtk/Portfile                      | 2 +-
 x11/aewm/Portfile                            | 2 +-
 x11/dlume/Portfile                           | 2 +-
 x11/gobby/Portfile                           | 2 +-
 x11/gtk-engines2/Portfile                    | 2 +-
 x11/gtk-nodoka-engine/Portfile               | 2 +-
 x11/gtk-osx-tiger/Portfile                   | 2 +-
 x11/gtk-sharp2/Portfile                      | 2 +-
 x11/gtk-theme-switch/Portfile                | 2 +-
 x11/gtk2-extra/Portfile                      | 2 +-
 x11/gtkextra3/Portfile                       | 2 +-
 x11/gtkglarea2/Portfile                      | 2 +-
 x11/gtkmm/Portfile                           | 2 +-
 x11/gtkspell2/Portfile                       | 2 +-
 x11/gtkspell3/Portfile                       | 2 +-
 x11/gxmessage/Portfile                       | 2 +-
 x11/lablgtk2/Portfile                        | 2 +-
 x11/libsexy/Portfile                         | 2 +-
 x11/mlterm/Portfile                          | 2 +-
 x11/nabi/Portfile                            | 2 +-
 x11/nimbus/Portfile                          | 2 +-
 x11/pcb/Portfile                             | 6 +++---
 x11/rep-gtk/Portfile                         | 2 +-
 x11/rox-filer/Portfile                       | 2 +-
 x11/subsurface/Portfile                      | 2 +-
 x11/xarchiver/Portfile                       | 2 +-
 x11/xcowsay/Portfile                         | 2 +-
 x11/xdialog/Portfile                         | 2 +-
 x11/xnee/Portfile                            | 2 +-
 x11/xournal/Portfile                         | 2 +-
 x11/xscreensaver/Portfile                    | 2 +-
 xfce/exo/Portfile                            | 2 +-
 xfce/garcon/Portfile                         | 2 +-
 xfce/gtk-xfce-engine/Portfile                | 2 +-
 xfce/libxfce4ui/Portfile                     | 2 +-
 xfce/mousepad/Portfile                       | 2 +-
 xfce/ristretto/Portfile                      | 2 +-
 xfce/squeeze/Portfile                        | 2 +-
 xfce/vte-gtk2-xfce/Portfile                  | 2 +-
 xfce/xfce4-terminal/Portfile                 | 2 +-
 xfce/xfconf/Portfile                         | 2 +-
 xfce/xfwm4/Portfile                          | 2 +-
 206 files changed, 221 insertions(+), 221 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/libcanberra/Portfile b/audio/libcanberra/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8b74350b43c..649b6d90cc6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/libcanberra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/libcanberra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +47,7 @@ configure.args      --disable-alsa \
</span> 
 variant x11 {
     depends_lib-append  port:xorg-libX11 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        path:lib/pkgconfig/gtk+-2.0.pc \
</span>                         port:gtk3
     configure.args-replace  --disable-gtk --enable-gtk
     configure.args-replace  --disable-gtk3 --enable-gtk3
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/lv2/Portfile b/audio/lv2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 88c0b9da3ca..d5d66990e1b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/lv2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/lv2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ configure.args-append   --no-plugins
</span> depends_build-append    port:pkgconfig
 
 variant plugins description {Add sample plugins} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append port:libsndfile port:gtk2 path:lib/pkgconfig/cairo.pc:cairo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append port:libsndfile path:lib/pkgconfig/gtk+-2.0.pc path:lib/pkgconfig/cairo.pc:cairo
</span>     configure.args-delete --no-plugins
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/tagtool/Portfile b/audio/tagtool/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1cfd6d15f3b..5a178e481bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/tagtool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/tagtool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@ depends_build   port:pkgconfig \
</span> depends_lib     port:id3lib \
                 port:libvorbis \
                 port:gettext \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:libglade2 \
                 port:libxml2 \
                 port:sqlite3 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cad/gaw/Portfile b/cad/gaw/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 15e0e4347a1..7e0d43ccdf0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cad/gaw/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cad/gaw/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@ variant gtk2 conflicts gtk3 description {Use the GTK2+ toolkit for the GUI} {
</span>                             sha1    f8ee9b494a597ecfee646371064bd4b8256a66b8 \
                             rmd160  b8ff66ff4033c7abad422f0ef14ebb2556475214 \
                             sha256  a73658c52f097bdede96277694dae1c2b41fae82fe95ed9f11a9b8e635680ed8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      path:lib/pkgconfig/gtk+-2.0.pc
</span> 
     require_active_variants gtk2 x11
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cad/gerbv/Portfile b/cad/gerbv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8fb4ab22cea..1496af42a02 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cad/gerbv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cad/gerbv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ checksums           rmd160  d1178c2ecdd3d821f4593c6dc284fff959b217e0 \
</span> revision            1
 
 depends_build       port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libpng
 
 configure.args      --disable-update-desktop-database
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cad/gtkwave/Portfile b/cad/gtkwave/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8528cb39a4a..0b6bbb5f072 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cad/gtkwave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cad/gtkwave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ checksums       rmd160  37e1b1bdc994ea8d9407e501b2afddb55321a22c \
</span> depends_build   port:pkgconfig
 
 depends_lib     port:bzip2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:gtk-osx-application-gtk2 \
                 port:tk \
                 port:xz \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/cad/xgsch2pcb/Portfile b/cad/xgsch2pcb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5e26702eafa..eb04c52459d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/cad/xgsch2pcb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/cad/xgsch2pcb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ checksums           md5     caf84bc0f17b75a2984fea2a64fc2c81 \
</span> distname            geda-${name}-${version}
 depends_build       port:intltool
 depends_lib         port:desktop-file-utils \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:pcb \
                     port:py27-pygtk \
                     port:dbus-python27
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/comms/gnokii/Portfile b/comms/gnokii/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a22ef6319b4..c7419e37350 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/comms/gnokii/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/comms/gnokii/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,7 +83,7 @@ platform macosx {
</span> }
 
 variant x11 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      path:lib/pkgconfig/gtk+-2.0.pc
</span>     configure.args-delete   --without-x
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/comms/libinfinity/Portfile b/comms/libinfinity/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f2f1cffa1de..5eb1760f471 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/comms/libinfinity/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/comms/libinfinity/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@ checksums       rmd160  c36895b04fc5be315f4f110438d14bcde2fbfb69 \
</span> depends_build   port:pkgconfig
 
 depends_lib     path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:libxml2 \
                 port:gnutls \
                 port:libgsasl \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/comms/xlog/Portfile b/comms/xlog/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5a52203dcc1..c8453304d1c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/comms/xlog/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/comms/xlog/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@ checksums           rmd160  8ce44c1521f4eb4e6af7400c39c2602ff7a613ad \
</span>                     size    11407849
 
 depends_lib         path:lib/libhamlib.dylib:hamlib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc
</span> depends_build       port:pkgconfig
 
 post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgis2/Portfile b/databases/postgis2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 680e0067d83..96dd7ce9f20 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgis2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgis2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,7 +102,7 @@ variant sfcgal              description {Uses SFCGAL for 3D queries} {
</span> 
 variant gui                 description {Build the GUI import tool} {
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      path:lib/pkgconfig/gtk+-2.0.pc
</span>     configure.args-append   --with-gui
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/codeblocks/Portfile b/devel/codeblocks/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cf413526d1e..efdd942338b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/codeblocks/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/codeblocks/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,7 +148,7 @@ if {[variant_isset wxgtk28] || [variant_isset wxgtk30]} {
</span>                             port:freetype \
                             port:gdk-pixbuf2 \
                             port:gettext \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            path:lib/pkgconfig/gtk+-2.0.pc \
</span>                             port:xorg-libX11 \
                             port:xorg-libXcomposite \
                             port:xorg-libXcursor \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/geany/Portfile b/devel/geany/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4ae7962227e..a6e3b0de9a1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/geany/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/geany/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +52,7 @@ configure.args      --disable-silent-rules \
</span> 
 variant gtk2 conflicts gtk3 description {Use gtk2} {
     depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:vte-gtk2-compat
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gecko-sharp2/Portfile b/devel/gecko-sharp2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 679f8ed59a8..b8208fcf966 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gecko-sharp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gecko-sharp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ checksums       md5     f88eaa06e71f8d8fa34cf59a3e034a6b \
</span> depends_build   port:pkgconfig
 
 depends_lib     port:mono \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:gtk-sharp2
 
 # mono is not universal
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/geoclue/Portfile b/devel/geoclue/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 59a53f6de6a..18f50c93e55 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/geoclue/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/geoclue/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ depends_build   \
</span>         port:pkgconfig
 
 depends_lib     \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        path:lib/pkgconfig/gtk+-2.0.pc \
</span>         port:dbus-glib \
         port:libsoup
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glade3/Portfile b/devel/glade3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5786b78f66b..1ad206fd0be 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glade3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glade3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ depends_build       port:pkgconfig \
</span>                     port:libtool
 
 depends_lib         port:desktop-file-utils \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libxml2
 
 depends_run         port:devhelp
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gpsim/Portfile b/devel/gpsim/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4190662f039..2abfcf3d0d3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gpsim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gpsim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,5 +23,5 @@ checksums           rmd160  e84db6f55320e98dc37796e582949617c3547555 \
</span> depends_build       port:gputils \
                     port:pkgconfig
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2-extra \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc-extra \
</span>                     port:popt
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gtk-osx-application/Portfile b/devel/gtk-osx-application/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3a703987a95..1f2d79f11ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gtk-osx-application/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gtk-osx-application/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,7 +102,7 @@ subport gtk-osx-application-common-gtk3 {
</span> subport gtk-osx-application-gtk2 {
     set gtk_version gtk2
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc \
</span>                        path:include/gtkmacintegration/gtk-mac-bundle.h:gtk-osx-application-common-gtk2
 
     # force gtk version to 2.0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,7 +121,7 @@ subport gtk-osx-application-gtk2 {
</span> subport gtk-osx-application-common-gtk2 {
     set gtk_version gtk2
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc
</span> 
     # force gtk version to 2.0
     configure.args-append --with-gtk2 --without-gtk3 --disable-introspection
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gtk2hs/Portfile b/devel/gtk2hs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0a0f8c59f05..1f2c92dff6e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gtk2hs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gtk2hs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ checksums           rmd160  c72acd0e2c5471c7757532cfb44c841be8e83f1d \
</span> depends_build       port:pkgconfig
 depends_lib         port:gconf \
                     port:ghc \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:gnome-vfs \
                     path:lib/pkgconfig/cairo.pc:cairo \
                     port:librsvg \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gtkglext/Portfile b/devel/gtkglext/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 08f09e67f84..17469a1156c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gtkglext/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gtkglext/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,7 @@ checksums           rmd160  7f5089d3ea64fd10b32632d9ea8f0b977e9317e7 \
</span>                     size    956401
 
 depends_build       port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libGLU \
                     port:mesa \
                     port:pangox-compat \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gtkimageview/Portfile b/devel/gtkimageview/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d836d6e3b31..565965aaad8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gtkimageview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gtkimageview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ depends_build   port:pkgconfig \
</span>                 port:gnome-common \
                 port:gtk-doc
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 patchfiles      patch-configure.in.diff
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,11 +49,11 @@ configure.args  --enable-compile-warnings=minimum
</span> #
 
 variant x11 conflicts quartz {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    require_active_variants port:gtk2 x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    require_active_variants path:lib/pkgconfig/gtk+-2.0.pc x11
</span> }
 
 variant quartz conflicts x11 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    require_active_variants port:gtk2 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    require_active_variants path:lib/pkgconfig/gtk+-2.0.pc quartz
</span> }
 
 if {![variant_isset quartz]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gwenhywfar4/Portfile b/devel/gwenhywfar4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 61c9c70229e..2c25b6c6d52 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gwenhywfar4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gwenhywfar4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,7 @@ master_sites      https://www.aquamaniac.de/rdm/attachments/download/${release}/
</span> distname          gwenhywfar-${version}
 
 if {$subport == "gwenhywfar4-gtk"} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      path:lib/pkgconfig/gtk+-2.0.pc
</span>     configure.args-append   --with-guis="gtk2 cpp" --disable-qt4
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/gwenhywfar5/Portfile b/devel/gwenhywfar5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f6a8e37d990..2bcd14eec7c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/gwenhywfar5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/gwenhywfar5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +42,7 @@ configure.args      --enable-static
</span> conflicts-delete  $subport
 
 subport gwenhywfar5-gtk2 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append      port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append      path:lib/pkgconfig/gtk+-2.0.pc
</span>         configure.args-append   --with-guis="gtk2 cpp" --disable-qt4 --disable-qt5
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libdivecomputer/Portfile b/devel/libdivecomputer/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d534d4f5cbf..3e0a20d8cc4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libdivecomputer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libdivecomputer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ checksums               rmd160 63b5d8eeb36c58a3736f5daddb12ec2fab85542e \
</span>                         sha256 7d64032d2e5cd4d6315ebb7ed5bcccc9399166d40228ae2e96e435749b950a0a
 
 depends_lib             port:gconf \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        path:lib/pkgconfig/gtk+-2.0.pc \
</span>                         path:lib/pkgconfig/libusb-1.0.pc:libusb
 
 use_autoreconf          yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libextractor/Portfile b/devel/libextractor/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8ae35771660..069bd08caa5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libextractor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libextractor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,7 @@ depends_lib         port:bzip2 \
</span>                     port:gettext \
                     port:giflib \
                     path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:gstreamer1 \
                     port:gstreamer1-gst-plugins-base \
                     path:include/turbojpeg.h:libjpeg-turbo \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libiodbc/Portfile b/devel/libiodbc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5dad2cda692..ac921ad8ccb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libiodbc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libiodbc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +42,7 @@ variant x11 {
</span>                         port:gdk-pixbuf2 \
                         port:gettext \
                         path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        path:lib/pkgconfig/gtk+-2.0.pc \
</span>                         path:lib/pkgconfig/pango.pc:pango \
                         port:xorg-libX11 \
                         port:xorg-libXcomposite \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/cssed/Portfile b/editors/cssed/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0210da6c58d..e971a54804f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/cssed/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/cssed/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ long_description    cssed is a small developer editor and validator, that \
</span> homepage            http://cssed.sourceforge.net/
 master_sites        sourceforge:project/cssed/cssed/${version}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libxml2
 
 depends_build       port:hicolor-icon-theme \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/leafpad/Portfile b/editors/leafpad/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 94bb59e44a8..c7df6e7d56f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/leafpad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/leafpad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ checksums       rmd160  df9caa1d4248e7da3dc5ecae31f3e758f477732e \
</span> depends_build   port:pkgconfig \
                 port:intltool
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:freetype \
                 port:desktop-file-utils
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/minimumprofit/Portfile b/editors/minimumprofit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8baaff53dae..bf33e2b1865 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/minimumprofit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/minimumprofit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@ distname            mp-${version}
</span> checksums           md5 bfdc05b51bfdbafed892ab678eff8772 \
                     sha1 5233b6481e654c8a096412ba9dacc7ae7de5900f \
                     rmd160 37b52db182035243504cd49acd4ee5dc2668e744
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:pcre \
                     port:ncurses
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/scite/Portfile b/editors/scite/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 83dd16645c8..35b68f06bd9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/scite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/scite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@ distname            ${name}[strsed ${version} {g/\.//}]
</span> extract.suffix      .tgz
 
 depends_build       port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 checksums           rmd160  0e0e79eee0dca1ee3f2d391f1a6e006763aa48ba \
                     sha256  9f17fe2a5dc294bd1077bf64f713bb06733eec271bab770841e55474e6c781c8
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/vim/Portfile b/editors/vim/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 044af0035cf..959497d979c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/vim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/vim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +75,7 @@ variant athena description {Build GUI version using Athena widgets} requires x11
</span> variant gtk2 description {Build GUI version using GTK 2.x widgets} requires x11 conflicts athena gtk3 motif {
     configure.args-delete   --disable-gui
     configure.args-append   --enable-gui=gtk2 --disable-darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      path:lib/pkgconfig/gtk+-2.0.pc
</span>     depends_build-append    port:pkgconfig
 }
 variant gtk3 description {Build GUI version using GTK 3.x widgets} requires x11 conflicts athena gtk2 motif {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/basiliskii-devel/Portfile b/emulators/basiliskii-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0f98fe39166..1e9f30e5d98 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/basiliskii-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/basiliskii-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,7 +114,7 @@ if {${subport} eq "basiliskii-devel"} {
</span>     description         Graphical user interface to configure basiliskii.
     long_description    ${description}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib         port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib         path:lib/pkgconfig/gtk+-2.0.pc
</span> 
     configure.args      --disable-vosf \
                         --without-esd  \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/basiliskii/Portfile b/emulators/basiliskii/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 03ccf5336ec..26c9be9b2be 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/basiliskii/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/basiliskii/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,7 +104,7 @@ if {${subport} eq "basiliskii"} {
</span>     description         Graphical user interface to configure basiliskii.
     long_description    ${description}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib         port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib         path:lib/pkgconfig/gtk+-2.0.pc
</span> 
     configure.args      --disable-vosf \
                         --without-esd  \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/nonpareil/Portfile b/emulators/nonpareil/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a04661fb38a..525c03c6105 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/nonpareil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/nonpareil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +50,7 @@ extract.only        ${prog}                                 \
</span>                     ${appbundles}
 
 depends_lib         path:lib/pkgconfig/glib-2.0.pc:glib2    \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2                               \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc                               \
</span>                     port:libpng                             \
                     port:libxml2                            \
                     port:libsdl_sound                       \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/qemu/Portfile b/emulators/qemu/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d423bf9ad35..fc9652c3a53 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/qemu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/qemu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -173,7 +173,7 @@ variant curses description {Use the curses text-only user interface} {
</span> #variant gtk2 description {Use the GTK+ 2 graphical user interface} conflicts cocoa curses gtk3 sdl sdl2 {
 #    configure.args-replace --disable-gtk --enable-gtk
 #    configure.args-append  --with-gtkabi=2.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#    depends_lib-append     port:gtk2 port:vte
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#    depends_lib-append     path:lib/pkgconfig/gtk+-2.0.pc port:vte
</span> #}
 
 # XXX: Build broken due to missing X11 symbols
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/sheepshaver/Portfile b/emulators/sheepshaver/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a660b50e494..d8454d2e4a9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/sheepshaver/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/sheepshaver/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,7 +109,7 @@ if {${subport} eq "sheepshaver"} {
</span>     description         Graphical user interface to configure SheepShaver.
     long_description    ${description}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib         port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib         path:lib/pkgconfig/gtk+-2.0.pc
</span> 
     configure.args      --disable-vosf \
                         --without-esd  \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/cannonsmash/Portfile b/games/cannonsmash/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index aff470c6afa..06e572e4ab5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/cannonsmash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/cannonsmash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ checksums           md5 bcf2eddd0f04d58e5dac6d767f41d9af
</span> depends_build       port:pkgconfig
 
 depends_lib         port:libsdl_mixer port:libsdl_image \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 port:mesa port:libGLU port:xorg-libXmu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc port:mesa port:libGLU port:xorg-libXmu
</span> 
 patchfiles          patch-BallView.h.diff \
                     patch-configure.in.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/crack-attack/Portfile b/games/crack-attack/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0383eda35a4..575111a1791 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/crack-attack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/crack-attack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@ depends_lib     port:libsdl \
</span>                 port:mesa \
                 port:libGLU \
                 port:freeglut \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 checksums       md5     262445024b0fca44508355242ea29d71 \
                 sha1    fbf445f95d77267d23a766a485fd55edbd333bb4 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/dopewars/Portfile b/games/dopewars/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fbcc1a76924..637cf8f8d0d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/dopewars/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/dopewars/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,7 @@ checksums md5 debf749de9053dc2fb2e74c37ae06206 \
</span>   rmd160 66c86bceb67657a9fb2ef7944b1a069dafab8ae0
 
 depends_build  port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2 port:esound
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib        path:lib/pkgconfig/gtk+-2.0.pc port:esound
</span> 
 post-patch     { reinplace "s| \$\(dopewars_DEPENDENCIES\)||g" ${worksrcpath}/src/Makefile.in
                  reinplace "s|need_relink=yes|need_relink=no|g" ${worksrcpath}/ltmain.sh
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/eboard/Portfile b/games/eboard/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d469a3c0252..7dec6cc89c6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/eboard/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/eboard/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,7 @@ checksums           rmd160  9157280313a11fa839a46bed68db2ad22311079a \
</span>                     size    1579046
 
 depends_build-append    port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append      port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append      path:lib/pkgconfig/gtk+-2.0.pc \
</span>                         port:gstreamer1 \
                         port:gstreamer1-gst-plugins-base
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/freeciv/Portfile b/games/freeciv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7eb1d2f25a7..328d1c46bf1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/freeciv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/freeciv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,7 +99,7 @@ subport freeciv-x11 {
</span> 
     platforms               darwin
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      path:lib/pkgconfig/gtk+-2.0.pc
</span> 
     configure.args-append   --enable-client=gtk2 \
                             --enable-fcmp=gtk2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/gdash/Portfile b/games/gdash/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 371e7bc59ce..ec8c94aaf72 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/gdash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/gdash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@ checksums           rmd160  bbd4a7486d04294b0ded8bac51567949e360b1b6 \
</span> 
 depends_build       port:pkgconfig
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libpng \
                     port:libsdl2 \
                     port:libsdl2_image \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/gnubg/Portfile b/games/gnubg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 05fe063535e..6796e042108 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/gnubg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/gnubg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ depends_build-append    port:pkgconfig \
</span>                         port:bison \
                         port:flex
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib             port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib             path:lib/pkgconfig/gtk+-2.0.pc \
</span>                         port:sqlite3 \
                         port:gmp \
                         port:libiconv \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,10 +72,10 @@ variant random_org description "enable random.org support" {
</span> default_variants +random_org
 
 variant x11 conflicts quartz {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    require_active_variants port:gtk2 x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    require_active_variants path:lib/pkgconfig/gtk+-2.0.pc x11
</span> }
 variant quartz conflicts x11 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    require_active_variants port:gtk2 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    require_active_variants path:lib/pkgconfig/gtk+-2.0.pc quartz
</span> }
 
 if {![variant_isset quartz]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/kanatest/Portfile b/games/kanatest/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d0754dcf0a2..1a049afc366 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/kanatest/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/kanatest/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ checksums       md5     b97b0521314f634e454354cb7ba2013d \
</span> depends_build   port:pkgconfig
 depends_lib     port:gettext \
                 path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:libiconv \
                 port:libxml2
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/mindless/Portfile b/games/mindless/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8957c74a88b..b03687781ba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/mindless/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/mindless/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ checksums           rmd160  e653318bcedb111db021cb5140aea7b95b351c8f \
</span>                     size    85620
 
 depends_build       port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 port:gdk-pixbuf2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc port:gdk-pixbuf2
</span> 
 use_configure       no
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/xboard/Portfile b/games/xboard/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 18b14cd3419..f7b23f1b733 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/xboard/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/xboard/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +50,7 @@ variant xaw conflicts gtk description {Use the XAW GUI toolkit} {
</span> 
 variant gtk conflicts xaw description {Use the GTK GUI toolkit} {
     configure.args-append   --with-gtk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      path:lib/pkgconfig/gtk+-2.0.pc
</span> }
 
 if {![variant_isset gtk]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/xmj/Portfile b/games/xmj/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d07a6b7a4b4..afcab950b08 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/xmj/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/xmj/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@ checksums           rmd160  b5ae9c22c48e429ce053b6150cc5ee494ca8119b \
</span>                     sha256  d115a1769b41a32cced0b236e4dbca9d9b0f30827032b507a18216896ef6da92 \
                     size    401105
 depends_build  port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib        path:lib/pkgconfig/gtk+-2.0.pc
</span> use_configure   no
 universal_variant yes
 patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/xqf/Portfile b/games/xqf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 45e005044f7..740c07d53b0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/xqf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/xqf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ depends_build       port:pkgconfig \
</span> depends_lib         port:desktop-file-utils \
                     port:bzip2 \
                     port:gdk-pixbuf2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libgeoip \
                     port:readline \
                     port:qstat
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/xscorch/Portfile b/games/xscorch/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2d0134619b0..f808bcd4be1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/xscorch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/xscorch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ checksums           rmd160  ac8688e40162834db064c2aa18f904748ef56d0e \
</span> 
 depends_build       port:pkgconfig
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libmikmod
 
 patchfiles          patch-configure.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/cog/Portfile b/gnome/cog/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 833ec2ebc23..828da055fc5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/cog/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/cog/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ checksums       md5 fa6a42b2fa355cf736f661e6ed0589e5 \
</span> depends_build   port:pkgconfig
 
 depends_lib     port:desktop-file-utils \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:gconf \
                 port:libgnomeui \
                 port:libglade2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/dia/Portfile b/gnome/dia/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 313bceba989..bc7bead86c9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/dia/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/dia/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,7 @@ depends_lib         port:desktop-file-utils \
</span>                     port:gettext \
                     path:lib/pkgconfig/glib-2.0.pc:glib2 \
                     port:gdk-pixbuf2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     path:lib/pkgconfig/pango.pc:pango \
                     port:popt \
                     port:shared-mime-info \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gdl/Portfile b/gnome/gdl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b809158f778..56e3b742e1e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gdl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gdl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@ depends_build       port:pkgconfig \
</span>                     port:libiconv \
                     port:libtool
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libxml2
 
 patchfiles          returns.patch \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gdmap/Portfile b/gnome/gdmap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 28503d22f8f..d7bab137b7e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gdmap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gdmap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ checksums \
</span>     rmd160  72744f1d25b3409d6609b7afa982669f17f4e8b5 \
     sha256  a200c98004b349443f853bf611e49941403fce46f2335850913f85c710a2285b
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 depends_build       port:pkgconfig \
                     port:autoconf \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/genius/Portfile b/gnome/genius/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bfc121b5f24..b184fc24ef3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/genius/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/genius/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@ configure.cflags-append \
</span> 
 variant gnome description {Compile with the GNOME frontend (GUI, plotting} {
     depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:gtksourceview2 \
                     port:vte-gtk2-compat
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-mud/Portfile b/gnome/gnome-mud/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 46967306664..168d46f19f6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-mud/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-mud/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ depends_build   port:pkgconfig \
</span>                 port:libtool
 
 depends_lib     port:desktop-file-utils \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:gconf  \
                 port:libglade2 \
                 port:gnet2 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-themes-extra/Portfile b/gnome/gnome-themes-extra/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 50d0c3bf514..62086b332d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-themes-extra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-themes-extra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@ depends_build       port:intltool \
</span>                     port:libtool
 
 depends_lib         port:gtk3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:librsvg
 
 patchfiles          patch-configure.ac.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnomeicu/Portfile b/gnome/gnomeicu/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9ed4b070f18..b3d510bfce1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnomeicu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnomeicu/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ checksums               rmd160  5afa16342127b361c38beb55c26b8c2d241c9b6c \
</span> depends_build           port:intltool \
                         port:pkgconfig
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib             port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib             path:lib/pkgconfig/gtk+-2.0.pc \
</span>                         port:gdbm \
                         port:gconf \
                         port:libgnomeui \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnotify/Portfile b/gnome/gnotify/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5fdd8d75e99..5d1db2d5fad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnotify/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnotify/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,7 @@ depends_build       port:pkgconfig \
</span>                     port:automake \
                     port:libtool
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:gettext \
                     port:libxml2
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnotime/Portfile b/gnome/gnotime/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 33e81571beb..7bb24037fd2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnotime/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnotime/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ depends_build       port:pkgconfig \
</span> 
 depends_lib         port:desktop-file-utils \
                     port:gconf \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:guile \
                     port:libglade2 \
                     port:libgnome \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/goffice/Portfile b/gnome/goffice/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3d9f2330cac..909e8c98f63 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/goffice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/goffice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,7 +97,7 @@ subport goffice08 {
</span>                         port:automake \
                         port:libtool
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                         port:gconf \
                         port:libgsf \
                         port:libxml2 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/goocanvas/Portfile b/gnome/goocanvas/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b6ca3dd57de..8b417ad86c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/goocanvas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/goocanvas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ checksums       rmd160  c55c6c037207fcef409d7a8d3ea83e4acef54e69 \
</span> depends_build   port:pkgconfig \
                 port:gettext
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 livecheck.type  gnome
 livecheck.regex {LATEST-IS-(1\.[0-8](?:\.\d+)*)}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/grisbi/Portfile b/gnome/grisbi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2d2eab95219..5d7e2fdadd7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/grisbi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/grisbi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@ depends_build       port:pkgconfig \
</span>                     port:automake \
                     port:libtool
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libxml2 \
                     port:goffice08 \
                     path:lib/libssl.dylib:openssl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gstreamer010-gst-plugins-base/Portfile b/gnome/gstreamer010-gst-plugins-base/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8fc925587e4..2d795867383 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gstreamer010-gst-plugins-base/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer010-gst-plugins-base/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,7 +84,7 @@ variant gnome_vfs description {Enable gnome-vfs support} {
</span> 
 variant examples description {Build example programs} {
     PortGroup qt4 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc
</span>     configure.args-delete --disable-examples
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk-quartz-engine/Portfile b/gnome/gtk-quartz-engine/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5ad0300704f..a576e07127a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk-quartz-engine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk-quartz-engine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@ depends_build       port:pkgconfig \
</span>                     port:libtool
 
 depends_lib         port:libpng \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 patchfiles          patch-autogen.sh.diff \
                     patch-src-Makefile.am.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk2-aurora/Portfile b/gnome/gtk2-aurora/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f411c108082..2c8d7ee1b68 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk2-aurora/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk2-aurora/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ checksums       md5     5eeea57c5938306ad7ccfc7cd71d009d \
</span>                 rmd160  538da2485bd5bf4e7bccc4d1fb124fe0407ece1c
 
 depends_build   port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 post-extract {
     system "tar xzf ${workpath}/aurora-gtk-engine-${branch}.tar.gz -C ${workpath}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk2-murrine/Portfile b/gnome/gtk2-murrine/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0948e17e2bd..d7fbd53267f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk2-murrine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk2-murrine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ depends_build \
</span>     port:pkgconfig
 
 depends_lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    path:lib/pkgconfig/gtk+-2.0.pc \
</span>     port:gettext
 
 configure.args  --enable-animation
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtksourceview/Portfile b/gnome/gtksourceview/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4e084013477..eb563ede6a0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtksourceview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtksourceview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ depends_build   port:intltool \
</span>                 port:automake \
                 port:libtool
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:gnome-vfs \
                 port:libxml2 \
                 port:libgnomeprint \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtksourceview2/Portfile b/gnome/gtksourceview2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 03f831aba44..ec6b465a390 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtksourceview2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtksourceview2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +44,7 @@ depends_build   port:intltool \
</span> depends_lib \
     path:lib/pkgconfig/glib-2.0.pc:glib2 \
     port:gettext \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    path:lib/pkgconfig/gtk+-2.0.pc \
</span>     port:libxml2
 
 patchfiles      patch-configure.ac.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/keybinder/Portfile b/gnome/keybinder/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d20dfa6734e..d6034048c0b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/keybinder/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/keybinder/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ depends_build       port:pkgconfig \
</span>                     port:gnome-common \
                     port:gtk-doc
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 patchfiles          patch-configure.ac.diff \
                     patch_python-keybinder_Makefile.am.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libbonoboui/Portfile b/gnome/libbonoboui/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5f82f7b4bf0..56dc22c9a20 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libbonoboui/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libbonoboui/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,7 @@ depends_lib         port:desktop-file-utils \
</span>                     port:pangox-compat
 
 # see #48986
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc
</span> require_active_variants gtk2 x11
 
 # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libglade2/Portfile b/gnome/libglade2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0e530efecf8..924457e526c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libglade2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libglade2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,7 @@ depends_lib-append \
</span>     port:gettext \
     port:fontconfig \
     port:libxml2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 configure.args  --disable-gtktest \
                 --with-xml-catalog=${prefix}/etc/xml/catalog
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libgnomecanvas/Portfile b/gnome/libgnomecanvas/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3f0edba1e27..536b87d19dc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libgnomecanvas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libgnomecanvas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ depends_build   port:pkgconfig \
</span>                 port:automake \
                 port:libtool
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:libart_lgpl \
                 port:libglade2
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libgnomeprintui/Portfile b/gnome/libgnomeprintui/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c748e7ac94b..7b1fdeadab8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libgnomeprintui/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libgnomeprintui/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ depends_build   port:pkgconfig \
</span>                 port:automake \
                 port:libtool
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:libgnomeprint \
                 port:libgnomecanvas
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libgtkhtml/Portfile b/gnome/libgtkhtml/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 49d01a99439..2f22b61074d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libgtkhtml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libgtkhtml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@ checksums               md5 a1d1a197dcff8c4571659deef5495e24 \
</span>                         sha1 1325c1540091b89cc03d99a1e594285d2e846e50 \
                         rmd160 4f3a65b616c0fbfaaa487d11c8749718708deb2a
 depends_build           port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib             port:gtk2 port:libxml2 port:gnome-vfs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib             path:lib/pkgconfig/gtk+-2.0.pc port:libxml2 port:gnome-vfs
</span> use_bzip2               yes
 
 configure.args          --mandir=${prefix}/share/man
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libgtkhtml3/Portfile b/gnome/libgtkhtml3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a4659def192..c318da4cc71 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libgtkhtml3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libgtkhtml3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ depends_build   port:pkgconfig \
</span> depends_lib     port:libsoup \
                 port:enchant \
                 port:iso-codes \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:gconf \
                 port:orbit2 \
                 port:gnuregex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libunique/Portfile b/gnome/libunique/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f275bc8e7aa..b4340673cef 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libunique/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libunique/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ patch.pre_args      -p1
</span> 
 depends_build       port:pkgconfig
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:dbus-glib
 
 gobject_introspection yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libwnck/Portfile b/gnome/libwnck/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 718b2a216dc..9ba7cb9650b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libwnck/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libwnck/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,7 @@ depends_build   port:pkgconfig \
</span>                 port:libtool
 
 depends_lib     port:startup-notification \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:xorg-libXres
 
 require_active_variants gtk2 x11
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/linsmith/Portfile b/gnome/linsmith/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0bbe4347def..c0b8a460a94 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/linsmith/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/linsmith/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ checksums       rmd160  a3f2c18bd4d89375ac8b55fd7370a6b958d01259 \
</span> depends_build   port:pkgconfig
 
 depends_lib     path:lib/pkgconfig/cairo.pc:cairo \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:libxml2 \
                 port:libgnomeui
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/oxygen-gtk2/Portfile b/gnome/oxygen-gtk2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b7378399f9f..e8d275b5543 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/oxygen-gtk2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/oxygen-gtk2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,7 @@ if {${subport} eq "oxygen-gtk3"} {
</span>     checksums           rmd160  51360c2b16887b22d093e29fea3456210d92e335 \
                         sha256  5b6c826a9741c244dc41ff5412657b82f1f4f622e8cfc3f99e6d2aa714c1d303
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append  port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append  path:lib/pkgconfig/gtk+-2.0.pc
</span> }
 
 livecheck.type      regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/planner/Portfile b/gnome/planner/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 41a9625f482..c545b5c0843 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/planner/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/planner/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@ depends_build   port:pkgconfig \
</span>                 port:gtk-doc
 
 depends_lib     port:desktop-file-utils \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:gconf \
                 port:libgnomeui \
                 port:libgnomecanvas \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/virt-manager/Portfile b/gnome/virt-manager/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6be43c433b3..1b20cdbf737 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/virt-manager/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/virt-manager/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,7 @@ python.default_version  39
</span> 
 depends_build \
     port:intltool \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    path:lib/pkgconfig/gtk+-2.0.pc \
</span>     port:python${python.version} \
     port:py${python.version}-docutils \
     bin:podman:perl5 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/vte-gtk2-compat/Portfile b/gnome/vte-gtk2-compat/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 78ffab98e61..7c39b948063 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/vte-gtk2-compat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/vte-gtk2-compat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ depends_build   port:pkgconfig \
</span>                 port:automake \
                 port:libtool
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 gobject_introspection no
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/g3data/Portfile b/graphics/g3data/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 14e62b21cef..c3ca79c7558 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/g3data/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/g3data/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ checksums               md5     21c37526dff8601d699fa511c9d5bc36 \
</span>                         rmd160  010c4f1ff9eb034aa85691cc182432a1c0972677
 
 depends_build           port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib             port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib             path:lib/pkgconfig/gtk+-2.0.pc
</span> #port:openjade
 
 patchfiles              patch-Makefile.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gegl-0.3/Portfile b/graphics/gegl-0.3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 47230d39bef..30ee1322f24 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gegl-0.3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gegl-0.3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,7 @@ depends_build-append \
</span> 
 depends_lib-append  port:babl \
                     port:gdk-pixbuf2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     path:include/turbojpeg.h:libjpeg-turbo \
                     port:lua \
                     path:bin/dot:graphviz \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2-devel/Portfile b/graphics/gimp2-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 17d75065db0..e385024482d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +47,7 @@ depends_lib         port:desktop-file-utils \
</span>                     port:atk \
                     port:gdk-pixbuf2 \
                     port:glib-networking \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:fontconfig \
                     port:freetype \
                     port:tiff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/Portfile b/graphics/gimp2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 89038b0db48..eeebaf011d1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,7 @@ depends_lib         port:desktop-file-utils \
</span>                     port:atk \
                     port:gdk-pixbuf2 \
                     port:glib-networking \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:fontconfig \
                     port:freetype \
                     port:tiff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gpick/Portfile b/graphics/gpick/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3788da0f5e9..ee3024172af 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gpick/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gpick/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,7 @@ depends_build-append    port:pkgconfig \
</span> 
 depends_lib-append      port:expat \
                         port:gettext \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        path:lib/pkgconfig/gtk+-2.0.pc \
</span>                         port:lua
 
 use_configure           no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gqview/Portfile b/graphics/gqview/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 60db6e62dda..a061d25a5b6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gqview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gqview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,5 +12,5 @@ homepage  http://gqview.sourceforge.net/
</span> master_sites      sourceforge
 checksums      md5 7196deab04db94cec2167637cddc02f9
 depends_build  port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib        path:lib/pkgconfig/gtk+-2.0.pc
</span> configure.args  --mandir=${prefix}/share/man
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphviz-devel/Portfile b/graphics/graphviz-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9d60487e1f0..bccc591a63b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/graphviz-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/graphviz-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -233,7 +233,7 @@ variant java description {Include Java language bindings} {
</span> 
 variant smyrna description {Include the Smyrna large graph viewer} {
     depends_lib-append          port:freeglut \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                path:lib/pkgconfig/gtk+-2.0.pc \
</span>                                 port:gtkglext \
                                 port:libglade2
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -257,7 +257,7 @@ variant rsvg description {enable the rsvg plugin} {
</span> }
 
 variant gdk_pixbuf description {enable the gdk_pixbuf plugin} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append          port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append          path:lib/pkgconfig/gtk+-2.0.pc
</span> 
     configure.args-replace      --without-gdk-pixbuf --with-gdk-pixbuf
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/graphviz/Portfile b/graphics/graphviz/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 74a5a370570..2cdb2c4932a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/graphviz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/graphviz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -233,7 +233,7 @@ variant java description {Include Java language bindings} {
</span> 
 variant smyrna description {Include the Smyrna large graph viewer} {
     depends_lib-append          port:freeglut \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                                port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                path:lib/pkgconfig/gtk+-2.0.pc \
</span>                                 port:gtkglext \
                                 port:libglade2
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -257,7 +257,7 @@ variant rsvg description {enable the rsvg plugin} {
</span> }
 
 variant gdk_pixbuf description {enable the gdk_pixbuf plugin} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append          port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append          path:lib/pkgconfig/gtk+-2.0.pc
</span> 
     configure.args-replace      --without-gdk-pixbuf --with-gdk-pixbuf
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/mtpaint/Portfile b/graphics/mtpaint/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b31eeeaa24b..84a717d745b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/mtpaint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/mtpaint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@ checksums               md5 fbe34eb25f96b6092403115f1f6ab387 \
</span>                         rmd160 94243d246cef12e09c33b728ef37b16594d40813
 
 depends_build           port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib             port:libpng port:gtk2 port:freetype
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib             port:libpng path:lib/pkgconfig/gtk+-2.0.pc port:freetype
</span> 
 patchfiles              patch-configure.diff \
                         patch-png.c.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/nip2/Portfile b/graphics/nip2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b89efedde8c..d7e27ba093f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/nip2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/nip2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,6 +26,6 @@ depends_build       port:flex \
</span> depends_lib         port:fftw-3 \
                     path:bin/dot:graphviz \
                     port:vips \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:goffice08 \
                     port:gsl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/osm-gps-map-gtk2/Portfile b/graphics/osm-gps-map-gtk2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4ed658ae377..d4616e91d9e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/osm-gps-map-gtk2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/osm-gps-map-gtk2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ depends_build   port:pkgconfig \
</span>                 port:gtk-doc
 
 depends_lib     port:libsoup \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 patchfiles      patch-Makefile.am.diff
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/pdf2svg/Portfile b/graphics/pdf2svg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 777943d2846..5259161c15f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/pdf2svg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/pdf2svg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,5 +18,5 @@ checksums           rmd160  dfe9aaf5acb0d084e9050cd7d9a7fd5550ee53de \
</span>                     sha256  7fb6aeee889b1c7a47312d12ab092e5ec905e2269b088fb5cb5f7ecc8604ad31
 
 depends_build       port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:poppler
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/qiv/Portfile b/graphics/qiv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d94c9deada3..5563fa3d62c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/qiv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/qiv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ checksums           rmd160  0ebbe5b6dfa64f363595c3f6da6071134fc5a8d3 \
</span> 
 depends_build       port:pkgconfig
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:imlib2 \
                     port:lcms2 \
                     port:libexif \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/rawstudio/Portfile b/graphics/rawstudio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b218102d557..02c84cb2b7c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/rawstudio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/rawstudio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ checksums       md5     25399cd80294fa44220a8940fc77689f \
</span>                 sha1    9ce96c40e0b8feaf4627c14310646782578d4da1 \
                 rmd160  035d80c9da44a7928d240f0b06473e8cd3efcebd
 depends_build   port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:gconf \
                 port:lcms \
                 port:exiv2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/ufraw/Portfile b/graphics/ufraw/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1fe6ce3554e..e5bd1c61230 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/ufraw/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/ufraw/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ depends_build       port:pkgconfig \
</span> depends_lib         port:cfitsio \
                     port:dcraw \
                     port:exiv2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:gtkimageview \
                     path:lib/pkgconfig/gimpui-2.0.pc:gimp2 \
                     port:jasper \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,10 +67,10 @@ variant x11 conflicts quartz {}
</span> variant quartz conflicts x11 {}
 
 if {[variant_isset quartz]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    require_active_variants port:gtk2 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    require_active_variants path:lib/pkgconfig/gtk+-2.0.pc quartz
</span> } else {
     default_variants +x11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    require_active_variants port:gtk2 x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    require_active_variants path:lib/pkgconfig/gtk+-2.0.pc x11
</span> }
 
 post-destroot {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/wxWidgets-2.8/Portfile b/graphics/wxWidgets-2.8/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 14131b768f8..62fcf896184 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/wxWidgets-2.8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/wxWidgets-2.8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,7 +118,7 @@ if {${wxWidgets.sdk} eq ""} {
</span> if {${name} ne ${subport}} {
     depends_build-append    port:pkgconfig
     depends_lib-append      path:lib/pkgconfig/cairo.pc:cairo \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            path:lib/pkgconfig/gtk+-2.0.pc \
</span>                             port:libGLU \
                             port:mesa \
                             port:libsdl \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/wxWidgets-3.0/Portfile b/graphics/wxWidgets-3.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0763943bb23..540fdc962c4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/wxWidgets-3.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/wxWidgets-3.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -196,7 +196,7 @@ if {${subport} eq "wxPython-3.0"} {
</span>     configure.args-append   --with-sdl
 
     #variant gtk2 conflicts gtk3 description {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    #    depends_lib-append      port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    #    depends_lib-append      path:lib/pkgconfig/gtk+-2.0.pc
</span>     #    configure.args-append   --with-gtk=2
     #    set wxtype              gtk2
     #}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/xsane/Portfile b/graphics/xsane/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 23be1c8bc7b..44b8b7e7e48 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/xsane/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/xsane/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,7 @@ checksums       rmd160  3799a599ddf06b0ca297b2270b50d4b93e1f0e12 \
</span> depends_build   port:pkgconfig
 depends_lib     path:lib/pkgconfig/gimp-2.0.pc:gimp2 \
                 path:include/turbojpeg.h:libjpeg-turbo \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:libpng \
                 port:sane-backends \
                 port:lcms
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/hexchat/Portfile b/irc/hexchat/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9988750713b..8274949fcb7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/hexchat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/hexchat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,7 @@ depends_build-append \
</span>                     port:pkgconfig \
                     port:python37
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:dbus-glib \
                     port:libproxy \
                     port:libnotify \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/gnu-classpath/Portfile b/java/gnu-classpath/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5ede4a0b857..fd64fdfbd0c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/gnu-classpath/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/gnu-classpath/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ configure.args  --mandir=${prefix}/share/man \
</span>                 --with-antlr-jar=${prefix}/lib/antlr.jar
 
 variant gtk {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      path:lib/pkgconfig/gtk+-2.0.pc \
</span>                             port:gconf
 
     configure.args-delete   --disable-gtk-peer \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/qtcurve/Portfile b/kde/qtcurve/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index deccd20b85f..d1320662743 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/qtcurve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/qtcurve/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,7 +79,7 @@ subport ${name}-gtk2 {
</span>         }
     }
     depends_build-append    port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      path:lib/pkgconfig/gtk+-2.0.pc
</span>     depends_run-append      port:perl5
     configure.args-delete   -DQTC_ENABLE_X11:BOOL=OFF
     configure.args-append   -DENABLE_GTK2:BOOL=ON -DQTC_ENABLE_X11:BOOL=ON \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/eiffelstudio/Portfile b/lang/eiffelstudio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e1cae7c1984..0c44145d5f6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/eiffelstudio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/eiffelstudio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,7 @@ master_sites      sourceforge:eiffelstudio:source \
</span>                   ftp://ftp.eiffel.com/pub/beta/nightly:source \
                   http://ftp.eiffel.com/pub/beta/nightly:source \
                   http://www.jann-roeder.net/download/:launcher
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib       port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib       path:lib/pkgconfig/gtk+-2.0.pc
</span> depends_build     bin:bzip2:bzip2 \
                   port:pkgconfig
 use_tar           yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/falcon/Portfile b/lang/falcon/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 15d89040d78..1f63fae5fb5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/falcon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/falcon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@ homepage            http://www.falconpl.org
</span> platforms           darwin
 depends_lib-append  port:curl \
                     port:freetype \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 master_sites        ${homepage}/project_dl/_official_rel/
 distname            Falcon-${version}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gauche-gtk/Portfile b/lang/gauche-gtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index eeb78d2c447..160f9affb50 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gauche-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gauche-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ master_sites      sourceforge:gauche
</span> distname  Gauche-gtk-$version
 extract.suffix .tgz
 checksums      md5 18356efab446b9524be8371a3b852a6a
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2 port:gauche
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib        path:lib/pkgconfig/gtk+-2.0.pc port:gauche
</span> 
 known_fail  yes
 pre-fetch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gst/Portfile b/lang/gst/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 49da38d3455..b055b82ae0e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gst/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gst/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +69,7 @@ test.target             check
</span> default_variants +gtk +tcltk
 
 variant gtk description {enable GTK+ bindings} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append  port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append  path:lib/pkgconfig/gtk+-2.0.pc
</span>     configure.args-replace \
                         --disable-gtk \
                         --enable-gtk
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/kaffe/Portfile b/lang/kaffe/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2bdf93b54ad..30b285cb118 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/kaffe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/kaffe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,7 @@ depends_build       port:jikes \
</span>                     port:pkgconfig
 depends_lib         port:esound \
                     port:gmp \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libart_lgpl \
                     port:freetype \
                     port:xorg-libXtst \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/mdk/Portfile b/lang/mdk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 83f081e05bd..4bcb81070b7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/mdk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/mdk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +64,7 @@ variant gui description "Build the GTK+ user interface" {
</span>                     --disable-gui
 
     depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libglade2
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/pike/Portfile b/lang/pike/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5951b33f3e2..3e56a241160 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/pike/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/pike/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +71,7 @@ variant postgresql description {Postgres database support for Pike} {
</span> 
 variant gtk description {GTK support for Pike} {
     configure.args-append --with-gtk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc
</span> }
 
 variant opengl description {OpenGL support for Pike} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/claws-mail/Portfile b/mail/claws-mail/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7c1e27c86c8..39865b6680c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/claws-mail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/claws-mail/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@ use_autoreconf  yes
</span> autoreconf.args -fvi
 depends_build-append    port:pkgconfig
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:libetpan \
                 port:gpgme \
                 port:compface \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/sylpheed/Portfile b/mail/sylpheed/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1f3fe08f136..49ca4ff06cf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/sylpheed/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/sylpheed/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ checksums           rmd160  9ecf4bee6718f6499533abb464638af6c39e595c \
</span> 
 depends_build       port:pkgconfig
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 configure.args      --disable-compface \
                     --disable-gpgme \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/fyre/Portfile b/math/fyre/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 97543c55563..af60a8c0283 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/fyre/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/fyre/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@ checksums md5 44d5830c527325c1ee6fa6ea92b4ba03 \
</span> depends_build \
                port:pkgconfig
 depends_lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           path:lib/pkgconfig/gtk+-2.0.pc \
</span>           port:desktop-file-utils \
                port:shared-mime-info \
                port:libglade2
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/gfm/Portfile b/math/gfm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8940fdc5eb9..8fc3ae0f747 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/gfm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/gfm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@ depends_lib         port:libiconv \
</span>                     port:libticables2 \
                     port:libticalcs2 \
                     port:gettext \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libglade2
 
 configure.args      --without-kde
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/gtkdatabox/Portfile b/math/gtkdatabox/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a0c2ddc133d..065f55cc54a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/gtkdatabox/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/gtkdatabox/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,7 @@ checksums           md5 910921da2198ebd02ea8a7eb622916ce \
</span>                     rmd160 9838387ac6c69cea5a8e024828f588f15028878e
 
 depends_build       port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 patchfiles          enable-deprecated.diff
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/tiemu3/Portfile b/math/tiemu3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fed6c2b561e..ae32829acce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/tiemu3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/tiemu3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ depends_lib         port:libiconv \
</span>                     port:libticables2 \
                     port:libticalcs2 \
                     port:gettext \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libglade2 \
                     port:libsdl
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/tilp2/Portfile b/math/tilp2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0c1f1c07de4..dce5cd3cea5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/tilp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/tilp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ depends_lib         port:libiconv \
</span>                     port:libticables2 \
                     port:libticalcs2 \
                     port:gettext \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libglade2
 
 use_autoreconf      yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/hdhomerun_gui/Portfile b/multimedia/hdhomerun_gui/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 588c41f59e2..5db04244338 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/hdhomerun_gui/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/hdhomerun_gui/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,10 +31,10 @@ worksrcdir          hdhomerun_config_gui
</span> 
 depends_build       port:pkgconfig
 depends_lib         port:hdhomerun \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:gtk-osx-application-gtk2
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-require_active_variants port:gtk2 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+require_active_variants path:lib/pkgconfig/gtk+-2.0.pc quartz
</span> 
 post-build {
 # no execute permission, will refuse to run with "Error 126", Permission denied
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mjpegtools/Portfile b/multimedia/mjpegtools/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 872fb08d3da..055072742aa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mjpegtools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mjpegtools/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@ checksums           rmd160  b63a26442e440512d946c4591ee604689f6e8159 \
</span> depends_build       port:pkgconfig
 
 depends_lib         path:lib/libquicktime.dylib:libquicktime-devel \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     path:include/turbojpeg.h:libjpeg-turbo \
                     port:libdv \
                     port:libpng \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mlt/Portfile b/multimedia/mlt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a20ea3f9ed7..9c55619f8fb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mlt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mlt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -147,7 +147,7 @@ if {${universal_possible} && [variant_isset universal]} {
</span> 
 variant gtk2 description {include the gtk2 module (for additional image and text producers)} {
     configure.args-delete   --disable-gtk2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      path:lib/pkgconfig/gtk+-2.0.pc
</span>     require_active_variants gtk2 x11
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/avahi/Portfile b/net/avahi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2fd1e2abe78..e228fdff97b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/avahi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/avahi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -151,7 +151,7 @@ variant test description {Build tests} {
</span> }
 
 variant gtk description {Build with GTK2} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      path:lib/pkgconfig/gtk+-2.0.pc \
</span>                             port:libglade2
     configure.args-replace  --disable-gtk --enable-gtk
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/gajim/Portfile b/net/gajim/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ebc3fcb848a..eca134c3d07 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/gajim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/gajim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ depends_build       port:intltool \
</span>                     port:automake \
                     port:libtool
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:gtkspell2 \
                     port:py27-pygtk \
                     port:py27-docutils \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/gftp/Portfile b/net/gftp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 84f011bf6c1..4d4a8db9af1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/gftp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/gftp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ checksums       md5 44b19442d06f6dc68c7211d66029d826 \
</span>                 rmd160 0e0daea8543ae822b25635647360193362a2648d
 
 depends_build   port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:gettext \
                 path:lib/libssl.dylib:openssl \
                 port:readline \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/gq/Portfile b/net/gq/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1cc469da327..e7aecdd7239 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/gq/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/gq/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@ depends_build   port:intltool \
</span>                 port:pkgconfig
 
 depends_lib     path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:expat \
                 port:openldap \
                 path:lib/libssl.dylib:openssl \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/gtk-gnutella/Portfile b/net/gtk-gnutella/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 06dcdf3cc66..8eeb576a9ce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/gtk-gnutella/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/gtk-gnutella/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,7 @@ checksums md5     d44e1af3441fb07a5e5712b0d522fae5 \
</span> 
 use_bzip2      yes
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:libxml2 port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib        port:libxml2 path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 depends_build  bin:gawk:gawk port:pkgconfig
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/jigdo/Portfile b/net/jigdo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e9f0306e178..4ac50540639 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/jigdo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/jigdo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ checksums           sha1    7b83c35af71f908b31b9aa55b0dda9dfb4d224f0 \
</span> depends_run         bin:wget:wget
 
 depends_lib         port:libwww \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libiconv
 
 patchfiles          patch-src-compat.hh.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/logjam/Portfile b/net/logjam/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 192c85484a2..cef67983908 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/logjam/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/logjam/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ depends_build       port:intltool \
</span> depends_lib         port:curl \
                     port:dbus \
                     port:dbus-glib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libxml2 \
                     port:sqlite3
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/pidgin/Portfile b/net/pidgin/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e897e32c72b..e85b37029f6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/pidgin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/pidgin/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -123,7 +123,7 @@ subport finch {
</span> if {${subport} eq $name} {
     depends_lib-append      port:libpurple \
                             port:audiofile \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            path:lib/pkgconfig/gtk+-2.0.pc \
</span>                             port:libao
 
     variant x11 conflicts quartz {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/tsclient/Portfile b/net/tsclient/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 76ad83ae255..5bd81837473 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/tsclient/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/tsclient/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ depends_build   port:pkgconfig \
</span>                 port:intltool
 
 depends_lib    port:desktop-file-utils \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           path:lib/pkgconfig/gtk+-2.0.pc \
</span>           port:shared-mime-info
 
 depends_run     path:bin/rdesktop:rdesktop \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/wireshark22/Portfile b/net/wireshark22/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dc816160ce8..ec91f205aa5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/wireshark22/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/wireshark22/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,7 +97,7 @@ variant qt5 conflicts no_gui qt4 gtk2 gtk3 description {Build wireshark with a q
</span> variant gtk2 conflicts no_gui qt4 qt5 gtk3 description {Build wireshark with a gtk2 GUI} {
     configure.args-replace  -DBUILD_wireshark_gtk=OFF -DBUILD_wireshark_gtk=ON
     configure.args-append   -DENABLE_GTK3=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      path:lib/pkgconfig/gtk+-2.0.pc
</span>     
     # post-destroot {
     #         file mkdir ${destroot}${applications_dir}/Wireshark.app/Contents/MacOS
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/yersinia/Portfile b/net/yersinia/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 621ed6d5e4e..82bcd28a1cd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/yersinia/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/yersinia/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,7 @@ configure.args      --disable-gtk \
</span>                     --with-pcap-includes=${prefix}/include
 
 variant gtk {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append    port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append    path:lib/pkgconfig/gtk+-2.0.pc
</span>     configure.args-delete --disable-gtk
     configure.args-append --enable-gtk
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/news/pan2/Portfile b/news/pan2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 719d6bf102e..3ce37c2d699 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/news/pan2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/news/pan2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@ depends_lib         port:desktop-file-utils \
</span>                     port:pcre \
                     port:gmime \
                     port:gnutls \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:gtkspell2 \
                     port:libiconv
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,7 +47,7 @@ configure.ldflags-append \
</span>                     -liconv
 
 variant gtk3 description {Build using gtk3} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-replace port:gtk2 port:gtk3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-replace path:lib/pkgconfig/gtk+-2.0.pc port:gtk3
</span>     depends_lib-replace port:gtkspell2 port:gtkspell3
     depends_lib-append  port:gcr port:libsecret
     depends_run-append  port:adwaita-icon-theme
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/palm/jpilot/Portfile b/palm/jpilot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 980941b0e59..e029f1e4653 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/palm/jpilot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/palm/jpilot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ configure.args      --with-libiconv-prefix=${prefix} \
</span> 
 depends_build       port:intltool \
                     port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libiconv \
                     port:pilot-link
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/perl/p5-gtk2/Portfile b/perl/p5-gtk2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 306e549dff0..bb870bc6402 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/perl/p5-gtk2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/perl/p5-gtk2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ checksums           rmd160  7319bf69885aa40c4c3f5288ab7735d099b3994d \
</span> 
 if {${perl5.major} != ""} {
     depends_lib-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:p${perl5.major}-extutils-depends \
                     port:p${perl5.major}-extutils-pkgconfig \
                     port:p${perl5.major}-glib \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-gtk/Portfile b/php/php-gtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fee004d4862..801de348693 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ if {${name} != ${subport}} {
</span> 
     depends_build-append        port:pkgconfig
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append          port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append          path:lib/pkgconfig/gtk+-2.0.pc \
</span>                                 port:libglade2 \
                                 port:${php}-cairo
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +50,7 @@ if {${name} != ${subport}} {
</span>     }
 
     variant extra {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append      port:gtk2-extra
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append      path:lib/pkgconfig/gtk+-2.0.pc-extra
</span>         configure.args-append   --with-extra
     }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/gutenprint/Portfile b/print/gutenprint/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cf6da0d3147..56a5a9946f3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/gutenprint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/gutenprint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ checksums           rmd160  3a1a9a66ad376294fbb10b547ff53481a81b0337 \
</span> 
 depends_build       port:pkgconfig
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     path:lib/pkgconfig/gimp-2.0.pc:gimp2
 
 pre-fetch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-goocanvas/Portfile b/python/py-goocanvas/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index defd0632387..d2cab0b006a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-goocanvas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-goocanvas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,7 @@ if {${name} ne ${subport}} {
</span>                             port:pkgconfig
 
     depends_lib-append      port:goocanvas \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                            port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            path:lib/pkgconfig/gtk+-2.0.pc \
</span>                             port:py${python.version}-pygtk \
                             port:py${python.version}-cairo \
                             port:py${python.version}-gobject
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pygtk-devel/Portfile b/python/py-pygtk-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 31dcadb3d42..fa3ca7578bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pygtk-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pygtk-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,7 @@ if {${name} ne ${subport}} {
</span>                     port:pkgconfig
     depends_lib-append \
                     port:atk \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libglade2 \
                     port:py${python.version}-cairo \
                     port:py${python.version}-gobject \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pygtk/Portfile b/python/py-pygtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 41cad35d29b..aa8bcda349a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pygtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pygtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,7 @@ if {${name} ne ${subport}} {
</span>                     port:pkgconfig
     depends_lib-append \
                     port:atk \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libglade2 \
                     port:py${python.version}-cairo \
                     port:py${python.version}-gobject \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/chemtool/Portfile b/science/chemtool/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 99f69ff7c9b..b6783e9f716 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/chemtool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/chemtool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ checksums           rmd160  bd3560bbfe6d95f9eb5dbafbb2cc3710a52cd04c \
</span>                     sha256  86161a0461386b334a5ffb17cdf094a491941884678272f45749813514ddafcb
 
 depends_build       port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:openbabel \
                     port:fig2dev
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/crystfel/Portfile b/science/crystfel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b0053232096..25ee279e9fe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/crystfel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/crystfel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ depends_build       port:pkgconfig
</span> depends_lib         port:gsl \
                     port:fftw-3 \
                     port:gdk-pixbuf2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:hdf5 \
                     path:lib/pkgconfig/pango.pc:pango
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/geda-gaf/Portfile b/science/geda-gaf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4eb65b84dd1..272bed58540 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/geda-gaf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/geda-gaf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,7 @@ depends_build \
</span>     port:pkgconfig
 
 depends_lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    path:lib/pkgconfig/gtk+-2.0.pc \
</span>     port:guile \
     port:libffi \
     port:python27
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gfsview/Portfile b/science/gfsview/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d868fde4b19..3f5cb0de0be 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gfsview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gfsview/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ depends_build         port:pkgconfig
</span> 
 depends_lib           port:gerris \
                       port:mesa \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                      port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                      path:lib/pkgconfig/gtk+-2.0.pc \
</span>                       port:gtkglext \
                       port:ftgl \
                       port:startup-notification \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@ depends_lib           port:gerris \
</span> 
 # avoid
 #    fatal error: 'gdk/x11/gdkglx.h' file not found
<span style='display:block; white-space:pre;background:#ffe0e0;'>-require_active_variants port:gtk2 x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+require_active_variants path:lib/pkgconfig/gtk+-2.0.pc x11
</span> 
 pre-configure {
     if {[mpi_variant_isset]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ggobi/Portfile b/science/ggobi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 363ccad1d94..d6d46f1655b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ggobi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ggobi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ checksums           rmd160  26c9dff129041c479598bf6461d3b60123c625d1 \
</span> use_bzip2           yes
 
 depends_build       port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libxml2 \
                     port:gob2
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ghemical/Portfile b/science/ghemical/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 825503fee32..ee77df3fdbd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ghemical/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ghemical/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@ depends_build       port:pkgconfig \
</span>                     port:automake \
                     port:libtool
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libglade2 \
                     port:gtkglext \
                     port:openbabel \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gildas/Portfile b/science/gildas/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8058417385e..036350efd0a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gildas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gildas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,7 @@ patchfiles          patch-admin-Makefile.def.diff \
</span>                     patch-admin-gildas-env.sh.diff \
                     patch-admin-define-system.sh.diff
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libpng \
                     port:python39 \
                     port:py39-numpy
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/grig/Portfile b/science/grig/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b47b12cbce6..2ae7c69d43a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/grig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/grig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ depends_build \
</span>     port:pkgconfig
 
 depends_lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    path:lib/pkgconfig/gtk+-2.0.pc \
</span>     path:lib/libhamlib.dylib:hamlib
 
 app.create yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gwyddion/Portfile b/science/gwyddion/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a06e3f0d877..2fba57a6874 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gwyddion/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gwyddion/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ checksums           sha256  00f30e25e66dff3a7c26f5e084a6799501512963bfe13543391a
</span>                     size    4903412
 depends_build       port:pkgconfig
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libxml2 \
                     port:fftw-3 \
                     port:zlib \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/playerstage-player/Portfile b/science/playerstage-player/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a3579cc29f6..1c704cf5fe1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/playerstage-player/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/playerstage-player/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ checksums         md5     b92b5ea028e6bfc49351849f420167db \
</span> 
 depends_build-append    port:libtool port:pkgconfig
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:libpng \
                 path:lib/pkgconfig/glib-2.0.pc:glib2 \
                 port:gsl \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/viking/Portfile b/science/viking/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 21a13d29d7a..c39f37b4527 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/viking/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/viking/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ depends_build       bin:gnutar:gnutar \
</span> depends_lib         port:curl \
                     port:geoclue2 \
                     port:gpsd \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:gexiv2 \
                     port:libmagic \
                     port:liboauth
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/wcalc/Portfile b/science/wcalc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0404ff9a746..074807fff8d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/wcalc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/wcalc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ checksums           md5     62d41eac2979c1a745e4e4c7045d97c4 \
</span>                     rmd160  d59b8b3dd8a850cc33bef601a61b6aafb6116384
 
 depends_build       port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:gawk
 
 use_parallel_build  no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/xmedcon/Portfile b/science/xmedcon/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 00255dba180..2684e068c5c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/xmedcon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/xmedcon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,5 +35,5 @@ default_variants    +gtk2
</span> variant gtk2 description {Enable gtk2 gui front end} {
   configure.args-delete   --disable-gui
  
<span style='display:block; white-space:pre;background:#ffe0e0;'>-  depends_lib-append      port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+  depends_lib-append      path:lib/pkgconfig/gtk+-2.0.pc
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/gnomint/Portfile b/security/gnomint/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 49bbb8c2c76..d77a4fbaa7f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/gnomint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/gnomint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,7 @@ depends_lib         port:gconf \
</span>                     port:gettext \
                     path:lib/pkgconfig/glib-2.0.pc:glib2 \
                     port:gnutls \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libgcrypt \
                     port:readline \
                     port:sqlite3 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/hydra/Portfile b/security/hydra/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a1359daf4ab..826f0f93c88 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/hydra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/hydra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +64,7 @@ pre-destroot {
</span> 
 variant xhydra description {Add xhydra GUI} {
     depends_build-append    port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      path:lib/pkgconfig/gtk+-2.0.pc
</span>     configure.args-delete   --disable-xhydra
     pre-build {
         reinplace "s|-Wl,--allow-multiple-definition|-W|g" ${worksrcpath}/hydra-gtk/configure
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/pinentry/Portfile b/security/pinentry/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 40099f33645..df656c7cce7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/pinentry/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/pinentry/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +51,7 @@ depends_lib                 port:libiconv \
</span>                             port:libgpg-error
 
 variant gtk2 description {Enable gtk2-based pinentry tool} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      path:lib/pkgconfig/gtk+-2.0.pc
</span>     configure.args-delete   --disable-pinentry-gtk2
     configure.args-append   --enable-pinentry-gtk2 \
                             --enable-fallback-curses
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/putty/Portfile b/security/putty/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 595bc307bb4..9d30b90a468 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/putty/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/putty/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ configure.cppflags-delete -I${prefix}/include
</span> configure.cppflags-append -isystem${prefix}/include
 
 variant gui description {Build the GUI tools (including putty itself)} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append    port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append    path:lib/pkgconfig/gtk+-2.0.pc
</span>     configure.args-replace --without-gtk --with-gtk=2
     require_active_variants gtk2 x11
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/dvdisaster/Portfile b/sysutils/dvdisaster/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4685867fe3a..872d9c83330 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/dvdisaster/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/dvdisaster/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@ master_sites            ${homepage}downloads/
</span> platforms               darwin
 use_bzip2               yes
 depends_build           port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib             port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib             path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 checksums               sha1    6ed08f8e52f4b90b39134b0caf9b5f0df221b0da \
                         rmd160  63a2dcd4387bd2bfd4632270a53e4a0dfd5a692e
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/gkrellm/Portfile b/sysutils/gkrellm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1d3cbf2e524..268027e40a8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/gkrellm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/gkrellm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ use_bzip2               yes
</span> 
 depends_build           port:pkgconfig
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib             port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib             path:lib/pkgconfig/gtk+-2.0.pc \
</span>                         port:xorg-libsm
 
 patch.pre_args          -p1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/bibledit/Portfile b/textproc/bibledit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 34e15ef0885..17395c51617 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/bibledit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/bibledit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ depends_build       port:pkgconfig \
</span>                     bin:merge:rcs
 
 depends_lib         port:desktop-file-utils \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2  \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc  \
</span>                     port:sqlite3 \
                     port:git \
                     port:enchant \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/stardict/Portfile b/textproc/stardict/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 213807fd2a4..8518d141391 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/stardict/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/stardict/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ depends_build           port:gnome-doc-utils \
</span>                         port:pkgconfig
 
 depends_lib             path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        path:lib/pkgconfig/gtk+-2.0.pc \
</span>                         port:libsigcxx2
 
 # libsigcxx2 requires C++11 or newer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/xmlroff/Portfile b/textproc/xmlroff/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a56c177e0e3..58a3e50b754 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/xmlroff/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/xmlroff/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@ depends_lib-append  path:lib/pkgconfig/cairo.pc:cairo \
</span>                     port:freetype \
                     port:gdk-pixbuf2 \
                     path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:icu \
                     port:librsvg \
                     port:libxml2 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/uzbl/Portfile b/www/uzbl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6d85e7b3195..f1d7b71e94e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/uzbl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/uzbl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@ homepage            https://www.uzbl.org
</span> 
 depends_build       port:pkgconfig
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libsoup \
                     port:python27 \
                     path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/w3m/Portfile b/www/w3m/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 006c41a0b65..89d58e28635 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/w3m/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/w3m/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,7 +81,7 @@ post-destroot {
</span> variant inline_image_gtk2 description {View inline images with GTK2} {
    configure.args-delete   --disable-image
    configure.args-append   --with-imagelib=gtk2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-   depends_lib-append      port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   depends_lib-append      path:lib/pkgconfig/gtk+-2.0.pc
</span> }
 
 variant inline_image_imlib2 description {View inline images with imlib2} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit-gtk-2.0/Portfile b/www/webkit-gtk-2.0/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0e08c4596e5..c684e6f973a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit-gtk-2.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit-gtk-2.0/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,7 +128,7 @@ subport webkit-gtk3-2.0 {
</span> if {${name} eq ${subport}} {
     conflicts   webkit-gtk webkit-gtk-devel
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      path:lib/pkgconfig/gtk+-2.0.pc
</span>     configure.args-append   --with-gtk=2.0
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit-gtk/Portfile b/www/webkit-gtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3601e1d2060..264da1aa261 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,7 +138,7 @@ subport webkit-gtk3 {
</span> 
 if {${name} eq ${subport}} {
     conflicts webkit-gtk-devel webkit-gtk-2.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      path:lib/pkgconfig/gtk+-2.0.pc
</span>     configure.args-append   --with-gtk=2.0
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/aewm/Portfile b/x11/aewm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index df49a82100f..8e8643c6279 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/aewm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/aewm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ patchfiles              patch-src-Makefile
</span> use_bzip2               yes
 
 depends_build           port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib             port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib             path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 use_configure           no
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/dlume/Portfile b/x11/dlume/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d081bf5d795..f40ffecfdba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/dlume/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/dlume/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,7 @@ use_parallel_build yes
</span> depends_build \
        port:pkgconfig
 depends_lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   path:lib/pkgconfig/gtk+-2.0.pc \
</span>   port:libxml2
 
 configure.args --mandir=${prefix}/share/man
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gobby/Portfile b/x11/gobby/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 46c85404f7b..523956b90d5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gobby/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/gobby/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +28,7 @@ depends_build           port:pkgconfig \
</span>                         port:gnome-doc-utils
 
 depends_lib             path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        path:lib/pkgconfig/gtk+-2.0.pc \
</span>                         port:glibmm \
                         port:libxmlxx2 \
                         port:gtkmm \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtk-engines2/Portfile b/x11/gtk-engines2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8d1bea8f2e2..498b86b5ba8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gtk-engines2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/gtk-engines2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ depends_build   port:intltool \
</span>                 port:automake \
                 port:libtool
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 patchfiles      patch-engines-clearlooks-src-animation.c.diff \
                 patch-remove-lua-engine.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtk-nodoka-engine/Portfile b/x11/gtk-nodoka-engine/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 244c61623b4..107ed3631c9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gtk-nodoka-engine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/gtk-nodoka-engine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ checksums       md5     22227adf29231ba2b87202ac3522e70f \
</span>                 rmd160  ea837815c87a4a3a5c6e8476e31a5901733a720b
 
 depends_build   port:coreutils port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 patchfiles      patch-glib-2.32.diff
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtk-osx-tiger/Portfile b/x11/gtk-osx-tiger/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d27b4808eee..0b19be0c493 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gtk-osx-tiger/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/gtk-osx-tiger/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ checksums           md5 44e64082569351b7782658d8b358de79 \
</span>                     sha1 1fca810834e78ec3a78f91b3de6a96b32eb753ea \
                     rmd160 367818153eac0b16cce0c03a8fccd2767504063d
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 use_configure       no
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtk-sharp2/Portfile b/x11/gtk-sharp2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index df96789d6cd..1c233f4e88c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gtk-sharp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/gtk-sharp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,7 @@ depends_build       port:pkgconfig
</span> 
 depends_lib         port:atk \
                     path:lib/pkgconfig/glib-2.0.pc:glib2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libglade2 \
                     port:mono \
                     path:lib/pkgconfig/pango.pc:pango
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtk-theme-switch/Portfile b/x11/gtk-theme-switch/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d223725a3a0..805024b0e6f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gtk-theme-switch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/gtk-theme-switch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@ checksums       md5 ea213872031bebcb0f3d736352a5aae7 \
</span>                 rmd160 13c66e1fe866461fe1236230da9a3a72c138515b
 
 depends_build   port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 build.target   switch2
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtk2-extra/Portfile b/x11/gtk2-extra/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index db545d254a8..cca8963e45d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gtk2-extra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/gtk2-extra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@ homepage          http://gtkextra.sourceforge.net/
</span> master_sites              sourceforge:project/gtkextra/${version}
 distname               gtk+extra-${version}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib             port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib                path:lib/pkgconfig/gtk+-2.0.pc \
</span>                   port:libpng
 
 depends_build          port:pkgconfig
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtkextra3/Portfile b/x11/gtkextra3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 77c77704443..a194a41cb80 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gtkextra3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/gtkextra3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ homepage                http://gtkextra.sourceforge.net/
</span> master_sites            sourceforge:project/${sf_name}/${branch}
 distname                ${sf_name}-${version}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib             port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib             path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 depends_build           port:pkgconfig
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtkglarea2/Portfile b/x11/gtkglarea2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 484d461f9bd..6e660d9cf55 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gtkglarea2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/gtkglarea2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ checksums               rmd160  4672718ad1eb96317c0f98ff52d6b64bc3b90c2a \
</span> 
 depends_build           port:pkgconfig
 depends_lib             port:mesa \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 # see #42982
 require_active_variants gtk2 x11
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtkmm/Portfile b/x11/gtkmm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 080b0478bb5..2a62d5823ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gtkmm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/gtkmm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@ depends_build   port:pkgconfig \
</span>                 port:p${perl5.major}-xml-parser
 
 depends_lib     port:gdk-pixbuf2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:glibmm \
                 port:atkmm \
                 path:lib/pkgconfig/cairomm-1.0.pc:cairomm \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtkspell2/Portfile b/x11/gtkspell2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5341a1805bf..4509a9e6f5a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gtkspell2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/gtkspell2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ depends_build       port:pkgconfig \
</span> 
 depends_lib         port:enchant \
                     port:gdk-pixbuf2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 patchfiles          patch-Makefile.in.diff \
                     patch-configure.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gtkspell3/Portfile b/x11/gtkspell3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2241c276f03..5d7ccf3ed83 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gtkspell3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/gtkspell3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,7 @@ configure.args      --disable-gtk2 \
</span>                     --disable-silent-rules
 
 variant gtk2 description {Build with support for GTK+ 2} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append  port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append  path:lib/pkgconfig/gtk+-2.0.pc
</span>     configure.args-replace  --disable-gtk2 --enable-gtk2
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/gxmessage/Portfile b/x11/gxmessage/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index aa1235cace0..9d4b90d1ab8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/gxmessage/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/gxmessage/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,6 +21,6 @@ checksums           md5     7c94c714ebedbfa2db2d645cc4a4092a \
</span>                     rmd160  ee98aecfa678586573938f49e46a200c0332c72a
 
 depends_build       port:intltool port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 configure.args      --mandir=${prefix}/share/man
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/lablgtk2/Portfile b/x11/lablgtk2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c978ddc0472..e18177c4981 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/lablgtk2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/lablgtk2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@ depends_build       port:pkgconfig
</span> 
 depends_lib         port:ocaml \
                     port:ocaml-findlib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:libglade2 \
                     port:libgnomecanvas \
                     port:libgnomeui
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/libsexy/Portfile b/x11/libsexy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 22b85482225..9e3658be0b5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/libsexy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/libsexy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@ master_sites            http://releases.chipx86.com/libsexy/libsexy/
</span> 
 depends_build           port:pkgconfig
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib             port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib             path:lib/pkgconfig/gtk+-2.0.pc \
</span>                         port:libpng
 
 checksums               md5 33c079a253270ec8bfb9508e4bb30754 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/mlterm/Portfile b/x11/mlterm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 88fa5878e90..df45ea6342e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/mlterm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/mlterm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@ checksums           rmd160  9a7675a86999541b57742099a5e9eac8a539b580 \
</span> 
 depends_build       port:pkgconfig
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:xorg-libsm \
                     port:Xft2
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/nabi/Portfile b/x11/nabi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index adeb7f2d188..db64c5ba5f0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/nabi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/nabi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,7 @@ master_sites              http://kldp.net/frs/download.php/3742/
</span> distname          nabi-${version}
 
 depends_build          port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib             port:gtk2 port:libhangul
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib                path:lib/pkgconfig/gtk+-2.0.pc port:libhangul
</span> checksums         md5 8746890ea666ac1b7ae6db77993c6592
 
 post-activate {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/nimbus/Portfile b/x11/nimbus/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ea533779895..ecbf12243bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/nimbus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/nimbus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ depends_build       port:intltool \
</span>                     port:icon-naming-utils \
                     path:lib/pkgconfig/glib-2.0.pc:glib2
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 universal_variant   no
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/pcb/Portfile b/x11/pcb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2660c763dd2..8b3df9089d9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/pcb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/pcb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ depends_build       port:intltool \
</span>                     port:pkgconfig
 depends_lib         port:flex \
                     port:gd2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:gtkglext \
                     port:libGLU \
                     port:m4 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,10 +85,10 @@ variant quartz {
</span>     configure.args-append   --with-x=no
 }
 if {[variant_isset quartz]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    require_active_variants port:gtk2     quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    require_active_variants path:lib/pkgconfig/gtk+-2.0.pc     quartz
</span>     require_active_variants port:gtkglext quartz
 } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    require_active_variants port:gtk2     x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    require_active_variants path:lib/pkgconfig/gtk+-2.0.pc     x11
</span>     require_active_variants port:gtkglext "" quartz
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/rep-gtk/Portfile b/x11/rep-gtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a5defdb9eca..319acff7463 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/rep-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/rep-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ patchfiles   patch-config.guess \
</span>                    patch-rep-gtk.h \
                         patch-Makefile.in
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib      port:gtk2 port:librep
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc port:librep
</span> 
 configure.args --without-gnome --without-libglade
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/rox-filer/Portfile b/x11/rox-filer/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 17225404834..845b7773fab 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/rox-filer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/rox-filer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ checksums       md5 f31b2999ac1ec3547ba2506655bf7d3f \
</span>                 rmd160 9f0aecde32fdd9ecc39efe80bd037b95850bb38c
 
 depends_build   port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:shared-mime-info port:libxml2 path:lib/pkgconfig/glib-2.0.pc:glib2 port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     port:shared-mime-info port:libxml2 path:lib/pkgconfig/glib-2.0.pc:glib2 path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:xorg-libX11 port:xorg-libsm port:libglade2
 
 use_configure          no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/subsurface/Portfile b/x11/subsurface/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d1f0d78b529..92be467cfe6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/subsurface/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/subsurface/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ patchfiles              Makefile.patch
</span> depends_build           port:pkgconfig
 depends_lib             path:lib/pkgconfig/glib-2.0.pc:glib2 \
                         port:libxml2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                        port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                        path:lib/pkgconfig/gtk+-2.0.pc \
</span>                         port:hicolor-icon-theme \
                         port:gconf \
                         port:libdivecomputer \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xarchiver/Portfile b/x11/xarchiver/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d96ae6f52f9..809a4e302a7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xarchiver/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xarchiver/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,4 +19,4 @@ checksums       rmd160  af130364d48678ee74a818eccfc8c7de34294e20 \
</span>                 size    1003045
 
 depends_build  port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib        path:lib/pkgconfig/gtk+-2.0.pc
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xcowsay/Portfile b/x11/xcowsay/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 49988ec499d..72f5c7e9f55 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xcowsay/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xcowsay/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@ checksums               rmd160  d9e7cdc0c52f6ae03aa9eb7b967bc79c768c2822 \
</span> 
 depends_build-append    port:pkgconfig
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib             port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib             path:lib/pkgconfig/gtk+-2.0.pc \
</span>                         port:gdk-pixbuf2 \
                         port:xorg-libXmu \
                         port:xrender
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xdialog/Portfile b/x11/xdialog/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 249227582d4..79f91a99265 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xdialog/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xdialog/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ distname            Xdialog-${version}
</span> use_bzip2           yes
 
 depends_build       port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 port:libiconv port:libpng
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc port:libiconv port:libpng
</span> 
 patchfiles          LC_CTYPE.patch
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xnee/Portfile b/x11/xnee/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d9da9098ca1..40d9e839f9a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xnee/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xnee/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,6 +21,6 @@ depends_build \
</span>   port:pkgconfig
 depends_lib \
        port:xorg-libXtst \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 configure.args --disable-doc
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xournal/Portfile b/x11/xournal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 34392bc35b5..ce3abece532 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xournal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xournal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ checksums               rmd160  36a0b2bb848d4801e2b00cf2cd58c8f847488c5d \
</span> 
 depends_build           port:pkgconfig
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib             port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib             path:lib/pkgconfig/gtk+-2.0.pc \
</span>                         port:libgnomecanvas \
                         port:poppler \
                         port:zlib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/xscreensaver/Portfile b/x11/xscreensaver/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8d3e9bed7fe..2c4d5afa246 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/xscreensaver/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/xscreensaver/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,7 +23,7 @@ checksums           rmd160  cd289aa0c083c517b5e2b525dc07ebfd508cd132 \
</span> 
 depends_build       port:pkgconfig port:intltool
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 port:libglade2 port:xpm port:xorg-libXmu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc port:libglade2 port:xpm port:xorg-libXmu
</span> 
 configure.args      --with-gtk --without-motif
 configure.ldflags   -lintl
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/exo/Portfile b/xfce/exo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d0b62012ff3..2ef9f72fd8e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/exo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/exo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ perl5.branches  5.28
</span> 
 depends_build   port:intltool \
                 port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:libxfce4util \
                 port:libxfce4ui \
                 port:p${perl5.major}-uri
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/garcon/Portfile b/xfce/garcon/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1493fb70c16..b2c9bc7434c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/garcon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/garcon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,6 +27,6 @@ configure.args  --mandir=${prefix}/share/man
</span> 
 depends_build   port:intltool \
                 port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:libxfce4ui \
                 port:libxfce4util
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/gtk-xfce-engine/Portfile b/xfce/gtk-xfce-engine/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9dc2e2bd1d5..93182115ad6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/gtk-xfce-engine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/gtk-xfce-engine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,4 +20,4 @@ checksums       sha256  4a92910205881f707f2cc8d3c9b00a95feb58eb9084d932c841f3ed0
</span>                 size    331787
 
 depends_build   port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     path:lib/pkgconfig/gtk+-2.0.pc
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/libxfce4ui/Portfile b/xfce/libxfce4ui/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e49b2057083..3d9547fced1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/libxfce4ui/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/libxfce4ui/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ depends_build   port:intltool \
</span>                 port:pkgconfig \
                 port:perl5.28
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 port:gtk3 \
                 port:libxfce4util \
                 port:xfconf \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/mousepad/Portfile b/xfce/mousepad/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 65b6d2197cf..b617fc7f2bc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/mousepad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/mousepad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ depends_build       port:desktop-file-utils \
</span>                     path:lib/pkgconfig/glib-2.0.pc:glib2 \
                     port:intltool \
                     port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib         port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib         path:lib/pkgconfig/gtk+-2.0.pc \
</span>                     port:gtksourceview2 \
                     port:libxfce4ui \
                     port:libxfce4util
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/ristretto/Portfile b/xfce/ristretto/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e725aec7a9d..17a01aa7aa5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/ristretto/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/ristretto/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ checksums       sha256  3a0be4526c93ec0ebbf2e63e69dd0c98f16b20b863d3b6426272592e
</span>                 size    581374
 
 depends_build   port:intltool port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2 port:xfconf path:lib/pkgconfig/cairo.pc:cairo port:libxfce4util \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     path:lib/pkgconfig/gtk+-2.0.pc port:xfconf path:lib/pkgconfig/cairo.pc:cairo port:libxfce4util \
</span>                 port:libxfce4ui port:libexif port:dbus-glib port:desktop-file-utils
 
 post-activate {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/squeeze/Portfile b/xfce/squeeze/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4ec1fb04949..544db58462b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/squeeze/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/squeeze/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,6 +21,6 @@ checksums       md5 bd3cb0648b49be1f146fc4f675606176 \
</span>                 sha256 7b8dc13e0adf72c67bba12e1ed1285ec820946e65d0eec247f7bd159a2cfac2d
 
 depends_build   port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2 port:libxfce4util port:dbus-glib port:Thunar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     path:lib/pkgconfig/gtk+-2.0.pc port:libxfce4util port:dbus-glib port:Thunar
</span> 
 patchfiles      patch-internals.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/vte-gtk2-xfce/Portfile b/xfce/vte-gtk2-xfce/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 319781d6faa..59685693fce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/vte-gtk2-xfce/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/vte-gtk2-xfce/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ depends_build   port:pkgconfig \
</span>                 port:automake \
                 port:libtool
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 gobject_introspection no
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/xfce4-terminal/Portfile b/xfce/xfce4-terminal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 87e7cff890f..87b96940713 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/xfce4-terminal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/xfce4-terminal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ checksums       sha256  62140f8956d9c9aa4d483cf6cfbf6d76749b0f1feb47fa8413f0972e
</span> configure.perl  ${prefix}/bin/perl5.28
 
 depends_build   port:intltool port:pkgconfig port:perl5.28
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:exo port:vte-gtk2-xfce port:dbus port:gtk2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     port:exo port:vte-gtk2-xfce port:dbus path:lib/pkgconfig/gtk+-2.0.pc \
</span>                 path:lib/pkgconfig/glib-2.0.pc:glib2 port:hicolor-icon-theme \
                 port:desktop-file-utils port:vte port:libxfce4ui
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/xfconf/Portfile b/xfce/xfconf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8d08bd1f6d1..09accb7c7d1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/xfconf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/xfconf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ depends_build   port:xfce4-dev-tools port:intltool port:pkgconfig
</span> depends_lib     port:libxfce4util \
                 port:dbus port:dbus-glib \
                 port:xorg-libsm port:xorg-libX11 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                port:gtk2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                path:lib/pkgconfig/gtk+-2.0.pc
</span> 
 # remove INTLTOOL_PERL
 pre-configure   { system -W ${worksrcpath} "xdt-autogen" }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/xfce/xfwm4/Portfile b/xfce/xfwm4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3feeead048d..6f4d3fa3769 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/xfce/xfwm4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/xfce/xfwm4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,6 +24,6 @@ patchfiles      patch-stacking4nonX11.diff
</span> 
 configure.args  --enable-randr --enable-startup-notification \
                 --disable-compositor --disable-xsync
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib     port:xfconf port:gtk2 port:dbus-glib port:libwnck \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib     port:xfconf path:lib/pkgconfig/gtk+-2.0.pc port:dbus-glib port:libwnck \
</span>                 port:libglade2 port:libxfce4ui
 depends_build   port:intltool port:xfce4-dev-tools port:pkgconfig
</pre><pre style='margin:0'>

</pre>