<pre style='margin:0'>
Mohamed Akram (mohd-akram) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cb0edd79d8b2c059ee8974837d29d1518e885571">https://github.com/macports/macports-ports/commit/cb0edd79d8b2c059ee8974837d29d1518e885571</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 cb0edd79d8b gtk{2,3}{,-devel}: Use GTK3 version of `gtk-update-icon-cache` by default
</span>cb0edd79d8b is described below

<span style='display:block; white-space:pre;color:#808000;'>commit cb0edd79d8b2c059ee8974837d29d1518e885571
</span>Author: QwertyChouskie <qwertychouskie@users.noreply.github.com>
AuthorDate: Fri Dec 20 23:29:54 2024 -0800

<span style='display:block; white-space:pre;color:#404040;'>    gtk{2,3}{,-devel}: Use GTK3 version of `gtk-update-icon-cache` by default
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * GTK2 applications: Use `gtk-update-icon-cache-2.0`
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * GTK3 applications: Use `gtk-update-icon-cache`
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    As opposed to `gtk-update-icon-cache-3.0`
</span>---
 audio/easytag/Portfile                             |  2 +-
 cad/xgsch2pcb/Portfile                             |  2 +-
 databases/gcstar/Portfile                          |  2 +-
 databases/libgda5/Portfile                         |  2 +-
 devel/geany/Portfile                               |  2 +-
 devel/giggle/Portfile                              |  2 +-
 devel/glade/Portfile                               |  2 +-
 devel/glade3/Portfile                              |  2 +-
 editors/abiword-x11/Portfile                       |  2 +-
 editors/bluefish/Portfile                          |  2 +-
 editors/l3afpad/Portfile                           |  2 +-
 editors/leafpad/Portfile                           |  2 +-
 emulators/gelide/Portfile                          |  2 +-
 games/pioneers/Portfile                            |  2 +-
 gnome/adwaita-icon-theme/Portfile                  |  3 +-
 .../files/patch-configure.ac.diff                  | 11 --------
 gnome/alacarte/Portfile                            |  2 +-
 gnome/anjuta/Portfile                              |  2 +-
 gnome/balsa/Portfile                               |  2 +-
 gnome/baobab/Portfile                              |  2 +-
 gnome/dconf-editor/Portfile                        |  2 +-
 gnome/devhelp/Portfile                             |  2 +-
 gnome/dia/Portfile                                 |  2 +-
 gnome/empathy/Portfile                             |  2 +-
 gnome/eog/Portfile                                 |  2 +-
 gnome/evince/Portfile                              |  2 +-
 gnome/file-roller/Portfile                         |  2 +-
 gnome/frogr/Portfile                               |  2 +-
 gnome/gcr/Portfile                                 |  2 +-
 gnome/gdm/Portfile                                 |  2 +-
 gnome/genius/Portfile                              |  4 +--
 gnome/ghex/Portfile                                |  2 +-
 gnome/gitg/Portfile                                |  2 +-
 gnome/glabels/Portfile                             |  2 +-
 gnome/glom/Portfile                                |  2 +-
 gnome/gnome-applets/Portfile                       |  2 +-
 gnome/gnome-calendar/Portfile                      |  2 +-
 gnome/gnome-characters/Portfile                    |  2 +-
 gnome/gnome-chemistry-utils/Portfile               |  4 +--
 gnome/gnome-chess/Portfile                         |  2 +-
 gnome/gnome-control-center/Portfile                |  2 +-
 gnome/gnome-internet-radio-locator/Portfile        |  2 +-
 gnome/gnome-maps/Portfile                          |  2 +-
 gnome/gnome-mud/Portfile                           |  2 +-
 gnome/gnome-music/Portfile                         |  2 +-
 gnome/gnome-panel/Portfile                         |  2 +-
 gnome/gnome-photo-print/Portfile                   |  2 +-
 gnome/gnome-photos/Portfile                        |  2 +-
 gnome/gnome-radio/Portfile                         |  2 +-
 gnome/gnome-session/Portfile                       |  2 +-
 gnome/gnome-settings-daemon/Portfile               |  2 +-
 gnome/gnome-sudoku/Portfile                        |  2 +-
 gnome/gnome-system-log/Portfile                    |  4 +--
 gnome/gnome-themes-extra/Portfile                  |  2 --
 .../files/patch-configure.ac.diff                  | 11 --------
 gnome/gnome-weather/Portfile                       |  2 +-
 gnome/gnome/Portfile                               |  2 +-
 gnome/gnucash/Portfile                             |  2 +-
 gnome/gnumeric/Portfile                            |  4 +--
 gnome/grisbi/Portfile                              |  2 +-
 gnome/gthumb/Portfile                              |  2 +-
 gnome/gtk-internet-radio-locator/Portfile          |  2 +-
 gnome/gtk-radio/Portfile                           |  2 +-
 gnome/gtk2-devel/Portfile                          |  8 ++++--
 gnome/gtk2/Portfile                                |  8 ++++--
 gnome/gtk3-devel/Portfile                          | 32 ++++++++++++++++++----
 gnome/gtk3/Portfile                                | 32 ++++++++++++++++++----
 gnome/gtkdbfeditor/Portfile                        |  2 +-
 gnome/libpeas/Portfile                             |  2 +-
 gnome/liferea/Portfile                             |  2 +-
 gnome/notekit/Portfile                             |  2 +-
 gnome/planner/Portfile                             |  2 +-
 gnome/polari/Portfile                              |  2 +-
 gnome/regexxer/Portfile                            |  2 +-
 gnome/regexxer/files/patch-configure.ac.diff       |  2 +-
 gnome/seahorse/Portfile                            |  2 +-
 gnome/totem/Portfile                               |  2 +-
 gnome/xchat-gnome/Portfile                         |  2 +-
 graphics/MyPaint/Portfile                          |  2 +-
 graphics/agave/Portfile                            |  2 +-
 graphics/gimp2-devel/Portfile                      |  2 +-
 graphics/gimp2/Portfile                            |  2 +-
 graphics/gimp3-devel/Portfile                      |  2 +-
 graphics/inkscape-devel/Portfile                   |  2 +-
 graphics/inkscape/Portfile                         |  2 +-
 graphics/photoqt/Portfile                          |  2 +-
 irc/hexchat/Portfile                               |  2 +-
 math/cadabra2/Portfile                             |  2 +-
 math/pspp-devel/Portfile                           |  4 +--
 math/pspp/Portfile                                 |  4 +--
 net/grsync/Portfile                                |  2 +-
 net/pidgin/Portfile                                |  2 +-
 net/transmission-x11/Portfile                      |  2 +-
 science/chemical-mime-data/Portfile                |  2 +-
 sysutils/gsmartcontrol/Portfile                    |  2 +-
 textproc/meld/Portfile                             |  2 +-
 www/midori/Portfile                                |  2 +-
 xfce/mousepad/Portfile                             |  2 +-
 xfce/ristretto/Portfile                            |  2 +-
 xfce/xfce4-terminal/Portfile                       |  2 +-
 100 files changed, 165 insertions(+), 138 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/easytag/Portfile b/audio/easytag/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ba3ca00dd49..f97b45dd243 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/easytag/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/easytag/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,7 +87,7 @@ subport easytag-devel {
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
 
<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 bc4f1d494bd..4f99a1eeaf5 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;'>@@ -50,5 +50,5 @@ configure.args      --disable-update-desktop-database
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache-2.0 -f -t ${prefix}/share/icons/hicolor"
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/gcstar/Portfile b/databases/gcstar/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7a56e5e994a..f2d665bc154 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/gcstar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/gcstar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,7 +86,7 @@ destroot {
</span> post-activate {
     system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span> }
 
 app.icon                gcstar/share/gcstar/icons/GCstar.ico
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/libgda5/Portfile b/databases/libgda5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2650926b319..711dedd1ae8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/libgda5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/libgda5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -221,7 +221,7 @@ To view the Gda Browser Help manual, use
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span> }
 
 livecheck.type          gnome
<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 594f7ffc4d0..b967ba11c0a 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;'>@@ -91,7 +91,7 @@ app.executable      ${filespath}/launch
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span> }
 
 livecheck.type      regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/giggle/Portfile b/devel/giggle/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1cde7142567..5ad1cb57b5b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/giggle/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/giggle/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ depends_lib         port:desktop-file-utils \
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache-2.0 -f -t ${prefix}/share/icons/hicolor"
</span> }
 
 livecheck.type      gnome
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/glade/Portfile b/devel/glade/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1a8009d4a3b..931b2867c46 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/glade/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/glade/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,7 +126,7 @@ To view the Glade Interface Designer Manual (GTK+ 3 version), use
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span> }
 
 variant x11 conflicts quartz {
<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 ff37fd805de..bbec967ca87 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;'>@@ -100,7 +100,7 @@ To view the Glade Interface Designer Manual (GTK+ 2 version), use
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache-2.0 -f -t ${prefix}/share/icons/hicolor"
</span> }
 
 livecheck.type      gnome
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/abiword-x11/Portfile b/editors/abiword-x11/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f6d7e6e4bb7..12a170019ec 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/abiword-x11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/abiword-x11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,6 +104,6 @@ variant evolution description "Enable Evolution data server" {
</span> # }
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/bluefish/Portfile b/editors/bluefish/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9322981a5d4..285efc367dd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/bluefish/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/bluefish/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,7 +86,7 @@ if {[variant_isset quartz]} {
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span> }
 
 livecheck.type      regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/editors/l3afpad/Portfile b/editors/l3afpad/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e485c109f16..9833d396a8b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/editors/l3afpad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/editors/l3afpad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,5 +34,5 @@ autoreconf.args -fvi
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span> }
<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 227811b9dfe..19be3ebed94 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;'>@@ -35,7 +35,7 @@ autoreconf.args -fvi
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache-2.0 -f -t ${prefix}/share/icons/hicolor"
</span> }
 
 livecheck.type  regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/gelide/Portfile b/emulators/gelide/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 33aad14a7a6..62359948d48 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/gelide/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/gelide/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,7 +65,7 @@ configure.args          --disable-scrollkeeper
