Update to 2.5.2.

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

8 files changed, 28 insertions, 135 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index d5f37ed28..d7543a922 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.5.1
+PORTVERSION=	2.5.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-panel/2.5
@@ -20,7 +20,8 @@ USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier gnomedesktop libwnck
+USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack lthack gnomedesktop \
+		libwnck
 GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
@@ -31,4 +32,9 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 
 MAN1=	gnome-panel.1 gnome-panel-preferences.1
 
+post-patch:
+.for po in da.po it.po zh_TW.po
+	@${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po}
+.endfor
+
 .include <bsd.port.mk>
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index d527066bf..c9cb06aa1 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-panel-2.5.1.tar.bz2) = fdebfb61eedb7afb2e119bbd575b880c
+MD5 (gnome2/gnome-panel-2.5.2.tar.bz2) = 0459e76ce9bd31f29e6bff1134710f4e
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock.c b/x11/gnome-panel/files/patch-applets_clock_clock.c
index 0b21f9967..7738df6bb 100644
--- a/x11/gnome-panel/files/patch-applets_clock_clock.c
+++ b/x11/gnome-panel/files/patch-applets_clock_clock.c
@@ -1,9 +1,6 @@
-
-$FreeBSD: ports/x11/gnomepanel/files/patch-applets_clock_clock.c,v 1.1 2003/09/18 06:49:26 marcus Exp $
-
---- applets/clock/clock.c	2002/05/14 14:08:16	1.1
-+++ applets/clock/clock.c	2002/05/14 14:12:56
-@@ -14,7 +14,9 @@
+--- applets/clock/clock.c.orig	Thu Dec  4 17:57:00 2003
++++ applets/clock/clock.c	Wed Dec 10 23:23:38 2003
+@@ -37,7 +37,9 @@
  #include <dirent.h>
  #include <string.h>
  #include <time.h>
@@ -13,15 +10,15 @@ $FreeBSD: ports/x11/gnomepanel/files/patch-applets_clock_clock.c,v 1.1 2003/09/1
  
  #include <panel-applet.h>
  #include <panel-applet-gconf.h>
