Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 3 Oct 2015 16:24:21 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r288611 - in stable/10: . secure/lib/libcrypto
Message-ID:  <201510031624.t93GOLww090318@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bdrewery
Date: Sat Oct  3 16:24:20 2015
New Revision: 288611
URL: https://svnweb.freebsd.org/changeset/base/288611

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

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

Modified: stable/10/ObsoleteFiles.inc
==============================================================================
--- stable/10/ObsoleteFiles.inc	Sat Oct  3 16:21:53 2015	(r288610)
+++ stable/10/ObsoleteFiles.inc	Sat Oct  3 16:24:20 2015	(r288611)
@@ -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

Modified: stable/10/secure/lib/libcrypto/Makefile
==============================================================================
--- stable/10/secure/lib/libcrypto/Makefile	Sat Oct  3 16:21:53 2015	(r288610)
+++ stable/10/secure/lib/libcrypto/Makefile	Sat Oct  3 16:24:20 2015	(r288611)
@@ -402,14 +402,6 @@ opensslconf.h: opensslconf-${MACHINE_CPU
 .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"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510031624.t93GOLww090318>