From udo.schweigert@siemens.com  Mon Dec 16 23:11:44 2002
Return-Path: <udo.schweigert@siemens.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3C1A537B401
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 16 Dec 2002 23:11:44 -0800 (PST)
Received: from david.siemens.de (david.siemens.de [192.35.17.14])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CEC6E43EC2
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 16 Dec 2002 23:11:42 -0800 (PST)
	(envelope-from udo.schweigert@siemens.com)
Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14])
	by david.siemens.de (8.11.6/8.11.6) with ESMTP id gBH7Ba606279;
	Tue, 17 Dec 2002 08:11:36 +0100 (MET)
Received: from mars.cert.siemens.de (ust.mchp.siemens.de [139.23.201.17])
	by mail3.siemens.de (8.11.6/8.11.6) with ESMTP id gBH7BY314080;
	Tue, 17 Dec 2002 08:11:35 +0100 (MET)
Received: from alaska.cert.siemens.de (alaska.cert.siemens.de [139.23.202.134])
	by mars.cert.siemens.de (8.12.6/8.12.6/Siemens CERT [ $Revision: 1.31 ]) with ESMTP id gBH7BYhQ030790;
	Tue, 17 Dec 2002 08:11:34 +0100 (CET)
	(envelope-from ust@alaska.cert.siemens.de)
Received: from alaska.cert.siemens.de (alaska.cert.siemens.de [127.0.0.1])
	by alaska.cert.siemens.de (8.12.6/8.12.6/alaska [ $Revision: 1.14 ]) with ESMTP id gBH7BYIb045797;
	Tue, 17 Dec 2002 08:11:34 +0100 (CET)
	(envelope-from ust@alaska.cert.siemens.de)
Received: (from ust@localhost)
	by alaska.cert.siemens.de (8.12.6/8.12.6/alaska [ $Revision: 1.3 ]) id gBH7BXIb008195;
	Tue, 17 Dec 2002 08:11:33 +0100 (CET)
	(envelope-from ust)
Message-Id: <200212170711.gBH7BXIb008195@alaska.cert.siemens.de>
Date: Tue, 17 Dec 2002 08:11:33 +0100 (CET)
From: Udo Schweigert <udo.schweigert@siemens.com>
Reply-To: Udo Schweigert <udo.schweigert@siemens.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: chris@aims.com.au
Subject: update of port net/rdesktop-devel
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         46321
>Category:       ports
>Synopsis:       update of port net/rdesktop-devel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Dec 16 23:20:01 PST 2002
>Closed-Date:    Fri Jan 03 10:50:19 PST 2003
>Last-Modified:  Fri Jan 03 10:50:19 PST 2003
>Originator:     Udo Schweigert
>Release:        FreeBSD 4.7-STABLE i386
>Organization:
>Environment:
System: FreeBSD alaska.cert.siemens.de 4.7-STABLE FreeBSD 4.7-STABLE #36: Sat Dec 7 15:23:45 CET 2002 ust@alaska.cert.siemens.de:/usr/obj/work/src/RELENG_4/sys/alaska i386


>Description:

Update of the net/rdesktop-devel port to the latest beta version, which now
supports high encryption.

>How-To-Repeat:
>Fix:

diff -ruN --exclude=CVS /usr/ports/net/rdesktop-devel/Makefile rdesktop-devel/Makefile
--- /usr/ports/net/rdesktop-devel/Makefile	Mon May 20 10:22:22 2002
+++ rdesktop-devel/Makefile	Sun Dec 15 10:49:35 2002
@@ -6,30 +6,31 @@
 #
 
 PORTNAME=	rdesktop
-PORTVERSION=	1.1.0.p19.9.0
+PORTVERSION=	1.2b1
 CATEGORIES=	net comms
