- orphaned, outdated

Changed files:
    rdesktop-opt+DESTDIR.patch -> 1.2
    rdesktop-srvr-fix.patch -> 1.2

diff --git a/rdesktop-opt+DESTDIR.patch b/rdesktop-opt+DESTDIR.patch
deleted file mode 100644 (file)
index a8985da..0000000
--- a/rdesktop-opt+DESTDIR.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- rdesktop-1.1.0/Makefile.orig       Fri Jun 14 11:24:24 2002
-+++ rdesktop-1.1.0/Makefile    Fri Jun 14 11:37:52 2002
-@@ -7,7 +7,7 @@
- # Configuration defaults
- 
- CC       = gcc
--CFLAGS   = -O2 -Wall
-+CFLAGS   = $(CFLAGSOPT) -Wall
- INCLUDES = -I$(shell pwd)
- LDLIBS   =
- 
-@@ -92,7 +92,7 @@
- 
- include Makeconf  # local configuration
- 
--all:  localendian.h rdesktop
-+all:  localendian.h rdesktop rdp-srvr
- 
- localendian.h: endian
-       rm -f localendian.h
-@@ -102,29 +102,24 @@
-       $(CC) -o tests/endian tests/endian.c
- 
- rdesktop: $(RDPOBJ) $(SSL_OBJ) ${GUI_OBJ} ${GNUOBJ}
--      $(CC) $(CFLAGS) -o rdesktop $(RDPOBJ) $(SSL_OBJ) $(LDDIRS) $(LDLIBS) ${GNUOBJ} ${GUI_OBJ} ${GUI_LIBS} ${SSL_LIBS}
-+      $(CC) $(CFLAGS) $(LDFLAGSOPT) -o rdesktop $(RDPOBJ) $(SSL_OBJ) $(LDDIRS) $(LDLIBS) ${GNUOBJ} ${GUI_OBJ} ${GUI_LIBS} ${SSL_LIBS}
- 
- rdp-srvr: $(RDPSOBJ) ${SSL_OBJ} ${GUI_OBJ} $(GNUOBJ)
--      $(CC) $(CFLAGS) -o rdp-srvr $(RDPSOBJ) $(SSL_OBJ) $(LDDIRS) $(LDLIBS) ${GNUOBJ} ${GUI_OBJ} ${GUI_LIBS}  ${SSL_LIBS}
-+      $(CC) $(CFLAGS) $(LDFLAGSOPT) -o rdp-srvr $(RDPSOBJ) $(SSL_OBJ) $(LDDIRS) $(LDLIBS) ${GNUOBJ} ${GUI_OBJ} ${GUI_LIBS}  ${SSL_LIBS}
- 
- Makeconf:
-       ./configure
- 
--install: installbin
-+install: installbin installman
- 
- installbin: rdesktop rdp-srvr
--      mkdir -p $(BINDIR)
--      cp rdesktop $(BINDIR)
--      cp rdp-srvr $(BINDIR)
--      strip $(BINDIR)/rdesktop
--      strip $(BINDIR)/rdp-srvr
--      chmod 755 $(BINDIR)/rdesktop
--      chmod 755 $(BINDIR)/rdp-srvr
-+      install -d $(DESTDIR)$(BINDIR)
-+      install -m755 rdesktop $(DESTDIR)$(BINDIR)
-+      install -m755 rdp-srvr $(DESTDIR)$(BINDIR)
- 
- installman: rdesktop.1
--      mkdir -p $(MANDIR)/man1
--      cp rdesktop.1 $(MANDIR)/man1
--      chmod 755 $(MANDIR)/man1/rdesktop.1
-+      install -d $(DESTDIR)$(MANDIR)/man1
-+      install -m644 rdesktop.1 $(DESTDIR)$(MANDIR)/man1
- 
- proto:
-       cproto -DMAKE_PROTO -o proto.h *.c

