Update to 2.5.4.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1771 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 30 insertions, 14 deletions

diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 46909e5e2..f9aed63d3 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.5.3
-PORTREVISION=	1
+PORTVERSION=	2.5.4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.5
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 99a315a78..dfcfae343 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-2.5.3.tar.bz2) = 0465215458864230b36d3b751fb337d6
+MD5 (gnome2/gnome-desktop-2.5.4.tar.bz2) = f49d36c3a58f68223ad25ffeae5b4f6f
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index 876944cf7..e613fc6d3 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -21,6 +21,14 @@ share/gnome/help/fdl/C/fdl.xml
 share/gnome/help/gnome-feedback/C/gnome-feedback.xml
 share/gnome/help/gpl/C/gpl.xml
 share/gnome/help/lgpl/C/lgpl.xml
+share/gnome/omf/gnome-desktop/fdl-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/fdl-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-desktop/gnome-feedback-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/gnome-feedback-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-desktop/gpl-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/gpl-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-desktop/lgpl-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/lgpl-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/advanced-directory.png
 share/gnome/pixmaps/apple-green.png
 share/gnome/pixmaps/apple-red.png
@@ -183,16 +191,13 @@ share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
-@dirrm share/gnome/help/lgpl/C/figures
+@dirrm share/gnome/omf/gnome-desktop
 @dirrm share/gnome/help/lgpl/C
 @dirrm share/gnome/help/lgpl
-@dirrm share/gnome/help/gpl/C/figures
 @dirrm share/gnome/help/gpl/C
 @dirrm share/gnome/help/gpl
-@dirrm share/gnome/help/gnome-feedback/C/figures
 @dirrm share/gnome/help/gnome-feedback/C
 @dirrm share/gnome/help/gnome-feedback
-@dirrm share/gnome/help/fdl/C/figures
 @dirrm share/gnome/help/fdl/C
 @dirrm share/gnome/help/fdl
 @dirrm share/gnome/gnome-about/headers
@@ -200,3 +205,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
 @dirrm include/gnome-desktop-2.0/libgnomeui
 @dirrm include/gnome-desktop-2.0/libgnome
 @dirrm include/gnome-desktop-2.0
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/fdl-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/gnome-feedback-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/gpl-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/lgpl-C.omf 2>/dev/null || /usr/bin/true
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index 46909e5e2..f9aed63d3 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.5.3
-PORTREVISION=	1
+PORTVERSION=	2.5.4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.5
diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo
index 99a315a78..dfcfae343 100644
--- a/x11/gnomedesktop/distinfo
+++ b/x11/gnomedesktop/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-desktop-2.5.3.tar.bz2) = 0465215458864230b36d3b751fb337d6
+MD5 (gnome2/gnome-desktop-2.5.4.tar.bz2) = f49d36c3a58f68223ad25ffeae5b4f6f
diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist
index 876944cf7..e613fc6d3 100644
--- a/x11/gnomedesktop/pkg-plist
+++ b/x11/gnomedesktop/pkg-plist
@@ -21,6 +21,14 @@ share/gnome/help/fdl/C/fdl.xml
 share/gnome/help/gnome-feedback/C/gnome-feedback.xml
 share/gnome/help/gpl/C/gpl.xml
 share/gnome/help/lgpl/C/lgpl.xml
+share/gnome/omf/gnome-desktop/fdl-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/fdl-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-desktop/gnome-feedback-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/gnome-feedback-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-desktop/gpl-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/gpl-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-desktop/lgpl-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-desktop/lgpl-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/advanced-directory.png
 share/gnome/pixmaps/apple-green.png
 share/gnome/pixmaps/apple-red.png
@@ -183,16 +191,13 @@ share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
-@dirrm share/gnome/help/lgpl/C/figures
+@dirrm share/gnome/omf/gnome-desktop
 @dirrm share/gnome/help/lgpl/C
 @dirrm share/gnome/help/lgpl
-@dirrm share/gnome/help/gpl/C/figures
 @dirrm share/gnome/help/gpl/C
 @dirrm share/gnome/help/gpl
-@dirrm share/gnome/help/gnome-feedback/C/figures
 @dirrm share/gnome/help/gnome-feedback/C
 @dirrm share/gnome/help/gnome-feedback
-@dirrm share/gnome/help/fdl/C/figures
 @dirrm share/gnome/help/fdl/C
 @dirrm share/gnome/help/fdl
 @dirrm share/gnome/gnome-about/headers
@@ -200,3 +205,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
 @dirrm include/gnome-desktop-2.0/libgnomeui
 @dirrm include/gnome-desktop-2.0/libgnome
 @dirrm include/gnome-desktop-2.0
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/fdl-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/gnome-feedback-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/gpl-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-desktop/lgpl-C.omf 2>/dev/null || /usr/bin/true