Update of the net/rdesktop-devel port to the latest beta version, which now supports high encryption.
Great! Thanks for keeping your eye on the project and providing a patch. I've made changes so that the system CFLAGS aren't clobbered. files/patch-Makefile and files/patch-configure should be as follows. Please commit the above patches, with the following exceptions. Index: patch-Makefile =================================================================== RCS file: /home/ncvs/ports/net/rdesktop-devel/files/patch-Makefile,v retrieving revision 1.2 diff -u -r1.2 patch-Makefile --- patch-Makefile 2 Feb 2002 05:26:26 -0000 1.2 +++ patch-Makefile 31 Dec 2002 11:13:02 -0000 @@ -1,30 +1,44 @@ ---- Makefile.orig Sat Feb 2 00:21:14 2002 -+++ Makefile Sat Feb 2 00:23:47 2002 -@@ -6,14 +6,9 @@ - +--- Makefile.orig Tue Nov 19 02:46:24 2002 ++++ Makefile Tue Dec 31 22:10:53 2002 +@@ -7,7 +7,7 @@ # Configuration defaults --CC = gcc --CFLAGS = -O2 -Wall --INCLUDES = -I$(shell pwd) --LDLIBS = -+INCLUDES = -I. - --PREFIX = /usr/local --EPREFIX = $(PREFIX) --BINDIR = $(EPREFIX)/bin -+BINDIR = $(PREFIX)/bin - MANDIR = $(PREFIX)/man - - RDPOBJ = rdesktop.o tcp.o iso.o mcs.o secure.o licence.o rdp.o orders.o bitmap.o cache.o decompress.o -@@ -26,8 +21,8 @@ - SSL_LIBS = - - #the xlib layer ( default ) --GUI_XWIN_INC = -I/usr/X11R6/include --GUI_XWIN_LIB = -L/usr/X11R6/lib -lX11 -+GUI_XWIN_INC = -I${X11BASE}/include -+GUI_XWIN_LIB = -L${X11BASE}/lib -lX11 - GUI_XWIN_OBJ = gl/xwin.o + CC = cc +-CFLAGS = -O2 -DKEYMAP_PATH=\"$(KEYMAP_PATH)\" ++CFLAGS += -DKEYMAP_PATH=\"$(KEYMAP_PATH)\" + LDFLAGS = + + prefix = /usr/local +@@ -24,6 +24,8 @@ + include Makeconf # configure-generated + + ++all: rdesktop ++ + rdesktop: $(RDPOBJ) $(CRYPTOBJ) + $(CC) $(CFLAGS) -o rdesktop $(RDPOBJ) $(CRYPTOBJ) $(LDFLAGS) + +@@ -33,23 +35,10 @@ + install: installbin installkeymaps installman + + installbin: rdesktop +- mkdir -p $(DESTDIR)/$(bindir) +- install rdesktop $(DESTDIR)/$(bindir) +- strip $(DESTDIR)/$(bindir)/rdesktop +- chmod 755 $(DESTDIR)/$(bindir)/rdesktop + + installman: doc/rdesktop.1 +- mkdir -p $(DESTDIR)/$(mandir)/man1 +- cp doc/rdesktop.1 $(DESTDIR)/$(mandir)/man1 +- chmod 644 $(DESTDIR)/$(mandir)/man1/rdesktop.1 + + installkeymaps: +- mkdir -p $(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)/* - #the nt layer + proto: + cproto -DMAKE_PROTO -o proto.h *.c Index: patch-configure =================================================================== RCS file: patch-configure diff -N patch-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patch-configure 31 Dec 2002 11:24:01 -0000 @@ -0,0 +1,19 @@ +--- configure.orig Tue Nov 19 22:05:27 2002 ++++ configure Tue Dec 31 22:23:43 2002 +@@ -98,7 +98,7 @@ + echo "CC = $cc" >>Makeconf + + if $cc -v 2>&1 |grep '^gcc' >/dev/null; then +- cflags="$cflags -Wall -O2" ++ #cflags="$cflags -Wall -O2" + else + cflags="$cflags -O" + fi +@@ -222,6 +222,7 @@ + + echo "CFLAGS += $cflags" >>Makeconf + echo "LDFLAGS += $ldflags" >>Makeconf ++echo 'DESTDIR = ${prefix}' >>Makeconf + + echo "configure complete - now run make" + Regards, Chris Knight Systems Administrator AIMS Independent Computer Professionals Tel: +61 3 6334 6664 Fax: +61 3 6331 7032 Mob: +61 419 528 795 Web: http://www.aims.com.au
State Changed From-To: open->closed committed, thanks