From 55e031ccadc718142e929d453b87412c0460ff0b Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Sat, 19 Sep 2015 03:46:10 +0000 Subject: [PATCH] Replace afterinstall: hack from r111083 with 'make delete-old' functionality. Sponsored by: EMC / Isilon Storage Division --- ObsoleteFiles.inc | 6 ++++++ secure/lib/libcrypto/Makefile | 8 -------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 37d090573243..8a9211e82c33 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -7234,6 +7234,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 dbe2157ec0b4..4c396a043c52 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -402,14 +402,6 @@ opensslconf.h: opensslconf-${MACHINE_CPUARCH}.h .endif ${CP} ${.ALLSRC} ${.TARGET} -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} == "amd64"