Update to 1.4.0

Changes:

   * Basic disk-, parallel-, printer- and serial-redirection
   * Fix timezone-redirection
   * Backing-store fixes
   * Fix client-IP sent to TS
   * XEmbed support for embedding rdesktop in other applications (KRDC)
   * Support for setting the RDP5 experience
   * Keyboard and keymap fixes
   * Performance improvements
   * Report disconnect-reason
   * Support for RDP-compression (currently only for 8bpp)
   * Support for persistent bitmap caching
   * Sound-driver for SGI/Irix

6 files changed, 43 insertions, 89 deletions

diff --git a/net/rdesktop/Makefile b/net/rdesktop/Makefile
index b559e755412..dc3d3ff5824 100644
--- a/net/rdesktop/Makefile
+++ b/net/rdesktop/Makefile
@@ -1,23 +1,17 @@
-# $NetBSD: Makefile,v 1.20 2005/02/15 20:20:06 xtraeme Exp $
+# $NetBSD: Makefile,v 1.21 2005/03/23 15:24:11 xtraeme Exp $
 #
 
-DISTNAME=		rdesktop-1.3.1
-PKGREVISION=		3
+DISTNAME=		rdesktop-1.4.0
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=rdesktop/}
 
-PATCH_SITES=		${MASTER_SITE_LOCAL}
-PATCHFILES=		rdesktop.patch
-PATCH_DIST_STRIP=	-p0
-
 MAINTAINER=		grant@NetBSD.org
 HOMEPAGE=		http://www.rdesktop.org/
 COMMENT=		Open-source Remote Desktop Protocol client
 
 USE_BUILDLINK3=		YES
 USE_X11=		YES
-HAS_CONFIGURE=		YES
-CONFIGURE_ARGS=		--prefix=${PREFIX}
+GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-x=${X11BASE}
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 
diff --git a/net/rdesktop/PLIST b/net/rdesktop/PLIST
index f595982c69e..da0c29145d6 100644
--- a/net/rdesktop/PLIST
+++ b/net/rdesktop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/11/20 04:46:08 grant Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/03/23 15:24:11 xtraeme Exp $
 bin/rdesktop
 man/man1/rdesktop.1
 share/rdesktop/keymaps/ar
@@ -9,6 +9,7 @@ share/rdesktop/keymaps/de-ch
 share/rdesktop/keymaps/en-gb
 share/rdesktop/keymaps/en-us
 share/rdesktop/keymaps/es
+share/rdesktop/keymaps/et
 share/rdesktop/keymaps/fi
 share/rdesktop/keymaps/fo
 share/rdesktop/keymaps/fr
@@ -17,12 +18,15 @@ share/rdesktop/keymaps/fr-ca
 share/rdesktop/keymaps/fr-ch
 share/rdesktop/keymaps/hr
 share/rdesktop/keymaps/hu
+share/rdesktop/keymaps/is
 share/rdesktop/keymaps/it
 share/rdesktop/keymaps/ja
 share/rdesktop/keymaps/lt
 share/rdesktop/keymaps/lv
 share/rdesktop/keymaps/mk
 share/rdesktop/keymaps/modifiers
+share/rdesktop/keymaps/nl
+share/rdesktop/keymaps/nl-be
 share/rdesktop/keymaps/no
 share/rdesktop/keymaps/pl
 share/rdesktop/keymaps/pt
diff --git a/net/rdesktop/distinfo b/net/rdesktop/distinfo
index c0ba89e5929..7400307cea4 100644
--- a/net/rdesktop/distinfo
+++ b/net/rdesktop/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.12 2005/02/24 12:14:03 agc Exp $
+$NetBSD: distinfo,v 1.13 2005/03/23 15:24:11 xtraeme Exp $
 
-SHA1 (rdesktop-1.3.1.tar.gz) = d80e7c3afb671c77e4d8a6a74b33c3d6256675ce
-RMD160 (rdesktop-1.3.1.tar.gz) = 8af984cd883f3c7587a30b09e350129ed8ebbefa
-Size (rdesktop-1.3.1.tar.gz) = 139686 bytes
-SHA1 (rdesktop.patch) = 2ac6ed5c855f010d40daf46a18020a65ea6373d1
-RMD160 (rdesktop.patch) = 8fb6c32ba27bc62db5ea30de028bb040ccc8af0b
-Size (rdesktop.patch) = 2348 bytes
-SHA1 (patch-aa) = 1a28125cfc8cb58ba67c2c10209d0eca4681404e
-SHA1 (patch-ab) = 2a86d850d0b3ee5e14ae6818c3ea492af558f22e
+SHA1 (rdesktop-1.4.0.tar.gz) = e9f6d484a33a7b7a82abbeeb5964cc1f5197679a
+RMD160 (rdesktop-1.4.0.tar.gz) = 8ccf9d126b4e2ea7edd7caefd4a69656468ed18a
+Size (rdesktop-1.4.0.tar.gz) = 202531 bytes
+SHA1 (patch-aa) = dd34f57ca1272bb4f708ca3b1580fe20318df523
+SHA1 (patch-ac) = 71a045ef114150f6535b20bb1e3c7b24d020107f
diff --git a/net/rdesktop/patches/patch-aa b/net/rdesktop/patches/patch-aa
index 5eee66f6ba3..a32b37fc4f3 100644
--- a/net/rdesktop/patches/patch-aa
+++ b/net/rdesktop/patches/patch-aa
@@ -1,18 +1,19 @@
-$NetBSD: patch-aa,v 1.8 2004/01/24 14:01:47 xtraeme Exp $
+$NetBSD: patch-aa,v 1.9 2005/03/23 15:24:11 xtraeme Exp $
 
