Remove obsolete SOCKSv4 support

svn path=/head/; revision=15996

usr.bin/telnet/Makefile

@@ -42,7 +42,7 @@ CFLAGS+=-I${.CURDIR}/../../lib
 #CFLAGS+= -DKRB4
 
 LDADD=	-ltermcap -ltelnet
-#LDADD+=-lkrb -ldes
+#LDADD+=	-lkrb -ldes
 DPADD=	${LIBTERMCAP}
 
 SRCS=	authenc.c commands.c main.c network.c ring.c sys_bsd.c telnet.c \
@@ -53,13 +53,6 @@ CRYPT_SRC= authenc.c commands.c externs.h main.c network.c
 CRYPT_SRC+= ring.c ring.h telnet.c terminal.c utilities.c Makefile
 NOCRYPT_DIR=${.CURDIR}/Nocrypt
 
-.if defined(SOCKS)
-CFLAGS+=-DSOCKS
-CFLAGS+=-Dconnect=Rconnect -Dgetsockname=Rgetsockname -Dlisten=Rlisten \
-	-Daccept=Raccept -Drcmd=Rrcmd -Dbind=Rbind -Dselect=Rselect
-LDADD+=	-lsocks
-.endif
-
 .include <bsd.prog.mk>
 
 nocrypt:

usr.bin/telnet/main.c

@@ -118,10 +118,6 @@ main(argc, argv)
 	extern int forward_flags;
 #endif	/* FORWARD */
 
-#ifdef	SOCKS
-	SOCKSinit(argv[0]);
-#endif	/* SOCKS */
-
 	tninit();		/* Clear out things */
 #if	defined(CRAY) && !defined(__STDC__)
 	_setlist_init();	/* Work around compiler bug */