summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2015-10-03 16:24:20 +0000
committerbdrewery <bdrewery@FreeBSD.org>2015-10-03 16:24:20 +0000
commit77f7f98e06db2a573f1d88419542d148554611f7 (patch)
treef55a15268af1c3780ea70bc0a09879e670b328ca
parente6473a1f3c37ea35159cd4d7d3c4bb693c9a99f6 (diff)
downloadFreeBSD-src-77f7f98e06db2a573f1d88419542d148554611f7.zip
FreeBSD-src-77f7f98e06db2a573f1d88419542d148554611f7.tar.gz
MFC r287981:
Replace afterinstall: hack from r111083 with 'make delete-old' functionality.
-rw-r--r--ObsoleteFiles.inc6
-rw-r--r--secure/lib/libcrypto/Makefile8
2 files changed, 6 insertions, 8 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 113c4fb..1e9497c 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -6403,6 +6403,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 330b08f..d0b2120 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -402,14 +402,6 @@ opensslconf.h: opensslconf-${MACHINE_CPUARCH}.h
.endif
cp -f ${.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"
OpenPOWER on IntegriCloud