From owner-p4-projects  Mon Oct 21  9:59:52 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 75E7337B404; Mon, 21 Oct 2002 09:59:28 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0506037B401
	for <perforce@freebsd.org>; Mon, 21 Oct 2002 09:59:28 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 984DA43E65
	for <perforce@freebsd.org>; Mon, 21 Oct 2002 09:59:26 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id g9LGwvmV013540
	for <perforce@freebsd.org>; Mon, 21 Oct 2002 09:58:57 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id g9LGwuFl013537
	for perforce@freebsd.org; Mon, 21 Oct 2002 09:58:56 -0700 (PDT)
Date: Mon, 21 Oct 2002 09:58:56 -0700 (PDT)
Message-Id: <200210211658.g9LGwuFl013537@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 19800 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=19800

Change 19800 by rwatson@rwatson_paprika on 2002/10/21 09:58:55

	Integ TrustedBSD base to MAC, looping back Biba/MLS cleanup
	in prep for user API merge.

Affected files ...

.. //depot/projects/trustedbsd/mac/contrib/gdb/gdb/i386bsd-nat.c#2 integrate
.. //depot/projects/trustedbsd/mac/contrib/groff/tmac/troffrc#4 integrate
.. //depot/projects/trustedbsd/mac/games/Makefile.inc#3 integrate
.. //depot/projects/trustedbsd/mac/games/adventure/Makefile#2 delete
.. //depot/projects/trustedbsd/mac/games/adventure/adventure.6#2 delete
.. //depot/projects/trustedbsd/mac/games/adventure/crc.c#3 delete
.. //depot/projects/trustedbsd/mac/games/adventure/done.c#3 delete
.. //depot/projects/trustedbsd/mac/games/adventure/glorkz#2 delete
.. //depot/projects/trustedbsd/mac/games/adventure/hdr.h#3 delete
.. //depot/projects/trustedbsd/mac/games/adventure/init.c#3 delete
.. //depot/projects/trustedbsd/mac/games/adventure/io.c#3 delete
.. //depot/projects/trustedbsd/mac/games/adventure/main.c#2 delete
.. //depot/projects/trustedbsd/mac/games/adventure/save.c#3 delete
.. //depot/projects/trustedbsd/mac/games/adventure/setup.c#3 delete
.. //depot/projects/trustedbsd/mac/games/adventure/subr.c#3 delete
.. //depot/projects/trustedbsd/mac/games/adventure/vocab.c#3 delete
.. //depot/projects/trustedbsd/mac/games/adventure/wizard.c#3 delete
.. //depot/projects/trustedbsd/mac/games/arithmetic/Makefile#2 delete
.. //depot/projects/trustedbsd/mac/games/arithmetic/arithmetic.6#2 delete
.. //depot/projects/trustedbsd/mac/games/arithmetic/arithmetic.c#3 delete
.. //depot/projects/trustedbsd/mac/games/atc/BUGS#2 delete
.. //depot/projects/trustedbsd/mac/games/atc/Makefile#3 delete
.. //depot/projects/trustedbsd/mac/games/atc/atc.6#2 delete
.. //depot/projects/trustedbsd/mac/games/atc/def.h#2 delete
.. //depot/projects/trustedbsd/mac/games/atc/extern.c#2 delete
.. //depot/projects/trustedbsd/mac/games/atc/extern.h#2 delete
.. //depot/projects/trustedbsd/mac/games/atc/games/Game_List#2 delete
.. //depot/projects/trustedbsd/mac/games/atc/games/Killer#2 delete
.. //depot/projects/trustedbsd/mac/games/atc/games/crossover#2 delete
.. //depot/projects/trustedbsd/mac/games/atc/games/default#2 delete
.. //depot/projects/trustedbsd/mac/games/atc/games/easy#2 delete
.. //depot/projects/trustedbsd/mac/games/atc/games/game_2#2 delete
.. //depot/projects/trustedbsd/mac/games/atc/grammar.y#2 delete
.. //depot/projects/trustedbsd/mac/games/atc/graphics.c#2 delete
.. //depot/projects/trustedbsd/mac/games/atc/include.h#2 delete
.. //depot/projects/trustedbsd/mac/games/atc/input.c#3 delete
.. //depot/projects/trustedbsd/mac/games/atc/lex.l#2 delete
.. //depot/projects/trustedbsd/mac/games/atc/list.c#2 delete
.. //depot/projects/trustedbsd/mac/games/atc/log.c#3 delete
.. //depot/projects/trustedbsd/mac/games/atc/main.c#3 delete
.. //depot/projects/trustedbsd/mac/games/atc/pathnames.h#2 delete
.. //depot/projects/trustedbsd/mac/games/atc/struct.h#2 delete
.. //depot/projects/trustedbsd/mac/games/atc/tunable.c#2 delete
.. //depot/projects/trustedbsd/mac/games/atc/tunable.h#2 delete
.. //depot/projects/trustedbsd/mac/games/atc/update.c#3 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/Makefile#2 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/backgammon/Makefile#2 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/backgammon/backgammon.6#2 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/backgammon/extra.c#2 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/backgammon/main.c#3 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/backgammon/move.c#2 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/backgammon/text.c#2 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/backgammon/version.c#2 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/common_source/allow.c#2 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/common_source/back.h#2 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/common_source/board.c#2 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/common_source/check.c#2 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/common_source/fancy.c#3 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/common_source/init.c#2 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/common_source/odds.c#2 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/common_source/one.c#2 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/common_source/save.c#2 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/common_source/subs.c#3 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/common_source/table.c#2 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/teachgammon/Makefile#2 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/teachgammon/data.c#2 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/teachgammon/teach.c#3 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/teachgammon/ttext1.c#2 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/teachgammon/ttext2.c#2 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/teachgammon/tutor.c#2 delete
.. //depot/projects/trustedbsd/mac/games/backgammon/teachgammon/tutor.h#2 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/Makefile#3 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/battlestar.6#2 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/battlestar.c#2 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/com1.c#3 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/com2.c#3 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/com3.c#2 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/com4.c#2 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/com5.c#2 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/com6.c#3 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/com7.c#2 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/cypher.c#2 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/dayfile.c#2 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/dayobjs.c#2 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/externs.h#3 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/fly.c#3 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/getcom.c#2 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/globals.c#2 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/init.c#3 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/misc.c#2 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/nightfile.c#2 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/nightobjs.c#2 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/parse.c#3 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/pathnames.h#2 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/room.c#2 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/save.c#2 delete
.. //depot/projects/trustedbsd/mac/games/battlestar/words.c#2 delete
.. //depot/projects/trustedbsd/mac/games/bs/Makefile#2 delete
.. //depot/projects/trustedbsd/mac/games/bs/bs.6#2 delete
.. //depot/projects/trustedbsd/mac/games/bs/bs.c#4 delete
.. //depot/projects/trustedbsd/mac/games/canfield/Makefile#2 delete
.. //depot/projects/trustedbsd/mac/games/canfield/canfield/Makefile#3 delete
.. //depot/projects/trustedbsd/mac/games/canfield/canfield/canfield.6#2 delete
.. //depot/projects/trustedbsd/mac/games/canfield/canfield/canfield.c#3 delete
.. //depot/projects/trustedbsd/mac/games/canfield/canfield/pathnames.h#2 delete
.. //depot/projects/trustedbsd/mac/games/canfield/cfscores/Makefile#2 delete
.. //depot/projects/trustedbsd/mac/games/canfield/cfscores/cfscores.c#4 delete
.. //depot/projects/trustedbsd/mac/games/cribbage/Makefile#4 delete
.. //depot/projects/trustedbsd/mac/games/cribbage/cards.c#2 delete
.. //depot/projects/trustedbsd/mac/games/cribbage/crib.c#2 delete
.. //depot/projects/trustedbsd/mac/games/cribbage/cribbage.6#2 delete
.. //depot/projects/trustedbsd/mac/games/cribbage/cribbage.h#4 delete
.. //depot/projects/trustedbsd/mac/games/cribbage/cribbage.n#2 delete
.. //depot/projects/trustedbsd/mac/games/cribbage/cribcur.h#2 delete
.. //depot/projects/trustedbsd/mac/games/cribbage/deck.h#3 delete
.. //depot/projects/trustedbsd/mac/games/cribbage/extern.c#2 delete
.. //depot/projects/trustedbsd/mac/games/cribbage/instr.c#3 delete
.. //depot/projects/trustedbsd/mac/games/cribbage/io.c#3 delete
.. //depot/projects/trustedbsd/mac/games/cribbage/pathnames.h#2 delete
.. //depot/projects/trustedbsd/mac/games/cribbage/score.c#2 delete
.. //depot/projects/trustedbsd/mac/games/cribbage/support.c#2 delete
.. //depot/projects/trustedbsd/mac/games/dm/Makefile#2 delete
.. //depot/projects/trustedbsd/mac/games/dm/dm.8#2 delete
.. //depot/projects/trustedbsd/mac/games/dm/dm.c#3 delete
.. //depot/projects/trustedbsd/mac/games/dm/dm.conf.5#2 delete
.. //depot/projects/trustedbsd/mac/games/dm/pathnames.h#2 delete
.. //depot/projects/trustedbsd/mac/games/fish/Makefile#3 delete
.. //depot/projects/trustedbsd/mac/games/fish/fish.6#2 delete
.. //depot/projects/trustedbsd/mac/games/fish/fish.c#3 delete
.. //depot/projects/trustedbsd/mac/games/fish/fish.instr#2 delete
.. //depot/projects/trustedbsd/mac/games/fish/pathnames.h#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/COPYRIGHT#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/Makefile#4 delete
.. //depot/projects/trustedbsd/mac/games/hack/Makequest#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/OWNER#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/Original_READ_ME#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/READ_ME#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/alloc.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/config.h#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/data#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/date.h#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/def.edog.h#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/def.eshk.h#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/def.flag.h#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/def.func_tab.h#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/def.gen.h#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/def.gold.h#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/def.mkroom.h#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/def.monst.h#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/def.obj.h#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/def.objclass.h#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/def.objects.h#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/def.permonst.h#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/def.rm.h#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/def.trap.h#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/def.wseg.h#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.6#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.Decl.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.apply.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.bones.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.c#4 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.cmd.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.do.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.do_name.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.do_wear.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.dog.c#4 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.eat.c#4 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.end.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.engrave.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.fight.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.fix#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.h#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.invent.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.ioctl.c#4 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.lev.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.main.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.makemon.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.mfndpos.h#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.mhitu.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.mklev.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.mkmaze.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.mkobj.c#4 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.mkshop.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.mon.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.monst.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.o_init.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.objnam.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.options.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.pager.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.potion.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.pri.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.read.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.rip.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.rumors.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.save.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.search.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.sh#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.shk.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.shknam.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.steal.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.termcap.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.timeout.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.topl.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.track.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.trap.c#4 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.tty.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.u_init.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.unix.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.vault.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.version.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.wield.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.wizard.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.worm.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.worn.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/hack.zap.c#3 delete
.. //depot/projects/trustedbsd/mac/games/hack/help#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/hh#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/makedefs.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/pathnames.h#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/rnd.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hack/rumors#2 delete
.. //depot/projects/trustedbsd/mac/games/hangman/Makefile#2 delete
.. //depot/projects/trustedbsd/mac/games/hangman/endgame.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hangman/extern.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hangman/getguess.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hangman/getword.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hangman/hangman.6#2 delete
.. //depot/projects/trustedbsd/mac/games/hangman/hangman.h#3 delete
.. //depot/projects/trustedbsd/mac/games/hangman/main.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hangman/pathnames.h#2 delete
.. //depot/projects/trustedbsd/mac/games/hangman/playgame.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hangman/prdata.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hangman/prman.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hangman/prword.c#2 delete
.. //depot/projects/trustedbsd/mac/games/hangman/setup.c#2 delete
.. //depot/projects/trustedbsd/mac/games/larn/COPYRIGHT#2 delete
.. //depot/projects/trustedbsd/mac/games/larn/Fixed.Bugs#2 delete
.. //depot/projects/trustedbsd/mac/games/larn/Makefile#4 delete
.. //depot/projects/trustedbsd/mac/games/larn/OWNER#2 delete
.. //depot/projects/trustedbsd/mac/games/larn/README#2 delete
.. //depot/projects/trustedbsd/mac/games/larn/bill.c#2 delete
.. //depot/projects/trustedbsd/mac/games/larn/config.c#2 delete
.. //depot/projects/trustedbsd/mac/games/larn/create.c#2 delete
.. //depot/projects/trustedbsd/mac/games/larn/data.c#2 delete
.. //depot/projects/trustedbsd/mac/games/larn/datfiles/larn.help#2 delete
.. //depot/projects/trustedbsd/mac/games/larn/datfiles/larnmaze#2 delete
.. //depot/projects/trustedbsd/mac/games/larn/datfiles/larnopts#2 delete
.. //depot/projects/trustedbsd/mac/games/larn/diag.c#3 delete
.. //depot/projects/trustedbsd/mac/games/larn/display.c#2 delete
.. //depot/projects/trustedbsd/mac/games/larn/fortune.c#2 delete
.. //depot/projects/trustedbsd/mac/games/larn/global.c#3 delete
.. //depot/projects/trustedbsd/mac/games/larn/header.h#3 delete
.. //depot/projects/trustedbsd/mac/games/larn/help.c#3 delete
.. //depot/projects/trustedbsd/mac/games/larn/holidays#2 delete
.. //depot/projects/trustedbsd/mac/games/larn/io.c#3 delete
.. //depot/projects/trustedbsd/mac/games/larn/larn.6#2 delete
.. //depot/projects/trustedbsd/mac/games/larn/main.c#3 delete
.. //depot/projects/trustedbsd/mac/games/larn/monster.c#2 delete
.. //depot/projects/trustedbsd/mac/games/larn/moreobj.c#2 delete
.. //depot/projects/trustedbsd/mac/games/larn/movem.c#2 delete
.. //depot/projects/trustedbsd/mac/games/larn/nap.c#3 delete
.. //depot/projects/trustedbsd/mac/games/larn/object.c#3 delete
.. //depot/projects/trustedbsd/mac/games/larn/pathnames.h#2 delete
.. //depot/projects/trustedbsd/mac/games/larn/regen.c#2 delete
.. //depot/projects/trustedbsd/mac/games/larn/savelev.c#2 delete
.. //depot/projects/trustedbsd/mac/games/larn/scores.c#3 delete
.. //depot/projects/trustedbsd/mac/games/larn/signal.c#3 delete
.. //depot/projects/trustedbsd/mac/games/larn/store.c#2 delete
.. //depot/projects/trustedbsd/mac/games/larn/tok.c#3 delete
.. //depot/projects/trustedbsd/mac/games/mille/Makefile#2 delete
.. //depot/projects/trustedbsd/mac/games/mille/comp.c#3 delete
.. //depot/projects/trustedbsd/mac/games/mille/end.c#4 delete
.. //depot/projects/trustedbsd/mac/games/mille/extern.c#3 delete
.. //depot/projects/trustedbsd/mac/games/mille/init.c#3 delete
.. //depot/projects/trustedbsd/mac/games/mille/mille.6#2 delete
.. //depot/projects/trustedbsd/mac/games/mille/mille.c#4 delete
.. //depot/projects/trustedbsd/mac/games/mille/mille.h#4 delete
.. //depot/projects/trustedbsd/mac/games/mille/misc.c#3 delete
.. //depot/projects/trustedbsd/mac/games/mille/move.c#4 delete
.. //depot/projects/trustedbsd/mac/games/mille/print.c#4 delete
.. //depot/projects/trustedbsd/mac/games/mille/roll.c#3 delete
.. //depot/projects/trustedbsd/mac/games/mille/save.c#4 delete
.. //depot/projects/trustedbsd/mac/games/mille/types.c#3 delete
.. //depot/projects/trustedbsd/mac/games/mille/varpush.c#3 delete
.. //depot/projects/trustedbsd/mac/games/phantasia/COPYRIGHT#2 delete
.. //depot/projects/trustedbsd/mac/games/phantasia/Makefile#3 delete
.. //depot/projects/trustedbsd/mac/games/phantasia/OWNER#2 delete
.. //depot/projects/trustedbsd/mac/games/phantasia/README#2 delete
.. //depot/projects/trustedbsd/mac/games/phantasia/fight.c#3 delete
.. //depot/projects/trustedbsd/mac/games/phantasia/gamesupport.c#2 delete
.. //depot/projects/trustedbsd/mac/games/phantasia/include.h#2 delete
.. //depot/projects/trustedbsd/mac/games/phantasia/interplayer.c#2 delete
.. //depot/projects/trustedbsd/mac/games/phantasia/io.c#2 delete
.. //depot/projects/trustedbsd/mac/games/phantasia/macros.h#2 delete
.. //depot/projects/trustedbsd/mac/games/phantasia/main.c#2 delete
.. //depot/projects/trustedbsd/mac/games/phantasia/map.c#2 delete
.. //depot/projects/trustedbsd/mac/games/phantasia/misc.c#4 delete
.. //depot/projects/trustedbsd/mac/games/phantasia/monsters.asc#2 delete
.. //depot/projects/trustedbsd/mac/games/phantasia/pathnames.h#2 delete
.. //depot/projects/trustedbsd/mac/games/phantasia/phantasia.6#2 delete
.. //depot/projects/trustedbsd/mac/games/phantasia/phantdefs.h#2 delete
.. //depot/projects/trustedbsd/mac/games/phantasia/phantglobs.c#2 delete
.. //depot/projects/trustedbsd/mac/games/phantasia/phantglobs.h#2 delete
.. //depot/projects/trustedbsd/mac/games/phantasia/phantstruct.h#2 delete
.. //depot/projects/trustedbsd/mac/games/phantasia/setup.c#3 delete
.. //depot/projects/trustedbsd/mac/games/piano/Makefile#2 delete
.. //depot/projects/trustedbsd/mac/games/piano/README#2 delete
.. //depot/projects/trustedbsd/mac/games/piano/piano.6#2 delete
.. //depot/projects/trustedbsd/mac/games/piano/piano.c#3 delete
.. //depot/projects/trustedbsd/mac/games/pig/Makefile#2 delete
.. //depot/projects/trustedbsd/mac/games/pig/pig.6#2 delete
.. //depot/projects/trustedbsd/mac/games/pig/pig.c#3 delete
.. //depot/projects/trustedbsd/mac/games/quiz/Makefile#3 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/africa#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/america#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/areas#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/arith#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/asia#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/babies#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/bard#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/chinese#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/collectives#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/ed#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/elements#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/europe#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/flowers#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/greek#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/inca#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/index#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/latin#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/locomotive#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/midearth#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/morse#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/mult#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/murders#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/poetry#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/posneg#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/pres#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/province#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/seq-easy#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/seq-hard#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/sexes#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/sov#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/spell#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/state#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/trek#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/datfiles/ucc#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/pathnames.h#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/quiz.6#2 delete
.. //depot/projects/trustedbsd/mac/games/quiz/quiz.c#4 delete
.. //depot/projects/trustedbsd/mac/games/quiz/quiz.h#3 delete
.. //depot/projects/trustedbsd/mac/games/quiz/rxp.c#3 delete
.. //depot/projects/trustedbsd/mac/games/rain/Makefile#2 delete
.. //depot/projects/trustedbsd/mac/games/rain/rain.6#2 delete
.. //depot/projects/trustedbsd/mac/games/rain/rain.c#3 delete
.. //depot/projects/trustedbsd/mac/games/robots/Makefile#3 delete
.. //depot/projects/trustedbsd/mac/games/robots/extern.c#2 delete
.. //depot/projects/trustedbsd/mac/games/robots/flush_in.c#3 delete
.. //depot/projects/trustedbsd/mac/games/robots/init_field.c#2 delete
.. //depot/projects/trustedbsd/mac/games/robots/main.c#2 delete
.. //depot/projects/trustedbsd/mac/games/robots/make_level.c#2 delete
.. //depot/projects/trustedbsd/mac/games/robots/move.c#2 delete
.. //depot/projects/trustedbsd/mac/games/robots/move_robs.c#3 delete
.. //depot/projects/trustedbsd/mac/games/robots/pathnames.h#2 delete
.. //depot/projects/trustedbsd/mac/games/robots/play_level.c#3 delete
.. //depot/projects/trustedbsd/mac/games/robots/query.c#2 delete
.. //depot/projects/trustedbsd/mac/games/robots/rnd_pos.c#2 delete
.. //depot/projects/trustedbsd/mac/games/robots/robots.6#2 delete
.. //depot/projects/trustedbsd/mac/games/robots/robots.h#2 delete
.. //depot/projects/trustedbsd/mac/games/robots/score.c#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/CHANGES#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/Makefile#3 delete
.. //depot/projects/trustedbsd/mac/games/rogue/USD.doc/Makefile#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/USD.doc/rogue.me#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/hit.c#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/init.c#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/inventory.c#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/level.c#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/machdep.c#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/main.c#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/message.c#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/monster.c#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/move.c#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/object.c#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/pack.c#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/pathnames.h#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/play.c#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/random.c#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/ring.c#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/rogue.6#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/rogue.h#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/room.c#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/save.c#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/score.c#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/spec_hit.c#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/throw.c#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/trap.c#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/use.c#2 delete
.. //depot/projects/trustedbsd/mac/games/rogue/zap.c#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/Makefile#3 delete
.. //depot/projects/trustedbsd/mac/games/sail/assorted.c#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/dr_1.c#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/dr_2.c#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/dr_3.c#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/dr_4.c#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/dr_5.c#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/dr_main.c#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/driver.h#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/externs.h#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/game.c#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/globals.c#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/lo_main.c#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/machdep.h#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/main.c#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/misc.c#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/parties.c#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/pathnames.h#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/pl_1.c#3 delete
.. //depot/projects/trustedbsd/mac/games/sail/pl_2.c#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/pl_3.c#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/pl_4.c#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/pl_5.c#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/pl_6.c#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/pl_7.c#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/pl_main.c#3 delete
.. //depot/projects/trustedbsd/mac/games/sail/player.h#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/sail.6#3 delete
.. //depot/projects/trustedbsd/mac/games/sail/sync.c#2 delete
.. //depot/projects/trustedbsd/mac/games/sail/version.c#2 delete
.. //depot/projects/trustedbsd/mac/games/snake/Makefile#2 delete
.. //depot/projects/trustedbsd/mac/games/snake/snake/Makefile#3 delete
.. //depot/projects/trustedbsd/mac/games/snake/snake/move.c#4 delete
.. //depot/projects/trustedbsd/mac/games/snake/snake/pathnames.h#2 delete
.. //depot/projects/trustedbsd/mac/games/snake/snake/snake.6#2 delete
.. //depot/projects/trustedbsd/mac/games/snake/snake/snake.c#2 delete
.. //depot/projects/trustedbsd/mac/games/snake/snake/snake.h#3 delete
.. //depot/projects/trustedbsd/mac/games/snake/snscore/Makefile#2 delete
.. //depot/projects/trustedbsd/mac/games/snake/snscore/snscore.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/DOC/read_me.nr#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/DOC/things#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/DOC/trekmanual.nr#3 delete
.. //depot/projects/trustedbsd/mac/games/trek/Makefile#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/USD.doc/Makefile#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/USD.doc/spell.ok#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/USD.doc/trek.me#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/abandon.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/attack.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/autover.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/capture.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/cgetc.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/check_out.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/checkcond.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/compkl.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/computer.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/damage.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/damaged.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/dcrept.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/destruct.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/dock.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/dumpgame.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/dumpme.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/dumpssradio.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/events.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/externs.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/getcodi.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/getpar.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/getpar.h#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/help.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/impulse.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/initquad.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/kill.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/klmove.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/lose.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/lrscan.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/main.c#3 delete
.. //depot/projects/trustedbsd/mac/games/trek/move.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/nova.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/out.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/phaser.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/play.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/ram.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/ranf.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/rest.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/schedule.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/score.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/setup.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/setwarp.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/shield.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/snova.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/srscan.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/systemname.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/torped.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/trek.6#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/trek.h#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/utility.c#3 delete
.. //depot/projects/trustedbsd/mac/games/trek/visual.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/warp.c#2 delete
.. //depot/projects/trustedbsd/mac/games/trek/win.c#2 delete
.. //depot/projects/trustedbsd/mac/games/wargames/Makefile#4 delete
.. //depot/projects/trustedbsd/mac/games/wargames/wargames.6#4 delete
.. //depot/projects/trustedbsd/mac/games/wargames/wargames.c#3 delete
.. //depot/projects/trustedbsd/mac/games/worm/Makefile#2 delete
.. //depot/projects/trustedbsd/mac/games/worm/worm.6#2 delete
.. //depot/projects/trustedbsd/mac/games/worm/worm.c#3 delete
.. //depot/projects/trustedbsd/mac/games/worms/Makefile#2 delete
.. //depot/projects/trustedbsd/mac/games/worms/worms.6#2 delete
.. //depot/projects/trustedbsd/mac/games/worms/worms.c#3 delete
.. //depot/projects/trustedbsd/mac/games/wump/Makefile#3 delete
.. //depot/projects/trustedbsd/mac/games/wump/pathnames.h#2 delete
.. //depot/projects/trustedbsd/mac/games/wump/wump.6#2 delete
.. //depot/projects/trustedbsd/mac/games/wump/wump.c#3 delete
.. //depot/projects/trustedbsd/mac/games/wump/wump.info#2 delete
.. //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/roff/groff/Makefile#3 integrate
.. //depot/projects/trustedbsd/mac/gnu/usr.bin/man/apropos/apropos.sh#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_clr_watch.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_set_watch.c#3 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/posix1e/Makefile.inc#18 integrate
.. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_internal.h#5 delete
.. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_sebsd.c#4 delete
.. //depot/projects/trustedbsd/mac/lib/libc/posix1e/mac_text.c#28 branch
.. //depot/projects/trustedbsd/mac/lib/libfetch/Makefile#7 integrate
.. //depot/projects/trustedbsd/mac/lib/libkvm/kvm_ia64.c#2 integrate
.. //depot/projects/trustedbsd/mac/release/Makefile#29 integrate
.. //depot/projects/trustedbsd/mac/release/alpha/drivers.conf#4 integrate
.. //depot/projects/trustedbsd/mac/release/i386/drivers.conf#7 integrate
.. //depot/projects/trustedbsd/mac/release/pc98/drivers.conf#6 integrate
.. //depot/projects/trustedbsd/mac/sbin/gbde/Makefile#2 integrate
.. //depot/projects/trustedbsd/mac/sbin/ping/ping.c#11 integrate
.. //depot/projects/trustedbsd/mac/share/doc/usd/30.rogue/Makefile#3 delete
.. //depot/projects/trustedbsd/mac/share/doc/usd/31.trek/Makefile#3 delete
.. //depot/projects/trustedbsd/mac/share/man/man5/drivers.conf.5#4 integrate
.. //depot/projects/trustedbsd/mac/share/man/man8/intro.8#5 integrate
.. //depot/projects/trustedbsd/mac/share/man/man8/rc.sendmail.8#4 integrate
.. //depot/projects/trustedbsd/mac/share/man/man9/mutex.9#6 integrate
.. //depot/projects/trustedbsd/mac/sys/alpha/include/bus.h#5 integrate
.. //depot/projects/trustedbsd/mac/sys/conf/files#62 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/firewire/bus_mgm.c#2 delete
.. //depot/projects/trustedbsd/mac/sys/dev/firewire/firewire.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/dev/firewire/fw_tap.c#2 delete
.. //depot/projects/trustedbsd/mac/sys/dev/firewire/sbp.c#2 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/isa/if_le.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/i386/isa/if_rdp.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_ipr.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/i4b/driver/i4b_isppp.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#321 integrate
.. //depot/projects/trustedbsd/mac/sys/modules/Makefile#42 integrate
.. //depot/projects/trustedbsd/mac/sys/net/bpf.c#19 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_arcsubr.c#5 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_ethersubr.c#25 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_fddisubr.c#11 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_iso88025subr.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_sl.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/net/if_vlan.c#10 integrate
.. //depot/projects/trustedbsd/mac/sys/net/ppp_tty.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/netgraph/ng_iface.c#7 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/in_pcb.c#17 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/in_pcb.h#13 integrate
.. //depot/projects/trustedbsd/mac/sys/netinet/tcp_usrreq.c#12 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_tl.c#8 integrate
.. //depot/projects/trustedbsd/mac/sys/pci/if_tlreg.h#2 integrate
.. //depot/projects/trustedbsd/mac/sys/powerpc/include/pcb.h#6 integrate
.. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/genassym.c#9 integrate
.. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/swtch.s#7 integrate
.. //depot/projects/trustedbsd/mac/sys/powerpc/powerpc/vm_machdep.c#13 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#139 integrate
.. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#122 integrate

Differences ...

==== //depot/projects/trustedbsd/mac/contrib/gdb/gdb/i386bsd-nat.c#2 (text+ko) ====

@@ -18,6 +18,8 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+/* $FreeBSD: src/contrib/gdb/gdb/i386bsd-nat.c,v 1.2 2002/10/21 05:33:05 phk Exp $ */
+
 #include "defs.h"
 #include "inferior.h"
 #include "regcache.h"
@@ -305,7 +307,7 @@
   /* For some mysterious reason, some of the reserved bits in the
      debug control register get set.  Mask these off, otherwise the
      ptrace call below will fail.  */
-  dbregs.dr7 &= ~(0x0000fc00);
+  dbregs.dr[7] &= ~(0x0000fc00);
 
   DBREG_DRX ((&dbregs), regnum) = value;
 
@@ -354,7 +356,7 @@
     return 0;
 #endif
 
-  return dbregs.dr6;
+  return dbregs.dr[6];
 }
 
 #endif /* PT_GETDBREGS */

==== //depot/projects/trustedbsd/mac/contrib/groff/tmac/troffrc#4 (text+ko) ====

@@ -1,5 +1,5 @@
 .\" Startup file for troff.
-.\" $FreeBSD: src/contrib/groff/tmac/troffrc,v 1.11 2002/10/18 09:10:44 ru Exp $
+.\" $FreeBSD: src/contrib/groff/tmac/troffrc,v 1.12 2002/10/21 12:29:57 ru Exp $
 .
 .\" This is tested by pic.
 .nr 0p 0
