rdesktop-1.3.0

2003-10-30 16:58:44 +00:00 · 2003-10-30 16:58:44 +00:00 · be0e39adb3
commit be0e39adb3
parent 18d6f5266a
7 changed files with 83 additions and 17 deletions
--- a/x11/rdesktop/Makefile
+++ b/x11/rdesktop/Makefile
@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.13 2003/06/10 19:59:02 jolan Exp $
+# $OpenBSD: Makefile,v 1.14 2003/10/30 16:58:44 jcs Exp $

 COMMENT=	"open source client for Windows Terminal Server"
-DISTNAME=	rdesktop-1.2.0
+DISTNAME=	rdesktop-1.3.0
 CATEGORIES=	x11 net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rdesktop/}

@ -20,6 +20,7 @@ USE_X11=	Yes

 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS+=--with-x=${X11BASE}
+WRKDIST=	${WRKDIR}/rdesktop

 ALL_TARGET=	rdesktop

--- a/x11/rdesktop/distinfo
+++ b/x11/rdesktop/distinfo
@ -1,3 +1,3 @@
-MD5 (rdesktop-1.2.0.tar.gz) = b5e108e83e9de883e965a2bb0c7e7036
-RMD160 (rdesktop-1.2.0.tar.gz) = 2b58d353621ae9235799dfefa241677f4e05d9ab
-SHA1 (rdesktop-1.2.0.tar.gz) = 9432ae527f35a332544cd56660b6d30cd09524b5
+MD5 (rdesktop-1.3.0.tar.gz) = d8108781d227221a823c34b861486a5d
+RMD160 (rdesktop-1.3.0.tar.gz) = 86ed74dc5aa2814a1946ca160de09f0aaa3ee730
+SHA1 (rdesktop-1.3.0.tar.gz) = 7d11082dee529dfbbd768f7494063fbc0fd02468
--- a/x11/rdesktop/patches/patch-channels_c
+++ b/x11/rdesktop/patches/patch-channels_c
@ -0,0 +1,12 @@
+$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;
+ 
--- a/x11/rdesktop/patches/patch-configure
+++ b/x11/rdesktop/patches/patch-configure
@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.2 2003/06/10 19:59:03 jolan Exp $
--- configure.orig	Thu Jan 30 04:54:48 2003
-+++ configure	Sun Jun  8 03:27:24 2003
-@@ -55,6 +55,9 @@ case $arg in
+$OpenBSD: patch-configure,v 1.3 2003/10/30 16:58:44 jcs Exp $
+--- configure.orig	Wed Oct 29 06:49:52 2003
+++ configure	Thu Oct 30 10:50:42 2003
+@@ -67,6 +67,9 @@
     ;;
   --without-debug*)
     ;;
@ -11,7 +11,7 @@ $OpenBSD: patch-configure,v 1.2 2003/06/10 19:59:03 jolan Exp $
   *)
     echo "Target directories:"
     echo " --prefix=PREFIX         location for architecture-independent files"
-@@ -98,7 +101,7 @@ fi
+@@ -115,7 +118,7 @@
 echo "CC          = $cc" >>Makeconf
 
 if $cc -v 2>&1 |grep '^gcc' >/dev/null; then
@ -20,7 +20,44 @@ $OpenBSD: patch-configure,v 1.2 2003/06/10 19:59:03 jolan Exp $
 else
     cflags="$cflags -O"
 fi
-@@ -220,8 +223,8 @@ case `uname -s` in
+@@ -259,21 +262,21 @@
+ 
+ # 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
 
 
@ -28,6 +65,6 @@ $OpenBSD: patch-configure,v 1.2 2003/06/10 19:59:03 jolan Exp $
 -echo "LDFLAGS     = $ldflags" >>Makeconf
 +echo "CFLAGS      += $cflags" >>Makeconf
 +echo "LDFLAGS     += $ldflags" >>Makeconf
+ echo "TARGETS     = $targets" >>Makeconf
 
 echo "configure complete - now run make"
- 
--- a/x11/rdesktop/patches/patch-rdesktop_h
+++ b/x11/rdesktop/patches/patch-rdesktop_h
@ -0,0 +1,11 @@
+$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"
--- a/x11/rdesktop/patches/patch-xwin_c
+++ b/x11/rdesktop/patches/patch-xwin_c
@ -1,11 +1,11 @@
-$OpenBSD: patch-xwin_c,v 1.1 2003/06/10 19:59:03 jolan Exp $
--- xwin.c.orig	Thu Jan 30 05:27:45 2003
-+++ xwin.c	Tue Jun 10 02:17:26 2003
+$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"
 
- extern int width;
--- a/x11/rdesktop/pkg/PLIST
+++ b/x11/rdesktop/pkg/PLIST
@ -1,17 +1,22 @@
-@comment $OpenBSD: PLIST,v 1.2 2003/06/10 19:59:03 jolan Exp $
+@comment $OpenBSD: PLIST,v 1.3 2003/10/30 16:58:44 jcs Exp $
 bin/rdesktop
 man/man1/rdesktop.1
 share/rdesktop/keymaps/ar
 share/rdesktop/keymaps/common
 share/rdesktop/keymaps/da
 share/rdesktop/keymaps/de
+share/rdesktop/keymaps/de-ch
 share/rdesktop/keymaps/en-gb
 share/rdesktop/keymaps/en-us
 share/rdesktop/keymaps/es
 share/rdesktop/keymaps/fi
+share/rdesktop/keymaps/fo
 share/rdesktop/keymaps/fr
 share/rdesktop/keymaps/fr-be
+share/rdesktop/keymaps/fr-ca
+share/rdesktop/keymaps/fr-ch
 share/rdesktop/keymaps/hr
+share/rdesktop/keymaps/hu
 share/rdesktop/keymaps/it
 share/rdesktop/keymaps/ja
 share/rdesktop/keymaps/lt