svn commit: r287981 - in head: . secure/lib/libcrypto

[Bryan Drewery]

Author: bdrewery
Date: Sat Sep 19 03:46:10 2015
New Revision: 287981
URL: https://svnweb.freebsd.org/changeset/base/287981

Log:
  Replace afterinstall: hack from r111083 with 'make delete-old' functionality.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/ObsoleteFiles.inc
  head/secure/lib/libcrypto/Makefile

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Fri Sep 18 23:49:32 2015	(r287980)
+++ head/ObsoleteFiles.inc	Sat Sep 19 03:46:10 2015	(r287981)
@@ -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

Modified: head/secure/lib/libcrypto/Makefile
==============================================================================
--- head/secure/lib/libcrypto/Makefile	Fri Sep 18 23:49:32 2015	(r287980)
+++ head/secure/lib/libcrypto/Makefile	Sat Sep 19 03:46:10 2015	(r287981)
@@ -402,14 +402,6 @@ opensslconf.h: opensslconf-${MACHINE_CPU
 .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"