@@ -46,6 +46,6 @@
 .\}
 .
 .\" Disable SGR support in grotty(1).
-.if n .do nop \X'tty: sgr 0'\c
+.if n .do output "x X tty: sgr 0
 .
 .\" Don't let blank lines creep in here.

==== //depot/projects/trustedbsd/mac/games/Makefile.inc#3 (text+ko) ====

@@ -1,13 +1,5 @@
 #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/games/Makefile.inc,v 1.15 2001/12/17 15:23:56 ru Exp $
+# $FreeBSD: src/games/Makefile.inc,v 1.16 2002/10/21 10:05:14 markm Exp $
 
 BINDIR?=	/usr/games
 FILESDIR?=	${SHAREDIR}/games
-
-.if defined(HIDEGAME)
-ORIGBINDIR:=	${BINDIR}
-BINDIR:=	${BINDIR}/hide
-ORIGBINGRP:=	${BINGRP}
-BINGRP=		games
-BINMODE=	550
-.endif

==== //depot/projects/trustedbsd/mac/gnu/usr.bin/groff/src/roff/groff/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/groff/src/roff/groff/Makefile,v 1.3 2002/04/11 11:06:05 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/groff/src/roff/groff/Makefile,v 1.5 2002/10/21 03:21:50 obrien Exp $
 
 PROG_CXX=	groff
 SRCS=		groff.cc pipeline.c
@@ -6,4 +6,10 @@
 LDADD=		${LIBGROFF} -lm
 CLEANFILES=	${MAN}
 
+.if ${MACHINE_ARCH} == "alpha"
+#XXXX ld produces only one PT_LOAD segment when this binary
+#XXXX is linked dynamically, which confuses the rtld
+NOSHARED?=	yes
+.endif
+
 .include <bsd.prog.mk>

==== //depot/projects/trustedbsd/mac/gnu/usr.bin/man/apropos/apropos.sh#3 (text+ko) ====

@@ -15,14 +15,14 @@
 # The University of Texas at Austin
 # Austin, Texas  78712
 #
-# $FreeBSD: src/gnu/usr.bin/man/apropos/apropos.sh,v 1.15 2002/08/07 17:39:35 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/man/apropos/apropos.sh,v 1.16 2002/10/21 07:44:42 ru Exp $
 
 
 PATH=/bin:/usr/bin:$PATH
 db=whatis	# name of whatis data base
 grepopt=''
 
-# man -k complain if exit_nomatch=1 and no keyword matched
+# man -k complains if exit_nomatch=1 and no keyword matched
 : ${exit_nomatch=0}	
 exit_error=2
 
@@ -41,7 +41,7 @@
 # test manpath
 manpath=`%bindir%/manpath -q | tr : '\040'`
 case X"$manpath" in X) 
-	echo "`basename $0`: manpath is null, use \"/usr/share/man\"" >&2
+	echo "`basename $0`: manpath is null, using \"/usr/share/man\"" >&2
 	manpath=/usr/share/man
 	;;
 esac

==== //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_clr_watch.c#3 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_clr_watch.c,v 1.2 2002/03/22 21:52:11 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_clr_watch.c,v 1.3 2002/10/21 03:47:22 sam Exp $");
 
 #include <machine/reg.h>
 #include <machine/sysarch.h>
@@ -39,7 +39,7 @@
 	if (watchnum < 0 || watchnum >= 4)
 		return -1;
 
-	d->dr7 = d->dr7 & ~((0x3 << (watchnum*2)) | (0x0f << (watchnum*4+16)));
+	DBREG_DRX(d,7) = DBREG_DRX(d,7) & ~((0x3 << (watchnum*2)) | (0x0f << (watchnum*4+16)));
         DBREG_DRX(d,watchnum) = 0;
 
 	return 0;

==== //depot/projects/trustedbsd/mac/lib/libc/i386/sys/i386_set_watch.c#3 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_set_watch.c,v 1.2 2002/03/22 21:52:11 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/i386/sys/i386_set_watch.c,v 1.3 2002/10/21 03:47:22 sam Exp $");
 
 #include <machine/reg.h>
 #include <machine/sysarch.h>
@@ -41,7 +41,7 @@
 
 	if (watchnum == -1) {
 		for (i = 0, mask = 0x3; i < 4; i++, mask <<= 2)
-			if ((d->dr7 & mask) == 0)
+			if ((DBREG_DRX(d,7) & mask) == 0)
 				break;
 		if (i < 4)
 			watchnum = i;
@@ -72,13 +72,13 @@
 	mask |= access;
 
 	/* clear the bits we are about to affect */
-	d->dr7 &= ~((0x3 << (watchnum*2)) | (0x0f << (watchnum*4+16)));
+	DBREG_DRX(d,7) &= ~((0x3 << (watchnum*2)) | (0x0f << (watchnum*4+16)));
 
 	/* set drN register to the address, N=watchnum */
 	DBREG_DRX(d,watchnum) = watchaddr;
 
 	/* enable the watchpoint */
-	d->dr7 |= (0x2 << (watchnum*2)) | (mask << (watchnum*4+16));
+	DBREG_DRX(d,7) |= (0x2 << (watchnum*2)) | (mask << (watchnum*4+16));
 
 	return watchnum;
 }

==== //depot/projects/trustedbsd/mac/lib/libc/posix1e/Makefile.inc#18 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.9 2002/08/02 21:14:42 rwatson Exp $
+# $FreeBSD: src/lib/libc/posix1e/Makefile.inc,v 1.10 2002/10/21 03:54:24 rwatson Exp $
 
 MAINTAINER=	rwatson@FreeBSD.org
 

