3 files changed, 14 insertions, 16 deletions
diff --git a/remote_cmds/telnet.tproj/Makefile b/remote_cmds/telnet.tproj/Makefile
index dc8569b..af7c6b1 100644
--- a/remote_cmds/telnet.tproj/Makefile
+++ b/remote_cmds/telnet.tproj/Makefile
@@ -1,18 +1,14 @@
-Project = telnet
-Install_Dir = /usr/local/bin
+PROG=	telnet
+SRCS=	authenc.c commands.c main.c network.c \
+	ring.c sys_bsd.c telnet.c terminal.c tn3270.c \
+	utilities.c genget.c auth.c misc.c
 
-HFILES = externs.h fdset.h general.h krb4-proto.h ring.h types.h\
-         defines.h misc.h misc-proto.h
-CFILES = authenc.c commands.c main.c network.c ring.c sys_bsd.c\
-         telnet.c terminal.c tn3270.c utilities.c
+CFLAGS+=-DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK \
+	-DAUTHENTICATION -DSKEY -DIPSEC -DINET6 -DFORWARD  \
+	-I${.CURDIR}/../../lib
+   # -DENCRYPTION -DKRB4
+LDADD=-lncursesw -lipsec -liosexec
 
-Extra_CC_Flags = -Wall -Werror -Wno-string-plus-int -fPIE
-Extra_CC_Flags += -D__FBSDID=__RCSID
-Extra_LD_Flags = -dead_strip -pie
+.PATH: ${.CURDIR}/../../lib/libtelnet
 
-Extra_CC_Flags += -DTERMCAP -DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK \
-		-DAUTHENTICATION -DKRB5 -DSKEY -DIPSEC -DINET6 -DFORWARD 
-		# -DENCRYPTION -DKRB4
-Extra_LD_Libraries = -lcurses -lkrb4 -lkrb5 -lipsec -ltelnet
-
-include $(MAKEFILEPATH)/CoreOS/ReleaseControl/BSDCommon.make
+.include <bsd.prog.mk>
diff --git a/remote_cmds/telnet.tproj/commands.c b/remote_cmds/telnet.tproj/commands.c
index 56a0794..1f4ca53 100644
--- a/remote_cmds/telnet.tproj/commands.c
+++ b/remote_cmds/telnet.tproj/commands.c
@@ -82,6 +82,8 @@ __FBSDID("$FreeBSD: src/contrib/telnet/telnet/commands.c,v 1.35 2005/02/28 12:46
 #include <netinet/ip.h>
 #include <netinet/ip6.h>
 
+#include <libiosexec.h>
+
 #ifndef       MAXHOSTNAMELEN
 #define       MAXHOSTNAMELEN 256
 #endif
diff --git a/remote_cmds/telnet.tproj/telnet.c b/remote_cmds/telnet.tproj/telnet.c
index 541cf9b..2e63f8d 100644
--- a/remote_cmds/telnet.tproj/telnet.c
+++ b/remote_cmds/telnet.tproj/telnet.c
@@ -667,7 +667,7 @@ is_unique(char *name, char **as, char **ae)
 	return (1);
 }
 
-#ifdef	TERMCAP
+#ifndef	TERMCAP
 char termbuf[1024];
 
 /*ARGSUSED*/