Update to 2.91.6.

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

5 files changed, 148 insertions, 60 deletions

diff --git a/x11/gnome-panel3/Makefile b/x11/gnome-panel3/Makefile
index 15cace517..9a8103ee3 100644
--- a/x11/gnome-panel3/Makefile
+++ b/x11/gnome-panel3/Makefile
@@ -3,15 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-panel3/Makefile,v 1.6 2011/01/23 23:03:48 kwm Exp $
+#   $MCom: ports/x11/gnome-panel3/Makefile,v 1.7 2011/01/26 10:47:58 avl Exp $
 #
 
 PORTNAME=	gnome-panel
-PORTVERSION=	2.91.0.1
-PORTREVISION?=	1
+PORTVERSION=	2.91.6
+PORTREVISION?=	0
 CATEGORIES=	x11 gnome
-MASTER_SITES=	LOCAL/kwm
-#MASTER_SITES=	GNOME
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -27,6 +26,7 @@ LIB_DEPENDS=	gweather-3.0:${PORTSDIR}/net/libgweather3 \
 		polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
 
 USE_GETTEXT=	yes
+USE_BZIP2=	yes
 USE_XORG=	ice sm x11 xau xrandr
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
@@ -43,6 +43,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 MAN1=		gnome-panel.1
 GCONF_SCHEMAS=	clock.schemas \
+		fish.schemas \
 		panel-compatibility.schemas panel-general.schemas \
 		panel-global.schemas panel-object.schemas \
 		panel-toplevel.schemas window-list.schemas \
@@ -70,7 +71,7 @@ CONFIGURE_ARGS+=--disable-eds
 #CONFIGURE_ARGS+=--enable-bonobo
 #PLIST_SUB+=	BONOBO=""
 #.else
-CONFIGURE_ARGS+=--disable-bonobo
+#CONFIGURE_ARGS+=--disable-bonobo
 PLIST_SUB+=	BONOBO="@comment "
 #.endif
 
@@ -79,12 +80,8 @@ post-patch:
 		${XARGS} -n 10 ${REINPLACE_CMD} -e \
 		's|"applications.menu"|"gnome-applications.menu"|'
 	@${REINPLACE_CMD} -e 's|xsltproc -o| xsltproc --nonet -o|g' \
-		${WRKSRC}/help/clock/Makefile.in
-#		${WRKSRC}/help/fish/Makefile.in
-#	@${REINPLACE_CMD} -e 's|libedataserverui-1.2|libedataserverui-3.0|g' \
-#		${WRKSRC}/configure
-#		-e 's|gtk+-2.0|gtk+-3.0|g' \
-#		-e 's|gnome-desktop-2.0|gnome-desktop-3.0|g' \
+		${WRKSRC}/help/clock/Makefile.in \
+		${WRKSRC}/help/fish/Makefile.in
 
 post-install:
 	@${MKDIR} ${PREFIX}/lib/gnome-panel/modules