-MASTER_SITES=	http://bibl4.oru.se/projects/rdesktop/dist/releases/
-DISTNAME=	rdesktop-1.1.0
-
-PATCH_SITES=	http://bibl4.oru.se/projects/rdesktop/ \
-		http://bibl4.oru.se/projects/rdesktop/patch19/
-PATCHFILES=	rdesktop-unified-patch19-9-0.bz2
-PATCH_DIST_STRIP=	-p2
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	rdesktop-1.2beta1
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MAINTAINER=	chris@aims.com.au
 
 USE_XLIB=	yes
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-openssl --enable-final
+CONFIGURE_ARGS=	--prefix=${PREFIX}
 
 MAN1=		rdesktop.1
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/rdesktop ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/rdesktop.1 ${PREFIX}/man/man1
+	@${INSTALL_MAN} ${WRKSRC}/doc/rdesktop.1 ${PREFIX}/man/man1
+	@${INSTALL} -d -v -m 755 ${PREFIX}/share/rdesktop
+	@${INSTALL} -d -v -m 755 ${PREFIX}/share/rdesktop/keymaps
+	@for f in ${WRKSRC}/keymaps/*; do \
+		${INSTALL_DATA} $$f ${PREFIX}/share/rdesktop/keymaps; \
+	done
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/net/rdesktop-devel/distinfo rdesktop-devel/distinfo
--- /usr/ports/net/rdesktop-devel/distinfo	Mon May 20 10:22:22 2002
+++ rdesktop-devel/distinfo	Sun Dec 15 10:13:36 2002
@@ -1,2 +1 @@
-MD5 (rdesktop-1.1.0.tar.bz2) = d88d26b179595546c13d70129a891a98
-MD5 (rdesktop-unified-patch19-9-0.bz2) = 1f46a1b137142474f8e5aef10b5d8d60
+MD5 (rdesktop-1.2beta1.tar.gz) = db39ce21a03832495b75a8b338525a15
diff -ruN --exclude=CVS /usr/ports/net/rdesktop-devel/files/patch-Makefile rdesktop-devel/files/patch-Makefile
--- /usr/ports/net/rdesktop-devel/files/patch-Makefile	Sat Feb  2 06:26:26 2002
+++ rdesktop-devel/files/patch-Makefile	Sun Dec 15 10:46:30 2002
@@ -1,30 +1,35 @@
---- Makefile.orig	Sat Feb  2 00:21:14 2002
-+++ Makefile	Sat Feb  2 00:23:47 2002
-@@ -6,14 +6,9 @@
- 
- # Configuration defaults
- 
--CC       = gcc
--CFLAGS   = -O2 -Wall
--INCLUDES = -I$(shell pwd)
--LDLIBS   =
-+INCLUDES = -I.
- 
--PREFIX   = /usr/local
--EPREFIX  = $(PREFIX)
--BINDIR   = $(EPREFIX)/bin
-+BINDIR   = $(PREFIX)/bin
- MANDIR   = $(PREFIX)/man
- 
- RDPOBJ   = rdesktop.o tcp.o iso.o mcs.o secure.o licence.o rdp.o orders.o bitmap.o cache.o decompress.o
-@@ -26,8 +21,8 @@
- SSL_LIBS =
- 
- #the xlib layer ( default )
--GUI_XWIN_INC = -I/usr/X11R6/include
--GUI_XWIN_LIB = -L/usr/X11R6/lib -lX11
-+GUI_XWIN_INC = -I${X11BASE}/include
-+GUI_XWIN_LIB = -L${X11BASE}/lib -lX11
- GUI_XWIN_OBJ = gl/xwin.o
+--- Makefile.orig	Mon Nov 18 16:46:24 2002
++++ Makefile	Sun Dec 15 10:45:38 2002
+@@ -24,6 +24,8 @@
+ include Makeconf  # configure-generated
+ 
+ 
++all: rdesktop
++
+ rdesktop: $(RDPOBJ) $(CRYPTOBJ)
+ 	$(CC) $(CFLAGS) -o rdesktop $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS)
+ 
+@@ -33,23 +35,10 @@
+ install: installbin installkeymaps installman
+ 
+ installbin: rdesktop
+-	mkdir -p $(DESTDIR)/$(bindir)
+-	install rdesktop $(DESTDIR)/$(bindir)
+-	strip $(DESTDIR)/$(bindir)/rdesktop
+-	chmod 755 $(DESTDIR)/$(bindir)/rdesktop
+ 
+ installman: doc/rdesktop.1
+-	mkdir -p $(DESTDIR)/$(mandir)/man1
+-	cp doc/rdesktop.1 $(DESTDIR)/$(mandir)/man1
+-	chmod 644 $(DESTDIR)/$(mandir)/man1/rdesktop.1
+ 
+ installkeymaps:
+-	mkdir -p $(DESTDIR)/$(KEYMAP_PATH)
+-# Prevent copying the CVS directory
+-	cp keymaps/?? keymaps/??-?? $(DESTDIR)/$(KEYMAP_PATH)
+-	cp keymaps/common $(DESTDIR)/$(KEYMAP_PATH)
+-	cp keymaps/modifiers $(DESTDIR)/$(KEYMAP_PATH)
+-	chmod 644 $(DESTDIR)/$(KEYMAP_PATH)/*
  
- #the nt layer
+ proto:
+ 	cproto -DMAKE_PROTO -o proto.h *.c
diff -ruN --exclude=CVS /usr/ports/net/rdesktop-devel/files/patch-configure rdesktop-devel/files/patch-configure
--- /usr/ports/net/rdesktop-devel/files/patch-configure	Thu Jan  1 01:00:00 1970
+++ rdesktop-devel/files/patch-configure	Sun Dec 15 10:47:01 2002
@@ -0,0 +1,10 @@
+--- configure.orig	Tue Nov 19 12:05:27 2002
++++ configure	Sun Dec 15 10:29:03 2002
+@@ -222,6 +222,7 @@
+ 
+ echo "CFLAGS     += $cflags" >>Makeconf
+ echo "LDFLAGS    += $ldflags" >>Makeconf
++echo 'DESTDIR     = ${prefix}' >>Makeconf
+ 
+ echo "configure complete - now run make"
+ 
diff -ruN --exclude=CVS /usr/ports/net/rdesktop-devel/pkg-plist rdesktop-devel/pkg-plist
--- /usr/ports/net/rdesktop-devel/pkg-plist	Tue Jun  5 04:07:54 2001
+++ rdesktop-devel/pkg-plist	Sun Dec 15 10:21:50 2002
@@ -1 +1,29 @@
 bin/rdesktop
+share/rdesktop/keymaps/ar
+share/rdesktop/keymaps/fr-be
+share/rdesktop/keymaps/en-us
+share/rdesktop/keymaps/en-gb
+share/rdesktop/keymaps/tr
+share/rdesktop/keymaps/th
+share/rdesktop/keymaps/sv
+share/rdesktop/keymaps/sl
+share/rdesktop/keymaps/ru
+share/rdesktop/keymaps/pt
+share/rdesktop/keymaps/pl
+share/rdesktop/keymaps/no
+share/rdesktop/keymaps/mk
+share/rdesktop/keymaps/lv
+share/rdesktop/keymaps/lt
+share/rdesktop/keymaps/ja
+share/rdesktop/keymaps/it
+share/rdesktop/keymaps/hr
+share/rdesktop/keymaps/fr
+share/rdesktop/keymaps/fi
+share/rdesktop/keymaps/es
+share/rdesktop/keymaps/de
+share/rdesktop/keymaps/da
+share/rdesktop/keymaps/pt-br
+share/rdesktop/keymaps/common
+share/rdesktop/keymaps/modifiers
+@unexec rmdir %D/share/rdesktop/keymaps 2>/dev/null || true
+@unexec rmdir %D/share/rdesktop 2>/dev/null || true

>Release-Note:
>Audit-Trail:

From: "Chris Knight" <chris@aims.com.au>
To: <FreeBSD-gnats-submit@freebsd.org>
Cc:  
Subject: Re: ports/46321: update of port net/rdesktop-devel
Date: Tue, 31 Dec 2002 23:40:25 +1100

 Great! Thanks for keeping your eye on the project and providing a patch.
 I've made changes so that the system CFLAGS aren't clobbered.
 files/patch-Makefile and files/patch-configure should be as follows.
 Please commit the above patches, with the following exceptions.
 
 Index: patch-Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/net/rdesktop-devel/files/patch-Makefile,v
 retrieving revision 1.2
 diff -u -r1.2 patch-Makefile
 --- patch-Makefile	2 Feb 2002 05:26:26 -0000	1.2
 +++ patch-Makefile	31 Dec 2002 11:13:02 -0000
 @@ -1,30 +1,44 @@
 ---- Makefile.orig	Sat Feb  2 00:21:14 2002
 -+++ Makefile	Sat Feb  2 00:23:47 2002
 -@@ -6,14 +6,9 @@
 - 
 +--- Makefile.orig	Tue Nov 19 02:46:24 2002
 ++++ Makefile	Tue Dec 31 22:10:53 2002
 +@@ -7,7 +7,7 @@
   # Configuration defaults
   
 --CC       = gcc
 --CFLAGS   = -O2 -Wall
 --INCLUDES = -I$(shell pwd)
 --LDLIBS   =
 -+INCLUDES = -I.
 - 
 --PREFIX   = /usr/local
 --EPREFIX  = $(PREFIX)
 --BINDIR   = $(EPREFIX)/bin
 -+BINDIR   = $(PREFIX)/bin
 - MANDIR   = $(PREFIX)/man
 - 
 - RDPOBJ   = rdesktop.o tcp.o iso.o mcs.o secure.o licence.o rdp.o orders.o bitmap.o cache.o decompress.o
 -@@ -26,8 +21,8 @@
 - SSL_LIBS =
 - 
 - #the xlib layer ( default )
 --GUI_XWIN_INC = -I/usr/X11R6/include
 --GUI_XWIN_LIB = -L/usr/X11R6/lib -lX11
 -+GUI_XWIN_INC = -I${X11BASE}/include
 -+GUI_XWIN_LIB = -L${X11BASE}/lib -lX11
 - GUI_XWIN_OBJ = gl/xwin.o
 + CC       = cc
 +-CFLAGS   = -O2 -DKEYMAP_PATH=\"$(KEYMAP_PATH)\"
 ++CFLAGS  += -DKEYMAP_PATH=\"$(KEYMAP_PATH)\"
 + LDFLAGS  =
 + 
 + prefix      = /usr/local
 +@@ -24,6 +24,8 @@
 + include Makeconf  # configure-generated
 + 
 + 
 ++all: rdesktop
 ++
 + rdesktop: $(RDPOBJ) $(CRYPTOBJ)
 + 	$(CC) $(CFLAGS) -o rdesktop $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS)
 + 
 +@@ -33,23 +35,10 @@
 + install: installbin installkeymaps installman
 + 
 + installbin: rdesktop
 +-	mkdir -p $(DESTDIR)/$(bindir)
 +-	install rdesktop $(DESTDIR)/$(bindir)
 +-	strip $(DESTDIR)/$(bindir)/rdesktop
 +-	chmod 755 $(DESTDIR)/$(bindir)/rdesktop
 + 
 + installman: doc/rdesktop.1
 +-	mkdir -p $(DESTDIR)/$(mandir)/man1
 +-	cp doc/rdesktop.1 $(DESTDIR)/$(mandir)/man1
 +-	chmod 644 $(DESTDIR)/$(mandir)/man1/rdesktop.1
 + 
 + installkeymaps:
 +-	mkdir -p $(DESTDIR)/$(KEYMAP_PATH)
 +-# Prevent copying the CVS directory
 +-	cp keymaps/?? keymaps/??-?? $(DESTDIR)/$(KEYMAP_PATH)
 +-	cp keymaps/common $(DESTDIR)/$(KEYMAP_PATH)
 +-	cp keymaps/modifiers $(DESTDIR)/$(KEYMAP_PATH)
 +-	chmod 644 $(DESTDIR)/$(KEYMAP_PATH)/*
   
 - #the nt layer
 + proto:
 + 	cproto -DMAKE_PROTO -o proto.h *.c
 Index: patch-configure
 ===================================================================
 RCS file: patch-configure
 diff -N patch-configure
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ patch-configure	31 Dec 2002 11:24:01 -0000
 @@ -0,0 +1,19 @@
 +--- configure.orig	Tue Nov 19 22:05:27 2002
 ++++ configure	Tue Dec 31 22:23:43 2002
 +@@ -98,7 +98,7 @@
 + echo "CC          = $cc" >>Makeconf
 + 
 + if $cc -v 2>&1 |grep '^gcc' >/dev/null; then
 +-    cflags="$cflags -Wall -O2"
 ++    #cflags="$cflags -Wall -O2"
 + else
 +     cflags="$cflags -O"
 + fi
 +@@ -222,6 +222,7 @@
 + 
 + echo "CFLAGS     += $cflags" >>Makeconf
 + echo "LDFLAGS    += $ldflags" >>Makeconf
 ++echo 'DESTDIR     = ${prefix}' >>Makeconf
 + 
 + echo "configure complete - now run make"
 + 
 
 Regards,
 Chris Knight
 Systems Administrator
 AIMS Independent Computer Professionals
 Tel: +61 3 6334 6664  Fax: +61 3 6331 7032  Mob: +61 419 528 795
 Web: http://www.aims.com.au
 
State-Changed-From-To: open->closed 
State-Changed-By: ijliao 
State-Changed-When: Fri Jan 3 10:50:12 PST 2003 
State-Changed-Why:  
committed, thanks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=46321 
>Unformatted:
