Updated rdesktop to 1.3.0.

Major changes since 1.2.0:

New features:

* RDP 5
* 15, 16 and 24 bit color depths
* Basic clipboard redirection
* Sound
* IPv6
* Attaching to console on Windows 2003

Other changes:

* Updated keymaps
* Increased maximum lengths for usernames and passwords
* Support for specifying geometry in terms of percent of whole screen

6 files changed, 69 insertions, 54 deletions

diff --git a/net/rdesktop/DESCR b/net/rdesktop/DESCR
index 79cc5c063ec..3d9c22759fc 100644
--- a/net/rdesktop/DESCR
+++ b/net/rdesktop/DESCR
@@ -1,2 +1,2 @@
-rdesktop is an open-source RDP client for connecting to Windows NT
-and Windows 2000 terminal servers.
+rdesktop is an open-source RDP client for connecting to Windows NT,
+2000, XP and 2003 Server terminal servers.
diff --git a/net/rdesktop/Makefile b/net/rdesktop/Makefile
index ef85075cd2b..e7b4c8a2b8a 100644
--- a/net/rdesktop/Makefile
+++ b/net/rdesktop/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2003/11/12 03:39:42 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2003/11/20 04:46:08 grant Exp $
 #
 
-DISTNAME=		rdesktop-1.2.0
-PKGREVISION=		1
+DISTNAME=		rdesktop-1.3.0
 CATEGORIES=		net
+WRKSRC=			${WRKDIR}/rdesktop
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=rdesktop/}
 
 MAINTAINER=		grant@NetBSD.org
@@ -16,7 +16,9 @@ HAS_CONFIGURE=		YES
 CONFIGURE_ARGS=		--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--with-x=${X11BASE}
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
-ALL_TARGET=		rdesktop
+
+LDFLAGS+=		${LIBOSSAUDIO}
 
 .include "../../security/openssl/buildlink2.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/rdesktop/PLIST b/net/rdesktop/PLIST
index fe2d8b2d6b9..f595982c69e 100644
--- a/net/rdesktop/PLIST
+++ b/net/rdesktop/PLIST
@@ -1,17 +1,22 @@
-@comment $NetBSD: PLIST,v 1.2 2003/02/13 23:25:06 grant Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/11/20 04:46:08 grant Exp $
 bin/rdesktop
 man/man1/rdesktop.1
 share/rdesktop/keymaps/ar
 share/rdesktop/keymaps/common
 share/rdesktop/keymaps/da
 share/rdesktop/keymaps/de
+share/rdesktop/keymaps/de-ch
 share/rdesktop/keymaps/en-gb
 share/rdesktop/keymaps/en-us
 share/rdesktop/keymaps/es
 share/rdesktop/keymaps/fi
+share/rdesktop/keymaps/fo
 share/rdesktop/keymaps/fr
 share/rdesktop/keymaps/fr-be
+share/rdesktop/keymaps/fr-ca
+share/rdesktop/keymaps/fr-ch
 share/rdesktop/keymaps/hr
+share/rdesktop/keymaps/hu
 share/rdesktop/keymaps/it
 share/rdesktop/keymaps/ja
 share/rdesktop/keymaps/lt
diff --git a/net/rdesktop/distinfo b/net/rdesktop/distinfo
index 509fe0a88eb..abf5cf1bba4 100644
--- a/net/rdesktop/distinfo
+++ b/net/rdesktop/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2003/03/06 19:08:10 jlam Exp $
+$NetBSD: distinfo,v 1.7 2003/11/20 04:46:08 grant Exp $
 
-SHA1 (rdesktop-1.2.0.tar.gz) = 9432ae527f35a332544cd56660b6d30cd09524b5
-Size (rdesktop-1.2.0.tar.gz) = 125674 bytes
-SHA1 (patch-aa) = 879d83dd83729e51028136f704dbc90f7a52cae1
-SHA1 (patch-ab) = 82e3f44c38cde9dcf8c0f6079b11222024e753ef
+SHA1 (rdesktop-1.3.0.tar.gz) = 7d11082dee529dfbbd768f7494063fbc0fd02468
+Size (rdesktop-1.3.0.tar.gz) = 136704 bytes
+SHA1 (patch-ab) = ebe5bdaeb0ce8187e5a7d537450dfbb4de6b1389
diff --git a/net/rdesktop/patches/patch-aa b/net/rdesktop/patches/patch-aa
deleted file mode 100644
index 8e5eae4a9aa..00000000000
--- a/net/rdesktop/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2003/03/06 19:08:11 jlam Exp $
-
---- Makefile.orig	Thu Mar  6 10:50:37 2003
-+++ Makefile
-@@ -29,23 +29,19 @@ Makeconf:
- install: installbin installkeymaps installman
- 
- installbin: rdesktop
--	mkdir -p $(DESTDIR)/$(bindir)
--	install rdesktop $(DESTDIR)/$(bindir)
--	strip $(DESTDIR)/$(bindir)/rdesktop
--	chmod 755 $(DESTDIR)/$(bindir)/rdesktop
-+	${BSD_INSTALL_PROGRAM_DIR} $(DESTDIR)/$(bindir)
-+	${BSD_INSTALL_PROGRAM} rdesktop $(DESTDIR)/$(bindir)
- 
- installman: doc/rdesktop.1
--	mkdir -p $(DESTDIR)/$(mandir)/man1
--	cp doc/rdesktop.1 $(DESTDIR)/$(mandir)/man1
--	chmod 644 $(DESTDIR)/$(mandir)/man1/rdesktop.1
-+	${BSD_INSTALL_MAN_DIR} $(DESTDIR)/$(mandir)/man1
-+	${BSD_INSTALL_MAN} doc/rdesktop.1 $(DESTDIR)/$(mandir)/man1
- 
- installkeymaps:
--	mkdir -p $(DESTDIR)/$(KEYMAP_PATH)
-+	${BSD_INSTALL_DATA_DIR} $(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)/*
-+	${BSD_INSTALL_DATA} keymaps/?? keymaps/??-?? $(DESTDIR)/$(KEYMAP_PATH)
-+	${BSD_INSTALL_DATA} keymaps/common $(DESTDIR)/$(KEYMAP_PATH)
-+	${BSD_INSTALL_DATA} keymaps/modifiers $(DESTDIR)/$(KEYMAP_PATH)
- 
- proto:
- 	cproto -DMAKE_PROTO -o proto.h *.c
diff --git a/net/rdesktop/patches/patch-ab b/net/rdesktop/patches/patch-ab
index 6105e1aa2cc..1496a795385 100644
--- a/net/rdesktop/patches/patch-ab
+++ b/net/rdesktop/patches/patch-ab
@@ -1,15 +1,60 @@
-$NetBSD: patch-ab,v 1.1 2003/03/06 19:08:11 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2003/11/20 04:46:08 grant Exp $
 
---- configure.orig	Thu Jan 30 02:54:48 2003
+--- configure.orig	2003-10-29 23:49:52.000000000 +1100
 +++ configure
-@@ -220,8 +220,8 @@ case `uname -s` in
+@@ -166,13 +166,6 @@ echo "  includes  $xdir/include"
+ echo "  libraries $xdir/lib"
+ echo
+ 
+-if [ $xdir != "/usr" ]; then
+-    cflags="$cflags -I$xdir/include"
+-    ldflags="$ldflags -L$xdir/lib"
+-    rpath="$rpath:$xdir/lib"
+-fi
+-
+-ldflags="$ldflags"
+ targets="$targets rdesktop"
+ 
+ #withoutopenssl not currently supported
+@@ -205,12 +198,6 @@ targets="$targets rdesktop"
+     
+     	echo "CRYPTOBJ    =" >>Makeconf
+     
+-    	if [ $ssldir != "/usr" ]; then
+-    	    cflags="$cflags -I$ssldir/include"
+-    	    ldflags="$ldflags -L$ssldir/lib"
+-    	    rpath="$rpath:$ssldir/lib"
+-    	fi
+-    
+     	cflags="$cflags -DWITH_OPENSSL"
+     	ldflags="$ldflags -lcrypto"
+     fi
+@@ -259,7 +246,7 @@ fi
+ 
+ # Check for OSS sound support
+ 
+-if [ -f /usr/include/sys/soundcard.h ]; then
++if [ -f /usr/include/sys/soundcard.h -o -f /usr/include/soundcard.h ]; then
+     echo Sound support enabled: Open Sound System
+     echo
+     echo "SOUNDOBJ    = rdpsnd.o rdpsnd_oss.o" >>Makeconf
+@@ -283,16 +270,13 @@ rpath=`echo $rpath |sed 's/^://'`
+ 
+ case `uname -s` in
+   SunOS)
+-    ldflags="$ldflags -lsocket -lnsl -R$rpath"
+-    ;;
+-  OSF1)
+-    ldflags="$ldflags -Wl,-rpath,$rpath"
++    ldflags="$ldflags -lsocket -lnsl"
+     ;;
  esac
  
  
 -echo "CFLAGS      = $cflags" >>Makeconf
 -echo "LDFLAGS     = $ldflags" >>Makeconf
-+echo "CFLAGS      += $cflags" >>Makeconf
-+echo "LDFLAGS     += $ldflags" >>Makeconf
++echo "CFLAGS      = $CFLAGS $cflags" >>Makeconf
++echo "LDFLAGS     = $LDFLAGS $ldflags" >>Makeconf
+ echo "TARGETS     = $targets" >>Makeconf
  
  echo "configure complete - now run make"
-