From f033840b253ebb28eee25beafde4d6863f5f6e57 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Thu, 20 Jan 2022 12:48:24 -0800 Subject: [PATCH] Use MOVED_LIBS for the libalias modules being moved to /lib. This is a bit more unusual in that the modules dropped their major version suffix at the same time, so the old files being removed by MOVED_LIBS in this case are the symlinks to the old libraries. Reviewed by: emaste Sponsored by: The University of Cambridge, Google Inc. Differential Revision: https://reviews.freebsd.org/D33849 --- ObsoleteFiles.inc | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 6c3f0f563461..74d7bbf2e442 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -14261,16 +14261,17 @@ OLD_FILES+=usr/bin/objformat OLD_FILES+=usr/share/man/man1/objformat.1.gz OLD_FILES+=usr/include/objformat.h OLD_FILES+=usr/share/man/man3/getobjformat.3.gz -# 20061201: remove symlink to *.so.4 libalias modules -OLD_FILES+=usr/lib/libalias_cuseeme.so -OLD_FILES+=usr/lib/libalias_dummy.so -OLD_FILES+=usr/lib/libalias_ftp.so -OLD_FILES+=usr/lib/libalias_irc.so -OLD_FILES+=usr/lib/libalias_nbt.so -OLD_FILES+=usr/lib/libalias_pptp.so -OLD_FILES+=usr/lib/libalias_skinny.so -OLD_FILES+=usr/lib/libalias_smedia.so -# 20061201: remove old *.so.4 libalias modules +# 20061008: rename *.so.4 libalias modules to *.so and move to /lib +# This uses MOVED_LIBS because the new files are libraries even though +# the old files to remove are symlinks +MOVED_LIBS+=usr/lib/libalias_cuseeme.so +MOVED_LIBS+=usr/lib/libalias_dummy.so +MOVED_LIBS+=usr/lib/libalias_ftp.so +MOVED_LIBS+=usr/lib/libalias_irc.so +MOVED_LIBS+=usr/lib/libalias_nbt.so +MOVED_LIBS+=usr/lib/libalias_pptp.so +MOVED_LIBS+=usr/lib/libalias_skinny.so +MOVED_LIBS+=usr/lib/libalias_smedia.so OLD_LIBS+=lib/libalias_cuseeme.so.4 OLD_LIBS+=lib/libalias_dummy.so.4 OLD_LIBS+=lib/libalias_ftp.so.4