</span> post-activate {
     system "${prefix}/bin/scrollkeeper-update"
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache-2.0 -f -t ${prefix}/share/icons/hicolor"
</span> }
 
 # Last release was in 2011. No new releases are expected.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/games/pioneers/Portfile b/games/pioneers/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 14445d9171b..24c2340f30a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/games/pioneers/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/games/pioneers/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +61,7 @@ post-configure {
</span> }
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 --ignore-theme-index ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache --ignore-theme-index ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/update-mime-database -V ${prefix}/share/mime"
     system "${prefix}/bin/gdk-pixbuf-query-loaders > ${prefix}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/adwaita-icon-theme/Portfile b/gnome/adwaita-icon-theme/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3cc84ff7456..eb54cd2ba51 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/adwaita-icon-theme/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/adwaita-icon-theme/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,8 +33,7 @@ depends_lib-append \
</span>                     path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
                     path:lib/pkgconfig/librsvg-2.0.pc:librsvg
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append   patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    patch-adwaita-icon-theme-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-adwaita-icon-theme-makefile.diff
</span> 
 use_autoreconf      yes
 autoreconf.args     -fvi
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/adwaita-icon-theme/files/patch-configure.ac.diff b/gnome/adwaita-icon-theme/files/patch-configure.ac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9652769893a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/adwaita-icon-theme/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig      2016-09-21 03:07:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac   2016-09-21 08:24:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,7 +30,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST([install_sizes], ["8x8 16x16 22x22 24x24 32x32 48x48 64x64 96x96 256x256 512x512"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_PROG_LN_S
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache-3.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # need git, icontool, and inkscape for rendering
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- allow_rendering=yes
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/alacarte/Portfile b/gnome/alacarte/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d32851b409f..0cde4defc8a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/alacarte/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/alacarte/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,7 +83,7 @@ notes "
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span> }
 
 livecheck.type      gnome
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/anjuta/Portfile b/gnome/anjuta/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4ec72ce9be3..5d5beef4a55 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/anjuta/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/anjuta/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -175,7 +175,7 @@ if {![variant_isset quartz] && ![variant_isset x11]} {
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/balsa/Portfile b/gnome/balsa/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1b5927cad9c..ae97920fa48 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/balsa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/balsa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +73,7 @@ configure.cflags-append -D_DARWIN_C_SOURCE
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span> }
 
 livecheck.type      regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/baobab/Portfile b/gnome/baobab/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8837746e967..06a91426780 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/baobab/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/baobab/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,7 @@ configure.args      --disable-schemas-compile \
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/dconf-editor/Portfile b/gnome/dconf-editor/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index df668aa5a73..8b9bbad58e9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/dconf-editor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/dconf-editor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,7 @@ configure.args      --disable-schemas-compile \
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/devhelp/Portfile b/gnome/devhelp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 58faf5c78b7..6001b878771 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/devhelp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/devhelp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +59,7 @@ if {${universal_possible} && [variant_isset universal]} {
</span> }
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
<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 a4328cc1b08..e2dd1127d11 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;'>@@ -84,7 +84,7 @@ configure.cxxflags-append -std=c++11
</span> 
 post-activate {
     system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache-2.0 -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/empathy/Portfile b/gnome/empathy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index db68614d123..e15d3bba9f0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/empathy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/empathy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,7 +122,7 @@ variant goa description {Enable GNOME online accounts plugin for mission control
</span> default_variants    +map +geocode +goa
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/eog/Portfile b/gnome/eog/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5d9604ce8ba..d0ef3820701 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/eog/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/eog/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,7 +102,7 @@ post-destroot {
</span> notes               "For extra functionality install eog-plugins"
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-   system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>    system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
    system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/evince/Portfile b/gnome/evince/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index de7b8833f0d..a0ae9e10f78 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/evince/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/evince/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,7 +121,7 @@ variant nautilus conflicts quartz description {Build optional nautilus extension
</span> }
 
 post-activate    {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/file-roller/Portfile b/gnome/file-roller/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index eef8e1b9f54..72e143b5d17 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/file-roller/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/file-roller/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +76,7 @@ variant nautilus description {Enable nautilus context menu actions} {
</span> }
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/frogr/Portfile b/gnome/frogr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d87d11d45a8..1047d35ec19 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/frogr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/frogr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,7 @@ patchfiles          patch-no-werror.diff
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span> }
 
 livecheck.type      gnome-with-unstable
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gcr/Portfile b/gnome/gcr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0ead1fcc14c..3ad3bc7416c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gcr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gcr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +55,7 @@ configure.args-append \
</span> post-activate {
     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gdm/Portfile b/gnome/gdm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3a8dc4fe165..78ea6a80c2f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gdm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gdm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,7 +99,7 @@ pre-activate {
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
     file mkdir ${prefix}/var/gdm
     file attributes ${prefix}/var/gdm -owner gdm -group gdm
<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 c43f1305fb5..feda2eb433e 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;'>@@ -41,7 +41,7 @@ depends_run         port:desktop-file-utils \
</span> patchfiles-append   dynamic_lookup-11.patch
 
 configure.env-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    GTK_UPDATE_ICON_CACHE=${prefix}/bin/gtk-update-icon-cache-3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    GTK_UPDATE_ICON_CACHE=${prefix}/bin/gtk-update-icon-cache
</span> 
 # disable extra gcc optimization for clang compatibility
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +71,7 @@ default_variants +gnome
</span> post-activate {
     system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span> }
 
 livecheck.type      gnome
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/ghex/Portfile b/gnome/ghex/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 560fc22f207..e65c27d6ad4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/ghex/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/ghex/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +55,7 @@ configure.args      --disable-silent-rules \
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gitg/Portfile b/gnome/gitg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8e722a2b65a..984438bbcbf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gitg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gitg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,6 +134,6 @@ if {[variant_isset quartz]} {
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/glabels/Portfile b/gnome/glabels/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index afe109764b1..4f833b8710e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/glabels/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/glabels/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +71,7 @@ if {[variant_isset eds]} {
</span> post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span> }
 
 livecheck.type      gnome
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/glom/Portfile b/gnome/glom/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 37118bf8d39..1a9031a6598 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/glom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/glom/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,7 +104,7 @@ app.retina          yes
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span> 
     # Note: MIME db update now handled automatically by shared-mime-info
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-applets/Portfile b/gnome/gnome-applets/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 700ec8a200e..aab3f83df8e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-applets/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-applets/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +61,7 @@ configure.args      --enable-compile-warnings=no \
</span>                     --disable-silent-rules
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-   system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>    system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-calendar/Portfile b/gnome/gnome-calendar/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5e2b319c9bb..60457f88ca5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-calendar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-calendar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,7 +61,7 @@ configure.args      --disable-maintainer-mode \
</span> universal_variant   no
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-   system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>    system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
    system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-characters/Portfile b/gnome/gnome-characters/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8505fca8c79..cef91408c8a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-characters/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-characters/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,7 @@ configure.args      --disable-schemas-compile \
</span>                     --disable-silent-rules
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-   system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>    system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
    system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-chemistry-utils/Portfile b/gnome/gnome-chemistry-utils/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ba8849298c5..5f43383b44b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-chemistry-utils/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-chemistry-utils/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,7 +84,7 @@ post-activate {
</span>     system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
     system "${prefix}/bin/scrollkeeper-update"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,7 +92,7 @@ post-deactivate {
</span>     system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
     system "${prefix}/bin/scrollkeeper-update"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-chess/Portfile b/gnome/gnome-chess/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e80d1d6aa09..bf2af5cfd7b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-chess/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-chess/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,7 @@ configure.args      --disable-schemas-compile \
</span>                     --disable-silent-rules
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-   system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>    system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
    system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-control-center/Portfile b/gnome/gnome-control-center/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a367f2a6fdb..e0e79d46fad 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-control-center/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-control-center/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,7 +81,7 @@ configure.args      --x-includes=${prefix}/include \
</span> 
 post-activate   {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span> }
 
 platform darwin {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-internet-radio-locator/Portfile b/gnome/gnome-internet-radio-locator/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 631feb5472f..78c75879f4f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-internet-radio-locator/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-internet-radio-locator/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@ configure.optflags  -O0
</span> configure.args      --disable-silent-rules
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-   system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>    system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-maps/Portfile b/gnome/gnome-maps/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 172e4dc1192..f11153a3806 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-maps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-maps/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,7 +73,7 @@ post-destroot {
</span> # port installs desktop application file, icons, and gschemas
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
 
<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 17c288ce964..6d86252fdd8 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;'>@@ -53,7 +53,7 @@ configure.args  --mandir=${prefix}/share/man \
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache-2.0 -f -t ${prefix}/share/icons/hicolor"
</span>     system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
         gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-music/Portfile b/gnome/gnome-music/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 76d467c4c2f..9071fae8173 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-music/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-music/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,7 +95,7 @@ if {![variant_isset python35] && ![variant_isset python37]} {
</span> 
 # port installs hicolor icons, desktop application file, and gschemas
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-panel/Portfile b/gnome/gnome-panel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8d3cb7dab88..2d21b689cde 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-panel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-panel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +70,7 @@ if {[variant_isset eds]} {
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-photo-print/Portfile b/gnome/gnome-photo-print/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 271ee962b59..a7c2a0787d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-photo-print/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-photo-print/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,7 +43,7 @@ configure.env   ACLOCAL=${prefix}/bin/aclocal \
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache-2.0 -f -t ${prefix}/share/icons/hicolor"
</span> }
 
 livecheck.type  regex
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-photos/Portfile b/gnome/gnome-photos/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6a641417ba0..a325d463f9c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-photos/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-photos/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +75,7 @@ configure.args      --disable-schemas-compile \
</span> 
 # port installs hicolor icons, desktop application file, and gschemas
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-radio/Portfile b/gnome/gnome-radio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 60b8256d25c..a12b77a38cc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-radio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-radio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,7 +66,7 @@ configure.args-append \
</span>                     --disable-silent-rules
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-   system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>    system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-session/Portfile b/gnome/gnome-session/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a4b4e239ed1..4ddd962013a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-session/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-session/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,7 +94,7 @@ variant gconf description {Enable gconf start-up} {
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-settings-daemon/Portfile b/gnome/gnome-settings-daemon/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e7ea743bc87..ca4c3007c30 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-settings-daemon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-settings-daemon/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,7 +87,7 @@ require_active_variants path:lib/pkgconfig/gtk+-3.0.pc:gtk3 x11
</span> require_active_variants port:libcanberra x11
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-sudoku/Portfile b/gnome/gnome-sudoku/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5baca55d426..99acd4a78ba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-sudoku/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-sudoku/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@ configure.args      --disable-schemas-compile \
</span>                     --disable-silent-rules
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-   system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>    system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
    system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-system-log/Portfile b/gnome/gnome-system-log/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 15a745c13ab..db64ce453aa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-system-log/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-system-log/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,8 +66,8 @@ variant zlib description {Enable zlib support} {
</span> 
 # port installs hicolor and HighContrast icons, desktop application file, and gschemas
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/HighContrast"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/HighContrast"
</span>     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
<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 f061fec3941..1ac32ae5ef3 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;'>@@ -35,8 +35,6 @@ depends_lib         path:lib/pkgconfig/gtk+-3.0.pc:gtk3 \
</span>                     path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \
                     path:lib/pkgconfig/librsvg-2.0.pc:librsvg
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles          patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
 
 post-patch {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-themes-extra/files/patch-configure.ac.diff b/gnome/gnome-themes-extra/files/patch-configure.ac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 238303a66ab..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-themes-extra/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig      2016-10-03 11:29:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac   2016-10-03 11:39:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -71,7 +71,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(GLIB_COMPILE_RESOURCES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache-3.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z "$GTK_UPDATE_ICON_CACHE"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-     AC_MSG_ERROR([Could not find gtk-update-icon-cache])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome-weather/Portfile b/gnome/gnome-weather/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 38653a720cc..31ad9f2c42e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome-weather/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome-weather/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +55,7 @@ configure.args      --disable-schemas-compile \
</span>                     --disable-silent-rules
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-   system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>    system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
    system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnome/Portfile b/gnome/gnome/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a47b664bcf4..000a12e947b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnome/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnome/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,7 @@ destroot    {
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database -q ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash/Portfile b/gnome/gnucash/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4b9a586a4cb..1ef63017a53 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnucash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnucash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,7 +132,7 @@ post-destroot {
</span> }
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnumeric/Portfile b/gnome/gnumeric/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9da2e5e0b86..07becd1dcfd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnumeric/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnumeric/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,8 +124,8 @@ if {![variant_isset python38] && \
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# gtk3 provides gtk-update-icon-cache-3.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# gtk3 provides gtk-update-icon-cache
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
 
<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 b049aafa67e..e3bf416afd5 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;'>@@ -94,7 +94,7 @@ app.retina          yes
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database -v ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span> }
 
 livecheck.regex     /${name}-(\[0-9\]+\\.\[0-9\]*\[02468\](\\.\[0-9\]+)*)${extract.suffix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gthumb/Portfile b/gnome/gthumb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cac2fdf8649..73b194f3dee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gthumb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gthumb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,7 +92,7 @@ variant x11 {
</span> default_variants    +x11
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk-internet-radio-locator/Portfile b/gnome/gtk-internet-radio-locator/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index edc0629a3f9..7361e2f3e55 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk-internet-radio-locator/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk-internet-radio-locator/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +70,7 @@ configure.optflags  -O0
</span> configure.args      --disable-silent-rules
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-   system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>    system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk-radio/Portfile b/gnome/gtk-radio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 04b2b67d072..88bd3e33821 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk-radio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk-radio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,7 +72,7 @@ configure.optflags  -O0
</span> configure.args      --disable-silent-rules
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-   system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>    system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk2-devel/Portfile b/gnome/gtk2-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ce681d68111..cf8e81bde6a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ name                gtk2-devel
</span> conflicts           gtk2
 set my_name         gtk2
 version             2.24.33
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            5
</span> epoch               0
 
 categories          gnome x11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,6 +128,10 @@ post-destroot {
</span>         AUTHORS COPYING HACKING NEWS README \
         ${destroot}${docdir}
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # avoid conflict with the gtk-update-icon-cache installed by gtk3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    move ${destroot}${prefix}/bin/gtk-update-icon-cache \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         ${destroot}${prefix}/bin/gtk-update-icon-cache-2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     ui_debug "Creating gtk.immodules..."
     system "DYLD_LIBRARY_PATH=${destroot}${prefix}/lib \
         ${destroot}${prefix}/bin/gtk-query-immodules-2.0 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -227,7 +231,7 @@ if {${universal_possible} && [variant_isset universal]} {
</span> 
         foreach arch ${cross_archs} {
             lappend merger_configure_env(${arch}) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                GTK_UPDATE_ICON_CACHE=${worksrcpath}-${run_arch}/gtk/gtk-update-icon-cache \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                GTK_UPDATE_ICON_CACHE=${worksrcpath}-${run_arch}/gtk/gtk-update-icon-cache-2.0 \
</span>                 GDK_PIXBUF_CSOURCE=${worksrcpath}-${run_arch}/gdk-pixbuf/gdk-pixbuf-csource
             lappend merger_build_env(${arch}) \
                 GDK_PIXBUF_MODULE_FILE=${worksrcpath}-${run_arch}/gdk-pixbuf/gdk-pixbuf.loaders
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk2/Portfile b/gnome/gtk2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 42dbee3a117..6457f33783d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ name                gtk2
</span> conflicts           gtk2-devel
 set my_name         gtk2
 version             2.24.33
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            5
</span> epoch               0
 
 categories          gnome x11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,6 +132,10 @@ post-destroot {
</span>         AUTHORS COPYING HACKING NEWS README \
         ${destroot}${docdir}
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    # avoid conflict with the gtk-update-icon-cache installed by gtk3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    move ${destroot}${prefix}/bin/gtk-update-icon-cache \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+         ${destroot}${prefix}/bin/gtk-update-icon-cache-2.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     ui_debug "Creating gtk.immodules..."
     system "DYLD_LIBRARY_PATH=${destroot}${prefix}/lib \
         ${destroot}${prefix}/bin/gtk-query-immodules-2.0 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -231,7 +235,7 @@ if {${universal_possible} && [variant_isset universal]} {
</span> 
         foreach arch ${cross_archs} {
             lappend merger_configure_env(${arch}) \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                GTK_UPDATE_ICON_CACHE=${worksrcpath}-${run_arch}/gtk/gtk-update-icon-cache \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                GTK_UPDATE_ICON_CACHE=${worksrcpath}-${run_arch}/gtk/gtk-update-icon-cache-2.0 \
</span>                 GDK_PIXBUF_CSOURCE=${worksrcpath}-${run_arch}/gdk-pixbuf/gdk-pixbuf-csource
             lappend merger_build_env(${arch}) \
                 GDK_PIXBUF_MODULE_FILE=${worksrcpath}-${run_arch}/gdk-pixbuf/gdk-pixbuf.loaders
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk3-devel/Portfile b/gnome/gtk3-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 72b0be67960..e398bba6165 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ name                gtk3-devel
</span> conflicts           gtk3
 set my_name         gtk3
 version             3.24.43
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> epoch               0
 
 set proj_name       gtk+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,6 +114,32 @@ pre-configure {
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Old versions of the gtk2{-devel} port provide the `gtk-update-icon-cache` binary,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # now this is provided by the gtk3{-devel} port, and the gtk2{-devel} port provides
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # `gtk-update-icon-cache-2.0` instead.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {![catch {lindex [registry_active gtk2] 0} installed]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set _version [lindex $installed 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set _revision [lindex $installed 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[vercmp $_version 2.24.33] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            registry_deactivate_composite gtk2 "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[vercmp $_version 2.24.34] < 0 && $_revision < 5} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            registry_deactivate_composite gtk2 "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {![catch {lindex [registry_active gtk2-devel] 0} installed]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set _version [lindex $installed 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set _revision [lindex $installed 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[vercmp $_version 2.24.33] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            registry_deactivate_composite gtk2-devel "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[vercmp $_version 2.24.34] < 0 && $_revision < 5} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            registry_deactivate_composite gtk2-devel "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.cppflags-append \
                     -DX_LOCALE
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,10 +162,6 @@ post-destroot {
</span>     xinstall -m 644 -W ${worksrcpath} CONTRIBUTING.md COPYING NEWS README.md \
         ${destroot}${docdir}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # avoid conflict with the gtk-update-icon-cache installed by gtk2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    move ${destroot}${prefix}/bin/gtk-update-icon-cache \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         ${destroot}${prefix}/bin/gtk-update-icon-cache-3.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     ui_debug "Creating gtk.immodules..."
     system "DYLD_LIBRARY_PATH=${destroot}${prefix}/lib \
         ${destroot}${prefix}/bin/gtk-query-immodules-3.0 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk3/Portfile b/gnome/gtk3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4c5a8c35698..ad6d90cfdf1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +13,7 @@ name                gtk3
</span> conflicts           gtk3-devel
 set my_name         gtk3
 version             3.24.43
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> epoch               1
 
 set proj_name       gtk+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,6 +114,32 @@ pre-configure {
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-activate {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Old versions of the gtk2{-devel} port provide the `gtk-update-icon-cache` binary,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # now this is provided by the gtk3{-devel} port, and the gtk2{-devel} port provides
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # `gtk-update-icon-cache-2.0` instead.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {![catch {lindex [registry_active gtk2] 0} installed]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set _version [lindex $installed 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set _revision [lindex $installed 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[vercmp $_version 2.24.33] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            registry_deactivate_composite gtk2 "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[vercmp $_version 2.24.34] < 0 && $_revision < 5} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            registry_deactivate_composite gtk2 "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {![catch {lindex [registry_active gtk2-devel] 0} installed]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set _version [lindex $installed 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set _revision [lindex $installed 2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[vercmp $_version 2.24.33] < 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            registry_deactivate_composite gtk2-devel "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {[vercmp $_version 2.24.34] < 0 && $_revision < 5} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            registry_deactivate_composite gtk2-devel "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.cppflags-append \
                     -DX_LOCALE
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -136,10 +162,6 @@ post-destroot {
</span>     xinstall -m 644 -W ${worksrcpath} CONTRIBUTING.md COPYING NEWS README.md \
         ${destroot}${docdir}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    # avoid conflict with the gtk-update-icon-cache installed by gtk2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    move ${destroot}${prefix}/bin/gtk-update-icon-cache \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-         ${destroot}${prefix}/bin/gtk-update-icon-cache-3.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     ui_debug "Creating gtk.immodules..."
     system "DYLD_LIBRARY_PATH=${destroot}${prefix}/lib \
         ${destroot}${prefix}/bin/gtk-query-immodules-3.0 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtkdbfeditor/Portfile b/gnome/gtkdbfeditor/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 30c42c7e6e5..889e7ee4edb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtkdbfeditor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtkdbfeditor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@ patchfiles      implicit.patch
</span> configure.args --disable-nls
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache-2.0 -f -t ${prefix}/share/icons/hicolor"
</span> }
 
 livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/libpeas/Portfile b/gnome/libpeas/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 36759a05a6b..7af1033ec07 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/libpeas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/libpeas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,7 +100,7 @@ post-destroot {
</span> }
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span> }
 
 livecheck.type      gnome
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/liferea/Portfile b/gnome/liferea/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 34a88ed878b..2b79b2b839c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/liferea/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/liferea/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,7 +57,7 @@ configure.args      --disable-schemas-compile \
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/notekit/Portfile b/gnome/notekit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index aa0b159f0c5..eb43d6d2bbe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/notekit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/notekit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +59,7 @@ configure.args-append \
</span> 
 # Port installs hicolor icons, desktop application file and gschemas
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
<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 85e353d32e9..5ebb0c12be0 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;'>@@ -46,7 +46,7 @@ compiler.blacklist-append \
</span> post-activate {
     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
     system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/polari/Portfile b/gnome/polari/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 94b56f43da4..6d00cde617b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/polari/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/polari/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +52,7 @@ configure.args      --enable-compile-warnings=no \
</span>                     --disable-silent-rules
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-   system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>    system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
    system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/regexxer/Portfile b/gnome/regexxer/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a885a4d631d..2ad662fb2be 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/regexxer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/regexxer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@ configure.args      --disable-schemas-compile
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/regexxer/files/patch-configure.ac.diff b/gnome/regexxer/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index bd72c51482d..278bcb66d28 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/regexxer/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/regexxer/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@
</span>  
  DK_PKG_PATH_PROG([GDK_PIXBUF_CSOURCE], [gdk-pixbuf-2.0], [gdk-pixbuf-csource])
 -DK_PKG_PATH_PROG([GTK_UPDATE_ICON_CACHE], [gtk+-2.0], [gtk-update-icon-cache])
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+DK_PKG_PATH_PROG([GTK_UPDATE_ICON_CACHE], [gtk+-3.0], [gtk-update-icon-cache-3.0])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++DK_PKG_PATH_PROG([GTK_UPDATE_ICON_CACHE], [gtk+-3.0], [gtk-update-icon-cache])
</span>  
  GLIB_GSETTINGS
  
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/seahorse/Portfile b/gnome/seahorse/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 07b68bd6832..9f73857c0fc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/seahorse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/seahorse/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,7 +62,7 @@ configure.args      --disable-sharing \
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database -q ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/totem/Portfile b/gnome/totem/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1b2c69c1194..f6e4a6ca91d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/totem/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/totem/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,7 +148,7 @@ post-destroot {
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/xchat-gnome/Portfile b/gnome/xchat-gnome/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8e1285dd4d3..a9ba2c9573f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/xchat-gnome/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/xchat-gnome/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +74,7 @@ configure.args      --disable-mmx \
</span> post-activate    {
     system "${prefix}/bin/scrollkeeper-update"
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache-2.0 -f -t ${prefix}/share/icons/hicolor"
</span>     system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
         gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/MyPaint/Portfile b/graphics/MyPaint/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f4b1a3d0dac..163c16428e8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/MyPaint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/MyPaint/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,7 +85,7 @@ app.executable              ${frameworks_dir}/Python.framework/Versions/${python
</span> app.icon                    pixmaps/mypaint_logo.png
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -tf ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -tf ${prefix}/share/icons/hicolor"
</span> }
 
 github.livecheck.regex      {([0-9.]+)}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/agave/Portfile b/graphics/agave/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d9da28fb45e..7212ab8ccbf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/agave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/agave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,7 @@ post-activate   {
</span>     system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
         gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache-2.0 -f -t ${prefix}/share/icons/hicolor"
</span> }
 
 platform darwin {
<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 1d1d76e22ed..666ab6a1bab 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;'>@@ -216,7 +216,7 @@ variant quartz {
</span> default_variants +python27
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache-2.0 -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
 }
 
<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 8f937d272ac..143f39e45d5 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;'>@@ -221,7 +221,7 @@ variant quartz {
</span> default_variants +python27
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache-2.0 -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp3-devel/Portfile b/graphics/gimp3-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index decda881e84..a81ff06bc61 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -234,7 +234,7 @@ if {![variant_isset quartz]} {
</span> }
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape-devel/Portfile b/graphics/inkscape-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bc119bdef69..46f6202270c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/inkscape-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,7 +179,7 @@ variant tests description {Enable tests} {
</span> }
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/inkscape/Portfile b/graphics/inkscape/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6685548bd3d..f5042e5c879 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/inkscape/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/inkscape/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -179,7 +179,7 @@ variant tests description {Enable tests} {
</span> }
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/photoqt/Portfile b/graphics/photoqt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b30fad19e02..4f1c375c717 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/photoqt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/photoqt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,5 +118,5 @@ compiler.cxx_standard   2011
</span> post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
     system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span> }
<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 53c8532313a..08082315c65 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;'>@@ -92,7 +92,7 @@ variant python description "Enable Python scripting, using python3${python_minor
</span> }
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache-2.0 -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/cadabra2/Portfile b/math/cadabra2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 006e8ed4462..ae302477a98 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/cadabra2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/cadabra2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +74,7 @@ post-destroot {
</span> 
 post-activate {
     system "${prefix}/bin/texhash"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "gtk-update-icon-cache-3.0 ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "gtk-update-icon-cache ${prefix}/share/icons/hicolor"
</span> }
 
 variant texmacs description {install TeXmacs front end} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/pspp-devel/Portfile b/math/pspp-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4bae31c1890..c37731ca276 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/pspp-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/pspp-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -167,12 +167,12 @@ post-destroot {
</span> }
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 --ignore-theme-index ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache --ignore-theme-index ${prefix}/share/icons/hicolor"
</span> 
 }
 
 post-deactivate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 --ignore-theme-index ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache --ignore-theme-index ${prefix}/share/icons/hicolor"
</span> }
 
 if {![variant_isset gui]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/pspp/Portfile b/math/pspp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6e1fededf7a..fb30f6a853e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/pspp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/pspp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -160,12 +160,12 @@ post-destroot {
</span> }
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 --ignore-theme-index ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache --ignore-theme-index ${prefix}/share/icons/hicolor"
</span> 
 }
 
 post-deactivate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 --ignore-theme-index ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache --ignore-theme-index ${prefix}/share/icons/hicolor"
</span> }
 
 if {![variant_isset gui]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/grsync/Portfile b/net/grsync/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bd7787297de..dfa60b7e745 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/grsync/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/grsync/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,7 @@ configure.args      --disable-unity
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span> }
 
 livecheck.type regex
<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 044ee2b492f..99eee1c47fa 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;'>@@ -162,7 +162,7 @@ if {${subport} eq $name} {
</span> 
     post-activate {
         system "dbus-uuidgen --ensure"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        system "${prefix}/bin/gtk-update-icon-cache-2.0 -f -t ${prefix}/share/icons/hicolor"
</span>         system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
             gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
     }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/transmission-x11/Portfile b/net/transmission-x11/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 08d29b3a3cc..c08938ea318 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/transmission-x11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/transmission-x11/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -109,7 +109,7 @@ variant gtk description {Build Gtk3 front-end} {
</span> 
     post-activate {
         system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     }
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/chemical-mime-data/Portfile b/science/chemical-mime-data/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 601ecc935eb..8f7a8f9c010 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/chemical-mime-data/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/chemical-mime-data/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,7 @@ configure.args      --disable-update-database \
</span>                     --without-gnome-mime
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
 }
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/gsmartcontrol/Portfile b/sysutils/gsmartcontrol/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9b80d81874a..70d82965c8a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/gsmartcontrol/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/gsmartcontrol/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -42,7 +42,7 @@ configure.cxxflags-append \
</span>                     -std=c++11
 
 post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "gtk-update-icon-cache-3.0 ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "gtk-update-icon-cache ${prefix}/share/icons/hicolor"
</span> }
 
 livecheck.regex     "[quotemeta ${name}]-(\\d+(\\.\\d+)*)[quotemeta ${extract.suffix}]"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/meld/Portfile b/textproc/meld/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 964c1204581..583d40931e5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/meld/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/meld/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,7 +80,7 @@ if {![variant_isset quartz]} {
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/midori/Portfile b/www/midori/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2cb2036b09e..65ad04176b5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/midori/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/midori/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,5 +47,5 @@ configure.universal_args-delete --disable-dependency-tracking
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span> }
<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 a506c5526c3..785472562cd 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;'>@@ -34,6 +34,6 @@ configure.args      --enable-dbus
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span>     system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
 }
<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 ae9756cf742..e87179ef97b 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;'>@@ -35,5 +35,5 @@ compiler.blacklist-append \
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span> }
<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 0fe49838f9e..cf4da07831d 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;'>@@ -30,5 +30,5 @@ patchfiles      remove-intltool-perl-hack.diff
</span> 
 post-activate {
     system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system "${prefix}/bin/gtk-update-icon-cache-3.0 -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span> }
</pre><pre style='margin:0'>

</pre>