Replace afterinstall: hack from r111083 with 'make delete-old' functionality.

Sponsored by:	EMC / Isilon Storage Division

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 37d090573243259b68746fc464ad1013ff29b603..8a9211e82c33f70b8f809e73c60b9bc736ecc3dd 100644 (file)
--- 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 dbe2157ec0b4c95c8b165db7fdbe02cb8ecf666c..4c396a043c5249eb79aebce59cc7fc10373ec5c9 100644 (file)
--- 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"