Update to 1.4.1, changes:

   * persistent bitmap cache optimisations
   * support for more RDP-orders (ellipse, polygon)
   * libao sound-driver (for Mac OSX and others)
   * Unicode support for transmitted strings/filenames
   * Added korean keymap
   * Xembed fixes to work with krdc correctly
   * Portability fixes
   * Support for RDP-compression (all bpps)
   * process RDP recv queue if send queue is full

5 files changed, 32 insertions, 52 deletions

diff --git a/net/rdesktop/Makefile b/net/rdesktop/Makefile
index 0d02ada4e50..def28d90132 100644
--- a/net/rdesktop/Makefile
+++ b/net/rdesktop/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:46:59 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/18 01:11:44 xtraeme Exp $
 #
 
-DISTNAME=		rdesktop-1.4.0
+DISTNAME=		rdesktop-1.4.1
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=rdesktop/}
 
diff --git a/net/rdesktop/PLIST b/net/rdesktop/PLIST
index da0c29145d6..eeb7dc983d4 100644
--- a/net/rdesktop/PLIST
+++ b/net/rdesktop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/03/23 15:24:11 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/05/18 01:11:44 xtraeme Exp $
 bin/rdesktop
 man/man1/rdesktop.1
 share/rdesktop/keymaps/ar
@@ -21,6 +21,7 @@ share/rdesktop/keymaps/hu
 share/rdesktop/keymaps/is
 share/rdesktop/keymaps/it
 share/rdesktop/keymaps/ja
+share/rdesktop/keymaps/ko
 share/rdesktop/keymaps/lt
 share/rdesktop/keymaps/lv
 share/rdesktop/keymaps/mk
diff --git a/net/rdesktop/distinfo b/net/rdesktop/distinfo
index 7400307cea4..d4f13e5d012 100644
--- a/net/rdesktop/distinfo
+++ b/net/rdesktop/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.13 2005/03/23 15:24:11 xtraeme Exp $
+$NetBSD: distinfo,v 1.14 2005/05/18 01:11:44 xtraeme Exp $
 
-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
+SHA1 (rdesktop-1.4.1.tar.gz) = 412ffa06dc216cc7ce1082a8a4912778f82425d9
+RMD160 (rdesktop-1.4.1.tar.gz) = c49a2425f1e00f5933d3873f6ea742b2ad4fea0c
+Size (rdesktop-1.4.1.tar.gz) = 216017 bytes
+SHA1 (patch-aa) = 1d50c6fee114a10d824d66abbd16acce161ac6b9
diff --git a/net/rdesktop/patches/patch-aa b/net/rdesktop/patches/patch-aa
index a32b37fc4f3..2269d292362 100644
--- a/net/rdesktop/patches/patch-aa
+++ b/net/rdesktop/patches/patch-aa
@@ -1,38 +1,38 @@
-$NetBSD: patch-aa,v 1.9 2005/03/23 15:24:11 xtraeme Exp $
+$NetBSD: patch-aa,v 1.10 2005/05/18 01:11:45 xtraeme Exp $
 
---- Makefile.in.orig	2005-03-08 04:19:45.000000000 +0100
-+++ Makefile.in	2005-03-08 04:21:35.000000000 +0100
+--- Makefile.in.orig	2005-05-18 03:01:07.000000000 +0200
++++ Makefile.in	2005-05-18 03:02:42.000000000 +0200
 @@ -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_PROGRAM_DIR) $(DESTDIR)/$(bindir)
-+	$(BSD_INSTALL_PROGRAM) rdesktop $(DESTDIR)/$(bindir)
+-	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)
  
  .PHONY: installman
  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
+-	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
  
  .PHONY: installkeymaps
  installkeymaps:
--	mkdir -p $(DESTDIR)/$(KEYMAP_PATH)
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)/$(KEYMAP_PATH)
+-	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)
+-	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)
  
  .PHONY: proto
  proto:
diff --git a/net/rdesktop/patches/patch-ac b/net/rdesktop/patches/patch-ac
deleted file mode 100644
index 6f55cb412b7..00000000000
--- a/net/rdesktop/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$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>