Index: head/lib/compat/Makefile.inc
===================================================================
--- head/lib/compat/Makefile.inc	(revision 83768)
+++ head/lib/compat/Makefile.inc	(revision 83769)
@@ -1,3 +1,13 @@
 # $FreeBSD$
 
 LIBCOMPATDIR?=	${LIBDIR}/compat/aout
+
+.if defined(LIBS) && !empty(LIBS)
+beforeinstall: __remove-stale-libs
+__remove-stale-libs: .PHONY
+.for lib in ${LIBS}
+.if exists(${DESTDIR}${SHLIBDIR}/${lib})
+	rm -f ${DESTDIR}${SHLIBDIR}/${lib}
+.endif
+.endfor
+.endif
Index: head/lib/compat/compat1x/Makefile
===================================================================
--- head/lib/compat/compat1x/Makefile	(revision 83768)
+++ head/lib/compat/compat1x/Makefile	(revision 83769)
@@ -1,33 +1,28 @@
 # $FreeBSD$
 
 DISTRIBUTION=	compat1x
 
 LIBS=	libc.so.1.1 libcurses.so.1.1 libf2c.so.1.1 libg++.so.1.1 \
 	libgcc.so.1.1 libgnumalloc.so.1.1 libgnuregex.so.1.1 libln.so.1.1 \
 	libm.so.1.1 libmalloc.so.1.1 libreadline.so.1.1 libresolv.so.1.1 \
 	librpcsvc.so.1.1 libskey.so.1.1 libtelnet.so.1.1 libtermcap.so.1.1 \
 	libutil.so.1.1 liby.so.1.1
 
 CLEANFILES+=	${LIBS}
 LINKS=	${LIBCOMPATDIR}/aout/libtermcap.so.1.1 \
 	${LIBCOMPATDIR}/aout/libtermlib.so.1.1
 
 all:	${LIBS}
 
 .for lib in ${LIBS}
 ${lib}:	${lib}.gz.uu
 	uudecode -p ${.CURDIR}/${lib}.gz.uu | gunzip > ${lib}
 .endfor
 
 beforeinstall:
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
 		${DESTDIR}${LIBCOMPATDIR}/aout
-.for lib in ${LIBS}
-.if exists(${DESTDIR}${SHLIBDIR}/${lib})
-	rm -f ${DESTDIR}${SHLIBDIR}/${lib}
-.endif
-.endfor
 
 # Get all the fruit, even though we don't set PROG.
 # XXX bsd.lib.mk has fruitflies, e.g., it fails if LIBS is empty.
 .include <bsd.prog.mk>
Index: head/lib/compat/compat20/Makefile
===================================================================
--- head/lib/compat/compat20/Makefile	(revision 83768)
+++ head/lib/compat/compat20/Makefile	(revision 83769)
@@ -1,30 +1,25 @@
 # $FreeBSD$
 
 DISTRIBUTION=	compat20
 
 LIBS=	libdialog.so.2.0 libforms.so.2.0 libg++.so.2.0 libgcc.so.261.0 \
 	libncurses.so.2.0 libreadline.so.2.0
 
 CLEANFILES+=	${LIBS} ld.so
 
 all:	${LIBS} ld.so
 
 .for lib in ${LIBS} ld.so
 ${lib}:	${lib}.gz.uu
 	uudecode -p ${.CURDIR}/${lib}.gz.uu | gunzip > ${lib}
 .endfor
 
 beforeinstall:
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ld.so \
 		${DESTDIR}/usr/libexec
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
 		${DESTDIR}${LIBCOMPATDIR}/aout
-.for lib in ${LIBS}
-.if exists(${DESTDIR}${SHLIBDIR}/${lib})
-	rm -f ${DESTDIR}${SHLIBDIR}/${lib}
-.endif
-.endfor
 
 # Get all the fruit, even though we don't set PROG.
 # XXX bsd.lib.mk has fruitflies, e.g., it fails if LIBS is empty.
 .include <bsd.prog.mk>
Index: head/lib/compat/compat21/Makefile
===================================================================
--- head/lib/compat/compat21/Makefile	(revision 83768)
+++ head/lib/compat/compat21/Makefile	(revision 83769)
@@ -1,29 +1,24 @@
 # $FreeBSD$
 
 DISTRIBUTION=	compat21
 
 LIBS=	libc.so.2.2 libg++.so.3.0 libgmp.so.2.0
 
 CLEANFILES+=	${LIBS} ld.so
 
 all:	${LIBS} ld.so
 
 .for lib in ${LIBS} ld.so
 ${lib}:	${lib}.gz.uu
 	uudecode -p ${.CURDIR}/${lib}.gz.uu | gunzip > ${lib}
 .endfor
 
 beforeinstall:
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ld.so \
 		${DESTDIR}/usr/libexec
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
 		${DESTDIR}${LIBCOMPATDIR}/aout
-.for lib in ${LIBS}
-.if exists(${DESTDIR}${SHLIBDIR}/${lib})
-	rm -f ${DESTDIR}${SHLIBDIR}/${lib}
-.endif
-.endfor
 
 # Get all the fruit, even though we don't set PROG.
 # XXX bsd.lib.mk has fruitflies, e.g., it fails if LIBS is empty.
 .include <bsd.prog.mk>
Index: head/lib/compat/compat22/Makefile
===================================================================
--- head/lib/compat/compat22/Makefile	(revision 83768)
+++ head/lib/compat/compat22/Makefile	(revision 83769)
@@ -1,43 +1,38 @@
 # $FreeBSD$
 
 DISTRIBUTION=	compat22
 
 LIBS=	libalias.so.2.4 libc.so.3.1 libc_r.so.3.0 libcalendar.so.2.0 \
 	libcom_err.so.2.0 libcurses.so.2.0 libdialog.so.3.1 libedit.so.2.0 \
 	libf2c.so.2.0 libftpio.so.4.0 libg++.so.4.0 libgmp.so.3.0 \
 	libgnuregex.so.2.0 libipx.so.2.0 libkvm.so.2.0 libm.so.2.0 \
 	libmp.so.3.0 libmytinfo.so.2.0 libncurses.so.3.1 libopie.so.2.0 \
 	libpcap.so.2.2 libreadline.so.3.0 librpcsvc.so.2.0 libscrypt.so.2.0 \
 	libscsi.so.2.0 libskey.so.2.0 libss.so.2.0 libstdc++.so.2.0 \
 	libtelnet.so.2.0 libtermcap.so.2.1 libutil.so.2.2 libvgl.so.1.0 \
 	libxpg4.so.2.0 libz.so.2.0
 
 CLEANFILES+=	${LIBS} ld.so
 
 all:	${LIBS} ld.so
 
 .for lib in ${LIBS} ld.so
 ${lib}:	${lib}.gz.uu
 	uudecode -p ${.CURDIR}/${lib}.gz.uu | gunzip > ${lib}
 .endfor
 
 beforeinstall:
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ld.so \
 		${DESTDIR}/usr/libexec
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
 		${DESTDIR}${LIBCOMPATDIR}/aout
 	@${ECHO} "libcrypt.so.2.0 -> libscrypt.so.2.0" ; \
 		cd ${DESTDIR}${LIBCOMPATDIR}/aout ; \
 		ln -sf libscrypt.so.2.0 libcrypt.so.2.0
 	@${ECHO} "libtermlib.so.2.1 -> libtermcap.so.2.1" ; \
 		cd ${DESTDIR}${LIBCOMPATDIR}/aout ; \
 		ln -sf libtermcap.so.2.1 libtermlib.so.2.1
-.for lib in ${LIBS}
-.if exists(${DESTDIR}${SHLIBDIR}/${lib})
-	rm -f ${DESTDIR}${SHLIBDIR}/${lib}
-.endif
-.endfor
 
 # Get all the fruit, even though we don't set PROG.
 # XXX bsd.lib.mk has fruitflies, e.g., it fails if LIBS is empty.
 .include <bsd.prog.mk>
Index: head/lib/compat/compat3x.i386/Makefile
===================================================================
--- head/lib/compat/compat3x.i386/Makefile	(revision 83768)
+++ head/lib/compat/compat3x.i386/Makefile	(revision 83769)
@@ -1,33 +1,28 @@
 # $FreeBSD$
 
 DISTRIBUTION=	compat3x
 
 LIBCOMPATDIR=	${LIBDIR}/compat
 
 LIBS=	libalias.so.3 libc.so.3 libc_r.so.3 libc_r.so.4 libcurses.so.2 \
 	libdialog.so.3 libedit.so.2 libf2c.so.2 libfetch.so.1 libftpio.so.4 \
 	libg++.so.4 libhistory.so.3 libmytinfo.so.2 libncurses.so.3 \
 	libperl.so.3 libreadline.so.3 libss.so.2 libstdc++.so.2 \
 	libtermcap.so.2 libutil.so.2 libvgl.so.1 libwrap.so.2 libxpg4.so.2
 
 CLEANFILES+=	${LIBS}
 
 all:	${LIBS}
 
 .for lib in ${LIBS}
 ${lib}:	${lib}.gz.uu
 	uudecode -p ${.CURDIR}/${lib}.gz.uu | gunzip > ${lib}
 .endfor
 
 beforeinstall:
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
 		${DESTDIR}${LIBCOMPATDIR}
-.for lib in ${LIBS}
-.if exists(${DESTDIR}${SHLIBDIR}/${lib})
-	rm -f ${DESTDIR}${SHLIBDIR}/${lib}
-.endif
-.endfor
 
 # Get all the fruit, even though we don't set PROG.
 # XXX bsd.lib.mk has fruitflies, e.g., it fails if LIBS is empty.
 .include <bsd.prog.mk>
Index: head/lib/compat/compat4x.alpha/Makefile
===================================================================
--- head/lib/compat/compat4x.alpha/Makefile	(revision 83768)
+++ head/lib/compat/compat4x.alpha/Makefile	(revision 83769)
@@ -1,33 +1,28 @@
 # $FreeBSD$
 
 DISTRIBUTION=	compat4x
 
 LIBCOMPATDIR=	${LIBDIR}/compat
 
 LIBS=	\
 	libc.so.4 \
 	libc_r.so.4 \
 	libcrypto.so.1 \
 	libssl.so.1
 
 CLEANFILES+=	${LIBS}
 
 all:	${LIBS}
 
 .for lib in ${LIBS}
 ${lib}:	${lib}.gz.uu
 	uudecode -p ${.CURDIR}/${lib}.gz.uu | gunzip > ${lib}
 .endfor
 
 beforeinstall:
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
 		${DESTDIR}${LIBCOMPATDIR}
-.for lib in ${LIBS}
-.if exists(${DESTDIR}${SHLIBDIR}/${lib})
-	rm -f ${DESTDIR}${SHLIBDIR}/${lib}
-.endif
-.endfor
 
 # Get all the fruit, even though we don't set PROG.
 # XXX bsd.lib.mk has fruitflies, e.g., it fails if LIBS is empty.
 .include <bsd.prog.mk>
Index: head/lib/compat/compat4x.i386/Makefile
===================================================================
--- head/lib/compat/compat4x.i386/Makefile	(revision 83768)
+++ head/lib/compat/compat4x.i386/Makefile	(revision 83769)
@@ -1,33 +1,28 @@
 # $FreeBSD$
 
 DISTRIBUTION=	compat4x
 
 LIBCOMPATDIR=	${LIBDIR}/compat
 
 LIBS=	\
 	libc.so.4 \
 	libc_r.so.4 \
 	libcrypto.so.1 \
 	libssl.so.1
 
 CLEANFILES+=	${LIBS}
 
 all:	${LIBS}
 
 .for lib in ${LIBS}
 ${lib}:	${lib}.gz.uu
 	uudecode -p ${.CURDIR}/${lib}.gz.uu | gunzip > ${lib}
 .endfor
 
 beforeinstall:
 	${INSTALL} ${COPY} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${LIBS} \
 		${DESTDIR}${LIBCOMPATDIR}
-.for lib in ${LIBS}
-.if exists(${DESTDIR}${SHLIBDIR}/${lib})
-	rm -f ${DESTDIR}${SHLIBDIR}/${lib}
-.endif
-.endfor
 
 # Get all the fruit, even though we don't set PROG.
 # XXX bsd.lib.mk has fruitflies, e.g., it fails if LIBS is empty.
 .include <bsd.prog.mk>