Bug 186035 - [maintainer update] net/xrdp: Fix the build after recent update of net/freerdp
Summary: [maintainer update] net/xrdp: Fix the build after recent update of net/freerdp
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Steve Wills
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2014-01-23 14:30 UTC by Koichiro Iwao
Modified: 2014-01-25 17:10 UTC (History)
0 users

See Also:


Attachments
file.diff (2.72 KB, patch)
2014-01-23 14:30 UTC, Koichiro Iwao
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Koichiro Iwao freebsd_committer 2014-01-23 14:30:00 UTC
- 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

Fix: Patch attached with submission follows:
Comment 1 Edwin Groothuis freebsd_committer 2014-01-23 14:30:08 UTC
Responsible Changed
From-To: freebsd-ports-bugs->swills

swills@ wants this submitter's PRs (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer 2014-01-25 17:00:28 UTC
Author: swills
Date: Sat Jan 25 17:00:15 2014
New Revision: 341061
URL: http://svnweb.freebsd.org/changeset/ports/341061
QAT: https://qat.redports.org/buildarchive/r341061/

Log:
  - Fix the build after recent update of net/freerdp
  - Follow upstream repository transfer
  - Remove unused files from distinfo
  
  PR:		ports/186035
  Submitted by:	Koichiro IWAO <meta+ports@vmeta.jp> (maintainer)

Modified:
  head/net/xrdp/Makefile
  head/net/xrdp/distinfo
  head/net/xrdp/pkg-plist

Modified: head/net/xrdp/Makefile
==============================================================================
--- head/net/xrdp/Makefile	Sat Jan 25 17:00:15 2014	(r341060)
+++ head/net/xrdp/Makefile	Sat Jan 25 17:00:15 2014	(r341061)
@@ -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 @@ MAINTAINER=	meta+ports@vmeta.jp
 COMMENT=	Open source Remote Desktop Protocol (RDP) server
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		pkgconfig
 USE_XORG=	x11 xfixes
@@ -22,17 +21,15 @@ GNU_CONFIGURE=	yes
 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

Modified: head/net/xrdp/distinfo
==============================================================================
--- head/net/xrdp/distinfo	Sat Jan 25 17:00:15 2014	(r341060)
+++ head/net/xrdp/distinfo	Sat Jan 25 17:00:15 2014	(r341061)
@@ -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

Modified: head/net/xrdp/pkg-plist
==============================================================================
--- head/net/xrdp/pkg-plist	Sat Jan 25 17:00:15 2014	(r341060)
+++ head/net/xrdp/pkg-plist	Sat Jan 25 17:00:15 2014	(r341061)
@@ -33,10 +33,6 @@ lib/xrdp/libxup.a
 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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Steve Wills freebsd_committer 2014-01-25 17:08:24 UTC
State Changed
From-To: open->closed

Committed. Thanks!