Update to 2.13.4.

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

8 files changed, 24 insertions, 64 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index ea75af72a..ef85b49e1 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomepanel/Makefile,v 1.114 2005/12/14 15:40:04 marcus Exp $
+#   $MCom: ports/x11/gnomepanel/Makefile,v 1.115 2005/12/21 16:17:05 jylefort Exp $
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.13.3
-PORTREVISION=	1
+PORTVERSION=	2.13.4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-panel/2.13
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index b1745ee62..ece5c24bc 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-panel-2.13.3.tar.bz2) = 55d8339ee3414533ce5cef1166bc1318
-SHA256 (gnome2/gnome-panel-2.13.3.tar.bz2) = 3c545a72be7ce6662e330f67cd9e923e99a73d732790864fbc22cb967e90d6e7
-SIZE (gnome2/gnome-panel-2.13.3.tar.bz2) = 2469521
+MD5 (gnome2/gnome-panel-2.13.4.tar.bz2) = 0470b5005716660966d39fb4a6299e24
+SHA256 (gnome2/gnome-panel-2.13.4.tar.bz2) = b17cc5e3a1c05977a9345e190792b93c28d7511022f473fad4086c149b96ad15
+SIZE (gnome2/gnome-panel-2.13.4.tar.bz2) = 2478702
diff --git a/x11/gnome-panel/files/patch-gnome-panel_egg-recent-model.c b/x11/gnome-panel/files/patch-gnome-panel_egg-recent-model.c
deleted file mode 100644
index c74812db8..000000000
--- a/x11/gnome-panel/files/patch-gnome-panel_egg-recent-model.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- gnome-panel/egg-recent-model.c.orig	Wed Dec 21 16:58:46 2005
-+++ gnome-panel/egg-recent-model.c	Wed Dec 21 16:59:03 2005
-@@ -942,7 +942,7 @@
- static gboolean
- egg_recent_model_lock_file (FILE *file)
- {
--#ifdef F_TLOCK
-+#ifdef HAVE_LOCKF
- 	int fd;
- 	gint	try = 5;
- 
-@@ -980,7 +980,7 @@
- static gboolean
- egg_recent_model_unlock_file (FILE *file)
- {
--#ifdef F_TLOCK
-+#ifdef HAVE_LOCKF
- 	int fd;
- 
- 	rewind (file);
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 79253377b..9714a53d1 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -34,6 +34,7 @@ share/doc/panel-applet/left.png
 share/doc/panel-applet/multi-applets.html
 share/doc/panel-applet/panel-applet-Panel-Applet-GConf-Utilities.html
 share/doc/panel-applet/panel-applet.devhelp
+share/doc/panel-applet/panel-applet.devhelp2
 share/doc/panel-applet/panel-applet.html
 share/doc/panel-applet/panel-signals.html
 share/doc/panel-applet/right.png
@@ -189,6 +190,9 @@ share/gnome/help/workspace-switcher/de/workspace-switcher.xml
 share/gnome/help/workspace-switcher/es/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/es/legal.xml
 share/gnome/help/workspace-switcher/es/workspace-switcher.xml
+share/gnome/help/workspace-switcher/fr/figures/workspace_switcher_applet.png
+share/gnome/help/workspace-switcher/fr/legal.xml
+share/gnome/help/workspace-switcher/fr/workspace-switcher.xml
 share/gnome/help/workspace-switcher/it/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/it/legal.xml
 share/gnome/help/workspace-switcher/it/workspace-switcher.xml
@@ -237,12 +241,6 @@ share/gnome/omf/fish/fish-es.omf
 share/gnome/omf/fish/fish-fr.omf
 share/gnome/omf/fish/fish-it.omf
 share/gnome/omf/fish/fish-uk.omf
-share/gnome/omf/gnome-panel/clock-de.omf
-share/gnome/omf/gnome-panel/clock-ja.omf
-share/gnome/omf/gnome-panel/clock-ko.omf
-share/gnome/omf/gnome-panel/clock-sv.omf
-share/gnome/omf/gnome-panel/clock-zh_CN.omf
-share/gnome/omf/gnome-panel/clock-zh_TW.omf
 share/gnome/omf/gnome-panel/fish-applet-2-de.omf
 share/gnome/omf/gnome-panel/fish-applet-2-ja.omf
 share/gnome/omf/gnome-panel/fish-applet-2-ko.omf
@@ -268,6 +266,7 @@ share/gnome/omf/window-list/window-list-it.omf
 share/gnome/omf/window-list/window-list-uk.omf
 share/gnome/omf/workspace-switcher/workspace-switcher-C.omf
 share/gnome/omf/workspace-switcher/workspace-switcher-es.omf
+share/gnome/omf/workspace-switcher/workspace-switcher-fr.omf
 share/gnome/omf/workspace-switcher/workspace-switcher-it.omf
 share/gnome/omf/workspace-switcher/workspace-switcher-nl.omf
 share/gnome/omf/workspace-switcher/workspace-switcher-uk.omf
@@ -410,6 +409,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/workspace-switcher/ja
 @dirrm share/gnome/help/workspace-switcher/it/figures
 @dirrm share/gnome/help/workspace-switcher/it
+@dirrm share/gnome/help/workspace-switcher/fr/figures
+@dirrm share/gnome/help/workspace-switcher/fr
 @dirrm share/gnome/help/workspace-switcher/es/figures
 @dirrm share/gnome/help/workspace-switcher/es
 @dirrm share/gnome/help/workspace-switcher/de/figures
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index ea75af72a..ef85b49e1 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomepanel/Makefile,v 1.114 2005/12/14 15:40:04 marcus Exp $
+#   $MCom: ports/x11/gnomepanel/Makefile,v 1.115 2005/12/21 16:17:05 jylefort Exp $
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.13.3
-PORTREVISION=	1
+PORTVERSION=	2.13.4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-panel/2.13
diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo
index b1745ee62..ece5c24bc 100644
--- a/x11/gnomepanel/distinfo
+++ b/x11/gnomepanel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-panel-2.13.3.tar.bz2) = 55d8339ee3414533ce5cef1166bc1318
-SHA256 (gnome2/gnome-panel-2.13.3.tar.bz2) = 3c545a72be7ce6662e330f67cd9e923e99a73d732790864fbc22cb967e90d6e7
-SIZE (gnome2/gnome-panel-2.13.3.tar.bz2) = 2469521
+MD5 (gnome2/gnome-panel-2.13.4.tar.bz2) = 0470b5005716660966d39fb4a6299e24
+SHA256 (gnome2/gnome-panel-2.13.4.tar.bz2) = b17cc5e3a1c05977a9345e190792b93c28d7511022f473fad4086c149b96ad15
+SIZE (gnome2/gnome-panel-2.13.4.tar.bz2) = 2478702
diff --git a/x11/gnomepanel/files/patch-gnome-panel_egg-recent-model.c b/x11/gnomepanel/files/patch-gnome-panel_egg-recent-model.c
deleted file mode 100644
index c74812db8..000000000
--- a/x11/gnomepanel/files/patch-gnome-panel_egg-recent-model.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- gnome-panel/egg-recent-model.c.orig	Wed Dec 21 16:58:46 2005
-+++ gnome-panel/egg-recent-model.c	Wed Dec 21 16:59:03 2005
-@@ -942,7 +942,7 @@
- static gboolean
- egg_recent_model_lock_file (FILE *file)
- {
--#ifdef F_TLOCK
-+#ifdef HAVE_LOCKF
- 	int fd;
- 	gint	try = 5;
- 
-@@ -980,7 +980,7 @@
- static gboolean
- egg_recent_model_unlock_file (FILE *file)
- {
--#ifdef F_TLOCK
-+#ifdef HAVE_LOCKF
- 	int fd;
- 
- 	rewind (file);
diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist
index 79253377b..9714a53d1 100644
--- a/x11/gnomepanel/pkg-plist
+++ b/x11/gnomepanel/pkg-plist
@@ -34,6 +34,7 @@ share/doc/panel-applet/left.png
 share/doc/panel-applet/multi-applets.html
 share/doc/panel-applet/panel-applet-Panel-Applet-GConf-Utilities.html
 share/doc/panel-applet/panel-applet.devhelp
+share/doc/panel-applet/panel-applet.devhelp2
 share/doc/panel-applet/panel-applet.html
 share/doc/panel-applet/panel-signals.html
 share/doc/panel-applet/right.png
@@ -189,6 +190,9 @@ share/gnome/help/workspace-switcher/de/workspace-switcher.xml
 share/gnome/help/workspace-switcher/es/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/es/legal.xml
 share/gnome/help/workspace-switcher/es/workspace-switcher.xml
+share/gnome/help/workspace-switcher/fr/figures/workspace_switcher_applet.png
+share/gnome/help/workspace-switcher/fr/legal.xml
+share/gnome/help/workspace-switcher/fr/workspace-switcher.xml
 share/gnome/help/workspace-switcher/it/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/it/legal.xml
 share/gnome/help/workspace-switcher/it/workspace-switcher.xml
@@ -237,12 +241,6 @@ share/gnome/omf/fish/fish-es.omf
 share/gnome/omf/fish/fish-fr.omf
 share/gnome/omf/fish/fish-it.omf
 share/gnome/omf/fish/fish-uk.omf
-share/gnome/omf/gnome-panel/clock-de.omf
-share/gnome/omf/gnome-panel/clock-ja.omf
-share/gnome/omf/gnome-panel/clock-ko.omf
-share/gnome/omf/gnome-panel/clock-sv.omf
-share/gnome/omf/gnome-panel/clock-zh_CN.omf
-share/gnome/omf/gnome-panel/clock-zh_TW.omf
 share/gnome/omf/gnome-panel/fish-applet-2-de.omf
 share/gnome/omf/gnome-panel/fish-applet-2-ja.omf
 share/gnome/omf/gnome-panel/fish-applet-2-ko.omf
@@ -268,6 +266,7 @@ share/gnome/omf/window-list/window-list-it.omf
 share/gnome/omf/window-list/window-list-uk.omf
 share/gnome/omf/workspace-switcher/workspace-switcher-C.omf
 share/gnome/omf/workspace-switcher/workspace-switcher-es.omf
+share/gnome/omf/workspace-switcher/workspace-switcher-fr.omf
 share/gnome/omf/workspace-switcher/workspace-switcher-it.omf
 share/gnome/omf/workspace-switcher/workspace-switcher-nl.omf
 share/gnome/omf/workspace-switcher/workspace-switcher-uk.omf
@@ -410,6 +409,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/workspace-switcher/ja
 @dirrm share/gnome/help/workspace-switcher/it/figures
 @dirrm share/gnome/help/workspace-switcher/it
+@dirrm share/gnome/help/workspace-switcher/fr/figures
+@dirrm share/gnome/help/workspace-switcher/fr
 @dirrm share/gnome/help/workspace-switcher/es/figures
 @dirrm share/gnome/help/workspace-switcher/es
 @dirrm share/gnome/help/workspace-switcher/de/figures