aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/file-roller/Makefile1
-rw-r--r--archivers/file-roller/pkg-plist4
-rw-r--r--archivers/fileroller/Makefile1
-rw-r--r--archivers/fileroller/pkg-plist4
-rw-r--r--audio/beast/Makefile2
-rw-r--r--audio/beast/pkg-plist4
-rw-r--r--cad/oregano/Makefile2
-rw-r--r--cad/oregano/pkg-plist4
-rw-r--r--comms/xlog/Makefile2
-rw-r--r--comms/xlog/pkg-plist4
-rw-r--r--deskutils/drivel/Makefile2
-rw-r--r--deskutils/drivel/pkg-plist4
-rw-r--r--deskutils/gdesklets/Makefile1
-rw-r--r--deskutils/gdesklets/pkg-plist4
-rw-r--r--deskutils/glabels/Makefile1
-rw-r--r--deskutils/glabels/pkg-plist8
-rw-r--r--deskutils/gnochm/Makefile2
-rw-r--r--deskutils/gnochm/pkg-plist4
-rw-r--r--deskutils/planner/Makefile1
-rw-r--r--deskutils/planner/pkg-plist4
-rw-r--r--devel/bug-buddy/Makefile1
-rw-r--r--devel/bug-buddy/pkg-plist4
-rw-r--r--devel/bugbuddy/Makefile1
-rw-r--r--devel/bugbuddy/pkg-plist4
-rw-r--r--devel/guikachu/Makefile2
-rw-r--r--devel/guikachu/pkg-plist4
-rw-r--r--editors/abiword-devel/Makefile2
-rw-r--r--editors/abiword-devel/pkg-plist4
-rw-r--r--editors/abiword/Makefile2
-rw-r--r--editors/abiword/pkg-plist4
-rw-r--r--editors/gedit/Makefile1
-rw-r--r--editors/gedit/pkg-plist4
-rw-r--r--editors/leafpad/Makefile2
-rw-r--r--editors/leafpad/pkg-plist4
-rw-r--r--games/gnome-games/Makefile1
-rw-r--r--games/gnome-games/pkg-plist4
-rw-r--r--games/gnomegames2/Makefile1
-rw-r--r--games/gnomegames2/pkg-plist4
-rw-r--r--graphics/eog/Makefile1
-rw-r--r--graphics/eog/pkg-plist4
-rw-r--r--graphics/evince/Makefile1
-rw-r--r--graphics/evince/pkg-plist4
-rw-r--r--graphics/gimp-app/Makefile2
-rw-r--r--graphics/gimp-app/pkg-plist4
-rw-r--r--graphics/gimp/Makefile2
-rw-r--r--graphics/gimp/pkg-plist4
-rw-r--r--graphics/gimpshop/Makefile2
-rw-r--r--graphics/gimpshop/pkg-plist4
-rw-r--r--graphics/gpdf/Makefile1
-rw-r--r--graphics/gpdf/pkg-plist4
-rw-r--r--graphics/inkscape/Makefile2
-rw-r--r--graphics/inkscape/pkg-plist4
-rw-r--r--graphics/sodipodi/Makefile2
-rw-r--r--graphics/sodipodi/pkg-plist4
-rw-r--r--multimedia/totem/Makefile1
-rw-r--r--multimedia/totem/pkg-plist4
-rw-r--r--net-p2p/gnome-btdownload/Makefile2
-rw-r--r--net-p2p/gnome-btdownload/pkg-plist4
-rw-r--r--net/gnoemoe/Makefile2
-rw-r--r--net/gnoemoe/pkg-plist4
-rw-r--r--net/gnome-btdownload/Makefile2
-rw-r--r--net/gnome-btdownload/pkg-plist4
-rw-r--r--print/ggv/Makefile2
-rw-r--r--print/ggv/pkg-plist4
-rw-r--r--science/gchempaint/Makefile2
-rw-r--r--science/gchempaint/pkg-plist4
-rw-r--r--science/gchemutils/Makefile2
-rw-r--r--science/gchemutils/pkg-plist4
-rw-r--r--security/seahorse/Makefile1
-rw-r--r--security/seahorse/pkg-plist8
-rw-r--r--sysutils/coaster/Makefile1
-rw-r--r--sysutils/coaster/pkg-plist8
-rw-r--r--sysutils/gnome-control-center/Makefile2
-rw-r--r--sysutils/gnome-control-center/pkg-plist4
-rw-r--r--sysutils/gnomecontrolcenter2/Makefile2
-rw-r--r--sysutils/gnomecontrolcenter2/pkg-plist4
-rw-r--r--www/epiphany/Makefile1
-rw-r--r--www/epiphany/pkg-plist4
-rw-r--r--www/galeon/Makefile1
-rw-r--r--www/galeon/pkg-plist4
-rw-r--r--www/screem-devel/Makefile2
-rw-r--r--www/screem-devel/pkg-plist8
-rw-r--r--www/screem/Makefile2
-rw-r--r--www/screem/pkg-plist8
-rw-r--r--x11-fm/nautilus2/Makefile1
-rw-r--r--x11-fm/nautilus2/pkg-plist4
86 files changed, 139 insertions, 120 deletions
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 4ba28821efe3..eb0c145c4737 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fileroller
PORTVERSION= 2.10.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= archivers gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/archivers/file-roller/pkg-plist b/archivers/file-roller/pkg-plist
index 139cdaa0f85b..4ebca1e9a42a 100644
--- a/archivers/file-roller/pkg-plist
+++ b/archivers/file-roller/pkg-plist
@@ -8,7 +8,7 @@ libdata/bonobo/servers/File_Roller_Component.server
%%PORTDOCS%%%%DOCSDIR%%/TODO
share/gnome/application-registry/file-roller.applications
share/gnome/applications/file-roller.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/file-roller/glade/file_roller.glade
share/gnome/help/file-roller/C/figures/file-roller_home.png
share/gnome/help/file-roller/C/figures/file-roller_leftarrow.png
@@ -177,4 +177,4 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
@dirrm share/gnome/file-roller/glade
@dirrm share/gnome/file-roller
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile
index 4ba28821efe3..eb0c145c4737 100644
--- a/archivers/fileroller/Makefile
+++ b/archivers/fileroller/Makefile
@@ -7,6 +7,7 @@
PORTNAME= fileroller
PORTVERSION= 2.10.0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= archivers gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
diff --git a/archivers/fileroller/pkg-plist b/archivers/fileroller/pkg-plist
index 139cdaa0f85b..4ebca1e9a42a 100644
--- a/archivers/fileroller/pkg-plist
+++ b/archivers/fileroller/pkg-plist
@@ -8,7 +8,7 @@ libdata/bonobo/servers/File_Roller_Component.server
%%PORTDOCS%%%%DOCSDIR%%/TODO
share/gnome/application-registry/file-roller.applications
share/gnome/applications/file-roller.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/file-roller/glade/file_roller.glade
share/gnome/help/file-roller/C/figures/file-roller_home.png
share/gnome/help/file-roller/C/figures/file-roller_leftarrow.png
@@ -177,4 +177,4 @@ share/locale/zh_TW/LC_MESSAGES/file-roller.mo
@dirrm share/gnome/file-roller/glade
@dirrm share/gnome/file-roller
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/audio/beast/Makefile b/audio/beast/Makefile
index d034d2e8b503..77e59c863cab 100644
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@@ -7,7 +7,7 @@
PORTNAME= beast
PORTVERSION= 0.6.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= ftp://beast.gtk.org/pub/beast/v0.6/ \
http://beast.gtk.org/beast-ftp/v0.6/
diff --git a/audio/beast/pkg-plist b/audio/beast/pkg-plist
index e8fa577b07d2..48e8c3e10111 100644
--- a/audio/beast/pkg-plist
+++ b/audio/beast/pkg-plist
@@ -294,5 +294,5 @@ share/mime/packages/beast.xml
@dirrm share/gnome/bse/v0.6.4/scripts
@dirrm share/gnome/bse/v0.6.4
@dirrm share/gnome/bse
-@exec update-mime-database %D/share/mime
-@unexec update-mime-database %D/share/mime
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
diff --git a/cad/oregano/Makefile b/cad/oregano/Makefile
index dfb3c30d1334..8fca404b1ee1 100644
--- a/cad/oregano/Makefile
+++ b/cad/oregano/Makefile
@@ -7,7 +7,7 @@
PORTNAME= oregano
PORTVERSION= 0.40.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= cad
MASTER_SITES= http://gforge.lug.fi.uba.ar/frs/download.php/56/
diff --git a/cad/oregano/pkg-plist b/cad/oregano/pkg-plist
index af10dae73359..fc59cef7012e 100644
--- a/cad/oregano/pkg-plist
+++ b/cad/oregano/pkg-plist
@@ -76,5 +76,5 @@ share/mime/text/oregano.xml
@dirrm share/gnome/help/oregano/es
@dirrm share/gnome/help/oregano/C
@dirrm share/gnome/help/oregano
-@exec update-mime-database %D/share/mime
-@unexec update-mime-database %D/share/mime
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile
index e9366df9623d..001da61449e9 100644
--- a/comms/xlog/Makefile
+++ b/comms/xlog/Makefile
@@ -6,7 +6,7 @@
PORTNAME= xlog
PORTVERSION= 1.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= comms
MASTER_SITES= http://pg4i.mattsnetwork.co.uk/download/ \
http://www.qsl.net/pg4i/download/
diff --git a/comms/xlog/pkg-plist b/comms/xlog/pkg-plist
index e539c6265847..52222b143246 100644
--- a/comms/xlog/pkg-plist
+++ b/comms/xlog/pkg-plist
@@ -42,8 +42,8 @@ share/xlog/qsllabels.glabels
@dirrm share/xlog/dxcc
@dirrm share/xlog
@dirrm share/pixmaps/xlog
-@exec update-mime-database %D/share/mime
-@unexec update-mime-database %D/share/mime
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec rmdir %D/share/applications 2> /dev/null || true
@unexec rmdir %D/share/applnk/Applications 2> /dev/null || true
@unexec rmdir %D/share/applnk 2> /dev/null || true
diff --git a/deskutils/drivel/Makefile b/deskutils/drivel/Makefile
index 6a2c8e745343..00ffbcb387be 100644
--- a/deskutils/drivel/Makefile
+++ b/deskutils/drivel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= drivel
PORTVERSION= 1.2.3
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/deskutils/drivel/pkg-plist b/deskutils/drivel/pkg-plist
index 7c48a4473742..efaa3f591b3d 100644
--- a/deskutils/drivel/pkg-plist
+++ b/deskutils/drivel/pkg-plist
@@ -55,5 +55,5 @@ share/mime/packages/drivel.xml
@dirrm share/gnome/drivel/languages
@dirrm share/gnome/drivel/glade
@dirrm share/gnome/drivel
-@exec update-mime-database %D/share/mime
-@unexec update-mime-database %D/share/mime
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
diff --git a/deskutils/gdesklets/Makefile b/deskutils/gdesklets/Makefile
index 691ccf5d213c..e45cf927c82d 100644
--- a/deskutils/gdesklets/Makefile
+++ b/deskutils/gdesklets/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gdesklets
PORTVERSION= 0.34.2
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= http://www.pycage.de/download/${PORTNAME}/
DISTNAME= gDesklets-${PORTVERSION}
diff --git a/deskutils/gdesklets/pkg-plist b/deskutils/gdesklets/pkg-plist
index 5f2802fd41c6..669765fde02d 100644
--- a/deskutils/gdesklets/pkg-plist
+++ b/deskutils/gdesklets/pkg-plist
@@ -625,5 +625,5 @@ share/mime/packages/gdesklets.xml
@dirrm lib/gdesklets/Controls/ArrayBuffer
@dirrm lib/gdesklets/Controls
@dirrm lib/gdesklets
-@exec update-mime-database %D/share/mime
-@unexec update-mime-database %D/share/mime
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
diff --git a/deskutils/glabels/Makefile b/deskutils/glabels/Makefile
index 5e7cf32bc3ac..5df34645bfc8 100644
--- a/deskutils/glabels/Makefile
+++ b/deskutils/glabels/Makefile
@@ -7,6 +7,7 @@
PORTNAME= glabels
PORTVERSION= 2.0.2
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/deskutils/glabels/pkg-plist b/deskutils/glabels/pkg-plist
index 53c508283c91..f6705f379a42 100644
--- a/deskutils/glabels/pkg-plist
+++ b/deskutils/glabels/pkg-plist
@@ -10,7 +10,7 @@ lib/libglabels.a
lib/libglabels.so
lib/libglabels.so.1
share/gnome/application-registry/glabels.applications
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/applications/glabels.desktop
share/gnome/glabels/dtd/glabels-2.0.dtd
share/gnome/glabels/glade/object-editor.glade
@@ -69,6 +69,6 @@ share/mime/packages/glabels.xml
@dirrm share/gnome/glabels/dtd
@dirrm share/gnome/glabels
@dirrm include/libglabels
-@exec update-mime-database %D/share/mime
-@unexec update-mime-database %D/share/mime
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/deskutils/gnochm/Makefile b/deskutils/gnochm/Makefile
index 9d741dc3c7e9..42c366290bc3 100644
--- a/deskutils/gnochm/Makefile
+++ b/deskutils/gnochm/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnochm
PORTVERSION= 0.9.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils python gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/deskutils/gnochm/pkg-plist b/deskutils/gnochm/pkg-plist
index d6de0a2ec754..f5a39468b1d4 100644
--- a/deskutils/gnochm/pkg-plist
+++ b/deskutils/gnochm/pkg-plist
@@ -26,5 +26,5 @@ share/mime/packages/gnochm.xml
@dirrm share/gnome/gnochm
@unexec rmdir %D/man/it/man1 2>/dev/null||true
@unexec rmdir %D/man/it 2>/dev/null||true
-@exec update-mime-database %D/share/mime
-@unexec update-mime-database %D/share/mime
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
diff --git a/deskutils/planner/Makefile b/deskutils/planner/Makefile
index 316a7ff01a54..c11eb8469e90 100644
--- a/deskutils/planner/Makefile
+++ b/deskutils/planner/Makefile
@@ -7,6 +7,7 @@
PORTNAME= planner
PORTVERSION= 0.13
+PORTREVISION= 1
CATEGORIES= deskutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.13
diff --git a/deskutils/planner/pkg-plist b/deskutils/planner/pkg-plist
index 2b7292e52c1a..9618edf6fe37 100644
--- a/deskutils/planner/pkg-plist
+++ b/deskutils/planner/pkg-plist
@@ -212,5 +212,5 @@ share/mime/packages/planner.xml
@dirrm lib/planner
@dirrm include/planner-1.0/libplanner
@dirrm include/planner-1.0
-@exec update-mime-database %D/share/mime
-@unexec update-mime-database %D/share/mime
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index ae4b62d0e793..ac0b3069a4f8 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bugbuddy
PORTVERSION= 2.10.0
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/bug-buddy/2.10
diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist
index 16d22f537467..ec291fb0ac4e 100644
--- a/devel/bug-buddy/pkg-plist
+++ b/devel/bug-buddy/pkg-plist
@@ -1,7 +1,7 @@
bin/bug-buddy
share/gnome/application-registry/bug-buddy.applications
share/gnome/applications/bug-buddy-core.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/applications/bug-buddy.desktop
share/gnome/bug-buddy/bug-buddy.glade
share/gnome/bug-buddy/bug-buddy.png
@@ -93,4 +93,4 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
@dirrm share/gnome/bug-buddy/bugzilla/gnome
@dirrm share/gnome/bug-buddy/bugzilla
@dirrm share/gnome/bug-buddy
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile
index ae4b62d0e793..ac0b3069a4f8 100644
--- a/devel/bugbuddy/Makefile
+++ b/devel/bugbuddy/Makefile
@@ -7,6 +7,7 @@
PORTNAME= bugbuddy
PORTVERSION= 2.10.0
+PORTREVISION= 1
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/bug-buddy/2.10
diff --git a/devel/bugbuddy/pkg-plist b/devel/bugbuddy/pkg-plist
index 16d22f537467..ec291fb0ac4e 100644
--- a/devel/bugbuddy/pkg-plist
+++ b/devel/bugbuddy/pkg-plist
@@ -1,7 +1,7 @@
bin/bug-buddy
share/gnome/application-registry/bug-buddy.applications
share/gnome/applications/bug-buddy-core.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/applications/bug-buddy.desktop
share/gnome/bug-buddy/bug-buddy.glade
share/gnome/bug-buddy/bug-buddy.png
@@ -93,4 +93,4 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
@dirrm share/gnome/bug-buddy/bugzilla/gnome
@dirrm share/gnome/bug-buddy/bugzilla
@dirrm share/gnome/bug-buddy
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/devel/guikachu/Makefile b/devel/guikachu/Makefile
index e3bc94f8855c..4a8abeef7358 100644
--- a/devel/guikachu/Makefile
+++ b/devel/guikachu/Makefile
@@ -7,7 +7,7 @@
PORTNAME= guikachu
PORTVERSION= 1.5.4
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= devel palm gnome
MASTER_SITES= http://cactus.rulez.org/projects/guikachu/download/
diff --git a/devel/guikachu/pkg-plist b/devel/guikachu/pkg-plist
index 3061191ac7aa..ccbbf8e7609d 100644
--- a/devel/guikachu/pkg-plist
+++ b/devel/guikachu/pkg-plist
@@ -82,5 +82,5 @@ share/mime/text/x-rcp.xml
@dirrm share/gnome/guikachu/glade
@dirrm share/gnome/guikachu/fonts
@dirrm share/gnome/guikachu
-@exec update-mime-database %D/share/mime
-@unexec update-mime-database %D/share/mime
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile
index 9e3f99e9220f..75cc56e3d87e 100644
--- a/editors/abiword-devel/Makefile
+++ b/editors/abiword-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= abiword
PORTVERSION= 2.2.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
MASTER_SITE_SUBDIR= abiword
diff --git a/editors/abiword-devel/pkg-plist b/editors/abiword-devel/pkg-plist
index 2afc8057e11b..ad1603cc836c 100644
--- a/editors/abiword-devel/pkg-plist
+++ b/editors/abiword-devel/pkg-plist
@@ -274,7 +274,7 @@ share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-yi
share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-zh_CN
share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-zh_TW
%%GNOME:%%share/gnome/applications/abiword.desktop
-%%GNOME:%%@exec update-desktop-database > /dev/null || /usr/bin/true
+%%GNOME:%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
%%GNOME:%%share/gnome/gnome-2.0/ui/abi-nautilus-view-file.xml
%%GNOME:%%share/gnome/pixmaps/abiword_48.png
@dirrm share/AbiSuite-%%ABIVERSION%%/templates
@@ -288,4 +288,4 @@ share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-zh_TW
@dirrm share/AbiSuite-%%ABIVERSION%%
@dirrm lib/AbiWord-%%ABIVERSION%%/plugins
@dirrm lib/AbiWord-%%ABIVERSION%%
-%%GNOME:%%@unexec update-desktop-database > /dev/null || /usr/bin/true
+%%GNOME:%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 9e3f99e9220f..75cc56e3d87e 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -7,7 +7,7 @@
PORTNAME= abiword
PORTVERSION= 2.2.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/
MASTER_SITE_SUBDIR= abiword
diff --git a/editors/abiword/pkg-plist b/editors/abiword/pkg-plist
index 2afc8057e11b..ad1603cc836c 100644
--- a/editors/abiword/pkg-plist
+++ b/editors/abiword/pkg-plist
@@ -274,7 +274,7 @@ share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-yi
share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-zh_CN
share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-zh_TW
%%GNOME:%%share/gnome/applications/abiword.desktop
-%%GNOME:%%@exec update-desktop-database > /dev/null || /usr/bin/true
+%%GNOME:%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
%%GNOME:%%share/gnome/gnome-2.0/ui/abi-nautilus-view-file.xml
%%GNOME:%%share/gnome/pixmaps/abiword_48.png
@dirrm share/AbiSuite-%%ABIVERSION%%/templates
@@ -288,4 +288,4 @@ share/AbiSuite-%%ABIVERSION%%/templates/normal.awt-zh_TW
@dirrm share/AbiSuite-%%ABIVERSION%%
@dirrm lib/AbiWord-%%ABIVERSION%%/plugins
@dirrm lib/AbiWord-%%ABIVERSION%%
-%%GNOME:%%@unexec update-desktop-database > /dev/null || /usr/bin/true
+%%GNOME:%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index ca0ae8b1291e..76ba5b970757 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gedit
PORTVERSION= 2.10.0
+PORTREVISION= 1
CATEGORIES= editors gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.10
diff --git a/editors/gedit/pkg-plist b/editors/gedit/pkg-plist
index d3732cae1da8..419dd1f2daab 100644
--- a/editors/gedit/pkg-plist
+++ b/editors/gedit/pkg-plist
@@ -51,7 +51,7 @@ libdata/bonobo/servers/GNOME_Gedit.server
libdata/pkgconfig/gedit-%%VERSION%%.pc
share/gnome/application-registry/gedit.applications
share/gnome/applications/gedit.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/gedit-2/glade/docinfo.glade2
share/gnome/gedit-2/glade/gedit-encodings-dialog.glade2
share/gnome/gedit-2/glade/gedit-preferences.glade2
@@ -250,4 +250,4 @@ share/locale/zh_TW/LC_MESSAGES/gedit.mo
@dirrm include/gedit-%%VERSION%%/gedit/recent-files
@dirrm include/gedit-%%VERSION%%/gedit
@dirrm include/gedit-%%VERSION%%
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/editors/leafpad/Makefile b/editors/leafpad/Makefile
index df25990a21a8..361ac1a6eb06 100644
--- a/editors/leafpad/Makefile
+++ b/editors/leafpad/Makefile
@@ -7,7 +7,7 @@
PORTNAME= leafpad
PORTVERSION= 0.7.9
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= editors
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/editors/leafpad/pkg-plist b/editors/leafpad/pkg-plist
index 1caf7634eeb6..691b8453e4d1 100644
--- a/editors/leafpad/pkg-plist
+++ b/editors/leafpad/pkg-plist
@@ -17,5 +17,5 @@ share/locale/ta/LC_MESSAGES/leafpad.mo
share/locale/zh_CN/LC_MESSAGES/leafpad.mo
share/locale/zh_TW/LC_MESSAGES/leafpad.mo
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@exec update-desktop-database > /dev/null || /usr/bin/true
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index b36d2def0e2d..4cb01ac5095d 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomegames2
PORTVERSION= 2.10.0
+PORTREVISION= 1
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-games/2.10
diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist
index 18e3c7765d79..5ce4853387f1 100644
--- a/games/gnome-games/pkg-plist
+++ b/games/gnome-games/pkg-plist
@@ -37,7 +37,7 @@ share/gnome/applications/iagno.desktop
share/gnome/applications/mahjongg.desktop
share/gnome/applications/same-gnome.desktop
share/gnome/applications/sol.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/blackjack/Ameristar.rules
share/gnome/blackjack/Atlantic_City.rules
share/gnome/blackjack/Vegas_Downtown.rules
@@ -793,4 +793,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/blackjack
@dirrm lib/gnome-stones/objects
@dirrm lib/gnome-stones
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index b36d2def0e2d..4cb01ac5095d 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnomegames2
PORTVERSION= 2.10.0
+PORTREVISION= 1
CATEGORIES= games gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gnome-games/2.10
diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist
index 18e3c7765d79..5ce4853387f1 100644
--- a/games/gnomegames2/pkg-plist
+++ b/games/gnomegames2/pkg-plist
@@ -37,7 +37,7 @@ share/gnome/applications/iagno.desktop
share/gnome/applications/mahjongg.desktop
share/gnome/applications/same-gnome.desktop
share/gnome/applications/sol.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/blackjack/Ameristar.rules
share/gnome/blackjack/Atlantic_City.rules
share/gnome/blackjack/Vegas_Downtown.rules
@@ -793,4 +793,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-games.mo
@dirrm share/gnome/blackjack
@dirrm lib/gnome-stones/objects
@dirrm lib/gnome-stones
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index e62f13025254..bd5ae66e6c36 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -7,6 +7,7 @@
PORTNAME= eog
PORTVERSION= 2.9.0
+PORTREVISION= 1
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.9
diff --git a/graphics/eog/pkg-plist b/graphics/eog/pkg-plist
index 52a7dd9f2196..e35c166211c2 100644
--- a/graphics/eog/pkg-plist
+++ b/graphics/eog/pkg-plist
@@ -1,6 +1,6 @@
bin/eog
share/gnome/applications/eog.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/eog/eog-gtk-ui.xml
share/gnome/eog/glade/eog.glade
share/gnome/help/eog/C/eog.xml
@@ -155,4 +155,4 @@ share/locale/zh_TW/LC_MESSAGES/eog.mo
@dirrm share/gnome/help/eog
@dirrm share/gnome/eog/glade
@dirrm share/gnome/eog
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index 38c17aafa7c7..ad4c9fce2a63 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -7,6 +7,7 @@
PORTNAME= evince
PORTVERSION= 0.1.9
+PORTREVISION= 1
CATEGORIES= graphics print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.1
diff --git a/graphics/evince/pkg-plist b/graphics/evince/pkg-plist
index 07ce7c384b55..c5fc807debaa 100644
--- a/graphics/evince/pkg-plist
+++ b/graphics/evince/pkg-plist
@@ -1,7 +1,7 @@
bin/evince
bin/evince-thumbnailer
share/gnome/applications/evince.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/evince/evince-password.glade
share/gnome/evince/evince-ui.xml
share/gnome/evince/pdf-icon.png
@@ -25,4 +25,4 @@ share/locale/sv/LC_MESSAGES/evince.mo
share/locale/zh_CN/LC_MESSAGES/evince.mo
share/locale/zh_TW/LC_MESSAGES/evince.mo
@dirrm share/gnome/evince
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 6e4d0e499404..054a80168410 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gimp
PORTVERSION= 2.2.4
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 01f793709fc2..81cb06541cc2 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -1177,7 +1177,7 @@ share/gimp/misc/gimp.desktop
share/gimp/misc/gimp.keys
%%GNOMEPANEL:%%share/gnome/application-registry/gimp-2.2.applications
%%GNOMEPANEL:%%share/gnome/applications/gimp-2.2.desktop
-%%GNOMEPANEL:%%@exec update-desktop-database > /dev/null || /usr/bin/true
+%%GNOMEPANEL:%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
%%GNOMEPANEL:%%share/gnome/mime-info/gimp-2.2.keys
share/gimp/palettes/Bears.gpl
share/gimp/palettes/Bgold.gpl
@@ -1900,4 +1900,4 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
@dirrm include/gimp-2.0
@dirrm etc/gimp/2.2
@dirrm etc/gimp
-%%GNOMEPANEL:%%@unexec update-desktop-database > /dev/null || /usr/bin/true
+%%GNOMEPANEL:%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 6e4d0e499404..054a80168410 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gimp
PORTVERSION= 2.2.4
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index 01f793709fc2..81cb06541cc2 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -1177,7 +1177,7 @@ share/gimp/misc/gimp.desktop
share/gimp/misc/gimp.keys
%%GNOMEPANEL:%%share/gnome/application-registry/gimp-2.2.applications
%%GNOMEPANEL:%%share/gnome/applications/gimp-2.2.desktop
-%%GNOMEPANEL:%%@exec update-desktop-database > /dev/null || /usr/bin/true
+%%GNOMEPANEL:%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
%%GNOMEPANEL:%%share/gnome/mime-info/gimp-2.2.keys
share/gimp/palettes/Bears.gpl
share/gimp/palettes/Bgold.gpl
@@ -1900,4 +1900,4 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
@dirrm include/gimp-2.0
@dirrm etc/gimp/2.2
@dirrm etc/gimp
-%%GNOMEPANEL:%%@unexec update-desktop-database > /dev/null || /usr/bin/true
+%%GNOMEPANEL:%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 6e4d0e499404..054a80168410 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gimp
PORTVERSION= 2.2.4
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index 01f793709fc2..81cb06541cc2 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -1177,7 +1177,7 @@ share/gimp/misc/gimp.desktop
share/gimp/misc/gimp.keys
%%GNOMEPANEL:%%share/gnome/application-registry/gimp-2.2.applications
%%GNOMEPANEL:%%share/gnome/applications/gimp-2.2.desktop
-%%GNOMEPANEL:%%@exec update-desktop-database > /dev/null || /usr/bin/true
+%%GNOMEPANEL:%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
%%GNOMEPANEL:%%share/gnome/mime-info/gimp-2.2.keys
share/gimp/palettes/Bears.gpl
share/gimp/palettes/Bgold.gpl
@@ -1900,4 +1900,4 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
@dirrm include/gimp-2.0
@dirrm etc/gimp/2.2
@dirrm etc/gimp
-%%GNOMEPANEL:%%@unexec update-desktop-database > /dev/null || /usr/bin/true
+%%GNOMEPANEL:%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/graphics/gpdf/Makefile b/graphics/gpdf/Makefile
index f9a9e248b18e..c244558197c6 100644
--- a/graphics/gpdf/Makefile
+++ b/graphics/gpdf/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gpdf
PORTVERSION= 2.10.0
+PORTREVISION= 1
CATEGORIES= graphics print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10
diff --git a/graphics/gpdf/pkg-plist b/graphics/gpdf/pkg-plist
index 0a67e02da255..c0bf3f455a26 100644
--- a/graphics/gpdf/pkg-plist
+++ b/graphics/gpdf/pkg-plist
@@ -3,7 +3,7 @@ libdata/bonobo/servers/GNOME_PDF.server
libexec/gnome-pdf-viewer
share/gnome/application-registry/gpdf.applications
share/gnome/applications/gpdf.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/gnome-2.0/ui/gpdf-control-ui.xml
share/gnome/gnome-2.0/ui/gpdf-window-ui.xml
share/gnome/gpdf/glade/gpdf-print-progress-dialog.glade
@@ -107,4 +107,4 @@ share/locale/zh_TW/LC_MESSAGES/gpdf.mo
@dirrm share/gnome/help/gpdf
@dirrm share/gnome/gpdf/glade
@dirrm share/gnome/gpdf
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 4ebaaa902ac0..d027a411c929 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -7,7 +7,7 @@
PORTNAME= inkscape
PORTVERSION= 0.41
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/graphics/inkscape/pkg-plist b/graphics/inkscape/pkg-plist
index c569be72e1b0..28cdeaf283b3 100644
--- a/graphics/inkscape/pkg-plist
+++ b/graphics/inkscape/pkg-plist
@@ -7,7 +7,7 @@ lib/inkscape/plugins/libgrid.a
lib/inkscape/plugins/libgrid.so
lib/inkscape/plugins/libgrid.so.0
share/gnome/applications/inkscape.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/inkscape/clipart/README
share/gnome/inkscape/clipart/README-ribbon.txt
share/gnome/inkscape/clipart/inkscape.logo.svg
@@ -156,4 +156,4 @@ share/locale/zh_CN/LC_MESSAGES/inkscape.mo
@dirrm share/gnome/inkscape
@dirrm lib/inkscape/plugins
@dirrm lib/inkscape
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index dabbfa089b2c..69828cec6d25 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -7,7 +7,7 @@
PORTNAME= sodipodi
PORTVERSION= 0.34
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/graphics/sodipodi/pkg-plist b/graphics/sodipodi/pkg-plist
index ee4f469938a3..e1abdf310897 100644
--- a/graphics/sodipodi/pkg-plist
+++ b/graphics/sodipodi/pkg-plist
@@ -2,7 +2,7 @@ bin/sodipodi
lib/sodipodi/extensions/ill2svg.pl
lib/sodipodi/modules/libxmleditor.so
share/gnome/applications/sodipodi.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/pixmaps/sodipodi.png
share/gnome/sodipodi/about.svg
share/gnome/sodipodi/add.xpm
@@ -220,4 +220,4 @@ share/locale/zh_CN/LC_MESSAGES/sodipodi.mo
@dirrm lib/sodipodi/modules
@dirrm lib/sodipodi/extensions
@dirrm lib/sodipodi
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index 186de43c49b7..00316058c808 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -7,6 +7,7 @@
PORTNAME= totem
PORTVERSION= 1.0
+PORTREVISION= 1
CATEGORIES= multimedia gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION}
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index 3d9d848dc419..70fe8951319f 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -147,5 +147,5 @@ share/locale/zh_TW/LC_MESSAGES/totem.mo
@dirrm include/totem/1/plparser
@dirrm include/totem/1
@dirrm include/totem
-@exec update-desktop-database > /dev/null || /usr/bin/true
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/net-p2p/gnome-btdownload/Makefile b/net-p2p/gnome-btdownload/Makefile
index 3fce0e3e3f63..2dc6e50dba0b 100644
--- a/net-p2p/gnome-btdownload/Makefile
+++ b/net-p2p/gnome-btdownload/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-btdownload
PORTVERSION= 0.0.17
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
diff --git a/net-p2p/gnome-btdownload/pkg-plist b/net-p2p/gnome-btdownload/pkg-plist
index 7cb3e4a657e2..cbd8bec4fb15 100644
--- a/net-p2p/gnome-btdownload/pkg-plist
+++ b/net-p2p/gnome-btdownload/pkg-plist
@@ -5,7 +5,7 @@ bin/gnome-btdownload
%%PORTDOCS%%%%DOCSDIR%%/README
share/gnome/application-registry/gnome-btdownload.applications
share/gnome/applications/gnome-btdownload.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/gnome-btdownload/glade/contdiag.glade
share/gnome/gnome-btdownload/glade/dlsession.glade
share/gnome/gnome-btdownload/glade/errdiag.glade
@@ -16,4 +16,4 @@ share/gnome/mime-info/gnome-btdownload.mime
@dirrm share/gnome/gnome-btdownload/glade
@dirrm share/gnome/gnome-btdownload
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/net/gnoemoe/Makefile b/net/gnoemoe/Makefile
index 31b43f6d2955..021b65119088 100644
--- a/net/gnoemoe/Makefile
+++ b/net/gnoemoe/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnoemoe
PORTVERSION= 0.8.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://www.icecrew.nl/software/gnoemoe/download/
diff --git a/net/gnoemoe/pkg-plist b/net/gnoemoe/pkg-plist
index f34ece230901..6a10c3c2c292 100644
--- a/net/gnoemoe/pkg-plist
+++ b/net/gnoemoe/pkg-plist
@@ -46,5 +46,5 @@ share/mime/packages/gnoemoe.xml
@dirrm share/gnome/gnoemoe/pixmaps/ice-userlist
@dirrm share/gnome/gnoemoe/pixmaps
@dirrm share/gnome/gnoemoe
-@exec update-mime-database %D/share/mime
-@unexec update-mime-database %D/share/mime
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
diff --git a/net/gnome-btdownload/Makefile b/net/gnome-btdownload/Makefile
index 3fce0e3e3f63..2dc6e50dba0b 100644
--- a/net/gnome-btdownload/Makefile
+++ b/net/gnome-btdownload/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-btdownload
PORTVERSION= 0.0.17
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= net gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
diff --git a/net/gnome-btdownload/pkg-plist b/net/gnome-btdownload/pkg-plist
index 7cb3e4a657e2..cbd8bec4fb15 100644
--- a/net/gnome-btdownload/pkg-plist
+++ b/net/gnome-btdownload/pkg-plist
@@ -5,7 +5,7 @@ bin/gnome-btdownload
%%PORTDOCS%%%%DOCSDIR%%/README
share/gnome/application-registry/gnome-btdownload.applications
share/gnome/applications/gnome-btdownload.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/gnome-btdownload/glade/contdiag.glade
share/gnome/gnome-btdownload/glade/dlsession.glade
share/gnome/gnome-btdownload/glade/errdiag.glade
@@ -16,4 +16,4 @@ share/gnome/mime-info/gnome-btdownload.mime
@dirrm share/gnome/gnome-btdownload/glade
@dirrm share/gnome/gnome-btdownload
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index f6301dea2156..55992aa5d774 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -7,7 +7,7 @@
PORTNAME= ggv
PORTVERSION= 2.8.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.8
diff --git a/print/ggv/pkg-plist b/print/ggv/pkg-plist
index bb916303feb0..4f3701d1ef37 100644
--- a/print/ggv/pkg-plist
+++ b/print/ggv/pkg-plist
@@ -2,7 +2,7 @@ bin/ggv
libdata/bonobo/servers/GNOME_GGV.server
libexec/ggv-postscript-viewer
share/gnome/applications/ggv.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/gnome-2.0/ui/ggv-control-ui.xml
share/gnome/gnome-2.0/ui/ggv-postscript-view-ui.xml
share/gnome/gnome-2.0/ui/ggv-ui.xml
@@ -147,4 +147,4 @@ share/locale/zh_TW/LC_MESSAGES/ggv.mo
@dirrm share/gnome/help/ggv/C/figures
@dirrm share/gnome/help/ggv/C
@dirrm share/gnome/help/ggv
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/science/gchempaint/Makefile b/science/gchempaint/Makefile
index 5fa1f32ce62c..d0c15ad533d7 100644
--- a/science/gchempaint/Makefile
+++ b/science/gchempaint/Makefile
@@ -6,7 +6,7 @@
PORTNAME= gchempaint
PORTVERSION= 0.4.11
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= science
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/science/gchempaint/pkg-plist b/science/gchempaint/pkg-plist
index d7e921f4a1c4..70bd9cff5c91 100644
--- a/science/gchempaint/pkg-plist
+++ b/science/gchempaint/pkg-plist
@@ -69,5 +69,5 @@ share/mime/packages/gchempaint.xml
@dirrm share/gnome/help/gchempaint/C
@dirrm share/gnome/help/gchempaint
@dirrm share/gnome/omf/gchempaint
-@exec update-mime-database %D/share/mime
-@unexec update-mime-database %D/share/mime
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
diff --git a/science/gchemutils/Makefile b/science/gchemutils/Makefile
index 3f8f74b7a8d7..bc1cdf28b662 100644
--- a/science/gchemutils/Makefile
+++ b/science/gchemutils/Makefile
@@ -6,7 +6,7 @@
PORTNAME= gchemutils
PORTVERSION= 0.2.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= science
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/science/gchemutils/pkg-plist b/science/gchemutils/pkg-plist
index 09e9562ac383..02b071410658 100644
--- a/science/gchemutils/pkg-plist
+++ b/science/gchemutils/pkg-plist
@@ -135,5 +135,5 @@ share/mime/packages/gchemutils.xml
@dirrm share/gnome/doc/gchemutils
@dirrm share/gnome/doc
@unexec rmdir %D/share/mime/chemical 2>/dev/null || true
-@exec update-mime-database %D/share/mime
-@unexec update-mime-database %D/share/mime
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index bba75d834ce0..f879683460d7 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -7,6 +7,7 @@
PORTNAME= seahorse
PORTVERSION= 0.7.6
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR=sources/${PORTNAME}/0.7
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
index 7d7410e04bc9..b50404ae6a1e 100644
--- a/security/seahorse/pkg-plist
+++ b/security/seahorse/pkg-plist
@@ -12,7 +12,7 @@ share/gnome/applications/seahorse.desktop
share/gnome/control-center-2.0/capplets/seahorse-pgp-preferences.desktop
share/gnome/applications/seahorse-pgp-encrypted.desktop
share/gnome/applications/seahorse-pgp-signature.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/help/seahorse/C/figures/export.png
share/gnome/help/seahorse/C/figures/file-manager.png
share/gnome/help/seahorse/C/figures/generate.png
@@ -94,6 +94,6 @@ share/locale/zh_CN/LC_MESSAGES/seahorse.mo
@dirrm share/gnome/omf/seahorse
@dirrm share/gnome/seahorse/glade
@dirrm share/gnome/seahorse
-@exec update-mime-database %D/share/mime
-@unexec update-mime-database %D/share/mime
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/sysutils/coaster/Makefile b/sysutils/coaster/Makefile
index 7bf8eaf33fac..ecd826899b7c 100644
--- a/sysutils/coaster/Makefile
+++ b/sysutils/coaster/Makefile
@@ -7,6 +7,7 @@
PORTNAME= coaster
PORTVERSION= 0.1.4.2
+PORTREVISION= 1
CATEGORIES= sysutils gnome
MASTER_SITES= http://www.coaster-burn.org/files/coaster/
diff --git a/sysutils/coaster/pkg-plist b/sysutils/coaster/pkg-plist
index c7984b6a880b..bf77dadeb535 100644
--- a/sysutils/coaster/pkg-plist
+++ b/sysutils/coaster/pkg-plist
@@ -7,7 +7,7 @@ bin/coaster
%%PORTDOCS%%%%DOCSDIR%%/TODO
share/gnome/application-registry/coaster.applications
share/gnome/applications/coaster.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/coaster/glade/coaster-dialogs.glade
share/gnome/coaster/glade/coaster-preferences.glade
share/gnome/coaster/glade/coaster.glade
@@ -42,6 +42,6 @@ share/mime/packages/coaster.xml
@dirrm share/gnome/coaster/glade
@dirrm share/gnome/coaster
%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec update-desktop-database > /dev/null || /usr/bin/true
-@exec update-mime-database %D/share/mime
-@unexec update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 498b16f8bd9c..66faa65f9b84 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomecontrolcenter2
PORTVERSION= 2.10.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/control-center/2.10
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 8787f4495677..51f4a7cb35f9 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -51,7 +51,7 @@ share/gnome/applications/keybinding.desktop
share/gnome/applications/keyboard.desktop
share/gnome/applications/themus-theme-applier.desktop
share/gnome/applications/window-properties.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/control-center-2.0/icons/display-capplet.png
share/gnome/control-center-2.0/interfaces/acme.glade
share/gnome/control-center-2.0/interfaces/apply-font.glade
@@ -198,4 +198,4 @@ share/locale/zu/LC_MESSAGES/control-center-2.0.mo
@unexec rmdir %D/share/gnome/control-center-2.0/icons 2> /dev/null || true
@dirrm lib/window-manager-settings
@dirrm include/gnome-window-settings-2.0
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 498b16f8bd9c..66faa65f9b84 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnomecontrolcenter2
PORTVERSION= 2.10.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/control-center/2.10
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index 8787f4495677..51f4a7cb35f9 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -51,7 +51,7 @@ share/gnome/applications/keybinding.desktop
share/gnome/applications/keyboard.desktop
share/gnome/applications/themus-theme-applier.desktop
share/gnome/applications/window-properties.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/control-center-2.0/icons/display-capplet.png
share/gnome/control-center-2.0/interfaces/acme.glade
share/gnome/control-center-2.0/interfaces/apply-font.glade
@@ -198,4 +198,4 @@ share/locale/zu/LC_MESSAGES/control-center-2.0.mo
@unexec rmdir %D/share/gnome/control-center-2.0/icons 2> /dev/null || true
@dirrm lib/window-manager-settings
@dirrm include/gnome-window-settings-2.0
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 32ab02e294f0..e8a4c068356e 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -7,6 +7,7 @@
PORTNAME= epiphany
PORTVERSION= 1.6.0
+PORTREVISION= 1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.6
diff --git a/www/epiphany/pkg-plist b/www/epiphany/pkg-plist
index 9da0f027eb82..7a07357f7dde 100644
--- a/www/epiphany/pkg-plist
+++ b/www/epiphany/pkg-plist
@@ -60,7 +60,7 @@ libdata/pkgconfig/epiphany-1.6.pc
share/gnome/application-registry/epiphany.applications
share/gnome/applications/bme.desktop
share/gnome/applications/epiphany.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/epiphany/art/epiphany-bookmarks.png
share/gnome/epiphany/art/epiphany-close-tab.png
share/gnome/epiphany/art/epiphany-download.png
@@ -209,4 +209,4 @@ share/locale/zh_TW/LC_MESSAGES/epiphany.mo
@dirrm %%DOCSDIR%%
@dirrm include/epiphany-%%EPHY_VERSION%%/epiphany
@dirrm include/epiphany-%%EPHY_VERSION%%
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 5d2a9e83183a..66d0fccd6084 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -7,6 +7,7 @@
PORTNAME= galeon
PORTVERSION= 1.3.20
+PORTREVISION= 1
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
http://osdn.dl.sourceforge.net/sourceforge/galeon/
diff --git a/www/galeon/pkg-plist b/www/galeon/pkg-plist
index 1f093a652fa2..ad1a91e1c987 100644
--- a/www/galeon/pkg-plist
+++ b/www/galeon/pkg-plist
@@ -5,7 +5,7 @@ etc/sound/events/galeon.soundlist
libdata/bonobo/servers/GNOME_Galeon_Automation.server
libdata/bonobo/servers/GNOME_Galeon_NautilusView.server
share/gnome/applications/galeon.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/galeon/FAQ.html
share/gnome/galeon/about_logo.png
share/gnome/galeon/autoscroll.xpm
@@ -222,4 +222,4 @@ share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo
@dirrm share/gnome/help/galeon/es
@dirrm share/gnome/help/galeon
@dirrm share/gnome/galeon
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/www/screem-devel/Makefile b/www/screem-devel/Makefile
index 3d86f0e163eb..01db789b068d 100644
--- a/www/screem-devel/Makefile
+++ b/www/screem-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= screem
PORTVERSION= 0.12.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/www/screem-devel/pkg-plist b/www/screem-devel/pkg-plist
index 14a3576bc82d..5b3e20e2ea69 100644
--- a/www/screem-devel/pkg-plist
+++ b/www/screem-devel/pkg-plist
@@ -12,7 +12,7 @@ lib/screem/plugins/tableWizard.so
lib/screem/plugins/uploadWizard.so
share/gnome/application-registry/screem.applications
share/gnome/applications/screem.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/help/screem/C/figures/color-wizard.png
share/gnome/help/screem/C/figures/css-wizard1.png
share/gnome/help/screem/C/figures/css-wizard2.png
@@ -226,6 +226,6 @@ share/locale/zh_CN/LC_MESSAGES/screem.mo
@dirrm share/gnome/screem/ui
@dirrm share/gnome/screem
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/screem/screem-C.omf 2>/dev/null || /usr/bin/true
-@exec update-mime-database %D/share/mime
-@unexec update-mime-database %D/share/mime
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/www/screem/Makefile b/www/screem/Makefile
index 3d86f0e163eb..01db789b068d 100644
--- a/www/screem/Makefile
+++ b/www/screem/Makefile
@@ -7,7 +7,7 @@
PORTNAME= screem
PORTVERSION= 0.12.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/www/screem/pkg-plist b/www/screem/pkg-plist
index 14a3576bc82d..5b3e20e2ea69 100644
--- a/www/screem/pkg-plist
+++ b/www/screem/pkg-plist
@@ -12,7 +12,7 @@ lib/screem/plugins/tableWizard.so
lib/screem/plugins/uploadWizard.so
share/gnome/application-registry/screem.applications
share/gnome/applications/screem.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/help/screem/C/figures/color-wizard.png
share/gnome/help/screem/C/figures/css-wizard1.png
share/gnome/help/screem/C/figures/css-wizard2.png
@@ -226,6 +226,6 @@ share/locale/zh_CN/LC_MESSAGES/screem.mo
@dirrm share/gnome/screem/ui
@dirrm share/gnome/screem
@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/screem/screem-C.omf 2>/dev/null || /usr/bin/true
-@exec update-mime-database %D/share/mime
-@unexec update-mime-database %D/share/mime
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index ad37cecf0e72..3228b5f50c1a 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= nautilus2
PORTVERSION= 2.10.0
+PORTREVISION= 1
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/2.10
diff --git a/x11-fm/nautilus2/pkg-plist b/x11-fm/nautilus2/pkg-plist
index 926374cdc6e6..44eccead5012 100644
--- a/x11-fm/nautilus2/pkg-plist
+++ b/x11-fm/nautilus2/pkg-plist
@@ -24,7 +24,7 @@ share/gnome/applications/nautilus-folder-handler.desktop
share/gnome/applications/nautilus-home.desktop
share/gnome/applications/nautilus.desktop
share/gnome/applications/network-scheme.desktop
-@exec update-desktop-database > /dev/null || /usr/bin/true
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
share/gnome/nautilus/browser.xml
share/gnome/nautilus/glade/nautilus-bookmarks-window.glade
share/gnome/nautilus/glade/nautilus-file-management-properties.glade
@@ -187,4 +187,4 @@ share/locale/zu/LC_MESSAGES/nautilus.mo
@exec /bin/mkdir -p %D/lib/nautilus/extensions-1.0
@unexec /bin/rmdir %D/lib/nautilus/extensions-1.0 2>/dev/null || /usr/bin/true
@unexec /bin/rmdir %D/lib/nautilus 2>/dev/null || /usr/bin/true
-@unexec update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true