From 214d38089900f72d5e8cabe2d37e888e13405b0c Mon Sep 17 00:00:00 2001 From: bdrewery Date: Sat, 3 Oct 2015 16:25:47 +0000 Subject: [PATCH] MFC r287981: Replace afterinstall: hack from r111083 with 'make delete-old' functionality. git-svn-id: svn://svn.freebsd.org/base/stable/9@288612 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- ObsoleteFiles.inc | 6 ++++++ secure/lib/libcrypto/Makefile | 8 -------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 699d2c365..af2bd6d31 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -5770,6 +5770,12 @@ OLD_LIBS+=usr/lib/libposix1e.so.2 OLD_LIBS+=usr/lib/libskey.so.2 OLD_LIBS+=usr/lib/libusbhid.so.0 OLD_LIBS+=usr/lib/libvgl.so.2 +# 20030218: OpenSSL 0.9.7 import +OLD_FILES+=usr/include/des.h +OLD_FILES+=usr/lib/libdes.a +OLD_FILES+=usr/lib/libdes.so +OLD_LIBS+=usr/lib/libdes.so.3 +OLD_FILES+=usr/lib/libdes_p.a # 200302XX OLD_LIBS+=usr/lib/libacl.so.3 OLD_LIBS+=usr/lib/libasn1.so.5 diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 705606879..bae86df54 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -378,14 +378,6 @@ fips_rand.h: CLEANFILES+= fips.h fips_rand.h -OLDSYMLINKS+= libdes.a libdes.so libdes.so.3 libdes_p.a -afterinstall: - @${ECHO} "Removing stale symlinks." - rm -f ${DESTDIR}${INCLUDEDIR}/des.h -.for symlink in ${OLDSYMLINKS} - rm -f ${DESTDIR}${LIBDIR}/${symlink} -.endfor - .include .if ${MACHINE_CPUARCH} == "i386" -- 2.45.0