Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 20 Dec 2016 09:01:37 +0000 (UTC)
From:      Ben Woods <woodsb02@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r428980 - in head: . net net/remmina-plugin-rdp net/remmina-plugins
Message-ID:  <201612200901.uBK91br3070334@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: woodsb02
Date: Tue Dec 20 09:01:36 2016
New Revision: 428980
URL: https://svnweb.freebsd.org/changeset/ports/428980

Log:
  net/remmina-plugin-rdp: Revive port
  
  PR:		214378
  Reported by:	Koichiro IWAO <meta+ports@vmeta.jp>
  Reported by:	timp87@gmail.com
  Approved by:	adamw (mentor, implicit)

Added:
  head/net/remmina-plugin-rdp/
     - copied from r404883, head/net/remmina-plugin-rdp/
Modified:
  head/MOVED
  head/net/Makefile
  head/net/remmina-plugin-rdp/Makefile
  head/net/remmina-plugins/Makefile
  head/net/remmina-plugins/bsd.plugin.mk
  head/net/remmina-plugins/distinfo

Modified: head/MOVED
==============================================================================
--- head/MOVED	Tue Dec 20 07:47:38 2016	(r428979)
+++ head/MOVED	Tue Dec 20 09:01:36 2016	(r428980)
@@ -8051,7 +8051,6 @@ graphics/pinta||2015-12-30|Has expired: 
 games/kanatest||2015-12-30|Has expired: Broken for more than 6 months
 editors/bless||2015-12-30|Has expired: Broken for more than 6 months
 security/burpsuite||2015-12-30|Has expired: Broken for more than 6 months
-net/remmina-plugin-rdp||2015-12-30|Has expired: Broken for more than 6 months
 dns/bind10|dns/bundy|2015-12-31|Has expired: Is not developed any more, use dns/bundy
 lang/perl5.16||2015-12-31|Has expired: Unsupported, please upgrade to a more recent version of Perl
 devel/py-distutils-extra|devel/py-python-distutils-extra|2015-12-31|Renamed to match upstream naming

Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile	Tue Dec 20 07:47:38 2016	(r428979)
+++ head/net/Makefile	Tue Dec 20 09:01:36 2016	(r428980)
@@ -1098,6 +1098,7 @@
     SUBDIR += remmina
     SUBDIR += remmina-plugin-gnome
     SUBDIR += remmina-plugin-nx
+    SUBDIR += remmina-plugin-rdp
     SUBDIR += remmina-plugin-telepathy
     SUBDIR += remmina-plugin-vnc
     SUBDIR += remmina-plugin-xdmcp

Modified: head/net/remmina-plugin-rdp/Makefile
==============================================================================
--- head/net/remmina-plugin-rdp/Makefile	Wed Dec 30 23:37:46 2015	(r404883)
+++ head/net/remmina-plugin-rdp/Makefile	Tue Dec 20 09:01:36 2016	(r428980)
@@ -5,13 +5,12 @@ PKGNAMESUFFIX=	-rdp
 
 COMMENT=	Remmina plugin for RDP protocol
 
-LIB_DEPENDS=	libfreerdp.so:${PORTSDIR}/net/freerdp
+LIB_DEPENDS=	libfreerdp.so:net/freerdp
 
-MASTERDIR=	${.CURDIR}/../remmina-plugins
+USE_GNOME+=	cairo
+USE_XORG+=	ice sm x11 xext
 
-BROKEN=		version 1.0.0 is incompatible with freerdp 1.2.x
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2015-12-30
+MASTERDIR=	${.CURDIR}/../remmina-plugins
 
 PLIST_SUB+=	ICONS="" SSH=""
 

Modified: head/net/remmina-plugins/Makefile
==============================================================================
--- head/net/remmina-plugins/Makefile	Tue Dec 20 07:47:38 2016	(r428979)
+++ head/net/remmina-plugins/Makefile	Tue Dec 20 09:01:36 2016	(r428980)
@@ -4,11 +4,17 @@
 PORTNAME?=	remmina-plugins
 DISTVERSIONPREFIX=v
 DISTVERSION=	1.2.0-rcgit.16
+PORTREVISION=	1
 CATEGORIES=	net gnome
 
+PATCH_SITES=	https://github.com/FreeRDP/Remmina/commit/
+PATCHFILES=	9b783595bd7fbfc39d1194d28110519c49dcaecc.patch:-p1
+
 MAINTAINER?=	woodsb02@FreeBSD.org
 COMMENT?=	Remmina plugin system
 
+LICENSE?=	GPLv2+
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeRDP
 GH_PROJECT=	Remmina