==== //depot/projects/trustedbsd/mac/lib/libfetch/Makefile#7 (text+ko) ====

@@ -1,8 +1,8 @@
-# $FreeBSD: src/lib/libfetch/Makefile,v 1.32 2002/09/28 00:25:29 peter Exp $
+# $FreeBSD: src/lib/libfetch/Makefile,v 1.33 2002/10/20 23:50:28 obrien Exp $
 
 MAINTAINER=	des@freebsd.org
 LIB=		fetch
-WARNS?=		4
+WARNS?=		2
 CFLAGS+=	-I.
 CFLAGS+=	-DINET6
 SRCS=		fetch.c common.c ftp.c http.c file.c \
@@ -17,8 +17,6 @@
 LDADD=		-lssl -lcrypto
 .endif
 
-NO_WERROR=	yes
-
 SHLIB_MAJOR=    3
 
 ftperr.h: ftp.errors

==== //depot/projects/trustedbsd/mac/lib/libkvm/kvm_ia64.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/* $FreeBSD: src/lib/libkvm/kvm_ia64.c,v 1.2 2001/10/25 09:08:21 dfr Exp $ */
+/* $FreeBSD: src/lib/libkvm/kvm_ia64.c,v 1.3 2002/10/21 04:21:12 marcel Exp $ */
 /*	$NetBSD: kvm_alpha.c,v 1.7.2.1 1997/11/02 20:34:26 mellon Exp $	*/
 
 /*
@@ -28,56 +28,125 @@
  * rights to redistribute these changes.
  */
 
-#include <sys/param.h>
-#include <sys/lock.h>
-#include <sys/mutex.h>
-#include <sys/user.h>
-#include <sys/proc.h>
-#include <sys/stat.h>
 #include <sys/types.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <nlist.h>
-#include <kvm.h>
+#include <sys/elf64.h>
+#include <sys/mman.h>
 
-#include <vm/vm.h>
-#include <vm/vm_param.h>
+#include <machine/pte.h>
 
+#include <kvm.h>
 #include <limits.h>
 #include <stdlib.h>
-#include <machine/pmap.h>
+#include <unistd.h>
+
 #include "kvm_private.h"
 
-static off_t   _kvm_pa2off(kvm_t *kd, u_long pa);
+#define	REGION_BASE(n)		(((uint64_t)(n)) << 61)
+#define	REGION_ADDR(x)		((x) & ((1LL<<61)-1LL))
+
+#define	NKPTEPG(ps)		((ps) / sizeof(struct ia64_lpte))
+#define	KPTE_PTE_INDEX(va,ps)	(((va)/(ps)) % NKPTEPG(ps))
+#define	KPTE_DIR_INDEX(va,ps)	(((va)/(ps)) / NKPTEPG(ps))
 
 struct vmstate {
-	u_int64_t       kptdir;		/* PA of page table directory */
-        u_int64_t	page_size;	/* Page size */
+	void	*mmapbase;
+	size_t	mmapsize;
+	size_t	pagesize;
+	u_long	kptdir;
 };
 
