From owner-cvs-src@FreeBSD.ORG Sun Oct 1 00:57:54 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9BAB616A407; Sun, 1 Oct 2006 00:57:54 +0000 (UTC) (envelope-from amdmi3@mail.ru) Received: from mx3.mail.ru (mx3.mail.ru [194.67.23.149]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0406C43D58; Sun, 1 Oct 2006 00:57:52 +0000 (GMT) (envelope-from amdmi3@mail.ru) Received: from [213.148.29.33] (port=5003 helo=nexii.panopticon) by mx3.mail.ru with esmtp id 1GTpeR-0005Cq-00; Sun, 01 Oct 2006 04:57:51 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.2]) by nexii.panopticon (Postfix) with ESMTP id E125F17046; Sun, 1 Oct 2006 04:57:11 +0400 (MSD) Received: by hades.panopticon (Postfix, from userid 1000) id 1D01740BC; Sun, 1 Oct 2006 04:58:02 +0400 (MSD) Date: Sun, 1 Oct 2006 04:58:02 +0400 From: Dmitry Marakasov To: Ruslan Ermilov Message-ID: <20061001005802.GA47847@hades.panopticon> Mail-Followup-To: Ruslan Ermilov , cvs-src@FreeBSD.org References: <200609291934.k8TJYcXo038707@repoman.freebsd.org> <20060930144627.GA16298@hades.panopticon> <20060930153048.GC39704@rambler-co.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline In-Reply-To: <20060930153048.GC39704@rambler-co.ru> User-Agent: Mutt/1.5.13 (2006-08-11) Cc: cvs-src@FreeBSD.org Subject: Re: cvs commit: src ObsoleteFiles.inc X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Oct 2006 00:57:54 -0000 * 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