6 files changed, 69 insertions, 60 deletions

diff --git a/deskutils/global-menu/Makefile b/deskutils/global-menu/Makefile
index 08030a5fbce7..01e7d2545c44 100644
--- a/deskutils/global-menu/Makefile
+++ b/deskutils/global-menu/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=		gnome-globalmenu
-PORTVERSION=		0.7.5
-PORTREVISION=		6
+PORTVERSION=		0.7.10
 CATEGORIES=		deskutils
 MASTER_SITES=		http://gnome2-globalmenu.googlecode.com/files/
 
@@ -27,11 +26,25 @@ INSTALLS_ICONS=		yes
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
+
+OPTIONS=		XFCE4_PANEL "Xfce panel applet" Off
+
+.include <bsd.port.options.mk>
+
+.if defined(WITHOUT_XFCE4_PANEL)
+CONFIGURE_ARGS+=	--without-xfce4-panel
+PLIST_SUB+=		XFCE4_PANEL="@comment "
+.else
+LIB_DEPENDS+=		libxfce4panel-1.0:${PORTSDIR}/x11-wm/xfce4-panel
+CONFIGURE_ARGS+=	--with-xfce4-panel
+PLIST_SUB+=		XFCE4_PANEL=""
+.endif
+
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=		yes
 PLIST_SUB+=		NLS=""
 .else
-CONFIGURE_ARGS+=--disable-nls
+CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
 .endif
 
diff --git a/deskutils/global-menu/distinfo b/deskutils/global-menu/distinfo
index 671d0a870e39..695933fb9f60 100644
--- a/deskutils/global-menu/distinfo
+++ b/deskutils/global-menu/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome-globalmenu-0.7.5.tar.bz2) = bafbad33ad43ba401d228dbaa10f26a0
-SHA256 (gnome-globalmenu-0.7.5.tar.bz2) = d628604c9623587cdb8b1459b6acee7a038faa2380d814ced27a22a72839d4db
-SIZE (gnome-globalmenu-0.7.5.tar.bz2) = 623230
+SHA256 (gnome-globalmenu-0.7.10.tar.bz2) = 5ce762e99ad033a64bb99ebc7d30159ee3225a88663e1d8585a8499174a12b89
+SIZE (gnome-globalmenu-0.7.10.tar.bz2) = 565247
diff --git a/deskutils/global-menu/files/patch-makefile.am b/deskutils/global-menu/files/patch-makefile.am
index f582c8b0eb21..808c6fe57cf2 100644
--- a/deskutils/global-menu/files/patch-makefile.am
+++ b/deskutils/global-menu/files/patch-makefile.am
@@ -1,11 +1,11 @@
---- libgnomenu/Makefile.am.orig	2009-04-27 10:04:37.000000000 +0200
-+++ libgnomenu/Makefile.am	2009-04-27 10:05:43.000000000 +0200
-@@ -32,7 +32,7 @@
- libgnomenu_la_LIBADD = $(GTK_LIBS) $(WNCK_LIBS) $(X11_LIBS) ../libcompat/libcompat.la
- libgnomenu_la_LDFLAGS = -version-info 2:0:0 -release $(VERSION) -no-undefined -Wl,--as-needed
+--- libserver/Makefile.am.orig	2010-11-29 16:10:04.000000000 +0200
++++ libserver/Makefile.am	2010-11-29 16:10:11.000000000 +0200
+@@ -31,7 +31,7 @@
+ libglobalmenu_server_includedir = $(includedir)/gnome-globalmenu
+ libglobalmenu_server_include_HEADERS = globalmenu-server.h
  
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libgnomenu.pc
+ pkgconfig_DATA = globalmenu-server.pc
  
- libgnomenu_includedir = $(includedir)/libgnomenu
+ libglobalmenu_server_la_SOURCES = \
diff --git a/deskutils/global-menu/files/patch-makefile.in b/deskutils/global-menu/files/patch-makefile.in
index 23c987986725..244905d23971 100644
--- a/deskutils/global-menu/files/patch-makefile.in
+++ b/deskutils/global-menu/files/patch-makefile.in
@@ -1,11 +1,11 @@
---- libgnomenu/Makefile.in.orig	2009-04-27 10:06:46.000000000 +0200
-+++ libgnomenu/Makefile.in	2009-04-27 10:07:20.000000000 +0200
-@@ -324,7 +324,7 @@
- libgnomenu_la_CPPFLAGS = -I$(top_srcdir) $(GTK_CFLAGS) $(WNCK_CFLAGS) $(X11_CFLAGS) -include $(CONFIG_HEADER) -DWNCK_I_KNOW_THIS_IS_UNSTABLE
- libgnomenu_la_LIBADD = $(GTK_LIBS) $(WNCK_LIBS) $(X11_LIBS) ../libcompat/libcompat.la
- libgnomenu_la_LDFLAGS = -version-info 2:0:0 -release $(VERSION) -no-undefined -Wl,--as-needed
+--- libserver/Makefile.in.orig	2010-11-29 16:10:57.000000000 +0200
++++ libserver/Makefile.in	2010-11-29 16:11:26.000000000 +0200
+@@ -325,7 +325,7 @@
+ lib_LTLIBRARIES = libglobalmenu-server.la
+ libglobalmenu_server_includedir = $(includedir)/gnome-globalmenu
+ libglobalmenu_server_include_HEADERS = globalmenu-server.h
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libgnomenu.pc
- libgnomenu_includedir = $(includedir)/libgnomenu
- libgnomenu_include_HEADERS = $(VALASOURCES:.vala=.h)
+ pkgconfig_DATA = globalmenu-server.pc
+ libglobalmenu_server_la_SOURCES = \
+ 						$(VALASOURCES:.vala=.c) \
diff --git a/deskutils/global-menu/files/patch-menuitem.c b/deskutils/global-menu/files/patch-menuitem.c
index 9e796739df87..b98c2cf750c5 100644
--- a/deskutils/global-menu/files/patch-menuitem.c
+++ b/deskutils/global-menu/files/patch-menuitem.c
@@ -1,9 +1,9 @@
---- libgnomenu/menuitem.c.old	2009-06-03 12:00:59.000000000 +0200
-+++ libgnomenu/menuitem.c	2009-06-03 12:01:05.000000000 +0200
-@@ -128,7 +128,7 @@
+--- libserver/widgets/menuitem.c.orig	2010-11-29 16:07:02.000000000 +0200
++++ libserver/widgets/menuitem.c	2010-11-29 16:07:09.000000000 +0200
+@@ -358,7 +358,7 @@
+ 		_tmp0_ = FALSE;
  	}
- 	if (_tmp0) {
- 		g_debug ("menuitem.vala:81: maybe?");
+ 	if (_tmp0_) {
 -		if (gtk_menu_item_get_submenu ((GtkMenuItem*) self) != GTK_MENU (self->_submenu_cache)) {
 +		if (gtk_menu_item_get_submenu ((GtkMenuItem*) self) != (GtkWidget*) GTK_MENU (self->_submenu_cache)) {
  			gtk_menu_item_set_submenu ((GtkMenuItem*) self, (GtkMenu*) self->_submenu_cache);
diff --git a/deskutils/global-menu/pkg-plist b/deskutils/global-menu/pkg-plist
index f03c576170d7..db060d011b5c 100644
--- a/deskutils/global-menu/pkg-plist
+++ b/deskutils/global-menu/pkg-plist
@@ -1,60 +1,57 @@
-include/libgnomenu/application.h
-include/libgnomenu/globalmenu.h
-include/libgnomenu/gnomenu.h
-include/libgnomenu/helper.h
-include/libgnomenu/interface-item.h
-include/libgnomenu/interface-shell.h
-include/libgnomenu/keygrab.h
-include/libgnomenu/label.h
-include/libgnomenu/menu.h
-include/libgnomenu/menubar.h
-include/libgnomenu/menubarbox.h
-include/libgnomenu/menuitem.h
-include/libgnomenu/menushellutils.h
-include/libgnomenu/monitor.h
-include/libgnomenu/parser.h
-include/libgnomenu/serializer.h
-include/libgnomenu/window.h
+bin/globalmenu-settings
+include/gnome-globalmenu/globalmenu-server.h
 lib/bonobo/servers/GlobalMenu_PanelApplet.server
-lib/gtk-2.0/modules/libglobalmenu-gnome-0.7.5.so
-lib/gtk-2.0/modules/libglobalmenu-gnome.la
-lib/gtk-2.0/modules/libglobalmenu-gnome.so
-lib/libgnomenu-0.7.5.so
-lib/libgnomenu-0.7.5.so.2
-lib/libgnomenu.la
-lib/libgnomenu.so
-libdata/pkgconfig/libgnomenu.pc
+lib/libglobalmenu-server.la
+lib/libglobalmenu-server.so
+lib/libglobalmenu-server.so.3
+libdata/pkgconfig/globalmenu-server.pc
 libdata/bonobo/servers/GlobalMenu_PanelApplet.server
+lib/gtk-2.0/modules/libglobalmenu-plugin.so
+lib/gtk-2.0/modules/libglobalmenu-plugin.la
+lib/gtk-2.0/modules/libglobalmenu-gnome-panel.so
+lib/gtk-2.0/modules/libglobalmenu-gnome-panel.la
 libexec/GlobalMenu.PanelApplet
-%%DOCSDIR%%/AUTHORS
+%%DOCSDIR%%/README
 %%DOCSDIR%%/COPYING
 %%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/AUTHORS
 %%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/README
-%%DOCSDIR%%/README.GNOME
 %%DOCSDIR%%/README.XFCE
+%%DOCSDIR%%/README.GNOME
+%%DOCSDIR%%/README.LEGACY
+share/locale/ca/LC_MESSAGES/gnome-globalmenu.mo
+share/locale/da/LC_MESSAGES/gnome-globalmenu.mo
 share/locale/de/LC_MESSAGES/gnome-globalmenu.mo
 share/locale/en_GB/LC_MESSAGES/gnome-globalmenu.mo
+share/locale/eo/LC_MESSAGES/gnome-globalmenu.mo
 share/locale/es/LC_MESSAGES/gnome-globalmenu.mo
 share/locale/fi/LC_MESSAGES/gnome-globalmenu.mo
 share/locale/fr/LC_MESSAGES/gnome-globalmenu.mo
+share/locale/gl/LC_MESSAGES/gnome-globalmenu.mo
+share/locale/he/LC_MESSAGES/gnome-globalmenu.mo
 share/locale/hu/LC_MESSAGES/gnome-globalmenu.mo
 share/locale/id/LC_MESSAGES/gnome-globalmenu.mo
 share/locale/it/LC_MESSAGES/gnome-globalmenu.mo
 share/locale/ko/LC_MESSAGES/gnome-globalmenu.mo
+share/locale/lt/LC_MESSAGES/gnome-globalmenu.mo
+share/locale/nb/LC_MESSAGES/gnome-globalmenu.mo
 share/locale/nl/LC_MESSAGES/gnome-globalmenu.mo
 share/locale/pl/LC_MESSAGES/gnome-globalmenu.mo
 share/locale/pt/LC_MESSAGES/gnome-globalmenu.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-globalmenu.mo
+share/locale/ro/LC_MESSAGES/gnome-globalmenu.mo
 share/locale/ru/LC_MESSAGES/gnome-globalmenu.mo
+share/locale/sk/LC_MESSAGES/gnome-globalmenu.mo
 share/locale/sv/LC_MESSAGES/gnome-globalmenu.mo
+share/locale/te/LC_MESSAGES/gnome-globalmenu.mo
+share/locale/tr/LC_MESSAGES/gnome-globalmenu.mo
+share/locale/uk/LC_MESSAGES/gnome-globalmenu.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-globalmenu.mo
 share/pixmaps/globalmenu.png
-@dirrmtry share/locale
-@dirrmtry share/pixmaps
-@dirrmtry include/libgnomenu
-@dirrmtry libdata/pkgconfig
-@dirrmtry libexec
+@dirrm include/gnome-globalmenu
+@dirrmtry etc/gconf/gconf.xml.defaults
+@dirrmtry etc/gconf/schemas
+@dirrmtry etc/gconf
 @dirrmtry lib/bonobo/servers
 @dirrmtry libdata/bonobo/servers
 @dirrm %%DOCSDIR%%