From d92e6568e981378d72ba3c1642763e79b702c1d6 Mon Sep 17 00:00:00 2001
From: jcs <jcs@openbsd.org>
Date: Thu, 24 Mar 2005 20:51:56 +0000
Subject: [PATCH] rdesktop-1.4.0

---
 x11/rdesktop/Makefile                | 12 +++++-----
 x11/rdesktop/distinfo                |  8 +++----
 x11/rdesktop/patches/patch-configure | 33 ----------------------------
 x11/rdesktop/pkg/PLIST               |  6 ++++-
 4 files changed, 15 insertions(+), 44 deletions(-)
 delete mode 100644 x11/rdesktop/patches/patch-configure

diff --git a/x11/rdesktop/Makefile b/x11/rdesktop/Makefile
index 9de843400cc..0f3fb54f5b7 100644
--- a/x11/rdesktop/Makefile
+++ b/x11/rdesktop/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.17 2004/12/19 17:36:33 alek Exp $
+# $OpenBSD: Makefile,v 1.18 2005/03/24 20:51:56 jcs Exp $
 
 COMMENT=	"open source client for Windows Terminal Server"
-DISTNAME=	rdesktop-1.3.1
+DISTNAME=	rdesktop-1.4.0
 CATEGORIES=	x11 net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rdesktop/}
 
@@ -19,9 +19,9 @@ WANTLIB=		X11 c crypto
 NO_REGRESS=	Yes
 USE_X11=	Yes
 
-CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS+=--with-x=${X11BASE}
-
-ALL_TARGET=	rdesktop
+CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS+= --with-x=${X11BASE} \
+		--with-sound=sun \
+		--with-ipv6
 
 .include <bsd.port.mk>
diff --git a/x11/rdesktop/distinfo b/x11/rdesktop/distinfo
index 1640430955b..45a50cf8c40 100644
--- a/x11/rdesktop/distinfo
+++ b/x11/rdesktop/distinfo
@@ -1,4 +1,4 @@
-MD5 (rdesktop-1.3.1.tar.gz) = 968a1e3f5161bab80c306df31c54cfb1
-RMD160 (rdesktop-1.3.1.tar.gz) = 8af984cd883f3c7587a30b09e350129ed8ebbefa
-SHA1 (rdesktop-1.3.1.tar.gz) = d80e7c3afb671c77e4d8a6a74b33c3d6256675ce
-SIZE (rdesktop-1.3.1.tar.gz) = 139686
+MD5 (rdesktop-1.4.0.tar.gz) = 542cb9d9b4dd1ecaf3ed4ff753fea7b8
+RMD160 (rdesktop-1.4.0.tar.gz) = 8ccf9d126b4e2ea7edd7caefd4a69656468ed18a
+SHA1 (rdesktop-1.4.0.tar.gz) = e9f6d484a33a7b7a82abbeeb5964cc1f5197679a
+SIZE (rdesktop-1.4.0.tar.gz) = 202531
diff --git a/x11/rdesktop/patches/patch-configure b/x11/rdesktop/patches/patch-configure
deleted file mode 100644
index d5b950b5176..00000000000
--- a/x11/rdesktop/patches/patch-configure
+++ /dev/null
@@ -1,33 +0,0 @@
-$OpenBSD: patch-configure,v 1.4 2004/01/22 16:57:18 jcs Exp $
---- configure.orig	Thu Jan 22 10:46:40 2004
-+++ configure	Thu Jan 22 10:47:32 2004
-@@ -67,6 +67,9 @@
-     ;;
-   --without-debug*)
-     ;;
-+  --sysconfdir*)
-+    # ignore
-+    ;;
-   *)
-     echo "Target directories:"
-     echo " --prefix=PREFIX         location for architecture-independent files"
-@@ -115,7 +118,7 @@
- echo "CC          = $cc" >>Makeconf
- 
- if $cc -v 2>&1 |grep '^gcc' >/dev/null; then
--    cflags="$cflags -Wall -O2"
-+    cflags="$cflags -Wall"
- else
-     cflags="$cflags -O"
- fi
-@@ -294,8 +297,8 @@
- esac
- 
- 
--echo "CFLAGS      = $cflags" >>Makeconf
--echo "LDFLAGS     = $ldflags" >>Makeconf
-+echo "CFLAGS      += $cflags" >>Makeconf
-+echo "LDFLAGS     += $ldflags" >>Makeconf
- echo "TARGETS     = $targets" >>Makeconf
- 
- echo "configure complete - now run make"
diff --git a/x11/rdesktop/pkg/PLIST b/x11/rdesktop/pkg/PLIST
index 2f57f48ee1d..76ebc71bec9 100644
--- a/x11/rdesktop/pkg/PLIST
+++ b/x11/rdesktop/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2004/09/15 19:26:31 espie Exp $
+@comment $OpenBSD: PLIST,v 1.5 2005/03/24 20:51:56 jcs Exp $
 bin/rdesktop
 @man man/man1/rdesktop.1
 share/rdesktop/
@@ -11,6 +11,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
@@ -19,12 +20,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