From 25f8ff738bd19612cf7f5930d3147905d17f39ca Mon Sep 17 00:00:00 2001
From: hubertf <hubertf@pkgsrc.org>
Date: Fri, 1 Dec 2006 10:53:15 +0000
Subject: Update rdesktop  to 1.5.0. Changes:

  * SeamlessRDP - seamless windows support
  * Keymap fixes
  * Fix connection issues with Windows XP RTM
  * Keyboard handling improvements and fixes
  * SGI/Irix sound-driver fixes
  * Support for clipboard INCR protocol
  * Session Directory support
  * Support for long filenames on redirected drives
  * XOR ellipse drawing fix
  * Clipboard unicode support (Ilya Konstantinov)
  * Fix display issues with exotic color depths (30bpp, 32bpp, etc)
  * Large file support
  * The default color depth is now the depth of the root window
  * Basic support for Windows Vista Beta 2
  * Fix high cpu-usage in OSS-driver
---
 doc/CHANGES-2006              |  3 ++-
 net/rdesktop/Makefile         |  5 ++---
 net/rdesktop/distinfo         | 11 +++++------
 net/rdesktop/patches/patch-aa | 10 +++++-----
 net/rdesktop/patches/patch-ab | 13 -------------
 5 files changed, 14 insertions(+), 28 deletions(-)
 delete mode 100644 net/rdesktop/patches/patch-ab

diff --git a/doc/CHANGES-2006 b/doc/CHANGES-2006
index a2d4ddb4d27..44c52b32f1f 100644
--- a/doc/CHANGES-2006
+++ b/doc/CHANGES-2006
@@ -1,4 +1,4 @@
->$NetBSD: CHANGES-2006,v 1.1904 2006/12/01 09:33:45 wulf Exp $
+>$NetBSD: CHANGES-2006,v 1.1905 2006/12/01 10:53:45 hubertf Exp $
 
 Changes to the packages collection and infrastructure in 2006:
 
@@ -5475,3 +5475,4 @@ Changes to the packages collection and infrastructure in 2006:
 	Updated graphics/gimp24 to 2.3.13 [adam 2006-12-01]
 	Updated textproc/p5-XML-Atom to 0.25 [kleink 2006-12-01]
 	Updated ham/gnuradio-core to 3.0.2nb1 [wulf 2006-11-13]
+	Updated net/rdesktop to 1.5.0 [hubeertf 2006-12-01]
diff --git a/net/rdesktop/Makefile b/net/rdesktop/Makefile
index ec8536d94d1..5439156f018 100644
--- a/net/rdesktop/Makefile
+++ b/net/rdesktop/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2006/11/06 11:00:24 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2006/12/01 10:53:15 hubertf Exp $
 #
 
-DISTNAME=		rdesktop-1.4.1
-PKGREVISION=		1
+DISTNAME=		rdesktop-1.5.0
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=rdesktop/}
 
diff --git a/net/rdesktop/distinfo b/net/rdesktop/distinfo
index 1f99ae13e2e..9848601a13e 100644
--- a/net/rdesktop/distinfo
+++ b/net/rdesktop/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.15 2005/10/10 20:23:05 joerg Exp $
+$NetBSD: distinfo,v 1.16 2006/12/01 10:53:15 hubertf Exp $
 
-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
-SHA1 (patch-ab) = 6021d075bfb61c0f4f7cee4ead21147a2beac18d
+SHA1 (rdesktop-1.5.0.tar.gz) = e3086bf865191eed41631813125f482e279c7f3d
+RMD160 (rdesktop-1.5.0.tar.gz) = 350e08166d0b7620b4ed9c6594addae7ec53d15a
+Size (rdesktop-1.5.0.tar.gz) = 245137 bytes
+SHA1 (patch-aa) = dda84f70792828c97aa02567b97d2ae9647b6fcb
diff --git a/net/rdesktop/patches/patch-aa b/net/rdesktop/patches/patch-aa
index 2269d292362..cf42ad22375 100644
--- a/net/rdesktop/patches/patch-aa
+++ b/net/rdesktop/patches/patch-aa
@@ -1,14 +1,14 @@
-$NetBSD: patch-aa,v 1.10 2005/05/18 01:11:45 xtraeme Exp $
+$NetBSD: patch-aa,v 1.11 2006/12/01 10:53:15 hubertf Exp $
 
---- 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 @@
+--- Makefile.in.orig	2006-04-09 20:27:50.000000000 +0200
++++ Makefile.in
+@@ -55,25 +55,21 @@ install: installbin installkeymaps insta
  
  .PHONY: installbin
  installbin: rdesktop
 -	mkdir -p $(DESTDIR)$(bindir)
 -	$(INSTALL) rdesktop $(DESTDIR)$(bindir)
--	strip $(DESTDIR)$(bindir)/rdesktop
+-	$(STRIP) $(DESTDIR)$(bindir)/rdesktop
 -	chmod 755 $(DESTDIR)$(bindir)/rdesktop
 +	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)
 +	$(BSD_INSTALL_PROGRAM) rdesktop $(DESTDIR)$(bindir)
diff --git a/net/rdesktop/patches/patch-ab b/net/rdesktop/patches/patch-ab
deleted file mode 100644
index e2ba10a4c43..00000000000
--- a/net/rdesktop/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2005/10/10 20:23:05 joerg Exp $
-
---- parallel.c.orig	2005-10-10 22:19:37.000000000 +0200
-+++ parallel.c
-@@ -14,8 +14,6 @@
- #include <linux/lp.h>
- #endif
- 
--extern int errno;
--
- extern RDPDR_DEVICE g_rdpdr_device[];
- 
- 
-- 
cgit v1.2.3