ports/123720: [PATCH] net/rdesktop: update to 1.6.0

Fri May 16 01:20:02 UTC 2008

>Number:         123720
>Category:       ports
>Synopsis:       [PATCH] net/rdesktop: update to 1.6.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri May 16 01:20:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Alexander Logvinov
>Release:        FreeBSD 6.3-RELEASE-p1 i386
>Organization:
>Environment:

>Description:

  Update to 1.6.0
  Add OPTIONS
  Add ipv6 to CATEGORIES
    
>How-To-Repeat:

>Fix:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/rdesktop/Makefile,v
retrieving revision 1.43
diff -u -r1.43 Makefile

--- Makefile	23 Sep 2007 11:25:03 -0000	1.43
+++ Makefile	16 May 2008 01:08:26 -0000
@@ -6,15 +6,25 @@
 #
 
 PORTNAME=	rdesktop
-PORTVERSION=	1.5.0
-PORTREVISION?=	3
-CATEGORIES=	net comms
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+PORTVERSION=	1.6.0
+CATEGORIES=	net comms ipv6
+MASTER_SITES=	SF
 
 MAINTAINER=	obrien at FreeBSD.org
 COMMENT=	RDP client for Windows NT/2000/2003 Terminal Server
 
+OPTIONS=        ICONV		"Enable iconv support"	on \
+		IPV6		"Enable IPv6 support"	on \
+		SMARTCARD	"Enable smartcard support"	off \
+		DEBUG		"Enable protocol debugging output"	off \
+		DEBUGKBD	"Enable debugging of keyboard handling"	off \
+		DEBUGRPD5	"Enable debugging of RDP5 code"	off \
+		DEBUGCLPBRD	"Enable debugging of clipboard code"	off \
+		DEBUGSOUND	"Enable debugging of sound code"	off \
+		DEBUGCHANNEL	"Enable debugging of virtual channel code"	off \
+		DEBUGSEAM	"Enable debugging of SeamlessRDP code"	off \
+		DEBUGSCARD	"Enable debugging of smart-card code"	off
+
 USE_XORG=	x11
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
@@ -22,6 +32,54 @@
 DOCS=		doc/AUTHORS doc/TODO doc/*.txt
 MAN1=		rdesktop.1
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_ICONV)
+USE_ICONV=	yes
+CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE}
+.endif
+
+.if defined(WITH_IPV6)
+CONFIGURE_ARGS+=	--with-ipv6
+.endif
+
+.if defined(WITH_SMARTCARD)
+LIB_DEPENDS+=	pcsclite.1:${PORTSDIR}/devel/pcsc-lite
+CONFIGURE_ARGS+=	--enable-smartcard
+.endif
+
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=	--with-debug
+.endif
+
+.if defined(WITH_DEBUGKBD)
+CONFIGURE_ARGS+=	--with-debug-kbd
+.endif
+
+.if defined(WITH_DEBUGRPD5)
+CONFIGURE_ARGS+=	--with-debug-rdp5
+.endif
+
+.if defined(WITH_DEBUGCLPBRD)
+CONFIGURE_ARGS+=	--with-debug-clipboard
+.endif
+
+.if defined(WITH_DEBUGSOUND)
+CONFIGURE_ARGS+=	--with-debug-sound
+.endif
+
+.if defined(WITH_DEBUGCHANNEL)
+CONFIGURE_ARGS+=	--with-debug-channel
+.endif
+
+.if defined(WITH_DEBUGSEAM)
+CONFIGURE_ARGS+=	--with-debug-seamless
+.endif
+
+.if defined(WITH_DEBUGSCARD) && defined(WITH_SMARTCARD)
+CONFIGURE_ARGS+=	--with-debug-smartcard
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rdesktop ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/rdesktop.1 ${MAN1PREFIX}/man/man1
@@ -32,4 +90,4 @@
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/net/rdesktop/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- distinfo	13 Sep 2006 16:46:57 -0000	1.14
+++ distinfo	16 May 2008 01:08:26 -0000
@@ -1,3 +1,3 @@
-MD5 (rdesktop-1.5.0.tar.gz) = 433546f60fc0f201e99307ba188369ed
-SHA256 (rdesktop-1.5.0.tar.gz) = 5ead17c3d29cb1028aeca485ee7a8c65694c1b02a1b7014c3da920b265a438aa
-SIZE (rdesktop-1.5.0.tar.gz) = 245137
+MD5 (rdesktop-1.6.0.tar.gz) = c6fcbed7f0ad7e60ac5fcb2d324d8b16
+SHA256 (rdesktop-1.6.0.tar.gz) = 35026eaa8e14ca8bd0ba3730926f14222f8452f2ac662623bbf1909d8b060979
+SIZE (rdesktop-1.6.0.tar.gz) = 284728
Index: files/patch-rdpsnd_oss.c
===================================================================
RCS file: files/patch-rdpsnd_oss.c
diff -N files/patch-rdpsnd_oss.c
--- files/patch-rdpsnd_oss.c	23 Aug 2007 23:53:59 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,57 +0,0 @@
---- rdpsnd_oss.c.orig	2007-08-20 23:20:40.000000000 -0700
-+++ rdpsnd_oss.c	2007-08-20 23:21:51.000000000 -0700
-@@ -51,6 +51,35 @@
- } packet_queue[MAX_QUEUE];
- static unsigned int queue_hi, queue_lo;
- 
-+/** Frees the first audio packet in the queue (that is, packet_queue[queue_lo]),
-+ * sending a completion notification back to the server.
-+ *
-+ * @return True if the packet queue has become empty; False otherwise. 
-+ *
-+ * If the packet queue is not empty, queue_lo will point at the next packet to
-+ * play.
-+ */
-+static BOOL
-+packet_done(void)
-+{
-+	struct audio_packet *packet = &packet_queue[queue_lo++];
-+	queue_lo %= MAX_QUEUE;
-+	rdpsnd_send_completion(packet->tick, packet->index);
-+	free(packet->s.data);
-+	return (queue_lo == queue_hi);
-+}
-+
-+/** Discards all audio packets queued, sending completion notifications back to
-+ * the server as necessary.
-+ */
-+static void
-+clear_queue(void)
-+{
-+	while (queue_lo != queue_hi)
-+		packet_done();
-+	g_dsp_busy = False;
-+}
-+
- BOOL
- wave_out_open(void)
- {
-@@ -74,6 +103,7 @@
- wave_out_close(void)
- {
- 	close(g_dsp_fd);
-+	clear_queue();
- }
- 
- BOOL
-@@ -277,9 +307,7 @@
- 
- 		if (elapsed >= (duration * 85) / 100)
- 		{
--			rdpsnd_send_completion(packet->tick, packet->index);
--			free(out->data);
--			queue_lo = (queue_lo + 1) % MAX_QUEUE;
-+			packet_done();
- 			started = False;
- 		}
- 		else
Index: files/patch-xwin.c
===================================================================
RCS file: files/patch-xwin.c
diff -N files/patch-xwin.c
--- files/patch-xwin.c	19 Jun 2007 08:55:11 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
---- xwin.c.orig	Fri Jun  1 10:27:15 2007
-+++ xwin.c	Fri Jun  1 10:28:26 2007
-@@ -3219,7 +3219,7 @@
- 		return;
- 
- 	image = XCreateImage(g_display, g_visual, g_depth, ZPixmap, 0,
--			     (char *) data, cx, cy, BitmapPad(g_display), cx * g_bpp / 8);
-+			     (char *) data, cx, cy, g_bpp, 0);
- 
- 	if (g_ownbackstore)
- 	{
>Release-Note:
>Audit-Trail:
>Unformatted:

