From nobody@FreeBSD.org  Tue Feb 26 12:19:48 2008
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6FAF61065671
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 26 Feb 2008 12:19:48 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 758DC13C4D5
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 26 Feb 2008 12:19:48 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m1QCH3NR038382
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 26 Feb 2008 12:17:03 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.2/8.14.1/Submit) id m1QCH3Ai038370;
	Tue, 26 Feb 2008 12:17:03 GMT
	(envelope-from nobody)
Message-Id: <200802261217.m1QCH3Ai038370@www.freebsd.org>
Date: Tue, 26 Feb 2008 12:17:03 GMT
From: Richard Tector <richardtector@thekeelecentre.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update OptionalObsoleteFiles.inc for builds without NCP
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         121118
>Category:       misc
>Synopsis:       Update OptionalObsoleteFiles.inc for builds without NCP
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    antoine
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 26 12:20:03 UTC 2008
>Closed-Date:    Sun Mar 30 14:02:41 UTC 2008
>Last-Modified:  Sun Mar 30 14:02:41 UTC 2008
>Originator:     Richard Tector
>Release:        FreeBSD 7.0-PRERELEASE
>Organization:
CAPL Limited
>Environment:
FreeBSD daffy.tector.org.uk 7.0-PRERELEASE FreeBSD 7.0-PRERELEASE #0: Mon Feb 25 18:07:37 GMT 2008     richard@daffy.tector.org.uk:/usr/obj/usr/src/sys/DAFFY  amd64
>Description:
The attached patch adds a list to tools/build/mk/OptionalObsoleteFiles.inc to remove the files built under the NCP category.
Therefore, setting WITHOUT_NCP=true in src.conf with patch allows make delete-old to remove the relevant files from the base system.

NB. I have added the lib32 alternatives for amd64. I assume these actually need putting under an if ARCH=amd64 if? I did not find any other examples in the original file where lib32/* libraries are set to be removed on a 64bit system.
The patch works fine however on an i386 system I have.
>How-To-Repeat:

>Fix:
See attached patch.

Patch attached with submission follows:

--- tools/build/mk/OptionalObsoleteFiles.inc.old	2008-01-21 18:47:37.000000000 +0000
+++ tools/build/mk/OptionalObsoleteFiles.inc	2008-02-26 12:18:06.000000000 +0000
@@ -940,9 +940,35 @@
 # Listing all of them here is overkill.
 #.endif
 
-#.if ${MK_NCP} == no
-# to be filled in
-#.endif
+.if ${MK_NCP} == no
+OLD_FILES+=usr/bin/ncplist
+OLD_FILES+=usr/bin/ncplogin
+OLD_FILES+=usr/lib/libncp.a 
+OLD_FILES+=usr/lib/libncp.so
+OLD_LIBS+=usr/lib/libncp.so.3
+OLD_FILES+=usr/lib32/libncp.a
+OLD_FILES+=usr/lib32/libncp.so
+OLD_LIBS+=usr/lib32/libncp.so.3
+OLD_FILES+=usr/sbin/mount_nwfs
+OLD_FILES+=usr/share/man/man1/ncplist.1.gz
+OLD_FILES+=usr/share/man/man1/ncplogin.1.gz
+OLD_FILES+=usr/share/man/man8/mount_nwfs.8.gz
+OLD_FILES+=usr/include/netncp/ncp.h
+OLD_FILES+=usr/include/netncp/ncp_cfg.h
+OLD_FILES+=usr/include/netncp/ncp_conn.h
+OLD_FILES+=usr/include/netncp/ncp_file.h
+OLD_FILES+=usr/include/netncp/ncp_lib.h
+OLD_FILES+=usr/include/netncp/ncp_ncp.h
+OLD_FILES+=usr/include/netncp/ncp_nls.h
+OLD_FILES+=usr/include/netncp/ncp_rcfile.h
+OLD_FILES+=usr/include/netncp/ncp_rq.h
+OLD_FILES+=usr/include/netncp/ncp_sock.h
+OLD_FILES+=usr/include/netncp/ncp_subr.h
+OLD_FILES+=usr/include/netncp/ncp_user.h
+OLD_FILES+=usr/include/netncp/ncpio.h
+OLD_FILES+=usr/include/netncp/nwerror.h
+OLD_DIRS+=usr/include/netncp
+.endif
 
 .if ${MK_NETCAT} == no
 OLD_FILES+=usr/bin/nc


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->antoine 
Responsible-Changed-By: antoine 
Responsible-Changed-When: Tue Feb 26 17:53:24 UTC 2008 
Responsible-Changed-Why:  
Take: this is in included in a patch I have for PR 120492. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=121118 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: misc/121118: commit references a PR
Date: Fri, 29 Feb 2008 18:59:59 +0000 (UTC)

 antoine     2008-02-29 18:59:28 UTC
 
   FreeBSD src repository
 
   Modified files:
     tools/build/mk       OptionalObsoleteFiles.inc 
   Log:
   Add files to remove when MK_GCOV, MK_IPX or MK_NCP are defined.
   
   Note: it may be a good idea to deduce obsolete usr/lib32/ files from
   obsolete lib/ and usr/lib/ files.
   
   PR:             120492
   PR:             121118
   PR:             121121
   Submitted by:   KAMIYA Satosi, Richard Tector
   Approved by:    rwatson (mentor)
   MFC after:      1 month
   
   Revision  Changes    Path
   1.13      +57 -9     src/tools/build/mk/OptionalObsoleteFiles.inc
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->patched 
State-Changed-By: antoine 
State-Changed-When: Fri Feb 29 19:11:40 UTC 2008 
State-Changed-Why:  
Patched in HEAD. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=121118 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: misc/121118: commit references a PR
Date: Sun, 30 Mar 2008 13:56:27 +0000 (UTC)

 antoine     2008-03-30 13:56:13 UTC
 
   FreeBSD src repository
 
   Modified files:        (Branch: RELENG_7)
     tools/build/mk       OptionalObsoleteFiles.inc 
   Log:
   MFC to RELENG_7:
     Add files to remove when MK_GCOV, MK_IPX or MK_NCP are defined.
   
     PR:             120492
     PR:             121118
     PR:             121121
     Submitted by:   KAMIYA Satosi, Richard Tector
     Approved by:    rwatson (mentor)
     MFC after:      1 month
   
   Revision  Changes    Path
   1.11.2.2  +61 -9     src/tools/build/mk/OptionalObsoleteFiles.inc
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: antoine 
State-Changed-When: Sun Mar 30 14:02:12 UTC 2008 
State-Changed-Why:  
Close: merged to RELENG_7. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=121118 
>Unformatted:
