Update to 2.23.6.

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

4 files changed, 11 insertions, 26 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 074425467..a167e8164 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-panel/Makefile,v 1.183 2008/06/17 19:44:35 marcus Exp $
+#   $MCom: ports/x11/gnome-panel/Makefile,v 1.184 2008/07/23 05:12:58 marcus Exp $
 #
 
 PORTNAME=	gnome-panel
-PORTVERSION=	2.23.5
+PORTVERSION=	2.23.6
 PORTREVISION?=	0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
@@ -75,11 +75,6 @@ post-patch:
 .endfor
 .endif
 
-post-install:
-	${MKDIR} ${PREFIX}/share/gnome-panel
-	${INSTALL_DATA} ${FILESDIR}/iso3166.tab \
-	    	${PREFIX}/share/gnome-panel/iso3166.tab
-
 .include <bsd.port.post.mk>
 
 .endif
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index 8feecc7d7..208d1f4f8 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-panel-2.23.5.tar.bz2) = 075172fb7a72e8a35df50e99a5a826af
-SHA256 (gnome2/gnome-panel-2.23.5.tar.bz2) = c98d3878af5895911f53e38a16079cc66bb0bcdcfb54a1381d26cbdfc510c331
-SIZE (gnome2/gnome-panel-2.23.5.tar.bz2) = 3255744
+MD5 (gnome2/gnome-panel-2.23.6.tar.bz2) = 6204b45029b79deeb6b05e46b7c2908d
+SHA256 (gnome2/gnome-panel-2.23.6.tar.bz2) = 4f15d3ebe12bad39c0af6d9f682c3e3ab391556a6209ad6f7961e16a388f82a9
+SIZE (gnome2/gnome-panel-2.23.6.tar.bz2) = 3245620
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c b/x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c
deleted file mode 100644
index b6524a42d..000000000
--- a/x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- applets/clock/clock-zonetable.c.orig	2008-04-15 16:58:01.000000000 -0400
-+++ applets/clock/clock-zonetable.c	2008-04-19 20:32:30.000000000 -0400
-@@ -18,8 +18,12 @@
- #define ISO3166_FILE SYSTEM_ZONEINFODIR"/country.tab"
- #else
- #define ZONETAB_FILE SYSTEM_ZONEINFODIR"/zone.tab"
-+#ifdef __FreeBSD__
-+#define ISO3166_FILE DATADIR"/gnome-panel/iso3166.tab"
-+#else
- #define ISO3166_FILE SYSTEM_ZONEINFODIR"/iso3166.tab"
- #endif
-+#endif
- 
- static GObject *zonetable_singleton = NULL;
- 
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 73ace9005..fc94d8957 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -44,7 +44,6 @@ share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
 %%DATADIR%%/glade/panel-test-applets.glade
 %%DATADIR%%/glade/window-list.glade
 %%DATADIR%%/glade/workspace-switcher.glade
-%%DATADIR%%/iso3166.tab
 %%DATADIR%%/pixmaps/clock-calendar-icon.png
 %%DATADIR%%/pixmaps/clock-face-large.svg
 %%DATADIR%%/pixmaps/clock-face-small-day.svg
@@ -146,6 +145,9 @@ share/gnome/help/fish/C/legal.xml
 share/gnome/help/fish/ca/figures/fish_applet.png
 share/gnome/help/fish/ca/fish.xml
 share/gnome/help/fish/ca/legal.xml
+share/gnome/help/fish/de/figures/fish_applet.png
+share/gnome/help/fish/de/fish.xml
+share/gnome/help/fish/de/legal.xml
 share/gnome/help/fish/el/figures/fish_applet.png
 share/gnome/help/fish/el/fish.xml
 share/gnome/help/fish/el/legal.xml
@@ -403,6 +405,7 @@ share/omf/clock/clock-zh_CN.omf
 share/omf/clock/clock-zh_TW.omf
 share/omf/fish/fish-C.omf
 share/omf/fish/fish-ca.omf
+share/omf/fish/fish-de.omf
 share/omf/fish/fish-el.omf
 share/omf/fish/fish-es.omf
 share/omf/fish/fish-fr.omf
@@ -524,6 +527,8 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
 @dirrm share/gnome/help/fish/es
 @dirrm share/gnome/help/fish/el/figures
 @dirrm share/gnome/help/fish/el
+@dirrm share/gnome/help/fish/de/figures
+@dirrm share/gnome/help/fish/de
 @dirrm share/gnome/help/fish/ca/figures
 @dirrm share/gnome/help/fish/ca
 @dirrm share/gnome/help/fish/C/figures