From chris@aims.com.au  Thu Dec 27 20:28:57 2001
Return-Path: <chris@aims.com.au>
Received: from postoffice.aims.com.au (eth0.lnk.aims.com.au [203.31.73.253])
	by hub.freebsd.org (Postfix) with ESMTP id ED14A37B405
	for <freebsd-gnats-submit@freebsd.org>; Thu, 27 Dec 2001 20:28:54 -0800 (PST)
Received: from postoffice.aims.com.au (nts-ts1.aims.private [192.168.10.2])
	by postoffice.aims.com.au  with ESMTP id fBS4SqM64761
	for <freebsd-gnats-submit@freebsd.org>; Fri, 28 Dec 2001 15:28:52 +1100 (EST)
	(envelope-from chris@aims.com.au)
Received: from ntsts1 by aims.com.au
	with SMTP (MDaemon.v3.5.3.R)
	for <freebsd-gnats-submit@freebsd.org>; Fri, 28 Dec 2001 15:28:21 +1100
Message-Id: <200112280424.fBS4OoX85277@ait0fd01.aims.private>
Date: Fri, 28 Dec 2001 15:28:18 +1100
From: chris@aims.com.au
Reply-To: <chris@aims.com.au>
To: <freebsd-gnats-submit@freebsd.org>
Subject: [MAINTAINER UPDATE] net/rdesktop-devel
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         33267
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] net/rdesktop-devel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pat
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 27 20:30:01 PST 2001
>Closed-Date:    Sun Dec 30 17:12:43 PST 2001
>Last-Modified:  Sun Dec 30 17:13:35 PST 2001
>Originator:     Chris Knight
>Release:        FreeBSD 4.4-STABLE i386
>Organization:
AIMS Independent Computer Professionals
>Environment:

System: FreeBSD ait0fd01.aims.private 4.4-STABLE FreeBSD 4.4-STABLE #0: Fri Dec 7 15:16:26 EST 2001
root@ait0fd01.aims.private:/var/obj/usr/src/sys/THINKPAD i386

>Description:

Update to rdesktop 1.1.0 with unified patch 19.8.2

>How-To-Repeat:

N/A

>Fix:

- Add rdesktop-devel to CVSROOT/modules
- Remove files/patch-aa
- Apply the following diff:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/rdesktop-devel/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile	2001/12/17 03:43:00	1.8
+++ Makefile	2001/12/28 04:19:44
@@ -6,14 +6,14 @@
 #

 PORTNAME=	rdesktop
-PORTVERSION=	1.0.0.p19.7.6
+PORTVERSION=	1.1.0.p19.8.2
 CATEGORIES=	net comms
 MASTER_SITES=	http://bibl4.oru.se/projects/rdesktop/dist/releases/
-DISTNAME=	rdesktop-1.0.0
+DISTNAME=	rdesktop-1.1.0

 PATCH_SITES=	http://bibl4.oru.se/projects/rdesktop/ \
 		http://bibl4.oru.se/projects/rdesktop/patch19/
-PATCHFILES=	rdesktop-unified-patch19-7-6.bz2
+PATCHFILES=	rdesktop-unified-patch19-8-2.bz2
 PATCH_DIST_STRIP=	-p2

 MAINTAINER=	chris@aims.com.au
@@ -23,6 +23,9 @@
 USE_GMAKE=	yes
 USE_OPENSSL=	yes

+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-openssl
+
 MAN1=		rdesktop.1
 ALL_TARGET=

@@ -32,8 +35,9 @@
 	@${PERL} -pi.orig -e 's:-O2.*-Wall:${CFLAGS}:g' ${WRKSRC}/Makefile
 	@${PERL} -pi.orig -e 's:/usr/X11R6/:${X11BASE}/:g' ${WRKSRC}/Makefile
 	@${PERL} -pi.orig -e 's:^PREFIX.*:PREFIX=${PREFIX}:g' ${WRKSRC}/Makefile
-	@${PERL} -pi.orig -e 's:^install.*:install\: rdesktop:g' ${WRKSRC}/Makefile
-	@${PERL} -pi.orig -e 's:^.*\(INSTALL\) rdp-srvr.*::g' ${WRKSRC}/Makefile
-	@${PERL} -pi.orig -e 's:<endian.h>:<machine/endian.h>:g' ${WRKSRC}/rdesktop.h
+	@${PERL} -pi.orig -e 's:rdesktop rdp-srvr:rdesktop:g' ${WRKSRC}/Makefile
+	@${PERL} -pi.orig -e 's:^.*(cp |/)rdp-srvr.*::g' ${WRKSRC}/Makefile
+	@${PERL} -pi.orig -e 's:^install\:.*:install\: installbin installman:g' \
+		${WRKSRC}/Makefile

 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/rdesktop-devel/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo	2001/12/17 03:43:00	1.6
+++ distinfo	2001/12/28 04:19:44
@@ -1,2 +1,2 @@
-MD5 (rdesktop-1.0.0.tar.bz2) = 2f45a57016fe7ee7930848bbcb94f8b7
-MD5 (rdesktop-unified-patch19-7-6.bz2) = c20774a5e6c446f82ec199e8143775ce
+MD5 (rdesktop-1.1.0.tar.bz2) = d88d26b179595546c13d70129a891a98
+MD5 (rdesktop-unified-patch19-8-2.bz2) = e2a21f2402d5faa8f4fb0f23d36d69fd
Index: files/patch-aa
===================================================================
RCS file: patch-aa
diff -N patch-aa
--- /tmp/cvsn9HJYf15bO	Fri Dec 28 15:19:44 2001
+++ /dev/null	Fri Dec 28 15:00:00 2001
@@ -1,12 +0,0 @@
---- secure.c~	Mon Aug 27 16:33:56 2001
-+++ secure.c	Mon Aug 27 16:36:19 2001
-@@ -387,6 +387,9 @@
- {
-   int hostlen = 2 * ( hostname == 0 ? 0 : strlen (hostname));
-
-+  if (hostlen > 30)
-+      hostlen = 30;
-+
-   out_uint16_be (s, 5);		/* unknown */
-   out_uint16_be (s, 0x14);
-   out_uint8 (s, 0x7c);


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->pat 
Responsible-Changed-By: pat 
Responsible-Changed-When: Fri Dec 28 18:03:50 PST 2001 
Responsible-Changed-Why:  
I'll take care of this one 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=33267 
State-Changed-From-To: open->closed 
State-Changed-By: pat 
State-Changed-When: Sun Dec 30 17:12:43 PST 2001 
State-Changed-Why:  
Committed w/patching improvements. Thanks! 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=33267 
>Unformatted:
