Update to 2.29.5.

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

4 files changed, 21 insertions, 65 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 4f2e8674f..6e80c5688 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/x11/gnome-panel/Makefile,v 1.210 2010/01/17 00:23:14 kwm Exp $
 #
 
 PORTNAME=	gnome-panel
-PORTVERSION=	2.28.0
-PORTREVISION?=	2
+PORTVERSION=	2.29.5
+PORTREVISION?=	0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -21,6 +21,7 @@ USE_BZIP2=	yes
 .if !defined(REFERENCE_PORT)
 
 LIB_DEPENDS=	gweather.1:${PORTSDIR}/net/libgweather \
+		canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
 		polkit-gnome.0:${PORTSDIR}/sysutils/policykit-gnome
 
 USE_GETTEXT=	yes
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index 74972b3b2..e9a66676a 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-panel-2.28.0.tar.bz2) = 9f0ea283d44bbcce67dc2e8a02fe9fad
-SHA256 (gnome2/gnome-panel-2.28.0.tar.bz2) = c1168c0c8f84692002557d60870c782f4831635080d2c52cd2a3665fb7718465
-SIZE (gnome2/gnome-panel-2.28.0.tar.bz2) = 2976766
+MD5 (gnome2/gnome-panel-2.29.5.tar.bz2) = 9220c0696b189fd3ae16b007569b8a51
+SHA256 (gnome2/gnome-panel-2.29.5.tar.bz2) = 536d5effea4dc04f40c5eec622f4f8ff2a715b8b818dd20890b5932364ccb388
+SIZE (gnome2/gnome-panel-2.29.5.tar.bz2) = 3047447
diff --git a/x11/gnome-panel/files/patch-configure b/x11/gnome-panel/files/patch-configure
index dc6445b93..785c7f0f6 100644
--- a/x11/gnome-panel/files/patch-configure
+++ b/x11/gnome-panel/files/patch-configure
@@ -9,62 +9,3 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
-@@ -14954,12 +14954,12 @@
-     pkg_cv_CLOCK_CFLAGS="$CLOCK_CFLAGS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED\"") >&5
--  ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED") 2>&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_CLOCK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>/dev/null`
-+  pkg_cv_CLOCK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -14970,12 +14970,12 @@
-     pkg_cv_CLOCK_LIBS="$CLOCK_LIBS"
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED\"") >&5
--  ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED") 2>&5
-+    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\"") >&5
-+  ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--  pkg_cv_CLOCK_LIBS=`$PKG_CONFIG --libs "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>/dev/null`
-+  pkg_cv_CLOCK_LIBS=`$PKG_CONFIG --libs "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -14993,14 +14993,14 @@
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        CLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>&1`
-+	        CLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>&1`
-         else
--	        CLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>&1`
-+	        CLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$CLOCK_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED) were not met:
-+	{ { $as_echo "$as_me:$LINENO: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) were not met:
- 
- $CLOCK_PKG_ERRORS
- 
-@@ -15011,7 +15011,7 @@
- and CLOCK_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED) were not met:
-+$as_echo "$as_me: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) were not met:
- 
- $CLOCK_PKG_ERRORS
- 
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 721436306..05c709476 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -75,6 +75,9 @@ share/gnome/help/clock/ca/legal.xml
 share/gnome/help/clock/cs/clock.xml
 share/gnome/help/clock/cs/figures/clock_applet.png
 share/gnome/help/clock/cs/legal.xml
+share/gnome/help/clock/da/clock.xml
+share/gnome/help/clock/da/figures/clock_applet.png
+share/gnome/help/clock/da/legal.xml
 share/gnome/help/clock/de/clock.xml
 share/gnome/help/clock/de/figures/clock_applet.png
 share/gnome/help/clock/de/legal.xml
@@ -114,6 +117,9 @@ share/gnome/help/clock/oc/legal.xml
 share/gnome/help/clock/pa/clock.xml
 share/gnome/help/clock/pa/figures/clock_applet.png
 share/gnome/help/clock/pa/legal.xml
+share/gnome/help/clock/pt/clock.xml
+share/gnome/help/clock/pt/figures/clock_applet.png
+share/gnome/help/clock/pt/legal.xml
 share/gnome/help/clock/pt_BR/clock.xml
 share/gnome/help/clock/pt_BR/figures/clock_applet.png
 share/gnome/help/clock/pt_BR/legal.xml
@@ -271,6 +277,7 @@ share/locale/da/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/de/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/dz/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/el/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/en@shaw/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/en_CA/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/en_GB/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/eo/LC_MESSAGES/gnome-panel-2.0.mo
@@ -313,6 +320,7 @@ share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/mr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nb/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/nds/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ne/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo
@@ -355,6 +363,7 @@ share/omf/clock/clock-C.omf
 share/omf/clock/clock-ar.omf
 share/omf/clock/clock-ca.omf
 share/omf/clock/clock-cs.omf
+share/omf/clock/clock-da.omf
 share/omf/clock/clock-de.omf
 share/omf/clock/clock-el.omf
 share/omf/clock/clock-en_GB.omf
@@ -368,6 +377,7 @@ share/omf/clock/clock-ko.omf
 share/omf/clock/clock-nl.omf
 share/omf/clock/clock-oc.omf
 share/omf/clock/clock-pa.omf
+share/omf/clock/clock-pt.omf
 share/omf/clock/clock-pt_BR.omf
 share/omf/clock/clock-ru.omf
 share/omf/clock/clock-sr.omf
@@ -451,6 +461,8 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy
 @dirrm share/gnome/help/clock/ru
 @dirrm share/gnome/help/clock/pt_BR/figures
 @dirrm share/gnome/help/clock/pt_BR
+@dirrm share/gnome/help/clock/pt/figures
+@dirrm share/gnome/help/clock/pt
 @dirrm share/gnome/help/clock/pa/figures
 @dirrm share/gnome/help/clock/pa
 @dirrm share/gnome/help/clock/oc/figures
@@ -477,6 +489,8 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy
 @dirrm share/gnome/help/clock/el
 @dirrm share/gnome/help/clock/de/figures
 @dirrm share/gnome/help/clock/de
+@dirrm share/gnome/help/clock/da/figures
+@dirrm share/gnome/help/clock/da
 @dirrm share/gnome/help/clock/cs/figures
 @dirrm share/gnome/help/clock/cs
 @dirrm share/gnome/help/clock/ca/figures