svn commit: r288612 - in stable/9: . secure/lib/libcrypto

[Bryan Drewery]

Author: bdrewery
Date: Sat Oct  3 16:25:47 2015
New Revision: 288612
URL: https://svnweb.freebsd.org/changeset/base/288612

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

Modified:
  stable/9/ObsoleteFiles.inc   (contents, props changed)
  stable/9/secure/lib/libcrypto/Makefile
Directory Properties:
  stable/9/secure/lib/libcrypto/   (props changed)

Modified: stable/9/ObsoleteFiles.inc
==============================================================================
--- stable/9/ObsoleteFiles.inc	Sat Oct  3 16:24:20 2015	(r288611)
+++ stable/9/ObsoleteFiles.inc	Sat Oct  3 16:25:47 2015	(r288612)
@@ -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

Modified: stable/9/secure/lib/libcrypto/Makefile
==============================================================================
--- stable/9/secure/lib/libcrypto/Makefile	Sat Oct  3 16:24:20 2015	(r288611)
+++ stable/9/secure/lib/libcrypto/Makefile	Sat Oct  3 16:25:47 2015	(r288612)
@@ -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 <bsd.lib.mk>
 
 .if ${MACHINE_CPUARCH} == "i386"