summaryrefslogtreecommitdiff
path: root/net/rdesktop/patches
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2003-11-20 04:46:08 +0000
committergrant <grant@pkgsrc.org>2003-11-20 04:46:08 +0000
commitc6c45e21381edaea6a9ca1dcd1914f9e8b43d5ea (patch)
tree0c4bbff9271031869160350732528558d7cba2fb /net/rdesktop/patches
parent1a6a8ae40066d4c239027b3add15dc8efff23f3a (diff)
downloadpkgsrc-c6c45e21381edaea6a9ca1dcd1914f9e8b43d5ea.tar.gz
Updated rdesktop to 1.3.0.
Major changes since 1.2.0: New features: * RDP 5 * 15, 16 and 24 bit color depths * Basic clipboard redirection * Sound * IPv6 * Attaching to console on Windows 2003 Other changes: * Updated keymaps * Increased maximum lengths for usernames and passwords * Support for specifying geometry in terms of percent of whole screen
Diffstat (limited to 'net/rdesktop/patches')
-rw-r--r--net/rdesktop/patches/patch-aa36
-rw-r--r--net/rdesktop/patches/patch-ab57
2 files changed, 51 insertions, 42 deletions
diff --git a/net/rdesktop/patches/patch-aa b/net/rdesktop/patches/patch-aa
deleted file mode 100644
index 8e5eae4a9aa..00000000000
--- a/net/rdesktop/patches/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2003/03/06 19:08:11 jlam Exp $
-
---- Makefile.orig Thu Mar 6 10:50:37 2003
-+++ Makefile
-@@ -29,23 +29,19 @@ Makeconf:
- 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_PROGRAM_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 -o proto.h *.c
diff --git a/net/rdesktop/patches/patch-ab b/net/rdesktop/patches/patch-ab
index 6105e1aa2cc..1496a795385 100644
--- a/net/rdesktop/patches/patch-ab
+++ b/net/rdesktop/patches/patch-ab
@@ -1,15 +1,60 @@
-$NetBSD: patch-ab,v 1.1 2003/03/06 19:08:11 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2003/11/20 04:46:08 grant Exp $
---- configure.orig Thu Jan 30 02:54:48 2003
+--- configure.orig 2003-10-29 23:49:52.000000000 +1100
+++ configure
-@@ -220,8 +220,8 @@ case `uname -s` in
+@@ -166,13 +166,6 @@ echo " includes $xdir/include"
+ echo " libraries $xdir/lib"
+ echo
+
+-if [ $xdir != "/usr" ]; then
+- cflags="$cflags -I$xdir/include"
+- ldflags="$ldflags -L$xdir/lib"
+- rpath="$rpath:$xdir/lib"
+-fi
+-
+-ldflags="$ldflags"
+ targets="$targets rdesktop"
+
+ #withoutopenssl not currently supported
+@@ -205,12 +198,6 @@ targets="$targets rdesktop"
+
+ echo "CRYPTOBJ =" >>Makeconf
+
+- if [ $ssldir != "/usr" ]; then
+- cflags="$cflags -I$ssldir/include"
+- ldflags="$ldflags -L$ssldir/lib"
+- rpath="$rpath:$ssldir/lib"
+- fi
+-
+ cflags="$cflags -DWITH_OPENSSL"
+ ldflags="$ldflags -lcrypto"
+ fi
+@@ -259,7 +246,7 @@ fi
+
+ # Check for OSS sound support
+
+-if [ -f /usr/include/sys/soundcard.h ]; then
++if [ -f /usr/include/sys/soundcard.h -o -f /usr/include/soundcard.h ]; then
+ 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/^://'`
+
+ case `uname -s` in
+ SunOS)
+- ldflags="$ldflags -lsocket -lnsl -R$rpath"
+- ;;
+- OSF1)
+- ldflags="$ldflags -Wl,-rpath,$rpath"
++ ldflags="$ldflags -lsocket -lnsl"
+ ;;
esac
-echo "CFLAGS = $cflags" >>Makeconf
-echo "LDFLAGS = $ldflags" >>Makeconf
-+echo "CFLAGS += $cflags" >>Makeconf
-+echo "LDFLAGS += $ldflags" >>Makeconf
++echo "CFLAGS = $CFLAGS $cflags" >>Makeconf
++echo "LDFLAGS = $LDFLAGS $ldflags" >>Makeconf
+ echo "TARGETS = $targets" >>Makeconf
echo "configure complete - now run make"
-