bin/120492: [patch] OptionalObsoleteFiles.inc - Add files to remove when WITHOUT_IPX and WITHOUT_GCOV are defined

[KAMIYA Satosi]

>Number:         120492
>Category:       bin
>Synopsis:       [patch] OptionalObsoleteFiles.inc - Add files to remove when WITHOUT_IPX and WITHOUT_GCOV are defined
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 10 08:10:02 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     KAMIYA Satosi
>Release:        7.0-RC2
>Organization:
>Environment:
FreeBSD svn01.un.cosat.com 7.0-RC2 FreeBSD 7.0-RC2 #2: Sun Feb 10 09:32:55 JST 2008     h at svn01.un.cosat.com:/usr/obj/usr/src/sys/COSATSVN01  i386
>Description:
'cd /usr/src; make delete-old' should delete files specified files when WITHOUT_IPX and WITHOUT_GCOV are defined
>How-To-Repeat:
write 2 lines in /etc/src.conf:
  WITHOUT_IPX=
  WITHOUT_GCOV=
then, do 'cd /usr/src; make delete-old'

>Fix:
% diff -u /usr/src/tools/build/mk/OptionalObsoleteFiles.inc{.orig,}
--- /usr/src/tools/build/mk/OptionalObsoleteFiles.inc.orig      2008-02-10 16:53:30.000000000 +0900
+++ /usr/src/tools/build/mk/OptionalObsoleteFiles.inc   2008-02-10 16:55:03.000000000 +0900
@@ -385,9 +385,9 @@
 # to be filled in
 #.endif
 
-#.if ${MK_GCOV} == no
-# to be filled in
-#.endif
+.if ${MK_GCOV} == no
+OLD_FILES+=usr/bin/gcov
+.endif
 
 #.if ${MK_GDB} == no
 # to be filled in
@@ -578,9 +578,13 @@
 OLD_FILES+=usr/share/man/man8/ippool.8.gz
 .endif
 
-#.if ${MK_IPX} == no
-# to be filled in
-#.endif
+.if ${MK_IPX} == no
+OLD_FILES+=usr/bin/ncplist
+OLD_FILES+=usr/bin/ncplogin
+OLD_FILES+=usr/bin/ncplogout
+OLD_FILES+=usr/sbin/mount_nwfs
+OLD_FILES+=usr/sbin/IPXrouted
+.endif
 
 .if ${MK_KERBEROS} == no
 OLD_FILES+=usr/bin/ksu


>Release-Note:
>Audit-Trail:
>Unformatted: