Update to 2.31.6.

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

3 files changed, 80 insertions, 40 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index a0f92d757..a06a082dc 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-panel/Makefile,v 1.220 2010/07/26 12:42:31 kwm Exp $
+#   $MCom: ports/x11/gnome-panel/Makefile,v 1.221 2010/07/26 14:12:55 kwm Exp $
 #
 
 PORTNAME=	gnome-panel
-PORTVERSION=	2.30.0
-PORTREVISION?=	1
+PORTVERSION=	2.31.6
+PORTREVISION?=	0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -22,15 +22,15 @@ USE_BZIP2=	yes
 
 LIB_DEPENDS=	gweather.1:${PORTSDIR}/net/libgweather \
 		canberra-gtk.0:${PORTSDIR}/audio/libcanberra \
-		polkit-gnome.0:${PORTSDIR}/sysutils/policykit-gnome
+		polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
 
 USE_GETTEXT=	yes
+USE_XORG=	ice sm x11 xau xrandr
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop librsvg2 \
-		libwnck gnomemenus gnomedocutils ltverhack referencehack \
-		libbonoboui
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop libwnck gnomemenus \
+		gnomedocutils ltverhack referencehack
 WANT_GNOME=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
@@ -47,7 +47,8 @@ GCONF_SCHEMAS=	clock.schemas fish.schemas \
 		panel-toplevel.schemas window-list.schemas \
 		workspace-switcher.schemas
 
-OPTIONS=	EVOLUTION "use the Evolution calendar if installed" on
+OPTIONS=	EVOLUTION "use the Evolution calendar if installed" on \
+		BONOBO "Support for bonobo applets aka Gnome 2 applets" on
 
 .if defined(PACKAGE_BUILDING)
 .undef WITHOUT_GNOME
@@ -56,12 +57,21 @@ WITH_GNOME=	yes
 
 .include <bsd.port.pre.mk>
 
-#.if !defined(WITHOUT_EVOLUTION) && ${HAVE_GNOME:Mevolutiondataserver}!=""
-#USE_GNOME+=	evolutiondataserver
+.if !defined(WITHOUT_EVOLUTION) && ${HAVE_GNOME:Mevolutiondataserver}!=""
+USE_GNOME+=	evolutiondataserver
 #CONFIGURE_ARGS+=--enable-eds
-#.else
+.else
 CONFIGURE_ARGS+=--disable-eds
-#.endif
+.endif
+
+.if defined(WITH_BONOBO)
+USE_GNOME+=	libbonoboui
+CONFIGURE_ARGS+=--enable-bonobo
+PLIST_SUB+=	BONOBO=""
+.else
+CONFIGURE_ARGS+=--disable-bonobo
+PLIST_SUB+=	BONOBO="@comment "
+.endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f | \
@@ -71,6 +81,10 @@ post-patch:
 		${WRKSRC}/help/clock/Makefile.in \
 		${WRKSRC}/help/fish/Makefile.in
 
+post-install:
+	@${MKDIR} ${PREFIX}/lib/gnome-panel/modules
+	-${LOCALBASE}/bin/gio-querymodules ${PREFIX}/lib/gnome-panel/modules
+
 .include <bsd.port.post.mk>
 
 .endif
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index e1b150163..4afa795b2 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-panel-2.30.0.tar.bz2) = e17f25417b2c9011ed1c3ebd75706de6
-SHA256 (gnome2/gnome-panel-2.30.0.tar.bz2) = 7e8f99d3105bc0dda038b5859ab56d0a9740e244d7853786f1deb2df0a692220
-SIZE (gnome2/gnome-panel-2.30.0.tar.bz2) = 3072146
+MD5 (gnome2/gnome-panel-2.31.6.tar.bz2) = 772d2c96debfe07d9d9ed996f0bfd01a
+SHA256 (gnome2/gnome-panel-2.31.6.tar.bz2) = f307b6f062c188c091709bdf60defeed3b8b4603e8ae87fe6f26915b6c6fe9d9
+SIZE (gnome2/gnome-panel-2.31.6.tar.bz2) = 3190084
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 1d349e926..5e07ff7a0 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -1,48 +1,70 @@
 bin/gnome-desktop-item-edit
 bin/gnome-panel
 bin/panel-test-applets
+%%BONOBO%%bin/panel-test-applets-bonobo
 etc/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
 @unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || /usr/bin/true
 @unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true
 etc/gconf/schemas/panel-default-setup.entries
 @exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true
 @exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || /usr/bin/true
