2 files changed, 21 insertions, 30 deletions

diff --git a/deskutils/global-menu/Makefile b/deskutils/global-menu/Makefile
index ac479342be69..0ad57eba6fdd 100644
--- a/deskutils/global-menu/Makefile
+++ b/deskutils/global-menu/Makefile
@@ -1,33 +1,33 @@
 # Created by: Gustavo Perez
 # $FreeBSD$
 
-PORTNAME=		gnome-globalmenu
-PORTVERSION=		0.7.10
-PORTREVISION=	3
-CATEGORIES=		deskutils
-MASTER_SITES=		http://gnome2-globalmenu.googlecode.com/files/
+PORTNAME=	gnome-globalmenu
+PORTVERSION=	0.7.10
+PORTREVISION=	4
+CATEGORIES=	deskutils
+MASTER_SITES=	http://gnome2-globalmenu.googlecode.com/files/
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=		Global menu for gnome
+COMMENT=	Global menu for gnome
 
-LIB_DEPENDS=		libnotify.so:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
 
-USE_GNOME=		gnomepanel gnomedesktop
+USE_GNOME=	gnomepanel gnomedesktop
 
-USE_BZIP2=		yes
-USE_LDCONFIG=		yes
-GNU_CONFIGURE=		yes
-USES=			gmake pkgconfig
-USE_AUTOTOOLS=		libtool automake:env autoheader:env
-INSTALLS_ICONS=		yes
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+USES=		gmake libtool pkgconfig tar:bzip2
+USE_AUTOTOOLS=	automake:env autoheader:env
+INSTALLS_ICONS=	yes
+INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+GCONF_SCHEMAS=	gnome-globalmenu.schemas
+
 OPTIONS_DEFINE=		XFCE4_PANEL NLS
 XFCE4_PANEL_DESC=	Xfce panel applet
 
-NO_STAGE=	yes
-
 BROKEN_sparc64=	Leaves files behind on deinstall on sparc64
 
 .include <bsd.port.options.mk>
@@ -49,13 +49,9 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
 .endif
 
-MAN1=			gnome-globalmenu.1
-
-GCONF_SCHEMAS=		gnome-globalmenu.schemas
-
 post-install:
-		@${INSTALL_DATA} ${WRKSRC}/applet/GlobalMenu_PanelApplet.server \
-			${LOCALBASE}/libdata/bonobo/servers
-		@${CAT} ${PKGMESSAGE}
+	${MKDIR} ${STAGEDIR}${PREFIX}/libdata/bonobo/servers
+	${INSTALL_DATA} ${WRKSRC}/applet/GlobalMenu_PanelApplet.server \
+		${STAGEDIR}${PREFIX}/libdata/bonobo/servers
 
 .include <bsd.port.mk>
diff --git a/deskutils/global-menu/pkg-plist b/deskutils/global-menu/pkg-plist
index db060d011b5c..18faa9732639 100644
--- a/deskutils/global-menu/pkg-plist
+++ b/deskutils/global-menu/pkg-plist
@@ -1,16 +1,15 @@
 bin/globalmenu-settings
 include/gnome-globalmenu/globalmenu-server.h
 lib/bonobo/servers/GlobalMenu_PanelApplet.server
-lib/libglobalmenu-server.la
 lib/libglobalmenu-server.so
 lib/libglobalmenu-server.so.3
+lib/libglobalmenu-server.so.3.0.0
 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
+man/man1/gnome-globalmenu.1.gz
 %%DOCSDIR%%/README
 %%DOCSDIR%%/COPYING
 %%DOCSDIR%%/ChangeLog
@@ -49,9 +48,5 @@ share/locale/uk/LC_MESSAGES/gnome-globalmenu.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-globalmenu.mo
 share/pixmaps/globalmenu.png
 @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%%