-@@ -684,7 +686,11 @@
- 	cd->hourformat = panel_applet_gconf_get_int (applet, KEY_HOUR_FORMAT, &error);
- 	if (error || (cd->hourformat != 12 && cd->hourformat != 24)) {
- 		/* if value is not valid, set it according to locale */
+@@ -1117,7 +1119,11 @@
+ {
+ 	const char *am;
+ 
 +#ifdef HAVE_LANGINFO_H
- 		const char *am = nl_langinfo (AM_STR);
+ 	am = nl_langinfo (AM_STR);
 +#else
-+		const char *am = "AM";
++	am = "AM";
 +#endif
- 		cd->hourformat = (am[0] == '\0') ? 24 : 12;
+ 	return (am[0] == '\0') ? CLOCK_FORMAT_24 : CLOCK_FORMAT_12;
+ }
  
- 		if (error)
diff --git a/x11/gnome-panel/files/patch-configure b/x11/gnome-panel/files/patch-configure
index a94d4761c..cdd3bc3ec 100644
--- a/x11/gnome-panel/files/patch-configure
+++ b/x11/gnome-panel/files/patch-configure
@@ -9,11 +9,3 @@
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  echo "$as_me:$LINENO: checking for $ac_header" >&5
-@@ -7878,6 +7878,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11/gnome-panel/files/patch-po_da.po b/x11/gnome-panel/files/patch-po_da.po
deleted file mode 100644
index 96bfea954..000000000
--- a/x11/gnome-panel/files/patch-po_da.po
+++ /dev/null
@@ -1,29 +0,0 @@
---- po/da.po.orig	Wed Oct  1 15:54:18 2003
-+++ po/da.po	Wed Oct  1 15:56:23 2003
-@@ -48,7 +48,7 @@
- 
- #: applets/clock/clock.c:227
- msgid "%a %b %d"
--msgstr "%a %-d. %b"
-+msgstr "%a %d. %b"
- 
- #. translators: reverse the order of these arguments
- #. *              if the time should come before the
-@@ -75,7 +75,7 @@
- #. Show date in tooltip
- #: applets/clock/clock.c:344
- msgid "%A %B %d"
--msgstr "%A den %-d. %B"
-+msgstr "%A den %d. %B"
- 
- #: applets/clock/clock.c:472
- msgid "Calendar"
-@@ -95,7 +95,7 @@
- 
- #: applets/clock/clock.c:809
- msgid "%A, %B %d %Y"
--msgstr "%A, %-d. %B %Y"
-+msgstr "%A, %d. %B %Y"
- 
- #: applets/clock/clock.c:850
- #, c-format
diff --git a/x11/gnome-panel/files/patch-po_it.po b/x11/gnome-panel/files/patch-po_it.po
deleted file mode 100644
index 572e174a3..000000000
--- a/x11/gnome-panel/files/patch-po_it.po
+++ /dev/null
@@ -1,59 +0,0 @@
---- po/it.po.orig	Tue Nov 11 10:11:20 2003
-+++ po/it.po	Tue Nov 11 22:14:34 2003
-@@ -17,23 +17,23 @@
- 
- #: applets/clock/clock.c:219
- msgid "%l:%M:%S %p"
--msgstr "%-I.%M.%S %p"
-+msgstr "%I.%M.%S %p"
- 
- #: applets/clock/clock.c:219
- msgid "%l:%M %p"
--msgstr "%-I.%M %p"
-+msgstr "%I.%M %p"
- 
- #: applets/clock/clock.c:221 applets/clock/clock.c:778
- msgid "%H:%M:%S"
--msgstr "%-H.%M.%S"
-+msgstr "%H.%M.%S"
- 
- #: applets/clock/clock.c:221 applets/clock/clock.c:780
- msgid "%H:%M"
--msgstr "%-H.%M"
-+msgstr "%H.%M"
- 
- #: applets/clock/clock.c:227
- msgid "%a %b %d"
--msgstr "%a %-d %b"
-+msgstr "%a %d %b"
- 
- #. translators: reverse the order of these arguments
- #. *              if the time should come before the
-@@ -60,7 +60,7 @@
- #. Show date in tooltip
- #: applets/clock/clock.c:344
- msgid "%A %B %d"
--msgstr "%A %-d %B"
-+msgstr "%A %d %B"
- 
- #: applets/clock/clock.c:473
- msgid "Calendar"
-@@ -72,15 +72,15 @@
- 
- #: applets/clock/clock.c:773
- msgid "%I:%M:%S %p"
--msgstr "%-I.%M.%S %p"
-+msgstr "%I.%M.%S %p"
- 
- #: applets/clock/clock.c:775
- msgid "%I:%M %p"
--msgstr "%-I.%M %p"
-+msgstr "%I.%M %p"
- 
- #: applets/clock/clock.c:814
- msgid "%A, %B %d %Y"
--msgstr "%A, %-d %B %Y"
-+msgstr "%A, %d %B %Y"
- 
- #: applets/clock/clock.c:855
- #, c-format
diff --git a/x11/gnome-panel/files/patch-po_zh_TW.po b/x11/gnome-panel/files/patch-po_zh_TW.po
deleted file mode 100644
index 3e7e16c45..000000000
--- a/x11/gnome-panel/files/patch-po_zh_TW.po
+++ /dev/null
@@ -1,20 +0,0 @@
---- po/zh_TW.po.orig	Wed Oct  1 15:57:10 2003
-+++ po/zh_TW.po	Wed Oct  1 15:57:19 2003
-@@ -40,7 +40,7 @@
- 
- #: applets/clock/clock.c:227
- msgid "%a %b %d"
--msgstr "%-m月%-d日(%a)"
-+msgstr "%m月%d日(%a)"
- 
- #. translators: reverse the order of these arguments
- #. *              if the time should come before the
-@@ -67,7 +67,7 @@
- #. Show date in tooltip
- #: applets/clock/clock.c:344
- msgid "%A %B %d"
--msgstr "%-m月%-d日(%A)"
-+msgstr "%m月%d日(%A)"
- 
- #: applets/clock/clock.c:472
- msgid "Calendar"
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 2f1c0ebdd..1a6647ba6 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -79,18 +79,24 @@ libdata/pkgconfig/libpanelapplet-2.0.pc
 libexec/fish-applet-2
 libexec/notification-area-applet
 libexec/wnck-applet
+share/doc/panel-applet/PanelApplet.html
 share/doc/panel-applet/applet-popups.html
 share/doc/panel-applet/applet-porting.html
 share/doc/panel-applet/applet-writing.html
+share/doc/panel-applet/home.png
+share/doc/panel-applet/index.html
 share/doc/panel-applet/index.sgml
-share/doc/panel-applet/libpanel-applet.html
+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-Panel-Applet-GConf-Utilities.html
+share/doc/panel-applet/panel-applet.devhelp
 share/doc/panel-applet/panel-applet.html
 share/doc/panel-applet/panel-signals.html
 share/doc/panel-applet/panelapplet.html
+share/doc/panel-applet/right.png
 share/doc/panel-applet/server-files.html
 share/doc/panel-applet/session-saving.html
+share/doc/panel-applet/up.png
 share/gnome/control-center-2.0/capplets/gnome-panel-preferences.desktop
 share/gnome/gnome-2.0/ui/GNOME_ClockApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_FishApplet.xml