diff options
author | bdrewery <bdrewery@FreeBSD.org> | 2015-09-19 03:46:10 +0000 |
---|---|---|
committer | bdrewery <bdrewery@FreeBSD.org> | 2015-09-19 03:46:10 +0000 |
commit | 8150777448e765815fbaf9a4ca3d64d5604f41fd (patch) | |
tree | cb134cfadf7b67ba14983712001b63edb14ace98 | |
parent | deb97713e003a627c3372748f02d703d89e62128 (diff) | |
download | FreeBSD-src-8150777448e765815fbaf9a4ca3d64d5604f41fd.zip FreeBSD-src-8150777448e765815fbaf9a4ca3d64d5604f41fd.tar.gz |
Replace afterinstall: hack from r111083 with 'make delete-old' functionality.
Sponsored by: EMC / Isilon Storage Division
-rw-r--r-- | ObsoleteFiles.inc | 6 | ||||
-rw-r--r-- | secure/lib/libcrypto/Makefile | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 37d0905..8a9211e 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 dbe2157..4c396a0 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 <bsd.lib.mk> .if ${MACHINE_CPUARCH} == "amd64" |