ports/186035: [maintainer update] net/xrdp: Fix the build after recent update of net/freerdp

[Koichiro IWAO]

>Number:         186035
>Category:       ports
>Synopsis:       [maintainer update] net/xrdp: Fix the build after recent update of net/freerdp
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 23 14:30:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Koichiro IWAO
>Release:        10.0-RELEASE
>Organization:
>Environment:
>Description:
- Fix the build after recent update of net/freerdp
- Follow upstream repository transfer [1]
- Remove unused files from distinfo

Now FreeRDP module is not built as xrdp 0.6.1 is incompatible
with FreeRDP 1.1 or later and net/freerdp has been updated to 
1.1 beta.

[1] http://www.mail-archive.com/xrdp-devel@lists.sourceforge.net/msg01603.html
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN /usr/ports/net/xrdp/Makefile net/xrdp/Makefile
--- /usr/ports/net/xrdp/Makefile	2014-01-23 22:53:51.527269612 +0900
+++ net/xrdp/Makefile	2014-01-23 22:54:54.360953718 +0900
@@ -3,7 +3,7 @@
 
 PORTNAME=	xrdp
 PORTVERSION=	0.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	GH
@@ -13,7 +13,6 @@
 COMMENT=	Open source Remote Desktop Protocol (RDP) server
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		pkgconfig
 USE_XORG=	x11 xfixes
@@ -22,17 +21,15 @@
 USE_RC_SUBR=	xrdp
 USE_LDCONFIG=	${STAGEDIR}${PREFIX}/lib/xrdp
 USE_GITHUB=	yes
-GH_ACCOUNT=	FreeRDP
+GH_ACCOUNT=	neutrinolabs
 GH_PROJECT=	xrdp
 GH_COMMIT=	5d53758
 GH_TAGNAME=	${GH_COMMIT}
 
-CONFIGURE_ARGS=	--localstatedir=/var \
-		--enable-freerdp1
+CONFIGURE_ARGS=	--localstatedir=/var
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFLICTS=	xrdp-devel-[0-9]*
-BUILD_DEPENDS+=	freerdp>=1.0.2:${PORTSDIR}/net/freerdp
 
 OPTIONS_DEFINE=	DEBUG
 OPTIONS_DEFAULT=	JP106 TIGERVNC
diff -ruN /usr/ports/net/xrdp/distinfo net/xrdp/distinfo
--- /usr/ports/net/xrdp/distinfo	2014-01-23 22:53:51.528267116 +0900
+++ net/xrdp/distinfo	2014-01-22 16:54:17.644709000 +0900
@@ -1,12 +1,2 @@
-SHA256 (xrdp/xrdp-0.6.1.tar.gz) = ef9b223cf8a114c05d85f352bbc842468028fed33842698ba09e2bc86c21bcd0
-SIZE (xrdp/xrdp-0.6.1.tar.gz) = 1559492
-SHA256 (xrdp/patch-instfiles__Makefile.am) = 92e8a1768b63f508bc5b37cdc5723d1e03875af7fbdf064aa86a6b40b1bd2f07
-SIZE (xrdp/patch-instfiles__Makefile.am) = 710
-SHA256 (xrdp/patch-instfiles__km-0411.ini) = 58bcb7f063db4fcde9230be3013d46226b8af5c0060b7faf00250a51aa7da4fd
-SIZE (xrdp/patch-instfiles__km-0411.ini) = 9576
-SHA256 (xrdp/patch-instfiles__km-e0010411.ini) = 201e55ae65c223602d66eb15ac3fd53564dc3f8e856f08183f9cf8f3fc6334c3
-SIZE (xrdp/patch-instfiles__km-e0010411.ini) = 9592
-SHA256 (xrdp/patch-instfiles__km-e0200411.ini) = d6e95d98629bf346173e97ebd9fba7910971a0165fc32c3e3cada3c5a6d01de8
-SIZE (xrdp/patch-instfiles__km-e0200411.ini) = 9592
-SHA256 (xrdp/patch-instfiles__km-e0210411.ini) = f3f29efc3541c08f60edbbb3ecf85da59abe7d745b59a7d5d0340d5940c3e723
-SIZE (xrdp/patch-instfiles__km-e0210411.ini) = 9592
+SHA256 (xrdp/xrdp-0.6.1.tar.gz) = 5a5316f9404243b2016b02f050648001987e648435927c9c965a804f233daa25
+SIZE (xrdp/xrdp-0.6.1.tar.gz) = 1559511
diff -ruN /usr/ports/net/xrdp/pkg-plist net/xrdp/pkg-plist
--- /usr/ports/net/xrdp/pkg-plist	2014-01-23 22:53:51.528267116 +0900
+++ net/xrdp/pkg-plist	2014-01-22 16:47:37.626735000 +0900
@@ -33,10 +33,6 @@
 lib/xrdp/libxup.la
 lib/xrdp/libxup.so
 lib/xrdp/libxup.so.0
-lib/xrdp/libxrdpfreerdp1.la
-lib/xrdp/libxrdpfreerdp1.a
-lib/xrdp/libxrdpfreerdp1.so
-lib/xrdp/libxrdpfreerdp1.so.0
 man/man5/sesman.ini.5.gz
 man/man5/xrdp.ini.5.gz
 man/man8/xrdp-sesman.8.gz


>Release-Note:
>Audit-Trail:
>Unformatted: