1 files changed, 44 insertions, 18 deletions

diff --git a/net/remmina/Makefile b/net/remmina/Makefile
index 075e3fe96fee..ecbd1f1249e2 100644
--- a/net/remmina/Makefile
+++ b/net/remmina/Makefile
@@ -5,50 +5,71 @@
 # $FreeBSD$
 #
 
-PORTNAME=	grdc
-PORTVERSION=	0.6.0
+PORTNAME=	remmina
+PORTVERSION=	0.7.0
 CATEGORIES=	net gnome
-MASTER_SITES=	SF
+MASTER_SITES=	SF/${PORTNAME}/0.7/
 
 MAINTAINER=	avl@FreeBSD.org
-COMMENT=	GTK+/GNOME remote desktop client
+COMMENT=	The GTK+ Remote Desktop Client
 
 RUN_DEPENDS=	rdesktop:${PORTSDIR}/net/rdesktop
 
 OPTIONS=	VNC	"Build with VNC protocol support"	off \
+		GNUTLS	"Build VNC with GNUTLS encryption support"	off \
+		XDMCP	"Build with XDMCP protocol support"	off \
 		SSH	"Build with SSH tunneling support"	off \
-		GCRYPT	"Build with libgcrypt support (only with SSH)"	off \
+		GCRYPT	"Build with libgcrypt support for password encryption"	off \
 		TERM	"Build with terminal support"	off \
-		AVAHI	"Build with Avahi support"	off
+		AVAHI	"Build with Avahi support"	off \
+		UNIQUE	"Build with Unique-App support"	off
 
 MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GETTEXT=	yes
-USE_GNOME=	gnomehack gnomeprefix glib20 gtk20
-CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+USE_GNOME=	glib20 gtk20 desktopfileutils
+INSTALLS_ICONS=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.pre.mk>
 
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
+
 .if defined(WITH_VNC)
-LIB_DEPENDS+=	vncclient.0:${PORTSDIR}/net/libvncserver
+LIB_DEPENDS+=	jpeg.10:${PORTSDIR}/graphics/jpeg
+.if defined(WITH_GNUTLS)
+LIB_DEPENDS+=	gnutls:${PORTSDIR}/security/gnutls
+.endif
 .else
 CONFIGURE_ARGS+=	--disable-vnc
 .endif
 
+.if defined(WITH_XDMCP)
+RUN_DEPENDS+=	Xephyr:${PORTSDIR}/x11-servers/xephyr
+.endif
+
 .if defined(WITH_SSH)
-LIB_DEPENDS+=	ssh.3:${PORTSDIR}/security/libssh
+LIB_DEPENDS+=	ssh.4:${PORTSDIR}/security/libssh
+.if ${OSVERSION} >= 800040
+LDFLAGS+=	-fstack-protector
+.endif
+.else
+CONFIGURE_ARGS+=	--disable-ssh
+.endif
+
 .if defined(WITH_GCRYPT)
 LIB_DEPENDS+=	gcrypt.16:${PORTSDIR}/security/libgcrypt
 .else
 CONFIGURE_ARGS+=	--disable-gcrypt
 .endif
-.else
-CONFIGURE_ARGS+=	--disable-ssh
-.endif
 
 .if defined(WITH_TERM)
 USE_GNOME+=	vte
@@ -62,8 +83,13 @@ LIB_DEPENDS+=	avahi-ui.0:${PORTSDIR}/net/avahi-gtk
 CONFIGURE_ARGS+=	--disable-avahi
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|Exec=grdc|Exec=${LOCALBASE}/bin/grdc|' \
-		${WRKSRC}/src/grdc.desktop.in
+.if defined(WITH_UNIQUE)
+LIB_DEPENDS+=	unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
+.else
+CONFIGURE_ARGS+=	--disable-unique
+.endif
+
+post-install:
+	@-update-desktop-database
 
 .include <bsd.port.post.mk>