rdesktop-1.3.1

fixes some rdp5 connectivity issues

x11/rdesktop/Makefile

@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.14 2003/10/30 16:58:44 jcs Exp $
+# $OpenBSD: Makefile,v 1.15 2004/01/22 16:57:18 jcs Exp $
 
 COMMENT=	"open source client for Windows Terminal Server"
-DISTNAME=	rdesktop-1.3.0
+DISTNAME=	rdesktop-1.3.1
 CATEGORIES=	x11 net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rdesktop/}
 
@@ -20,7 +20,6 @@ USE_X11=	Yes
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS+=--with-x=${X11BASE}
-WRKDIST=	${WRKDIR}/rdesktop
 
 ALL_TARGET=	rdesktop
 

x11/rdesktop/distinfo

@@ -1,3 +1,3 @@
-MD5 (rdesktop-1.3.0.tar.gz) = d8108781d227221a823c34b861486a5d
+MD5 (rdesktop-1.3.1.tar.gz) = 968a1e3f5161bab80c306df31c54cfb1
-RMD160 (rdesktop-1.3.0.tar.gz) = 86ed74dc5aa2814a1946ca160de09f0aaa3ee730
+RMD160 (rdesktop-1.3.1.tar.gz) = 8af984cd883f3c7587a30b09e350129ed8ebbefa
-SHA1 (rdesktop-1.3.0.tar.gz) = 7d11082dee529dfbbd768f7494063fbc0fd02468
+SHA1 (rdesktop-1.3.1.tar.gz) = d80e7c3afb671c77e4d8a6a74b33c3d6256675ce

x11/rdesktop/patches/patch-channels_c

@@ -1,12 +0,0 @@
-$OpenBSD: patch-channels_c,v 1.1 2003/10/30 16:58:44 jcs Exp $
---- channels.c.orig	Thu Oct 30 10:54:38 2003
-+++ channels.c	Thu Oct 30 10:54:39 2003
-@@ -27,6 +27,8 @@
- #define CHANNEL_FLAG_LAST		0x02
- #define CHANNEL_FLAG_SHOW_PROTOCOL	0x10
- 
-+#define MIN(x,y)			(((x) < (y)) ? (x) : (y))
-+
- extern BOOL g_use_rdp5;
- extern BOOL g_encryption;
- 

x11/rdesktop/patches/patch-configure

@@ -1,6 +1,6 @@
-$OpenBSD: patch-configure,v 1.3 2003/10/30 16:58:44 jcs Exp $
+$OpenBSD: patch-configure,v 1.4 2004/01/22 16:57:18 jcs Exp $
---- configure.orig	Wed Oct 29 06:49:52 2003
+--- configure.orig	Thu Jan 22 10:46:40 2004
-+++ configure	Thu Oct 30 10:50:42 2003
++++ configure	Thu Jan 22 10:47:32 2004
 @@ -67,6 +67,9 @@
      ;;
    --without-debug*)
@@ -20,44 +20,7 @@ $OpenBSD: patch-configure,v 1.3 2003/10/30 16:58:44 jcs Exp $
  else
      cflags="$cflags -O"
  fi
-@@ -259,21 +262,21 @@
+@@ -294,8 +297,8 @@
- 
- # Check for OSS sound support
- 
--if [ -f /usr/include/sys/soundcard.h ]; then
--    echo Sound support enabled: Open Sound System
--    echo
--    echo "SOUNDOBJ    = rdpsnd.o rdpsnd_oss.o" >>Makeconf
--    cflags="$cflags -DWITH_RDPSND"
--elif [ -f /usr/include/sys/audioio.h ]; then
--    echo Sound support enabled: Sun
--    echo
--    echo "SOUNDOBJ    = rdpsnd.o rdpsnd_sun.o" >>Makeconf
--    cflags="$cflags -DWITH_RDPSND"
--else
--    echo "WARNING: sound support disabled (no /usr/include/sys/soundcard.h or /usr/include/sys/audio.h)"
--    echo "Currently supported systems are Open Sound System and Sun"
--    echo
--fi
-+#if [ -f /usr/include/sys/soundcard.h ]; then
-+#    echo Sound support enabled: Open Sound System
-+#    echo
-+#    echo "SOUNDOBJ    = rdpsnd.o rdpsnd_oss.o" >>Makeconf
-+#    cflags="$cflags -DWITH_RDPSND"
-+#elif [ -f /usr/include/sys/audioio.h ]; then
-+#    echo Sound support enabled: Sun
-+#    echo
-+#    echo "SOUNDOBJ    = rdpsnd.o rdpsnd_sun.o" >>Makeconf
-+#    cflags="$cflags -DWITH_RDPSND"
-+#else
-+#    echo "WARNING: sound support disabled (no /usr/include/sys/soundcard.h or /usr/include/sys/audio.h)"
-+#    echo "Currently supported systems are Open Sound System and Sun"
-+#    echo
-+#fi
- 
- 
- # Platform-specific options
-@@ -291,8 +294,8 @@
  esac
  
  

x11/rdesktop/patches/patch-rdesktop_h

@@ -1,11 +0,0 @@
-$OpenBSD: patch-rdesktop_h,v 1.4 2003/10/30 16:58:44 jcs Exp $
---- rdesktop.h.orig	Thu Oct 30 10:53:51 2003
-+++ rdesktop.h	Thu Oct 30 10:53:59 2003
-@@ -49,7 +49,6 @@
- #endif
- 
- #define STRNCPY(dst,src,n)	{ strncpy(dst,src,n-1); dst[n-1] = 0; }
--#define MIN(x,y)		(((x) < (y)) ? (x) : (y))
- 
- #include "parse.h"
- #include "constants.h"

x11/rdesktop/patches/patch-xwin_c

@@ -1,11 +0,0 @@
-$OpenBSD: patch-xwin_c,v 1.2 2003/10/30 16:58:44 jcs Exp $
---- xwin.c.orig	Wed Oct 29 12:05:48 2003
-+++ xwin.c	Wed Oct 29 12:05:56 2003
-@@ -22,6 +22,7 @@
- #include <X11/Xutil.h>
- #include <time.h>
- #include <errno.h>
-+#include <unistd.h>
- #include "rdesktop.h"
- #include "xproto.h"
-