+/*
+ * Map the ELF headers into the process' address space. We do this in two
+ * steps: first the ELF header itself and using that information the whole
+ * set of headers.
+ */
+static int
+_kvm_maphdrs(kvm_t *kd, size_t sz)
+{
+	struct vmstate *vm = kd->vmst;
+
+	/* munmap() previous mmap(). */
+	if (vm->mmapbase != NULL) {
+		munmap(vm->mmapbase, vm->mmapsize);
+		vm->mmapbase = NULL;
+	}
+
+	vm->mmapsize = sz;
+	vm->mmapbase = mmap(NULL, sz, PROT_READ, MAP_PRIVATE, kd->pmfd, NULL);
+	if (vm->mmapbase == MAP_FAILED) {
+		_kvm_err(kd, kd->program, "cannot mmap corefile");
+		return (-1);
+	}
+
+	return (0);
+}
+
+/*
+ * Translate a physical memory address to a file-offset in the crash-dump.
+ */
+static size_t
+_kvm_pa2off(kvm_t *kd, uint64_t pa, u_long *ofs, size_t pgsz)
+{
+	Elf64_Ehdr *e = kd->vmst->mmapbase;
+	Elf64_Phdr *p = (Elf64_Phdr*)((char*)e + e->e_phoff);
+	int n = e->e_phnum;
+
+	if (pa != REGION_ADDR(pa)) {
+		_kvm_err(kd, kd->program, "internal error");
+		return (0);
+	}
+
+	while (n && (pa < p->p_paddr || pa >= p->p_paddr + p->p_memsz))
+		p++, n--;
+	if (n == 0)
+		return (0);
+
+	*ofs = (pa - p->p_paddr) + p->p_offset;
+	if (pgsz == 0)
+		return (p->p_memsz - (pa - p->p_paddr));
+	return (pgsz - ((size_t)pa & (pgsz - 1)));
+}
+
 void
 _kvm_freevtop(kvm_t *kd)
 {
+	struct vmstate *vm = kd->vmst;
 
-	/* Not actually used for anything right now, but safe. */
-	if (kd->vmst != 0)
-		free(kd->vmst);
+	if (vm->mmapbase != NULL)
+		munmap(vm->mmapbase, vm->mmapsize);
+	free(vm);
+	kd->vmst = NULL;
 }
 
 int
 _kvm_initvtop(kvm_t *kd)
 {
-	struct vmstate *vm;
 	struct nlist nlist[2];
-	u_int64_t va;
+	uint64_t va;
+	Elf64_Ehdr *ehdr;
+	size_t hdrsz;
 
-	vm = (struct vmstate *)_kvm_malloc(kd, sizeof(*vm));
-	if (vm == 0) {
+	kd->vmst = (struct vmstate *)_kvm_malloc(kd, sizeof(*kd->vmst));
+	if (kd->vmst == NULL) {
 		_kvm_err(kd, kd->program, "cannot allocate vm");
 		return (-1);
 	}
-	kd->vmst = vm;
-	vm->page_size = getpagesize(); /* XXX wrong for crashdumps */
+
+	kd->vmst->pagesize = getpagesize();
+
+	if (_kvm_maphdrs(kd, sizeof(Elf64_Ehdr)) == -1)
+		return (-1);
+
+	ehdr = kd->vmst->mmapbase;
+	hdrsz = ehdr->e_phoff + ehdr->e_phentsize * ehdr->e_phnum;
+	if (_kvm_maphdrs(kd, hdrsz) == -1)
+		return (-1);
+
+	/*
+	 * At this point we've got enough information to use kvm_read() for
+	 * direct mapped (ie region 6 and region 7) address, such as symbol
+	 * addresses/values.
+	 */
 
 	nlist[0].n_name = "kptdir";
 	nlist[1].n_name = 0;
@@ -87,110 +156,54 @@
 		return (-1);
 	}
 
-	if(!ISALIVE(kd)) {
-		if (kvm_read(kd, (nlist[0].n_value), &va, sizeof(va)) != sizeof(va)) {
-			_kvm_err(kd, kd->program, "cannot read kptdir");
-			return (-1);
-		}
-	} else 
-		if (kvm_read(kd, (nlist[0].n_value), &va, sizeof(va)) != sizeof(va)) {
-			_kvm_err(kd, kd->program, "cannot read kptdir");
-			return (-1);
-		}
-	vm->kptdir = IA64_RR_MASK(va);
+	if (kvm_read(kd, (nlist[0].n_value), &va, sizeof(va)) != sizeof(va)) {
+		_kvm_err(kd, kd->program, "cannot read kptdir");
+		return (-1);
+	}
+
+	if (va < REGION_BASE(6)) {
+		_kvm_err(kd, kd->program, "kptdir is itself virtual");
+		return (-1);
+	}
+
+	kd->vmst->kptdir = va;
 	return (0);
-
 }
 
 int
 _kvm_kvatop(kvm_t *kd, u_long va, u_long *pa)
 {
-	u_int64_t	kptdir;			/* PA of kptdir */
-        u_int64_t	page_size;
-	int		rv, page_off;
 	struct ia64_lpte pte;
-	off_t		pteoff;
-	struct vmstate	*vm;
+	uint64_t pgaddr, ptaddr;
+	size_t pgno, pgsz, ptno;
 
-	vm = kd->vmst;
-	
-        if (ISALIVE(kd)) {
-                _kvm_err(kd, 0, "vatop called in live kernel!");
-                return(0);
-        }
-	kptdir = vm->kptdir;
-	page_size = vm->page_size;
-
-	page_off = va & (page_size - 1);
-	if (va >= IA64_RR_BASE(6) && va <= IA64_RR_BASE(7) + ((1L<<61)-1)) {
-		/*
-		 * Direct-mapped address: just convert it.
-		 */
-
-		*pa = IA64_RR_MASK(va);
-		rv = page_size - page_off;
-	} else if (va >= IA64_RR_BASE(5) && va < IA64_RR_BASE(6)) {

>>> TRUNCATED FOR MAIL (1000 lines) <<<

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message