diff --git a/rdesktop-srvr-fix.patch b/rdesktop-srvr-fix.patch
deleted file mode 100644 (file)
index d83b7ba..0000000
--- a/rdesktop-srvr-fix.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- rdesktop-1.1.0/Makefile.orig       Fri Jun 14 11:46:27 2002
-+++ rdesktop-1.1.0/Makefile    Fri Jun 14 11:48:46 2002
-@@ -104,8 +104,8 @@
- rdesktop: $(RDPOBJ) $(SSL_OBJ) ${GUI_OBJ} ${GNUOBJ}
-       $(CC) $(CFLAGS) $(LDFLAGSOPT) -o rdesktop $(RDPOBJ) $(SSL_OBJ) $(LDDIRS) $(LDLIBS) ${GNUOBJ} ${GUI_OBJ} ${GUI_LIBS} ${SSL_LIBS}
- 
--rdp-srvr: $(RDPSOBJ) ${SSL_OBJ} ${GUI_OBJ} $(GNUOBJ)
--      $(CC) $(CFLAGS) $(LDFLAGSOPT) -o rdp-srvr $(RDPSOBJ) $(SSL_OBJ) $(LDDIRS) $(LDLIBS) ${GNUOBJ} ${GUI_OBJ} ${GUI_LIBS}  ${SSL_LIBS}
-+rdp-srvr: $(RDPSOBJ) ${SSL_OBJ} $(GNUOBJ)
-+      $(CC) $(CFLAGS) $(LDFLAGSOPT) -o rdp-srvr $(RDPSOBJ) $(SSL_OBJ) $(LDDIRS) $(LDLIBS) ${GNUOBJ} ${GUI_LIBS}  ${SSL_LIBS}
- 
- Makeconf:
-       ./configure
-@@ -130,25 +130,25 @@
-       rm -f gl/*.o
- 
- rdp-srvr.o: rdesktop.c
--      $(CC) $(CFLAGS) -DSERVER -o $@ -c $<
-+      $(CC) $(CFLAGS) $(SSL_INCLUDES) $(INCLUDES) -DSERVER -o $@ -c $<
- 
- iso-s.o: iso.c
--      $(CC) $(CFLAGS) -DSERVER -o $@ -c $<
-+      $(CC) $(CFLAGS) $(SSL_INCLUDES) $(INCLUDES) -DSERVER -o $@ -c $<
- 
- mcs-s.o: mcs.c
--      $(CC) $(CFLAGS) -DSERVER -o $@ -c $<
-+      $(CC) $(CFLAGS) $(SSL_INCLUDES) $(INCLUDES) -DSERVER -o $@ -c $<
- 
- rdp-s.o: rdp.c
--      $(CC) $(CFLAGS) -DSERVER -o $@ -c $<
-+      $(CC) $(CFLAGS) $(SSL_INCLUDES) $(INCLUDES) -DSERVER -o $@ -c $<
- 
- secure-s.o: secure.c
--      $(CC) $(CFLAGS) -DSERVER -o $@ -c $<
-+      $(CC) $(CFLAGS) $(SSL_INCLUDES) $(INCLUDES) -DSERVER -o $@ -c $<
- 
- tcp-s.o: tcp.c
--      $(CC) $(CFLAGS) -DSERVER -o $@ -c $<
-+      $(CC) $(CFLAGS) $(SSL_INCLUDES) $(INCLUDES) -DSERVER -o $@ -c $<
- 
--xwin-s.o: xwin.c keymap_wrap.c keymap.c
--      $(CC) $(CFLAGS) -DSERVER -o $@ -c $<
-+xwin-s.o: gl/xwin.c keymap_wrap.c keymap.h
-+      $(CC) $(CFLAGS) $(SSL_INCLUDES) $(INCLUDES) -DSERVER -o $@ -c $<
- 
- .SUFFIXES:
- .SUFFIXES: .c .o
---- rdesktop-1.1.0/gl/xwin.c.orig      Fri Jun 14 11:56:33 2002
-+++ rdesktop-1.1.0/gl/xwin.c   Fri Jun 14 11:59:53 2002
-@@ -33,6 +33,7 @@
- #include <sys/time.h>
- #include <rdesktop.h>
- #include <stdlib.h>
-+#include <time.h>
- 
- #include <keymap_wrap.c>
- 
-@@ -1803,6 +1804,7 @@
- 
- #include <X11/keysym.h>
- 
-+unsigned int
- x_key_to_sym(key, down)
- int key;
- int down;