From owner-cvs-games Sun Jun 23 00:52:39 1996 Return-Path: owner-cvs-games Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id AAA10474 for cvs-games-outgoing; Sun, 23 Jun 1996 00:52:39 -0700 (PDT) Received: (from jkh@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id AAA10456; Sun, 23 Jun 1996 00:52:28 -0700 (PDT) Date: Sun, 23 Jun 1996 00:52:28 -0700 (PDT) From: "Jordan K. Hubbard" Message-Id: <199606230752.AAA10456@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-games Subject: cvs commit: src/games Makefile src/games/backgammon/common_source backgammon.c src/games/boggle/boggle Makefile src/games/canfield/canfield Makefile src/games/cribbage Makefile src/games/fortune Makefile src/games/fortune/datfiles Makefile fortunes fortunes.sp.ok fortunes2 src/games/fortune/unstr Makefile unstr.c src/games/morse Makefile morse.c src/games/phantasia Makefile src/games/pom Makefile pom.c src/games/quiz Makefile quiz.c src/games/robots Makefile src/games/snake/snake Makefile snake.6 src/games/wargames Makefile src/games/wump Makefile src/games/adventure done.c init.c io.c main.c save.c subr.c vocab.c wizard.c src/games/atc Makefile src/games/bcd bcd.6 src/games/caesar Makefile caesar.6 caesar.c rot13.sh src/games/fish Makefile src/games/fortune/fortune Makefile fortune.6 fortune.c src/games/fortune/strfile Makefile strfile.c strfile.h src/games/larn Makefile larn.6 src/games/mille mille.6 varpush.c src/games/sail pl_main.c Sender: owner-cvs-games@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk jkh 96/06/23 00:52:28 Branch: games RELENG_2_1_0 games/adventure RELENG_2_1_0 games/atc RELENG_2_1_0 games/backgammon/common_source RELENG_2_1_0 games/bcd RELENG_2_1_0 games/boggle/boggle RELENG_2_1_0 games/caesar RELENG_2_1_0 games/canfield/canfield RELENG_2_1_0 games/cribbage RELENG_2_1_0 games/fish RELENG_2_1_0 games/fortune RELENG_2_1_0 games/fortune/datfiles RELENG_2_1_0 games/fortune/fortune RELENG_2_1_0 games/fortune/strfile RELENG_2_1_0 games/fortune/unstr RELENG_2_1_0 games/larn RELENG_2_1_0 games/mille RELENG_2_1_0 games/morse RELENG_2_1_0 games/phantasia RELENG_2_1_0 games/pom RELENG_2_1_0 games/quiz RELENG_2_1_0 games/robots RELENG_2_1_0 games/sail RELENG_2_1_0 games/snake/snake RELENG_2_1_0 games/wargames RELENG_2_1_0 games/wump RELENG_2_1_0 Modified: games Makefile games/adventure done.c init.c io.c main.c save.c subr.c vocab.c wizard.c games/atc Makefile games/backgammon/common_source backgammon.c games/bcd bcd.6 games/boggle/boggle Makefile games/caesar Makefile caesar.6 caesar.c rot13.sh games/canfield/canfield Makefile games/cribbage Makefile games/fish Makefile games/fortune Makefile games/fortune/datfiles Makefile fortunes fortunes.sp.ok fortunes2 games/fortune/fortune Makefile fortune.6 fortune.c games/fortune/strfile Makefile strfile.c strfile.h games/fortune/unstr Makefile unstr.c games/larn Makefile larn.6 games/mille mille.6 varpush.c games/morse Makefile morse.c games/phantasia Makefile games/pom Makefile pom.c games/quiz Makefile quiz.c games/robots Makefile games/sail pl_main.c games/snake/snake Makefile snake.6 games/wargames Makefile games/wump Makefile Log: Merge various useful things from HEAD. Revision Changes Path 1.9.4.4 +1 -0 src/games/Makefile 1.1.1.1.6.3 +1 -0 src/games/adventure/done.c 1.2.4.3 +2 -0 src/games/adventure/init.c 1.1.1.1.6.3 +1 -0 src/games/adventure/io.c 1.1.1.1.6.3 +1 -0 src/games/adventure/main.c 1.1.1.1.6.3 +1 -0 src/games/adventure/save.c 1.1.1.1.6.3 +1 -0 src/games/adventure/subr.c 1.1.1.1.6.3 +1 -0 src/games/adventure/vocab.c 1.1.1.1.6.3 +2 -0 src/games/adventure/wizard.c 1.3.4.3 +1 -1 src/games/atc/Makefile 1.2.4.3 +6 -6 src/games/backgammon/common_source/backgammon.c 1.1.1.1.6.3 +71 -3 src/games/bcd/bcd.6 1.2.6.3 +1 -1 src/games/boggle/boggle/Makefile 1.1.1.1.6.3 +3 -1 src/games/caesar/Makefile 1.1.1.1.6.3 +3 -3 src/games/caesar/caesar.6 1.1.1.1.6.3 +20 -14 src/games/caesar/caesar.c 1.1.1.1.6.3 +1 -1 src/games/caesar/rot13.sh 1.2.6.3 +1 -0 src/games/canfield/canfield/Makefile 1.3.4.3 +1 -1 src/games/cribbage/Makefile 1.2.4.3 +1 -1 src/games/fish/Makefile 1.3.4.3 +1 -11 src/games/fortune/Makefile 1.2.4.3 +24 -7 src/games/fortune/datfiles/Makefile 1.1.1.1.6.3 +3 -3 src/games/fortune/datfiles/fortunes 1.1.1.1.6.3 +3 -3 src/games/fortune/datfiles/fortunes.sp.ok 1.1.1.1.6.3 +3 -3 src/games/fortune/datfiles/fortunes2 1.1.1.1.6.1 +1 -1 src/games/fortune/fortune/Makefile 1.1.1.1.6.3 +1 -1 src/games/fortune/fortune/fortune.6 1.1.1.1.6.1 +81 -49 src/games/fortune/fortune/fortune.c 1.1.1.1.6.1 +4 -1 src/games/fortune/strfile/Makefile 1.2.4.1 +77 -74 src/games/fortune/strfile/strfile.c 1.1.1.1.6.1 +1 -1 src/games/fortune/strfile/strfile.h 1.1.1.1.6.1 +2 -1 src/games/fortune/unstr/Makefile 1.1.1.1.6.1 +9 -13 src/games/fortune/unstr/unstr.c 1.2.6.3 +2 -2 src/games/larn/Makefile 1.1.1.1.6.3 +2 -2 src/games/larn/larn.6 1.1.1.1.6.3 +1 -1 src/games/mille/mille.6 1.1.1.1.6.3 +1 -1 src/games/mille/varpush.c 1.1.1.1.6.3 +1 -1 src/games/morse/Makefile 1.1.1.1.6.3 +293 -72 src/games/morse/morse.c 1.8.4.3 +9 -9 src/games/phantasia/Makefile 1.1.1.1.6.1 +1 -0 src/games/pom/Makefile 1.1.1.1.6.2 +12 -17 src/games/pom/pom.c 1.3.4.3 +2 -2 src/games/quiz/Makefile 1.1.1.1.6.3 +5 -2 src/games/quiz/quiz.c 1.2.6.3 +1 -1 src/games/robots/Makefile 1.1.1.1.6.3 +3 -2 src/games/sail/pl_main.c 1.2.6.3 +1 -0 src/games/snake/snake/Makefile 1.1.1.1.6.3 +3 -3 src/games/snake/snake/snake.6 1.1.1.1.6.3 +1 -1 src/games/wargames/Makefile 1.1.1.1.6.3 +1 -1 src/games/wump/Makefile From owner-cvs-games Sun Jun 23 21:28:09 1996 Return-Path: owner-cvs-games Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id VAA21966 for cvs-games-outgoing; Sun, 23 Jun 1996 21:28:09 -0700 (PDT) Received: (from jkh@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id VAA21752; Sun, 23 Jun 1996 21:26:25 -0700 (PDT) Date: Sun, 23 Jun 1996 21:26:25 -0700 (PDT) From: "Jordan K. Hubbard" Message-Id: <199606240426.VAA21752@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-bin, cvs-games, cvs-lib, cvs-user, cvs-share, cvs-usrbin, cvs-gnu, cvs-usrsbin Subject: cvs commit: src Makefile src/bin/sh Makefile mkbuiltins src/eBones/lib/libkadm Makefile src/eBones/lib/libkrb Makefile src/gnu/libexec/uucp Makefile.inc src/gnu/usr.bin/as Makefile src/gnu/usr.bin/cc Makefile.inc src/gnu/usr.bin/cvs Makefile.inc src/gnu/usr.bin/groff Makefile.cfg src/gnu/usr.bin/man/lib Makefile src/gnu/usr.bin/man/manpath Makefile src/gnu/usr.bin/rcs Makefile.inc src/gnu/usr.bin/texinfo/doc Makefile src/lib Makefile src/lib/libss Makefile src/share/man/man4 Makefile src/share/man/man8 Makefile src/usr.bin/make main.c pathnames.h src/usr.bin/mklocale/data Makefile src/usr.bin/tip/tip Makefile src/usr.bin/tn3270/tn3270 Makefile src/usr.sbin/cron/crontab Makefile src/usr.sbin/mrouted/mrinfo Makefile src/usr.sbin/pcvt/vgaio Makefile src/usr.sbin/pkg_install/add Makefile src/usr.sbin/pkg_install/delete Makefile src/usr.sbin/sup/supfilesrv Makefile src/usr.sbin/sup/supscan Makefile src/usr.sbin/xntpd/ntpq Makefile src/usr.sbin/xntpd/ntptrace Makefile src/usr.sbin/xntpd/xntpdc Makefile src/bin/ed/test Makefile src/eBones Makefile.inc src/games/boggle Makefile src/games/fortune/datfiles Makefile src/gnu/lib/libgmp/tests Makefile src/gnu/usr.bin/gdb/gdb Makefile src/gnu/usr.bin/man/man Makefile src/gnu/usr.bin/perl/usub Makefile src/gnu/usr.bin/send-pr Makefile src/release/floppies/boot/floppy Makefile src/secure/lib/libcrypt/test Makefile src/secure/usr.bin/bdes Makefile src/share/doc/psd/19.curses Makefile src/share/mk Makefile bsd.dep.mk bsd.doc.mk bsd.info.mk bsd.kmod.mk bsd.lib.mk bsd.obj.mk bsd.own.mk bsd.port.mk bsd.prog.mk bsd.sgml.mk src/share/zoneinfo Makefile src/usr.bin/colldef/data Makefile src/usr.bin/sgmls Makefile.inc src/usr.bin/tn3270/mset Makefile src/usr.sbin/cron/cron Makefile src/usr.sbin/mrouted/map-mbone Makefile src/usr.sbin/mrouted/mrouted Makefile src/usr.sbin/mrouted/mtrace Makefile src/usr.sbin/pcvt/kbdio Makefile src/usr.sbin/pcvt/kcon Makefile src/usr.sbin/pkg_install/create Makefile src/usr.sbin/pkg_install/info Makefile src/usr.sbin/sup/sup Makefile src/usr.sbi Sender: owner-cvs-games@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk jkh 96/06/23 21:26:23 Modified: . Makefile bin/ed/test Makefile bin/sh Makefile mkbuiltins eBones Makefile.inc eBones/lib/libkadm Makefile eBones/lib/libkrb Makefile games/boggle Makefile games/fortune/datfiles Makefile gnu/lib/libgmp/tests Makefile gnu/libexec/uucp Makefile.inc gnu/usr.bin/as Makefile gnu/usr.bin/cc Makefile.inc gnu/usr.bin/cvs Makefile.inc gnu/usr.bin/gdb/gdb Makefile gnu/usr.bin/groff Makefile.cfg gnu/usr.bin/man/lib Makefile gnu/usr.bin/man/man Makefile gnu/usr.bin/man/manpath Makefile gnu/usr.bin/perl/usub Makefile gnu/usr.bin/rcs Makefile.inc gnu/usr.bin/send-pr Makefile gnu/usr.bin/texinfo/doc Makefile lib Makefile lib/libss Makefile release/floppies/boot/floppy Makefile secure/lib/libcrypt/test Makefile secure/usr.bin/bdes Makefile share/doc/psd/19.curses Makefile share/man/man4 Makefile share/man/man8 Makefile share/mk Makefile bsd.dep.mk bsd.doc.mk bsd.info.mk bsd.kmod.mk bsd.lib.mk bsd.obj.mk bsd.own.mk bsd.port.mk bsd.prog.mk bsd.sgml.mk share/zoneinfo Makefile usr.bin/colldef/data Makefile usr.bin/make main.c pathnames.h usr.bin/mklocale/data Makefile usr.bin/sgmls Makefile.inc usr.bin/tip/tip Makefile usr.bin/tn3270/mset Makefile usr.bin/tn3270/tn3270 Makefile usr.sbin/cron/cron Makefile usr.sbin/cron/crontab Makefile usr.sbin/mrouted/map-mbone Makefile usr.sbin/mrouted/mrinfo Makefile usr.sbin/mrouted/mrouted Makefile usr.sbin/mrouted/mtrace Makefile usr.sbin/pcvt/kbdio Makefile usr.sbin/pcvt/kcon Makefile usr.sbin/pcvt/vgaio Makefile usr.sbin/pkg_install/add Makefile usr.sbin/pkg_install/create Makefile usr.sbin/pkg_install/delete Makefile usr.sbin/pkg_install/info Makefile usr.sbin/sup/sup Makefile usr.sbin/sup/supfilesrv Makefile usr.sbin/sup/supscan Makefile usr.sbin/xntpd/authstuff Makefile usr.sbin/xntpd/ntpdate Makefile usr.sbin/xntpd/ntpq Makefile usr.sbin/xntpd/ntptrace Makefile usr.sbin/xntpd/parse/util Makefile usr.sbin/xntpd/util Makefile usr.sbin/xntpd/xntpd Makefile usr.sbin/xntpd/xntpdc Makefile Log: Bring in my changes for removing the pestilent obj links (unless you really want them) from /usr/src. This is the final version of the patches, incorporating the feedback I've received from -current. Revision Changes Path 1.85 +6 -23 src/Makefile 1.6 +2 -2 src/bin/ed/test/Makefile 1.12 +2 -2 src/bin/sh/Makefile 1.4 +5 -5 src/bin/sh/mkbuiltins 1.11 +13 -13 src/eBones/Makefile.inc 1.10 +1 -2 src/eBones/lib/libkadm/Makefile 1.13 +1 -2 src/eBones/lib/libkrb/Makefile 1.8 +4 -4 src/games/boggle/Makefile 1.6 +4 -4 src/games/fortune/datfiles/Makefile 1.4 +2 -2 src/gnu/lib/libgmp/tests/Makefile 1.8 +6 -6 src/gnu/libexec/uucp/Makefile.inc 1.10 +2 -4 src/gnu/usr.bin/as/Makefile 1.14 +3 -3 src/gnu/usr.bin/cc/Makefile.inc 1.2 +2 -2 src/gnu/usr.bin/cvs/Makefile.inc 1.13 +10 -10 src/gnu/usr.bin/gdb/gdb/Makefile 1.10 +6 -8 src/gnu/usr.bin/groff/Makefile.cfg 1.7 +2 -2 src/gnu/usr.bin/man/lib/Makefile 1.18 +5 -5 src/gnu/usr.bin/man/man/Makefile 1.14 +5 -5 src/gnu/usr.bin/man/manpath/Makefile 1.7 +2 -2 src/gnu/usr.bin/perl/usub/Makefile 1.3 +2 -2 src/gnu/usr.bin/rcs/Makefile.inc 1.11 +1 -1 src/gnu/usr.bin/send-pr/Makefile 1.3 +2 -2 src/gnu/usr.bin/texinfo/doc/Makefile 1.40 +1 -1 src/lib/Makefile 1.12 +3 -3 src/lib/libss/Makefile 1.2 +6 -5 src/release/floppies/boot/floppy/Makefile 1.5 +2 -8 src/secure/lib/libcrypt/test/Makefile 1.7 +3 -3 src/secure/usr.bin/bdes/Makefile 1.3 +2 -2 src/share/doc/psd/19.curses/Makefile 1.22 +1 -1 src/share/man/man4/Makefile 1.6 +1 -1 src/share/man/man8/Makefile 1.11 +2 -2 src/share/mk/Makefile 1.5 +25 -9 src/share/mk/bsd.dep.mk 1.25 +4 -22 src/share/mk/bsd.doc.mk 1.18 +11 -28 src/share/mk/bsd.info.mk 1.23 +8 -24 src/share/mk/bsd.kmod.mk 1.36 +7 -50 src/share/mk/bsd.lib.mk 1.5 +51 -48 src/share/mk/bsd.obj.mk 1.7 +1 -15 src/share/mk/bsd.own.mk 1.214 +5 -26 src/share/mk/bsd.port.mk 1.34 +9 -52 src/share/mk/bsd.prog.mk 1.6 +3 -3 src/share/mk/bsd.sgml.mk 1.9 +3 -3 src/share/zoneinfo/Makefile 1.2 +3 -3 src/usr.bin/colldef/data/Makefile 1.4 +7 -26 src/usr.bin/make/main.c 1.3 +2 -2 src/usr.bin/make/pathnames.h 1.3 +3 -3 src/usr.bin/mklocale/data/Makefile 1.4 +3 -3 src/usr.bin/sgmls/Makefile.inc 1.5 +2 -2 src/usr.bin/tip/tip/Makefile 1.5 +2 -2 src/usr.bin/tn3270/mset/Makefile 1.6 +8 -8 src/usr.bin/tn3270/tn3270/Makefile 1.6 +3 -3 src/usr.sbin/cron/cron/Makefile 1.6 +3 -3 src/usr.sbin/cron/crontab/Makefile 1.3 +4 -4 src/usr.sbin/mrouted/map-mbone/Makefile 1.5 +4 -4 src/usr.sbin/mrouted/mrinfo/Makefile 1.4 +4 -4 src/usr.sbin/mrouted/mrouted/Makefile 1.4 +4 -4 src/usr.sbin/mrouted/mtrace/Makefile 1.4 +1 -1 src/usr.sbin/pcvt/kbdio/Makefile 1.3 +1 -1 src/usr.sbin/pcvt/kcon/Makefile 1.6 +1 -1 src/usr.sbin/pcvt/vgaio/Makefile 1.8 +3 -3 src/usr.sbin/pkg_install/add/Makefile 1.8 +3 -3 src/usr.sbin/pkg_install/create/Makefile 1.8 +3 -3 src/usr.sbin/pkg_install/delete/Makefile 1.8 +3 -3 src/usr.sbin/pkg_install/info/Makefile 1.4 +3 -3 src/usr.sbin/sup/sup/Makefile 1.4 +3 -3 src/usr.sbin/sup/supfilesrv/Makefile 1.2 +3 -3 src/usr.sbin/sup/supscan/Makefile 1.3 +4 -4 src/usr.sbin/xntpd/authstuff/Makefile 1.5 +4 -4 src/usr.sbin/xntpd/ntpdate/Makefile 1.5 +4 -4 src/usr.sbin/xntpd/ntpq/Makefile 1.4 +4 -4 src/usr.sbin/xntpd/ntptrace/Makefile 1.3 +4 -4 src/usr.sbin/xntpd/parse/util/Makefile 1.4 +4 -4 src/usr.sbin/xntpd/util/Makefile 1.8 +7 -7 src/usr.sbin/xntpd/xntpd/Makefile 1.4 +4 -4 src/usr.sbin/xntpd/xntpdc/Makefile