[pkgsrc/trunk]: pkgsrc/net/rdesktop Update rdesktop to 1.3.1

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4bf9d7cd19ee
branches:  trunk
changeset: 466920:4bf9d7cd19ee
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Sat Jan 24 14:01:47 2004 +0000

description:
Update rdesktop to 1.3.1

Changes:

   * Crypto fixes for RDP5
   * Keyboard and keymap fixes
   * some endianess fixes for high color
   * portability enhancements

diffstat:

 net/rdesktop/Makefile         |   8 +++-----
 net/rdesktop/distinfo         |   9 +++++----
 net/rdesktop/patches/patch-aa |  36 ++++++++++++++++++++++++++++++++++++
 net/rdesktop/patches/patch-ab |  17 ++++++++++-------
 4 files changed, 54 insertions(+), 16 deletions(-)

diffs (139 lines):

diff -r 725ed437573c -r 4bf9d7cd19ee net/rdesktop/Makefile
--- a/net/rdesktop/Makefile     Sat Jan 24 13:51:13 2004 +0000
+++ b/net/rdesktop/Makefile     Sat Jan 24 14:01:47 2004 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2004/01/20 12:22:20 agc Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/24 14:01:47 xtraeme Exp $
 #
 
-DISTNAME=              rdesktop-1.3.0
-PKGREVISION=           1
+DISTNAME=              rdesktop-1.3.1
 CATEGORIES=            net
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=rdesktop/}
 
@@ -10,7 +9,6 @@
 HOMEPAGE=              http://www.rdesktop.org/
 COMMENT=               Open-source Remote Desktop Protocol client
 
-WRKSRC=                        ${WRKDIR}/rdesktop
 USE_BUILDLINK2=                YES
 USE_X11=               YES
 HAS_CONFIGURE=         YES
@@ -18,7 +16,7 @@
 CONFIGURE_ARGS+=       --with-x=${X11BASE}
 CONFIGURE_ARGS+=       --with-openssl=${SSLBASE}
 
-CFLAGS+=               -DAUDIO_DEV='\"${DEVOSSAUDIO}\"'
+CFLAGS+=               -DAUDIO_DEV=\"\\\"${DEVOSSAUDIO}\\\"\"
 LDFLAGS+=              ${LIBOSSAUDIO}
 
 .include "../../security/openssl/buildlink2.mk"
diff -r 725ed437573c -r 4bf9d7cd19ee net/rdesktop/distinfo
--- a/net/rdesktop/distinfo     Sat Jan 24 13:51:13 2004 +0000
+++ b/net/rdesktop/distinfo     Sat Jan 24 14:01:47 2004 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2003/11/22 03:34:51 grant Exp $
+$NetBSD: distinfo,v 1.9 2004/01/24 14:01:47 xtraeme Exp $
 
-SHA1 (rdesktop-1.3.0.tar.gz) = 7d11082dee529dfbbd768f7494063fbc0fd02468
-Size (rdesktop-1.3.0.tar.gz) = 136704 bytes
-SHA1 (patch-ab) = ebe5bdaeb0ce8187e5a7d537450dfbb4de6b1389
+SHA1 (rdesktop-1.3.1.tar.gz) = d80e7c3afb671c77e4d8a6a74b33c3d6256675ce
+Size (rdesktop-1.3.1.tar.gz) = 139686 bytes
+SHA1 (patch-aa) = 1a28125cfc8cb58ba67c2c10209d0eca4681404e
+SHA1 (patch-ab) = 2a86d850d0b3ee5e14ae6818c3ea492af558f22e
 SHA1 (patch-ac) = 2d00269140102a08a355c4890d08e0ec0c761a38
diff -r 725ed437573c -r 4bf9d7cd19ee net/rdesktop/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/rdesktop/patches/patch-aa     Sat Jan 24 14:01:47 2004 +0000
@@ -0,0 +1,36 @@
+$NetBSD: patch-aa,v 1.8 2004/01/24 14:01:47 xtraeme Exp $
+
+--- Makefile.orig      2004-01-24 14:20:46.000000000 +0100
++++ Makefile   2004-01-24 14:22:36.000000000 +0100
+@@ -48,23 +48,19 @@
+ install: installbin installkeymaps installman
+ 
+ installbin: rdesktop
+-      mkdir -p $(DESTDIR)/$(bindir)
+-      $(INSTALL) rdesktop $(DESTDIR)/$(bindir)
+-      strip $(DESTDIR)/$(bindir)/rdesktop
+-      chmod 755 $(DESTDIR)/$(bindir)/rdesktop
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)/$(bindir)
++      $(BSD_INSTALL_PROGRAM) rdesktop $(DESTDIR)/$(bindir)
+ 
+ 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
+ 
+ installkeymaps:
+-      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)
+ 
+ proto:
+       cproto -DMAKE_PROTO -DWITH_OPENSSL -o proto.h *.c
diff -r 725ed437573c -r 4bf9d7cd19ee net/rdesktop/patches/patch-ab
--- a/net/rdesktop/patches/patch-ab     Sat Jan 24 13:51:13 2004 +0000
+++ b/net/rdesktop/patches/patch-ab     Sat Jan 24 14:01:47 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2003/11/20 04:46:08 grant Exp $
+$NetBSD: patch-ab,v 1.3 2004/01/24 14:01:47 xtraeme Exp $
 
---- configure.orig     2003-10-29 23:49:52.000000000 +1100
-+++ configure
-@@ -166,13 +166,6 @@ echo "  includes  $xdir/include"
+--- configure.orig     2004-01-24 14:14:38.000000000 +0100
++++ configure  2004-01-24 14:18:23.000000000 +0100
+@@ -166,13 +166,6 @@
  echo "  libraries $xdir/lib"
  echo
  
@@ -16,7 +16,7 @@
  targets="$targets rdesktop"
  
  #withoutopenssl not currently supported
-@@ -205,12 +198,6 @@ targets="$targets rdesktop"
+@@ -205,12 +198,6 @@
      
        echo "CRYPTOBJ    =" >>Makeconf
      
@@ -29,7 +29,7 @@
        cflags="$cflags -DWITH_OPENSSL"
        ldflags="$ldflags -lcrypto"
      fi
-@@ -259,7 +246,7 @@ fi
+@@ -259,7 +246,7 @@
  
  # Check for OSS sound support
  
@@ -38,7 +38,7 @@
      echo Sound support enabled: Open Sound System
      echo
      echo "SOUNDOBJ    = rdpsnd.o rdpsnd_oss.o" >>Makeconf
-@@ -283,16 +270,13 @@ rpath=`echo $rpath |sed 's/^://'`
+@@ -283,10 +270,7 @@
  
  case `uname -s` in
    SunOS)
@@ -48,6 +48,9 @@
 -    ldflags="$ldflags -Wl,-rpath,$rpath"
 +    ldflags="$ldflags -lsocket -lnsl"
      ;;
+   HP-UX)
+     cflags="$cflags -D_XOPEN_SOURCE_EXTENDED"
+@@ -294,8 +278,8 @@
  esac