"un-bump" the major number for libtermcap.so. This brings -current back

to the same version numbers as 2.2.x.
The problem with the way things were was:
 - if you took a 2.2.x binary, it either wouldn't run on -current or
   if you had the old -current version of libtermcap.so.2.1 then it could
   potentially be a security problem.
 - the alternative is to start a compat22 tree dist for -current with a
   uuencoded binary.  This makefile hack is less cost.
libtermcap.so.3.0 is provided via /usr/lib/compat to avoid transition
problems.

1 files changed, 13 insertions, 2 deletions

diff --git a/lib/libtermcap/Makefile b/lib/libtermcap/Makefile
index 2e2c0b3837d1..c33919687130 100644
--- a/lib/libtermcap/Makefile
+++ b/lib/libtermcap/Makefile
@@ -1,8 +1,8 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
 
 LIB=	termcap
-SHLIB_MAJOR= 3
-SHLIB_MINOR= 0
+SHLIB_MAJOR= 2
+SHLIB_MINOR= 1
 CFLAGS+=-DCM_N -DCM_GT -DCM_B -DCM_D -I${.CURDIR}
 SRCS=   termcap.c tgoto.c tputs.c tparm.c tospeed.c
 
@@ -19,8 +19,19 @@ LINKS+= ${SHLIBDIR}/libtermcap.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 LINKS+=	${LIBDIR}/libtermcap_p.a ${LIBDIR}/libtermlib_p.a
 .endif
 
+# This is a hack.. Work around a major number bump that should have been
+# done differently.  Back out this delta when it's time to go to 3.0 for real.
+.if !defined(NOPIC)
+LINKS+= ${SHLIBDIR}/libtermcap.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+	/usr/lib/compat/libtermcap.so.3.0
+LINKS+= ${SHLIBDIR}/libtermcap.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+	/usr/lib/compat/libtermlib.so.3.0
+.endif
+
 beforeinstall:
 	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/termcap.h \
 		${DESTDIR}/usr/include
+	rm -f ${DESTDIR}${SHLIBDIR}/libtermcap.so.3.0 \
+	      ${DESTDIR}${SHLIBDIR}/libtermlib.so.3.0
 
 .include <bsd.lib.mk>