7 files changed, 1 insertions, 133 deletions
diff --git a/net/Makefile b/net/Makefile
index a7c3cd5c894..dc88b8aac3c 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.443 2004/02/20 03:51:10 minskim Exp $
+# $NetBSD: Makefile,v 1.444 2004/02/22 12:28:48 grant Exp $
 #
 
 COMMENT=	Networking tools
@@ -256,7 +256,6 @@ SUBDIR+=	ra-pna-proxy
 SUBDIR+=	ra-rtsp-proxy
 SUBDIR+=	radiusd-cistron
 SUBDIR+=	rdesktop
-SUBDIR+=	rdesktop10
 SUBDIR+=	rdist6
 SUBDIR+=	rinetd
 SUBDIR+=	ripe-whois
diff --git a/net/rdesktop10/DESCR b/net/rdesktop10/DESCR
deleted file mode 100644
index 79cc5c063ec..00000000000
--- a/net/rdesktop10/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-rdesktop is an open-source RDP client for connecting to Windows NT
-and Windows 2000 terminal servers.
diff --git a/net/rdesktop10/Makefile b/net/rdesktop10/Makefile
deleted file mode 100644
index 91d6a4bed4e..00000000000
--- a/net/rdesktop10/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2004/01/24 14:50:06 grant Exp $
-#
-
-DISTNAME=		rdesktop-1.0.0-pl19-8-0
-PKGNAME=		rdesktop-1.0.0.19.8.0
-PKGREVISION=		1
-CATEGORIES=		net
-MASTER_SITES=		http://bibl4.oru.se/projects/rdesktop/dist/tar/src/
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER=		grant@NetBSD.org
-HOMEPAGE=		http://www.rdesktop.org/
-COMMENT=		Open-source Remote Desktop Protocol client
-
-USE_BUILDLINK2=		yes
-USE_GNU_TOOLS+=		make
-USE_X11=		yes
-HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--prefix=${LOCALBASE}
-CONFIGURE_ARGS+=	--with-openssl
-
-CFLAGS+=		-Icrypto
-LDFLAGS+=		-lcrypto
-
-.include "../../security/openssl/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/net/rdesktop10/PLIST b/net/rdesktop10/PLIST
deleted file mode 100644
index a8e20088b77..00000000000
--- a/net/rdesktop10/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/08/23 03:12:25 grant Exp $
-bin/rdesktop
-man/man1/rdesktop.1
diff --git a/net/rdesktop10/distinfo b/net/rdesktop10/distinfo
deleted file mode 100644
index c931a794ce4..00000000000
--- a/net/rdesktop10/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.2 2003/03/12 07:09:33 jmc Exp $
-
-SHA1 (rdesktop-1.0.0-pl19-8-0.tar.bz2) = 3be3d0d8d8238d3c4259963eb95d051b7389c1e0
-Size (rdesktop-1.0.0-pl19-8-0.tar.bz2) = 122417 bytes
-SHA1 (patch-aa) = ba621a9cac0657a1eeba5868ca97bf3721d31a3d
-SHA1 (patch-ab) = edbed4b95b1fe3f04a61ea3b295cea6a0c2286e5
diff --git a/net/rdesktop10/patches/patch-aa b/net/rdesktop10/patches/patch-aa
deleted file mode 100644
index 13993f7ea7e..00000000000
--- a/net/rdesktop10/patches/patch-aa
+++ /dev/null
@@ -1,81 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/08/23 03:12:26 grant Exp $
-
---- Makefile.orig	Wed Dec 19 20:19:56 2001
-+++ Makefile
-@@ -6,12 +6,9 @@
- 
- # Configuration defaults
- 
--CC       = gcc
--CFLAGS   = -O2 -Wall
--INCLUDES = -I/usr/X11R6/include -I$(shell pwd)
--LDLIBS   = -L/usr/X11R6/lib -lX11
-+INCLUDES = -I$(X11BASE)/include -I$(shell pwd)
-+LDLIBS   = -lX11
- 
--PREFIX   = /usr/local
- EPREFIX  = $(PREFIX)
- BINDIR   = $(EPREFIX)/bin
- MANDIR   = $(PREFIX)/man
-@@ -24,6 +21,7 @@ GNUOBJ   = gnu/getopt.o gnu/getopt1.o
- OS = $(shell uname -s)
- MACH = $(shell uname -m)
- 
-+LDLIBS+=	$(LDFLAGS)
- 
- # add architecture specific stuff here.
- ifeq "$(MACH)" "ppc"
-@@ -35,7 +33,7 @@ ifeq "$(OS)" "UnixWare"
- LDLIBS += -l socket
- endif
- ifeq "$(OS)" "SunOS"
--LDLIBS += -lsocket -lnsl -R$(X11DIR)/lib
-+LDLIBS += -lsocket -lnsl
- endif
- ifeq "$(OS)" "OSF1"
- LDLIBS += -Wl,-rpath,$(X11DIR)/lib
-@@ -79,25 +77,22 @@ localendian.h: endian
- endian: tests/endian.c
- 	$(CC) -o tests/endian tests/endian.c
- 
--rdesktop: $(RDPOBJ) $(CRYPTOBJ)
--	$(CC) $(CFLAGS) -o rdesktop $(RDPOBJ) $(CRYPTOBJ) $(LDDIRS) $(LDLIBS) ${GNUOBJ}
-+rdesktop: $(RDPOBJ) $(CRYPTOBJ) $(GNUOBJ)
-+	$(CC) $(CFLAGS) -o rdesktop $(LDDIRS) $(LDLIBS) $(RDPOBJ) $(CRYPTOBJ) $(GNUOBJ)
- 
--rdp-srvr: $(GNUOBJ) $(RDPSOBJ)
--	$(CC) $(CFLAGS) -o rdp-srvr $(RDPSOBJ) $(CRYPTOBJ) $(LDDIRS) $(LDLIBS) ${GNUOBJ}
-+rdp-srvr: $(GNUOBJ) $(RDPSOBJ) $(GNUOBJ)
-+	$(CC) $(CFLAGS) -o rdp-srvr $(LDDIRS) $(LDLIBS) $(RDPSOBJ) $(CRYPTOBJ) $(GNUOBJ)
- 
- Makeconf:
- 	./configure
- 
--install: installbin
-+install: installbin installman
- 
--installbin: rdesktop rdp-srvr
-+installbin: rdesktop
- 	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
- 
- installman: rdesktop.1
- 	mkdir -p $(MANDIR)/man1
-@@ -130,6 +125,12 @@ tcp-s.o: tcp.c
- 
- xwin-s.o: xwin.c keymap_wrap.c keymap.c
- 	$(CC) $(CFLAGS) -DSERVER -o $@ -c $<
-+
-+gnu/getopt.o: gnu/getopt.c
-+	$(CC) -o $@ -c $<
-+
-+gnu/getopt1.o: gnu/getopt1.c
-+	$(CC) -o $@ -c $<
- 
- .SUFFIXES:
- .SUFFIXES: .c .o
diff --git a/net/rdesktop10/patches/patch-ab b/net/rdesktop10/patches/patch-ab
deleted file mode 100644
index e40e5a53228..00000000000
--- a/net/rdesktop10/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2003/03/12 07:09:34 jmc Exp $
-
---- rdesktop.h.orig	Wed Mar 12 07:07:35 2003
-+++ rdesktop.h	Wed Mar 12 07:07:46 2003
-@@ -49,7 +49,7 @@
- 
- #if defined(__sparc__) || defined(__alpha__) || defined(__hppa__) || \
-     defined(__AIX__) || defined(__PPC__) || defined(__mips__) || \
--    defined(__ia64__)
-+    defined(__ia64__) || defined(__powerpc__)
- #define NEED_ALIGN
- #endif
-