diff --git a/x11/gnome-panel3/distinfo b/x11/gnome-panel3/distinfo
index 8a61351d8..28c343508 100644
--- a/x11/gnome-panel3/distinfo
+++ b/x11/gnome-panel3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-panel-2.91.0.1.tar.bz2) = 70a7a9faffc41421129350adcad4395ea3a011aa4e2ea043d6ef14c831df0ee9
-SIZE (gnome3/gnome-panel-2.91.0.1.tar.bz2) = 2877383
+SHA256 (gnome3/gnome-panel-2.91.6.tar.bz2) = 0a2a81e5fb6e524a15861acebc2b342a11d5b337ad2b64198e5c2365f93946ca
+SIZE (gnome3/gnome-panel-2.91.6.tar.bz2) = 3112904
diff --git a/x11/gnome-panel3/files/patch-configure b/x11/gnome-panel3/files/patch-configure
deleted file mode 100644
index fb42c4d3e..000000000
--- a/x11/gnome-panel3/files/patch-configure
+++ /dev/null
@@ -1,34 +0,0 @@
---- configure.orig	2011-01-18 14:59:30.000000000 +0000
-+++ configure	2011-01-18 15:01:50.000000000 +0000
-@@ -17641,7 +17641,7 @@
- fi
- 
- 
--ac_config_files="$ac_config_files Makefile icons/Makefile icons/16x16/Makefile icons/22x22/Makefile icons/24x24/Makefile icons/32x32/Makefile icons/48x48/Makefile icons/scalable/Makefile gnome-panel/Makefile gnome-panel/libegg/Makefile gnome-panel/libpanel-applet-private/Makefile gnome-panel/libpanel-util/Makefile gnome-panel/gnome-panel.desktop.in libpanel-applet/Makefile po/Makefile.in applets/Makefile applets/clock/Makefile applets/clock/pixmaps/Makefile applets/fish/Makefile applets/notification_area/Makefile applets/wncklet/Makefile doc/Makefile doc/reference/Makefile doc/reference/panel-applet/Makefile help/Makefile help/clock/Makefile help/fish/Makefile man/Makefile bonobo/Makefile bonobo/idl/Makefile bonobo/libpanel-applet/libpanelapplet-2.0.pc bonobo/libpanel-applet/libpanelapplet-2.0-uninstalled.pc bonobo/libpanel-applet/Makefile bonobo/panel-module/Makefile"
-+ac_config_files="$ac_config_files Makefile icons/Makefile icons/16x16/Makefile icons/22x22/Makefile icons/24x24/Makefile icons/32x32/Makefile icons/48x48/Makefile icons/scalable/Makefile gnome-panel/Makefile gnome-panel/libegg/Makefile gnome-panel/libpanel-applet-private/Makefile gnome-panel/libpanel-util/Makefile gnome-panel/gnome-panel.desktop.in libpanel-applet/Makefile po/Makefile.in applets/Makefile applets/clock/Makefile applets/clock/pixmaps/Makefile applets/notification_area/Makefile applets/wncklet/Makefile doc/Makefile doc/reference/Makefile doc/reference/panel-applet/Makefile help/Makefile help/clock/Makefile man/Makefile"
- 
- 
- ac_config_files="$ac_config_files libpanel-applet/libpanelapplet-4.0.pc:libpanel-applet/libpanelapplet.pc.in"
-@@ -18737,7 +18737,6 @@
-     "applets/Makefile") CONFIG_FILES="$CONFIG_FILES applets/Makefile" ;;
-     "applets/clock/Makefile") CONFIG_FILES="$CONFIG_FILES applets/clock/Makefile" ;;
-     "applets/clock/pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES applets/clock/pixmaps/Makefile" ;;
--    "applets/fish/Makefile") CONFIG_FILES="$CONFIG_FILES applets/fish/Makefile" ;;
-     "applets/notification_area/Makefile") CONFIG_FILES="$CONFIG_FILES applets/notification_area/Makefile" ;;
-     "applets/wncklet/Makefile") CONFIG_FILES="$CONFIG_FILES applets/wncklet/Makefile" ;;
-     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-@@ -18745,14 +18744,7 @@
-     "doc/reference/panel-applet/Makefile") CONFIG_FILES="$CONFIG_FILES doc/reference/panel-applet/Makefile" ;;
-     "help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
-     "help/clock/Makefile") CONFIG_FILES="$CONFIG_FILES help/clock/Makefile" ;;
--    "help/fish/Makefile") CONFIG_FILES="$CONFIG_FILES help/fish/Makefile" ;;
-     "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
--    "bonobo/Makefile") CONFIG_FILES="$CONFIG_FILES bonobo/Makefile" ;;
--    "bonobo/idl/Makefile") CONFIG_FILES="$CONFIG_FILES bonobo/idl/Makefile" ;;
--    "bonobo/libpanel-applet/libpanelapplet-2.0.pc") CONFIG_FILES="$CONFIG_FILES bonobo/libpanel-applet/libpanelapplet-2.0.pc" ;;
--    "bonobo/libpanel-applet/libpanelapplet-2.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES bonobo/libpanel-applet/libpanelapplet-2.0-uninstalled.pc" ;;
--    "bonobo/libpanel-applet/Makefile") CONFIG_FILES="$CONFIG_FILES bonobo/libpanel-applet/Makefile" ;;
--    "bonobo/panel-module/Makefile") CONFIG_FILES="$CONFIG_FILES bonobo/panel-module/Makefile" ;;
-     "libpanel-applet/libpanelapplet-4.0.pc") CONFIG_FILES="$CONFIG_FILES libpanel-applet/libpanelapplet-4.0.pc:libpanel-applet/libpanelapplet.pc.in" ;;
-     "libpanel-applet/libpanelapplet-4.0-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES libpanel-applet/libpanelapplet-4.0-uninstalled.pc:libpanel-applet/libpanelapplet-uninstalled.pc.in" ;;
-     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
diff --git a/x11/gnome-panel3/files/patch-help_Makefile.in b/x11/gnome-panel3/files/patch-help_Makefile.in
deleted file mode 100644
index 14cce3359..000000000
--- a/x11/gnome-panel3/files/patch-help_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- help/Makefile.in.orig	2011-01-18 15:05:12.000000000 +0000
-+++ help/Makefile.in	2011-01-18 15:05:21.000000000 +0000
-@@ -314,7 +314,7 @@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = clock fish
-+SUBDIRS = clock
- all: all-recursive
- 
- .SUFFIXES:
diff --git a/x11/gnome-panel3/pkg-plist b/x11/gnome-panel3/pkg-plist
index 30ad64444..906ddd47f 100644
--- a/x11/gnome-panel3/pkg-plist
+++ b/x11/gnome-panel3/pkg-plist
@@ -32,16 +32,19 @@ lib/libpanel-applet-4.so.0
 %%BONOBO%%libdata/pkgconfig/libpanelapplet-2.0.pc
 libdata/pkgconfig/libpanelapplet-4.0.pc
 libexec/clock-applet
