4 files changed, 47 insertions, 27 deletions

diff --git a/net/remmina-applet/Makefile b/net/remmina-applet/Makefile
index f0b7c4217409..57577b162481 100644
--- a/net/remmina-applet/Makefile
+++ b/net/remmina-applet/Makefile
@@ -5,30 +5,41 @@
 # $FreeBSD$
 #
 
-PORTNAME=	grdc
-PORTVERSION=	0.6.0
+PORTNAME=	remmina
+PORTVERSION=	0.7.0
 CATEGORIES=	net gnome
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-gnome/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/0.7/
 PKGNAMESUFFIX=	-applet
 DISTNAME=	${PORTNAME}-gnome-${PORTVERSION}
 
 MAINTAINER=	avl@FreeBSD.org
-COMMENT=	A GNOME Desktop applet for GTK+/GNOME remote desktop client
+COMMENT=	A GNOME Desktop applet for Remmina
 
-RUN_DEPENDS=	grdc:${PORTSDIR}/net/grdc
+RUN_DEPENDS=	remmina:${PORTSDIR}/net/remmina
+
+OPTIONS=	AVAHI	"Build with Avahi support"	off
 
 MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_GNOME=	gnomehack glib20 gtk20 gnomepanel
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
 USE_GETTEXT=	yes
-USE_GNOME=	gnomehack gnomeprefix glib20 gtk20 gnomepanel
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
+PLIST_SUB+=	NLS=""
+.endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|"grdc"|"${LOCALBASE}/bin/grdc"|' \
-		${WRKSRC}/src/grdcapplet.c
+.if defined(WITH_AVAHI)
+LIB_DEPENDS+=	avahi-ui.0:${PORTSDIR}/net/avahi-gtk
+.else
+CONFIGURE_ARGS+=	--disable-avahi
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/remmina-applet/distinfo b/net/remmina-applet/distinfo
index ec5339dec8bf..4a770ca6c1f0 100644
--- a/net/remmina-applet/distinfo
+++ b/net/remmina-applet/distinfo
@@ -1,3 +1,3 @@
-MD5 (grdc-gnome-0.6.0.tar.gz) = a5c50ab1750f9e28aadd63a2dfc0442c
-SHA256 (grdc-gnome-0.6.0.tar.gz) = f6dba860e30bb84e3dcf70014f18b71c48d24ec12066ff2dafa210ff227c79fc
-SIZE (grdc-gnome-0.6.0.tar.gz) = 119077
+MD5 (remmina-gnome-0.7.0.tar.gz) = 10b6e0edccc579e5658a5b86c3fbd88c
+SHA256 (remmina-gnome-0.7.0.tar.gz) = d3541b2bce56d3438494454dfc0f74e801426bfd5fb5fb6187dc8ee50abd3248
+SIZE (remmina-gnome-0.7.0.tar.gz) = 124760
diff --git a/net/remmina-applet/pkg-descr b/net/remmina-applet/pkg-descr
index 5264c4f7851f..30d84f66fbf1 100644
--- a/net/remmina-applet/pkg-descr
+++ b/net/remmina-applet/pkg-descr
@@ -1,10 +1,13 @@
-Grdc is a remote desktop client based on GTK+ and GNOME.
+Remmina is a remote desktop client written in GTK+, aiming to be useful for
+system administrators and travellers, who need to work with lots of remote
+computers in front of either large monitors or tiny netbooks. Remmina supports
+multiple network protocols in an integrated and consistant user interface.
 
-The Grdc GNOME applet:
+The Remmina GNOME applet:
 
- * A GNOME Desktop applet for easy-access of Grdc main features
+ * A GNOME Desktop applet for easy-access of Remmina main features
  * List all remote desktop files and make the connection easily
  * Support remote desktop files grouping feature
  * Automatic service discovery using Avahi
 
-WWW: http://grdc.sourceforge.net/
+WWW: http://remmina.sourceforge.net/
diff --git a/net/remmina-applet/pkg-plist b/net/remmina-applet/pkg-plist
index e4ad9136dd8c..970ff890e6a9 100644
--- a/net/remmina-applet/pkg-plist
+++ b/net/remmina-applet/pkg-plist
@@ -1,8 +1,14 @@
-bin/grdc-applet
-libdata/bonobo/servers/Grdc_Applet.server
-share/locale/el/LC_MESSAGES/grdc-gnome.mo
-share/locale/es/LC_MESSAGES/grdc-gnome.mo
-share/locale/pl/LC_MESSAGES/grdc-gnome.mo
-share/locale/zh_CN/LC_MESSAGES/grdc-gnome.mo
+bin/remmina-applet
+libdata/bonobo/servers/Remmina_Applet.server
+%%NLS%%share/locale/de/LC_MESSAGES/remmina-gnome.mo
+%%NLS%%share/locale/el/LC_MESSAGES/remmina-gnome.mo
+%%NLS%%share/locale/es/LC_MESSAGES/remmina-gnome.mo
+%%NLS%%share/locale/it/LC_MESSAGES/remmina-gnome.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/remmina-gnome.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/remmina-gnome.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/remmina-gnome.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/remmina-gnome.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/remmina-gnome.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/remmina-gnome.mo
 @dirrmtry libdata/bonobo/servers
 @dirrmtry libdata/bonobo