-include/panel-2.0/GNOME_Panel.h
-include/panel-2.0/panel-applet-enums.h
-include/panel-2.0/panel-applet-gconf.h
-include/panel-2.0/panel-applet.h
-lib/libpanel-applet-2.a
-lib/libpanel-applet-2.la
-lib/libpanel-applet-2.so
-lib/libpanel-applet-2.so.0
-libdata/bonobo/servers/GNOME_ClockApplet_Factory.server
-libdata/bonobo/servers/GNOME_FishApplet_Factory.server
-libdata/bonobo/servers/GNOME_NotificationAreaApplet.server
-libdata/bonobo/servers/GNOME_Wncklet_Factory.server
-libdata/pkgconfig/libpanelapplet-2.0.pc
+%%BONOBO%%include/panel-2.0/GNOME_Panel.h
+%%BONOBO%%include/panel-2.0/panel-applet-enums.h
+%%BONOBO%%include/panel-2.0/panel-applet-gconf.h
+%%BONOBO%%include/panel-2.0/panel-applet.h
+include/gnome-panel-3.0/libpanel-applet/panel-applet-enums.h
+include/gnome-panel-3.0/libpanel-applet/panel-applet-gconf.h
+include/gnome-panel-3.0/libpanel-applet/panel-applet.h
+lib/girepository-1.0/PanelApplet-3.0.typelib
+@exec mkdir -p %D/lib/gnome-panel/modules
+%%BONOBO%%lib/gnome-panel/modules/libpanel-applets-bonobo.a
+%%BONOBO%%lib/gnome-panel/modules/libpanel-applets-bonobo.la
+%%BONOBO%%lib/gnome-panel/modules/libpanel-applets-bonobo.so
+@exec %%LOCALBASE%%/bin/gio-querymodules %D/lib/gnome-panel/modules 2>1/dev/null || /usr/bin/true
+@unexec /bin/rm -f %D/lib/gnome-panel/modules/giomodule.cache
+%%BONOBO%%lib/libpanel-applet-2.a
+%%BONOBO%%lib/libpanel-applet-2.la
+%%BONOBO%%lib/libpanel-applet-2.so
+%%BONOBO%%lib/libpanel-applet-2.so.0
+lib/libpanel-applet-3.a
+lib/libpanel-applet-3.la
+lib/libpanel-applet-3.so
+lib/libpanel-applet-3.so.0
+%%BONOBO%%libdata/pkgconfig/libpanelapplet-2.0.pc
+libdata/pkgconfig/libpanelapplet-3.0.pc
 libexec/clock-applet
-libexec/fish-applet-2
+libexec/fish-applet
 libexec/gnome-clock-applet-mechanism
 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
 share/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
-share/gnome-2.0/ui/GNOME_ClockApplet.xml
-share/gnome-2.0/ui/GNOME_FishApplet.xml
-share/gnome-2.0/ui/GNOME_NotificationAreaApplet.xml
-share/gnome-2.0/ui/GNOME_Panel_Popup.xml
-share/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml
-share/gnome-2.0/ui/GNOME_WindowListApplet.xml
-share/gnome-2.0/ui/GNOME_WindowMenuApplet.xml
-share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
+%%BONOBO%%share/gnome-2.0/ui/GNOME_Panel_Popup.xml
+share/gir-1.0/PanelApplet-3.0.gir
+%%DATADIR%%/applets/org.gnome.panel.ClockApplet.panel-applet
+%%DATADIR%%/applets/org.gnome.panel.FishApplet.panel-applet
+%%DATADIR%%/applets/org.gnome.panel.NotificationAreaApplet.panel-applet
+%%DATADIR%%/applets/org.gnome.panel.Wncklet.panel-applet
 %%DATADIR%%/ui/clock.ui
+%%DATADIR%%/ui/clock-menu.xml
 %%DATADIR%%/ui/fish.ui
+%%DATADIR%%/ui/fish-menu.xml
+%%DATADIR%%/ui/notification-area-menu.xml
+%%BONOBO%%%%DATADIR%%/ui/panel-test-applets-bonobo.ui
 %%DATADIR%%/ui/panel-properties-dialog.ui
 %%DATADIR%%/ui/panel-run-dialog.ui
+%%DATADIR%%/ui/showdesktop-menu.xml
 %%DATADIR%%/ui/panel-test-applets.ui
 %%DATADIR%%/ui/window-list.ui
+%%DATADIR%%/ui/window-list-menu.xml
+%%DATADIR%%/ui/window-menu-menu.xml
 %%DATADIR%%/ui/workspace-switcher.ui
+%%DATADIR%%/ui/workspace-switcher-menu.xml
 %%DATADIR%%/pixmaps/clock-calendar-icon.png
 %%DATADIR%%/pixmaps/clock-face-large.svg
 %%DATADIR%%/pixmaps/clock-face-small-day.svg
@@ -257,7 +279,7 @@ share/icons/hicolor/scalable/apps/gnome-panel-window-list.svg
 share/icons/hicolor/scalable/apps/gnome-panel-window-menu.svg
 share/icons/hicolor/scalable/apps/gnome-panel-workspace-switcher.svg
 share/icons/hicolor/scalable/apps/gnome-panel.svg
-share/idl/gnome-panel-2.0/GNOME_Panel.idl
+%%BONOBO%%share/idl/gnome-panel-2.0/GNOME_Panel.idl
 share/locale/af/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
@@ -411,7 +433,7 @@ share/omf/fish/fish-zh_CN.omf
 share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy
 @dirrm share/omf/fish
 @dirrm share/omf/clock
-@dirrm share/idl/gnome-panel-2.0
+%%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
@@ -508,9 +530,13 @@ share/polkit-1/actions/org.gnome.clockapplet.mechanism.policy
 @dirrm share/gnome/help/clock
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/ui
+@dirrm %%DATADIR%%/applets
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
-@dirrm include/panel-2.0
+@dirrmtry lib/gnome-panel/modules
+@dirrm include/gnome-panel-3.0/libpanel-applet
+@dirrm include/gnome-panel-3.0/
+%%BONOBO%%@dirrm include/panel-2.0
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES