Date: Sun, 1 Oct 2006 04:58:02 +0400 From: Dmitry Marakasov <amdmi3@mail.ru> To: Ruslan Ermilov <ru@FreeBSD.org> Cc: cvs-src@FreeBSD.org Subject: Re: cvs commit: src ObsoleteFiles.inc Message-ID: <20061001005802.GA47847@hades.panopticon> In-Reply-To: <20060930153048.GC39704@rambler-co.ru> References: <200609291934.k8TJYcXo038707@repoman.freebsd.org> <20060930144627.GA16298@hades.panopticon> <20060930153048.GC39704@rambler-co.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
* Ruslan Ermilov (ru@FreeBSD.org) wrote:
> > > Modified files: (Branch: RELENG_6)
> > > . ObsoleteFiles.inc
> > > Log:
> > > Shared pcap and pthread (libc_r on alpha and sparc64) libraries moved to /lib.
> > >
> > > Approved by: re (kensmith)
> > Don't forget HEAD also
> Care to prepare a patch for me? ;-)
Let me try. The idea is to remove all instances of libpcap, libpthread
and libc_r from /usr/lib, am I right? This should do the thing, if I've
understood meaning of ObsoleteFiles.inc correctly. If this is right,
similar changes should be committed into RELENG_6 as well.
--- ObsoleteFiles.patch begins here ---
? ObsoleteFiles.patch
Index: ObsoleteFiles.inc
===================================================================
RCS file: /home/ncvs/src/ObsoleteFiles.inc,v
retrieving revision 1.54
diff -u -r1.54 ObsoleteFiles.inc
--- ObsoleteFiles.inc 30 Sep 2006 09:44:58 -0000 1.54
+++ ObsoleteFiles.inc 1 Oct 2006 00:49:57 -0000
@@ -14,6 +14,19 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20061001: libpcap.so.4 moved to /lib/
+OLD_FILES+=usr/lib/libpcap.a
+OLD_FILES+=usr/lib/libpcap.so
+OLD_FILES+=usr/lib/libpcap_p.a
+# 20061001: libpthread.so.2 moved to /lib/
+.if ${TARGET_ARCH} != "alpha" && ${TARGET_ARCH} != "sparc64"
+OLD_FILES+=usr/lib/libpthread.a
+OLD_FILES+=usr/lib/libpthread.so
+OLD_FILES+=usr/lib/libpthread_p.a
+.endif
+OLD_FILES+=usr/lib/libc_r.a
+OLD_FILES+=usr/lib/libc_r.so
+OLD_FILES+=usr/lib/libc_r_p.a
# 20060930: demangle.h from contrib/libstdc++/include/ext/
OLD_FILES+=usr/include/c++/3.4/ext/demangle.h
# 20060929: mrouted removed
@@ -2950,6 +2963,14 @@
# - var/yp/Makefile
+# 20061001: libpcap.so.4 moved to /lib/
+OLD_LIBS+=usr/lib/libpcap.so.4
+# 20061001: libpthread.so.2 moved to /lib/
+.if ${TARGET_ARCH} != "alpha" && ${TARGET_ARCH} != "sparc64"
+OLD_LIBS+=usr/lib/libpthread.so.2
+.else
+OLD_LIBS+=usr/lib/libc_r.so.6
+.endif
# 20060729: OpenSSL 0.9.7e -> 0.9.8b upgrade
OLD_LIBS+=lib/libcrypto.so.4
OLD_LIBS+=usr/lib/libssl.so.4
--- ObsoleteFiles.patch ends here ---
--
Best regards,
Dmitry mailto:amdmi3@mail.ru
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061001005802.GA47847>