+libexec/fish-applet
 libexec/gnome-panel-add
 libexec/notification-area-applet
 libexec/wnck-applet
 share/applications/gnome-panel.desktop
 share/dbus-1/services/org.gnome.panel.applet.ClockAppletFactory.service
+share/dbus-1/services/org.gnome.panel.applet.FishAppletFactory.service
 share/dbus-1/services/org.gnome.panel.applet.NotificationAreaAppletFactory.service
 share/dbus-1/services/org.gnome.panel.applet.WnckletFactory.service
 %%BONOBO%%share/gnome-2.0/ui/GNOME_Panel_Popup.xml
 share/gir-1.0/PanelApplet-4.0.gir
 %%DATADIR%%/4.0/applets/org.gnome.panel.ClockApplet.panel-applet
+%%DATADIR%%/4.0/applets/org.gnome.panel.FishApplet.panel-applet
 %%DATADIR%%/4.0/applets/org.gnome.panel.NotificationAreaApplet.panel-applet
 %%DATADIR%%/4.0/applets/org.gnome.panel.Wncklet.panel-applet
 %%DATADIR%%/ui/clock.ui
@@ -68,9 +71,15 @@ share/gir-1.0/PanelApplet-4.0.gir
 %%DATADIR%%/pixmaps/clock-map-location-hilight.png
 %%DATADIR%%/pixmaps/clock-map-location-marker.png
 %%DATADIR%%/pixmaps/clock-map.png
+%%DATADIR%%/pixmaps/fishanim.png
+%%DATADIR%%/pixmaps/footguy.png
 %%DATADIR%%/pixmaps/gnome-gegl2-2.png
 %%DATADIR%%/pixmaps/gnome-gegl2.png
-share/gnome-panelrc
+%%DATADIR%%/pixmaps/monkey.png
+%%DATADIR%%/pixmaps/oldwanda.png
+%%DATADIR%%/pixmaps/wanda.png
+%%DATADIR%%/ui/fish-menu.xml
+%%DATADIR%%/ui/fish.ui
 share/gnome/help/clock/C/clock.xml
 share/gnome/help/clock/C/figures/clock_applet.png
 share/gnome/help/clock/C/legal.xml
@@ -158,6 +167,69 @@ share/gnome/help/clock/zh_HK/legal.xml
 share/gnome/help/clock/zh_TW/clock.xml
 share/gnome/help/clock/zh_TW/figures/clock_applet.png
 share/gnome/help/clock/zh_TW/legal.xml
+share/gnome/help/fish/C/figures/fish_applet.png
+share/gnome/help/fish/C/fish.xml
+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/cs/figures/fish_applet.png
+share/gnome/help/fish/cs/fish.xml
+share/gnome/help/fish/cs/legal.xml
+share/gnome/help/fish/da/figures/fish_applet.png
+share/gnome/help/fish/da/fish.xml
+share/gnome/help/fish/da/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
+share/gnome/help/fish/en_GB/figures/fish_applet.png
+share/gnome/help/fish/en_GB/fish.xml
+share/gnome/help/fish/en_GB/legal.xml
+share/gnome/help/fish/es/figures/fish_applet.png
+share/gnome/help/fish/es/fish.xml
+share/gnome/help/fish/es/legal.xml
+share/gnome/help/fish/eu/figures/fish_applet.png
+share/gnome/help/fish/eu/fish.xml
+share/gnome/help/fish/eu/legal.xml
+share/gnome/help/fish/fi/figures/fish_applet.png
+share/gnome/help/fish/fi/fish.xml
+share/gnome/help/fish/fi/legal.xml
+share/gnome/help/fish/fr/figures/fish_applet.png
+share/gnome/help/fish/fr/fish.xml
+share/gnome/help/fish/fr/legal.xml
+share/gnome/help/fish/it/figures/fish_applet.png
+share/gnome/help/fish/it/fish.xml
+share/gnome/help/fish/it/legal.xml
+share/gnome/help/fish/ja/figures/fish_applet.png
+share/gnome/help/fish/ja/fish.xml
+share/gnome/help/fish/ja/legal.xml
+share/gnome/help/fish/ko/figures/fish_applet.png
+share/gnome/help/fish/ko/fish.xml
+share/gnome/help/fish/ko/legal.xml
+share/gnome/help/fish/oc/figures/fish_applet.png
+share/gnome/help/fish/oc/fish.xml
+share/gnome/help/fish/oc/legal.xml
+share/gnome/help/fish/ru/figures/fish_applet.png
+share/gnome/help/fish/ru/fish.xml
+share/gnome/help/fish/ru/legal.xml
+share/gnome/help/fish/sl/figures/fish_applet.png
+share/gnome/help/fish/sl/fish.xml
+share/gnome/help/fish/sl/legal.xml
+share/gnome/help/fish/sv/figures/fish_applet.png
+share/gnome/help/fish/sv/fish.xml
+share/gnome/help/fish/sv/legal.xml
+share/gnome/help/fish/th/figures/fish_applet.png
+share/gnome/help/fish/th/fish.xml
+share/gnome/help/fish/th/legal.xml
+share/gnome/help/fish/uk/figures/fish_applet.png
+share/gnome/help/fish/uk/fish.xml
+share/gnome/help/fish/uk/legal.xml
+share/gnome/help/fish/zh_CN/figures/fish_applet.png
+share/gnome/help/fish/zh_CN/fish.xml
+share/gnome/help/fish/zh_CN/legal.xml
 share/icons/hicolor/16x16/apps/gnome-panel-clock.png
 share/icons/hicolor/16x16/apps/gnome-panel-drawer.png
 share/icons/hicolor/16x16/apps/gnome-panel-fish.png
