Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 6 Oct 2012 01:25:47 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r305328 - head/net/xrdp
Message-ID:  <201210060125.q961PlRZ074541@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Sat Oct  6 01:25:46 2012
New Revision: 305328
URL: http://svn.freebsd.org/changeset/ports/305328

Log:
  - Update to 0.6.0 latest stable release
  - Add GATEWAY option (do not install net/vnc as backend)
  - Fix debug build's configure option
  
  PR:		ports/172306
  Submitted by:	Koichiro IWAO <meta+ports@vmeta.jp> (maintainer)

Modified:
  head/net/xrdp/Makefile
  head/net/xrdp/distinfo   (contents, props changed)
  head/net/xrdp/pkg-plist   (contents, props changed)

Modified: head/net/xrdp/Makefile
==============================================================================
--- head/net/xrdp/Makefile	Sat Oct  6 00:09:41 2012	(r305327)
+++ head/net/xrdp/Makefile	Sat Oct  6 01:25:46 2012	(r305328)
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	xrdp
-PORTVERSION=	0.6.0.20110117
-PORTREVISION=	3
+PORTVERSION=	0.6.0
+PORTEPOCH=	1
 CATEGORIES=	net
-MASTER_SITES=	http://www.club.kyutech.ac.jp/~meta/distfiles/ \
-		http://key2.jp/~meta/distfiles/
-DISTNAME=	${PORTNAME}-${PORTVERSION}cvs
+MASTER_SITES=	SF/xrdp/xrdp/${PORTVERSION}
+DISTNAME=	${PORTNAME}-v${PORTVERSION}
 DIST_SUBDIR?=	${PORTNAME}
 
 PATCH_SITES=	http://www.club.kyutech.ac.jp/~meta/patches/xrdp/0.6.0/ \
@@ -31,17 +30,18 @@ USE_RC_SUBR=	xrdp
 CONFIGURE_ARGS=	--localstatedir=/var
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
-RUN_DEPENDS+=	Xvnc:${PORTSDIR}/net/vnc
 
 USE_LDCONFIG=	${PREFIX}/lib/xrdp
 
-OPTIONS_DEFINE=	DEBUG JP106
+OPTIONS_DEFINE=	DEBUG GATEWAY JP106
 OPTIONS_DEFAULT=	JP106
+GATEWAY_DESC=	Install xrdp as RDP gateway (no VNC backend)
 JP106_DESC=	Install Japanese JP106 keymap
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEBUG}
+CONFIGURE_ARGS+=	--enable-xrdpdebug
 CFLAGS+=	-DXRDP_DEBUG
 .endif
 
@@ -56,6 +56,10 @@ PLIST_SUB+=	JP106=""
 PLIST_SUB+=	JP106="@comment "
 .endif
 
+.if !${PORT_OPTIONS:MGATEWAY}
+RUN_DEPENDS+=	Xvnc:${PORTSDIR}/net/vnc
+.endif
+
 MAN5=		sesman.ini.5 xrdp.ini.5
 MAN8=		xrdp-sesman.8 xrdp-sesrun.8 xrdp.8
 

Modified: head/net/xrdp/distinfo
==============================================================================
--- head/net/xrdp/distinfo	Sat Oct  6 00:09:41 2012	(r305327)
+++ head/net/xrdp/distinfo	Sat Oct  6 01:25:46 2012	(r305328)
@@ -1,5 +1,5 @@
-SHA256 (xrdp/xrdp-0.6.0.20110117cvs.tar.gz) = 06ad5b8afa4841aaa25ef06c7374ae881bd678b8ab5d6230ce0b9f6a463cfa98
-SIZE (xrdp/xrdp-0.6.0.20110117cvs.tar.gz) = 1998298
+SHA256 (xrdp/xrdp-v0.6.0.tar.gz) = 8b20fe56d935252981d73ac3b70b9b1654a83939824d9962beebb1586e429690
+SIZE (xrdp/xrdp-v0.6.0.tar.gz) = 322104
 SHA256 (xrdp/patch-instfiles__Makefile.am) = 92e8a1768b63f508bc5b37cdc5723d1e03875af7fbdf064aa86a6b40b1bd2f07
 SIZE (xrdp/patch-instfiles__Makefile.am) = 710
 SHA256 (xrdp/patch-instfiles__km-0411.ini) = 58bcb7f063db4fcde9230be3013d46226b8af5c0060b7faf00250a51aa7da4fd

Modified: head/net/xrdp/pkg-plist
==============================================================================
--- head/net/xrdp/pkg-plist	Sat Oct  6 00:09:41 2012	(r305327)
+++ head/net/xrdp/pkg-plist	Sat Oct  6 01:25:46 2012	(r305328)
@@ -1,4 +1,5 @@
 @stopdaemon xrdp
+bin/xrdp-dis
 bin/xrdp-genkeymap
 bin/xrdp-keygen
 bin/xrdp-sesadmin



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