From 3aa9387e7e9a2ec55e1aa3cd071436dda245e633 Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Mon, 2 May 2005 23:53:47 +0000
Subject: [PATCH] Adjust the upgrade target to remove libraries from /usr/lib
 that exist in /usr/lib/compat.  This occurs when upgrading from RELEASE-1.2
 to HEAD.

---
 etc/Makefile | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/etc/Makefile b/etc/Makefile
index 57c63e7ddc..94646fc01d 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,6 +1,6 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
 # $FreeBSD: src/etc/Makefile,v 1.219.2.38 2003/03/04 09:49:00 ru Exp $
-# $DragonFly: src/etc/Makefile,v 1.53 2005/04/26 16:59:59 corecode Exp $
+# $DragonFly: src/etc/Makefile,v 1.54 2005/05/02 23:53:47 dillon Exp $
 
 .if !defined(NO_SENDMAIL)
 SUBDIR=	sendmail
@@ -64,6 +64,10 @@ ETCMAIL=Makefile README mailer.conf access.sample virtusertable.sample \
 # Special top level files for FreeBSD
 FREEBSD=COPYRIGHT
 
+# List of libraries in /usr/lib/compat that might have to be removed
+# from /usr/lib.
+COMPAT_LIBS != cd ${DESTDIR}/usr/lib/compat; ls
+
 distribute:
 	cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/${DISTRIBUTION}
 
@@ -219,6 +223,11 @@ upgrade_etc:	preupgrade
 	rm -f ${DESTDIR}/usr/share/syscons/keymaps/jp.pc98.kbd
 	csh -c "rm -f ${DESTDIR}/etc/rc.d/{bootconf.sh,lkm1,lkm2,lkm3,mountall,pcvt,wscons}"
 	rm -f ${DESTDIR}/modules/canbus.ko
+.for lib in ${COMPAT_LIBS:M*.so.*}
+.if exists(${DESTDIR}/usr/lib/${lib})
+	rm -f ${DESTDIR}/usr/lib/${lib}
+.endif
+.endfor
 	ldconfig -R
 
 distribution:
-- 
2.41.0