@@ -19,9 +25,10 @@ GH_PROJECT=	Remmina
 
 USES=	metaport
 
-OPTIONS_DEFINE=		KEYRING NX TELEP VNC XDMCP
-OPTIONS_DEFAULT=	KEYRING TELEP VNC XDMCP
+OPTIONS_DEFINE=		KEYRING NX RDP TELEP VNC XDMCP
+OPTIONS_DEFAULT=	KEYRING RDP TELEP VNC XDMCP
 KEYRING_DESC=		GNOME Keyring plugin
+RDP_DESC=		Remote Desktop Protocol plugin
 VNC_DESC=		VNC protocol plugin
 XDMCP_DESC=		XDMCP protocol plugin
 TELEP_DESC=		Telepathy protocol plugin
@@ -29,10 +36,13 @@ NX_DESC=		NX protocol plugin
 
 KEYRING_RUN_DEPENDS=	remmina-plugin-gnome>=0:net/remmina-plugin-gnome
 NX_RUN_DEPENDS=		remmina-plugin-nx>=0:net/remmina-plugin-nx
+RDP_RUN_DEPENDS=	remmina-plugin-rdp>=0:net/remmina-plugin-rdp
 TELEP_RUN_DEPENDS=	remmina-plugin-telepathy>=0:net/remmina-plugin-telepathy
 VNC_RUN_DEPENDS=	remmina-plugin-vnc>=0:net/remmina-plugin-vnc
 XDMCP_RUN_DEPENDS=	remmina-plugin-xdmcp>=0:net/remmina-plugin-xdmcp
 
+do-patch:
+
 .include <bsd.port.mk>
 
 .endif

Modified: head/net/remmina-plugins/bsd.plugin.mk
==============================================================================
--- head/net/remmina-plugins/bsd.plugin.mk	Tue Dec 20 07:47:38 2016	(r428979)
+++ head/net/remmina-plugins/bsd.plugin.mk	Tue Dec 20 09:01:36 2016	(r428980)
@@ -37,9 +37,6 @@ post-patch:
 # Do not build remmina core program
 	${REINPLACE_CMD} -e 's|add_subdirectory(remmina)||' ${WRKSRC}/CMakeLists.txt
 	${REINPLACE_CMD} -e 's|find_suggested_package(AVAHI)||' ${WRKSRC}/CMakeLists.txt
-# Do not build broken freerdp plugin
-	${REINPLACE_CMD} -e 's|find_suggested_package(FREERDP)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
-	${REINPLACE_CMD} -e 's|add_subdirectory(rdp)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
 # Which plugins to build
 .if ${PKGNAMESUFFIX:S,-,,} != "nx"
 	${REINPLACE_CMD} -e 's|find_suggested_package(LIBSSH)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
@@ -49,6 +46,10 @@ post-patch:
 .if ${PKGNAMESUFFIX:S,-,,} != "gnome"
 	${REINPLACE_CMD} -e 's|add_subdirectory(remmina-plugins-gnome)||' ${WRKSRC}/CMakeLists.txt
 .endif
+.if ${PKGNAMESUFFIX:S,-,,} != "rdp"
+	${REINPLACE_CMD} -e 's|find_suggested_package(FREERDP)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
+	${REINPLACE_CMD} -e 's|add_subdirectory(rdp)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
+.endif
 .if ${PKGNAMESUFFIX:S,-,,} != "vnc"
 	${REINPLACE_CMD} -e 's|find_suggested_package(GCRYPT)||' ${WRKSRC}/CMakeLists.txt
 	${REINPLACE_CMD} -e' s|find_required_package(LIBVNCSERVER)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt

Modified: head/net/remmina-plugins/distinfo
==============================================================================
--- head/net/remmina-plugins/distinfo	Tue Dec 20 07:47:38 2016	(r428979)
+++ head/net/remmina-plugins/distinfo	Tue Dec 20 09:01:36 2016	(r428980)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1478177235
+TIMESTAMP = 1482223169
 SHA256 (FreeRDP-Remmina-v1.2.0-rcgit.16_GH0.tar.gz) = edb347f9e4d0a2e682f7ffd22caa364b477653a1aca31d1c1922a86d81df4995
 SIZE (FreeRDP-Remmina-v1.2.0-rcgit.16_GH0.tar.gz) = 1008438
+SHA256 (9b783595bd7fbfc39d1194d28110519c49dcaecc.patch) = 2f6234f3be140fc17fc88da09cca06a0ff5364b123f7ee560c1daa17a3a00e53
+SIZE (9b783595bd7fbfc39d1194d28110519c49dcaecc.patch) = 58905



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612200901.uBK91br3070334>