4 files changed, 39 insertions, 30 deletions

diff --git a/secure/Makefile.inc b/secure/Makefile.inc
index 855f8e1e692a..3e080b85fda1 100644
--- a/secure/Makefile.inc
+++ b/secure/Makefile.inc
@@ -3,11 +3,10 @@
 DISTRIBUTION?=crypto
 
 TELNETDIR=	${.CURDIR}/../../../crypto/telnet
-
 .if exists(${.OBJDIR}/../../lib/libtelnet)
-TELNETOBJDIR=	${.OBJDIR}/../../lib/libtelnet
+LIBTELNET=	${.OBJDIR}/../../lib/libtelnet/libtelnet.a
 .else
-TELNETOBJDIR=	${.CURDIR}/../../lib/libtelnet
+LIBTELNET=	${.CURDIR}/../../lib/libtelnet/libtelnet.a
 .endif
 
 .if exists(${.CURDIR}/../../lib/libcrypt/obj)
diff --git a/secure/lib/libtelnet/Makefile b/secure/lib/libtelnet/Makefile
index 9732074d0698..b964e16baa00 100644
--- a/secure/lib/libtelnet/Makefile
+++ b/secure/lib/libtelnet/Makefile
@@ -2,13 +2,17 @@
 
 LIB=		telnet
 
+INTERNALLIB=	yes
+INTERNALSTATICLIB=yes
+NOPIC=		yes
+
 SRCS=		genget.c getent.c misc.c encrypt.c auth.c \
 		enc_des.c sra.c pk.c
 
-CFLAGS+=        -DHAS_CGETENT -DENCRYPTION -DDES_ENCRYPTION -DAUTHENTICATION \
-                -DSRA -I${TELNETDIR} \
+CFLAGS+=	-DENCRYPTION -DAUTHENTICATION -DSRA \
+		-I${TELNETDIR} -I${TELNETDIR}/libtelnet
 
-NOPIC=          yes
+WARNS?=		2
 
 INCS=		${TELNETDIR}/arpa/telnet.h
 INCDIR=		/usr/include/arpa
@@ -18,12 +22,13 @@ INCDIR=		/usr/include/arpa
 .PATH:	${TELNETDIR}/libtelnet
 
 #
-# Before complaining about this, please *double-check* that you have
-# updated the ldconfig path in /etc/rc to include /usr/lib/compat that
-# was added in src/etc/rc rev 1.98.
-# This is so that `ld' will not continue to generate binaries linked
-# shared against libtelnet, so that in a future release we can move this
-# off to a compat dist (like compat22).
+# Remove obsolete shared libraries, if any.  We don't bother moving them
+# to /usr/lib/compat, since they were only used by telnet, telnetd and
+# tn3270.
 #
-beforeinstall:
-	rm -f ${DESTDIR}${LIBDIR}/lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
+beforeinstall: __remove-stale-libs
+__remove-stale-libs: .PHONY
+.if exists(${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0)
+	-chflags noschg ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0
+	rm -f ${DESTDIR}${SHLIBDIR}/lib${LIB}.so.2.0
+.endif
diff --git a/secure/libexec/telnetd/Makefile b/secure/libexec/telnetd/Makefile
index fbfe4a9ec295..07378fd6d137 100644
--- a/secure/libexec/telnetd/Makefile
+++ b/secure/libexec/telnetd/Makefile
@@ -4,19 +4,22 @@
 # telnet implementations.
 
 PROG=		telnetd
-MAN8=		telnetd.8
+MAN=		telnetd.8
+
+SRCS=		global.c slc.c state.c sys_term.c telnetd.c \
+		termstat.c utility.c authenc.c
 
 CFLAGS+=	-DLINEMODE -DUSE_TERMIO -DDIAGNOSTICS -DOLD_ENVIRON \
 		-DENV_HACK -DAUTHENTICATION -DENCRYPTION \
 		-I${TELNETDIR} -DINET6
 
-SRCS=		global.c slc.c state.c sys_term.c telnetd.c \
-		termstat.c utility.c authenc.c
+WARNS?=		2
+WFORMAT?=	0
 
-DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBMP} \
-                ${LIBCRYPT}
-LDADD=		-lutil -ltermcap -L${TELNETOBJDIR} -ltelnet -lcrypto -lcrypt
-LDADD+=		-lmp -lpam
+DPADD=		${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} ${LIBMP} ${LIBCRYPTO} \
+		${LIBCRYPT} ${LIBPAM}
+LDADD=		-lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \
+		-lcrypt ${MINUSLPAM}
 
 .include <bsd.prog.mk>
 
diff --git a/secure/usr.bin/telnet/Makefile b/secure/usr.bin/telnet/Makefile
index 515385234568..74cf075d18d9 100644
--- a/secure/usr.bin/telnet/Makefile
+++ b/secure/usr.bin/telnet/Makefile
@@ -2,17 +2,19 @@
 
 PROG=		telnet
 
-CFLAGS+=	-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DSKEY \
-                -DENCRYPTION -DAUTHENTICATION -I${TELNETDIR}
-CFLAGS+=	-DIPSEC -DINET6
-
 SRCS=		authenc.c commands.c main.c network.c ring.c sys_bsd.c \
-		telnet.c terminal.c tn3270.c utilities.c
+		telnet.c terminal.c utilities.c
+
+CFLAGS+=	-DKLUDGELINEMODE -DUSE_TERMIO -DENV_HACK -DOPIE \
+		-DENCRYPTION -DAUTHENTICATION -DIPSEC -DINET6 \
+		-I${TELNETDIR} -I${TELNETDIR}/libtelnet/
+
+WARNS?=		2
 
-DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBCRYPTO} ${LIBCRYPT} ${LIBMP}
-DPADD+=		${LIBIPSEC}
-LDADD=		-ltermcap -L${TELNETOBJDIR} -ltelnet -lcrypto -lcrypt -lmp
-LDADD+=		-lipsec -lpam
+DPADD=		${LIBTERMCAP} ${LIBTELNET} ${LIBMP} \
+		${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
+LDADD=		-ltermcap ${LIBTELNET} -lmp \
+		-lcrypto -lcrypt -lipsec ${MINUSLPAM}
 
 .include <bsd.prog.mk>