From cbdf38a451dbff1bdb16bb5fff320610e7129aeb Mon Sep 17 00:00:00 2001
From: Koop Mast <kwm@FreeBSD.org>
Date: Tue, 18 Feb 2014 21:06:31 +0000
Subject: [PATCH] Remove gnome-panel 2.x support. While here stagify, switch to
 USES=gmake, remove desktopfileutils it not needed.

---
 net/g2ipmsg/Makefile  | 25 ++++---------------------
 net/g2ipmsg/pkg-plist |  3 ---
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/net/g2ipmsg/Makefile b/net/g2ipmsg/Makefile
index 74152ef01dec..5cfbb1280ae8 100644
--- a/net/g2ipmsg/Makefile
+++ b/net/g2ipmsg/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	g2ipmsg
 PORTVERSION=	0.9.6
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	http://ipmsg.org/archive/
 
@@ -11,18 +12,14 @@ COMMENT=	Popup style message communication tool for GNOME2
 
 LICENSE=	GPLv2 # (or later)
 
-OPTIONS_DEFINE=	GNOMEPANEL
-OPTIONS_DEFAULT=	GNOMEPANEL
-GNOMEPANEL_DESC=	GNOME Panel Applet
-
-USES=		gettext pathfix pkgconfig
-USE_GNOME=	desktopfileutils gnomeprefix libgnomeui
+USES=		gettext gmake pathfix pkgconfig
+USE_GNOME=	gnomeprefix libgnomeui
 USE_GSTREAMER=	vorbis
 USE_OPENSSL=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-doxygen-doc \
 		--enable-systray \
+		--disable-applet \
 		--with-ssl=${OPENSSLBASE}
 
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -30,18 +27,4 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	g2ipmsg.schemas
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGNOMEPANEL}
-USE_GNOME+=	gnomepanel
-PLIST_SUB+=	GNOMEPANEL=""
-.else
-CONFIGURE_ARGS+=--disable-applet
-PLIST_SUB+=	GNOMEPANEL="@comment "
-.endif
-
-post-install:
-	@update-desktop-database
-
 .include <bsd.port.mk>
diff --git a/net/g2ipmsg/pkg-plist b/net/g2ipmsg/pkg-plist
index d1789f2f5455..da3ea82b7bd2 100644
--- a/net/g2ipmsg/pkg-plist
+++ b/net/g2ipmsg/pkg-plist
@@ -1,5 +1,4 @@
 bin/g2ipmsg
-%%GNOMEPANEL%%bin/g2ipmsg_applet
 libdata/bonobo/servers/g2ipmsg.server
 share/applications/g2ipmsg.desktop
 share/locale/ja/LC_MESSAGES/g2ipmsg.mo
@@ -10,7 +9,5 @@ share/pixmaps/g2ipmsg/ipmsg.xpm
 share/pixmaps/g2ipmsg/ipmsgrev.xpm
 share/pixmaps/ipmsg.png
 share/sounds/g2ipmsg/g2ipmsg.ogg
-@exec   %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrm share/sounds/g2ipmsg
 @dirrm share/pixmaps/g2ipmsg