---- Makefile.orig	2004-01-24 14:20:46.000000000 +0100
-+++ Makefile	2004-01-24 14:22:36.000000000 +0100
-@@ -48,23 +48,19 @@
- install: installbin installkeymaps installman
+--- Makefile.in.orig	2005-03-08 04:19:45.000000000 +0100
++++ Makefile.in	2005-03-08 04:21:35.000000000 +0100
+@@ -54,25 +54,21 @@
  
+ .PHONY: installbin
  installbin: rdesktop
 -	mkdir -p $(DESTDIR)/$(bindir)
 -	$(INSTALL) rdesktop $(DESTDIR)/$(bindir)
 -	strip $(DESTDIR)/$(bindir)/rdesktop
 -	chmod 755 $(DESTDIR)/$(bindir)/rdesktop
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)/$(bindir)
++	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)/$(bindir)
 +	$(BSD_INSTALL_PROGRAM) rdesktop $(DESTDIR)/$(bindir)
  
+ .PHONY: installman
  installman: doc/rdesktop.1
 -	mkdir -p $(DESTDIR)/$(mandir)/man1
 -	cp doc/rdesktop.1 $(DESTDIR)/$(mandir)/man1
@@ -20,6 +21,7 @@ $NetBSD: patch-aa,v 1.8 2004/01/24 14:01:47 xtraeme Exp $
 +	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)/$(mandir)/man1
 +	$(BSD_INSTALL_MAN) doc/rdesktop.1 $(DESTDIR)/$(mandir)/man1
  
+ .PHONY: installkeymaps
  installkeymaps:
 -	mkdir -p $(DESTDIR)/$(KEYMAP_PATH)
 +	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)/$(KEYMAP_PATH)
@@ -32,5 +34,5 @@ $NetBSD: patch-aa,v 1.8 2004/01/24 14:01:47 xtraeme Exp $
 +	$(BSD_INSTALL_DATA) keymaps/common $(DESTDIR)/$(KEYMAP_PATH)
 +	$(BSD_INSTALL_DATA) keymaps/modifiers $(DESTDIR)/$(KEYMAP_PATH)
  
+ .PHONY: proto
  proto:
- 	cproto -DMAKE_PROTO -DWITH_OPENSSL -o proto.h *.c
diff --git a/net/rdesktop/patches/patch-ab b/net/rdesktop/patches/patch-ab
deleted file mode 100644
index 5f8b3c92a56..00000000000
--- a/net/rdesktop/patches/patch-ab
+++ /dev/null
@@ -1,63 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2004/01/24 14:01:47 xtraeme Exp $
-
---- configure.orig	2004-01-24 14:14:38.000000000 +0100
-+++ configure	2004-01-24 14:18:23.000000000 +0100
-@@ -166,13 +166,6 @@
- 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 @@
-     
-     	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 @@
- 
- # 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,10 +270,7 @@
- 
- case `uname -s` in
-   SunOS)
--    ldflags="$ldflags -lsocket -lnsl -R$rpath"
--    ;;
--  OSF1)
--    ldflags="$ldflags -Wl,-rpath,$rpath"
-+    ldflags="$ldflags -lsocket -lnsl"
-     ;;
-   HP-UX)
-     cflags="$cflags -D_XOPEN_SOURCE_EXTENDED"
-@@ -294,8 +278,8 @@
- esac
- 
- 
--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"
diff --git a/net/rdesktop/patches/patch-ac b/net/rdesktop/patches/patch-ac
new file mode 100644
index 00000000000..6f55cb412b7
--- /dev/null
+++ b/net/rdesktop/patches/patch-ac
@@ -0,0 +1,20 @@
+$NetBSD: patch-ac,v 1.3 2005/03/23 15:24:11 xtraeme Exp $
+
+--- disk.c.orig	2005-03-04 11:05:52.000000000 +0100
++++ disk.c	2005-03-23 16:18:02.000000000 +0100
+@@ -56,9 +56,14 @@
+ #elif (defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__APPLE__))
+ #include <sys/param.h>
+ #include <sys/mount.h>
++#define F_NAMELEN(buf) (NAME_MAX)
++#if (__NetBSD_Version__ >= 200040000)
++#define STATFS_FN(path, buf) (statvfs(path,buf))
++#define STATFS_T statvfs
++#else
+ #define STATFS_FN(path, buf) (statfs(path,buf))
+ #define STATFS_T statfs
+-#define F_NAMELEN(buf) (NAME_MAX)
++#endif
+ 
+ #elif (defined(__SGI_IRIX__))
+ #include <sys/types.h>