@@ -352,8 +424,72 @@ share/omf/clock/clock-uk.omf
 share/omf/clock/clock-zh_CN.omf
 share/omf/clock/clock-zh_HK.omf
 share/omf/clock/clock-zh_TW.omf
+share/omf/fish/fish-C.omf
+share/omf/fish/fish-ca.omf
+share/omf/fish/fish-cs.omf
+share/omf/fish/fish-da.omf
+share/omf/fish/fish-de.omf
+share/omf/fish/fish-el.omf
+share/omf/fish/fish-en_GB.omf
+share/omf/fish/fish-es.omf
+share/omf/fish/fish-eu.omf
+share/omf/fish/fish-fi.omf
+share/omf/fish/fish-fr.omf
+share/omf/fish/fish-it.omf
+share/omf/fish/fish-ja.omf
+share/omf/fish/fish-ko.omf
+share/omf/fish/fish-oc.omf
+share/omf/fish/fish-ru.omf
+share/omf/fish/fish-sl.omf
+share/omf/fish/fish-sv.omf
+share/omf/fish/fish-th.omf
+share/omf/fish/fish-uk.omf
+share/omf/fish/fish-zh_CN.omf
+@dirrm share/omf/fish
 @dirrm share/omf/clock
 %%BONOBO%%@dirrm share/idl/gnome-panel-2.0
+@dirrm share/gnome/help/fish/zh_CN/figures
+@dirrm share/gnome/help/fish/zh_CN
+@dirrm share/gnome/help/fish/uk/figures
+@dirrm share/gnome/help/fish/uk
+@dirrm share/gnome/help/fish/th/figures
+@dirrm share/gnome/help/fish/th
+@dirrm share/gnome/help/fish/sv/figures
+@dirrm share/gnome/help/fish/sv
+@dirrm share/gnome/help/fish/sl/figures
+@dirrm share/gnome/help/fish/sl
+@dirrm share/gnome/help/fish/ru/figures
+@dirrm share/gnome/help/fish/ru
+@dirrm share/gnome/help/fish/oc/figures
+@dirrm share/gnome/help/fish/oc
+@dirrm share/gnome/help/fish/ko/figures
+@dirrm share/gnome/help/fish/ko
+@dirrm share/gnome/help/fish/ja/figures
+@dirrm share/gnome/help/fish/ja
+@dirrm share/gnome/help/fish/it/figures
+@dirrm share/gnome/help/fish/it
+@dirrm share/gnome/help/fish/fr/figures
+@dirrm share/gnome/help/fish/fr
+@dirrm share/gnome/help/fish/fi/figures
+@dirrm share/gnome/help/fish/fi
+@dirrm share/gnome/help/fish/eu/figures
+@dirrm share/gnome/help/fish/eu
+@dirrm share/gnome/help/fish/es/figures
+@dirrm share/gnome/help/fish/es
+@dirrm share/gnome/help/fish/en_GB/figures
+@dirrm share/gnome/help/fish/en_GB
+@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/da/figures
+@dirrm share/gnome/help/fish/da
+@dirrm share/gnome/help/fish/cs/figures
+@dirrm share/gnome/help/fish/cs
+@dirrm share/gnome/help/fish/ca/figures
+@dirrm share/gnome/help/fish/ca
+@dirrm share/gnome/help/fish/C/figures
+@dirrm share/gnome/help/fish/C
 @dirrm share/gnome/help/clock/zh_TW/figures
 @dirrm share/gnome/help/clock/zh_TW
 @dirrm share/gnome/help/clock/zh_HK/figures