From owner-cvs-share Sun Aug 31 06:46:35 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id GAA05186 for cvs-share-outgoing; Sun, 31 Aug 1997 06:46:35 -0700 (PDT) Received: (from jmb@localhost) by hub.freebsd.org (8.8.7/8.8.7) id GAA05145; Sun, 31 Aug 1997 06:44:26 -0700 (PDT) From: "Jonathan M. Bresler" Message-Id: <199708311344.GAA05145@hub.freebsd.org> Subject: Re: cvs commit: src/share/mk bsd.lib.mk bsd.prog.mk sys.mk To: max@wide.ad.jp (Masafumi NAKANE/=?ISO-2022-JP?B?GyRCQ2Y6LDJtSjgbKEI=?=) Date: Sun, 31 Aug 1997 06:44:26 -0700 (PDT) Cc: peter@FreeBSD.ORG, cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-share@FreeBSD.ORG, max@wide.ad.jp In-Reply-To: <199708310100.KAA02696@access.sfc.wide.ad.jp> from "Masafumi NAKANE/=?ISO-2022-JP?B?GyRCQ2Y6LDJtSjgbKEI=?=" at Aug 31, 97 10:00:57 am X-Mailer: ELM [version 2.4 PL24] Content-Type: text Sender: owner-cvs-share@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk Masafumi NAKANE/=?ISO-2022-JP?B?GyRCQ2Y6LDJtSjgbKEI=?= wrote: > > > # make buildworld > -------------------------------------------------------------- > Making make > -------------------------------------------------------------- > mkdir -p /usr/obj/usr/src/tmp/usr/bin [snip] > "/usr/src/share/mk/bsd.prog.mk", line 149: Malformed conditional (${BINFORMAT} != aout) > "/usr/src/share/mk/bsd.prog.mk", line 151: if-less endif > "/usr/src/share/mk/bsd.prog.mk", line 151: Need an operator > make: fatal errors encountered -- cannot continue > *** Error code 1 either sys.mk should be included before bsd.prog.mk is used (sys.mk will define BINFORMAT) or both bsd.prog.mk (1 occurance) and bsd.lib.mk (5 occurances) have to be changed to "conditionalize" BINFORMAT test. i'll let someone that is more expert in out make system determine the "right thing". bsd.prog.mk: *** 147,151 **** .endif ! .if ${BINFORMAT} != aout .include .endif --- 147,151 ---- .endif ! .if defined(BINFORMAT) && (${BINFORMAT} != aout) .include .endif jmb From owner-cvs-share Sun Aug 31 10:26:55 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id KAA11186 for cvs-share-outgoing; Sun, 31 Aug 1997 10:26:55 -0700 (PDT) Received: from spinner.dialix.com.au (spinner.dialix.com.au [192.203.228.67]) by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id KAA11158; Sun, 31 Aug 1997 10:25:37 -0700 (PDT) Received: from spinner.dialix.com.au (localhost.dialix.com.au [127.0.0.1]) by spinner.dialix.com.au with ESMTP id BAA21480; Mon, 1 Sep 1997 01:24:55 +0800 (WST) Message-Id: <199708311724.BAA21480@spinner.dialix.com.au> X-Mailer: exmh version 2.0zeta 7/24/97 To: "Jonathan M. Bresler" cc: max@wide.ad.jp (Masafumi NAKANE/=?ISO-2022-JP?B?GyRCQ2Y6LDJtSjgbKEI=?=), peter@FreeBSD.ORG, cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-share@FreeBSD.ORG Subject: Re: cvs commit: src/share/mk bsd.lib.mk bsd.prog.mk sys.mk In-reply-to: Your message of "Sun, 31 Aug 1997 06:44:26 MST." <199708311344.GAA05145@hub.freebsd.org> Date: Mon, 01 Sep 1997 01:24:53 +0800 From: Peter Wemm Sender: owner-cvs-share@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk "Jonathan M. Bresler" wrote: > Masafumi NAKANE/=?ISO-2022-JP?B?GyRCQ2Y6LDJtSjgbKEI=?= wrote: > > > > > > # make buildworld > > -------------------------------------------------------------- > > Making make > > -------------------------------------------------------------- > > mkdir -p /usr/obj/usr/src/tmp/usr/bin > [snip] > > "/usr/src/share/mk/bsd.prog.mk", line 149: Malformed conditional (${BINFORM AT} != aout) > > "/usr/src/share/mk/bsd.prog.mk", line 151: if-less endif > > "/usr/src/share/mk/bsd.prog.mk", line 151: Need an operator > > make: fatal errors encountered -- cannot continue > > *** Error code 1 > > > either sys.mk should be included before bsd.prog.mk is used > (sys.mk will define BINFORMAT) or both bsd.prog.mk (1 > occurance) and bsd.lib.mk (5 occurances) have to be changed > to "conditionalize" BINFORMAT test. I don't understand what's going wrong there. It seems to be working fine for me. sys.mk is implicitly included by make *before* reading the user Makefile. bsd.prog.mk should always be able to see it. Remember, sys.mk includes /etc/make.conf, which bsd.prog.mk refers to. > i'll let someone that is more expert in out make system > determine the "right thing". > > bsd.prog.mk: > *** 147,151 **** > .endif > > ! .if ${BINFORMAT} != aout > .include > .endif > --- 147,151 ---- > .endif > > ! .if defined(BINFORMAT) && (${BINFORMAT} != aout) > .include > .endif Does this sort of thing fix the problem? (Just asking, because I've not been able to duplicate it yet) peter@beast[1:12am]~src/share/mk-240> cvs update cvs update: Updating . peter@beast[1:13am]~src/share/mk-241> diff -ru . /usr/share/mk Only in .: CVS Only in .: Makefile peter@beast[1:13am]~src/share/mk-242> cd ../../sbin/dmesg peter@beast[1:13am]~src/sbin/dmesg-243> make clean rm -f a.out Errs errs mklog dmesg dmesg.o dmesg.8.gz dmesg.8.cat.gz peter@beast[1:13am]~src/sbin/dmesg-244> make cc -O -pipe -c /home/src/sbin/dmesg/dmesg.c cc -O -pipe -static -o dmesg dmesg.o -lkvm gzip -c /home/src/sbin/dmesg/dmesg.8 > dmesg.8.gz [note, BINFORMAT is not presently defined on this system in /etc/make.conf] peter@beast[1:13am]~src/sbin/dmesg-245> grep BINFORMAT /etc/make.conf #BINFORMAT= elf peter@beast[1:13am]~src/sbin/dmesg-246> grep BINFORMAT /usr/share/mk/* /usr/share/mk/bsd.lib.mk:.if ${BINFORMAT} == aout /usr/share/mk/bsd.lib.mk:.if ${BINFORMAT} == aout /usr/share/mk/bsd.lib.mk:.if ${BINFORMAT} == aout /usr/share/mk/bsd.lib.mk:.if ${BINFORMAT} == aout /usr/share/mk/bsd.lib.mk:.if ${BINFORMAT} == aout /usr/share/mk/bsd.prog.mk:.if ${BINFORMAT} == aout /usr/share/mk/bsd.prog.mk:.if ${BINFORMAT} != aout /usr/share/mk/sys.mk:BINFORMAT?= aout peter@beast[1:13am]~src/sbin/dmesg-247> The only thing I can think of is if the 'make install' in share/mk got interrupted somehow and only some of the .mk files got installed.. That goes for both /usr/share/mk or /usr/obj//tmp/usr/share/mk. A buildworld gets well past that point of failure for me, but fails for other reasons.. (This is a pure ELF system that has not had all the tools integrated yet, and buildworld doesn't like not having 'ld' installed by the bmakefiles into ${DESTDIR} very much..) > jmb > Cheers, -Peter From owner-cvs-share Sun Aug 31 11:11:19 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id LAA12475 for cvs-share-outgoing; Sun, 31 Aug 1997 11:11:19 -0700 (PDT) Received: from helios.dnttm.ru (root@dnttm.wave.ras.ru [194.85.104.197]) by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id LAA12434; Sun, 31 Aug 1997 11:10:44 -0700 (PDT) Received: (from uucp@localhost) by helios.dnttm.ru (8.8.5/8.8.5/IP-3) with UUCP id WAA17706; Sun, 31 Aug 1997 22:04:28 +0400 Received: from tejblum.dnttm.rssi.ru (localhost [127.0.0.1]) by tejblum.dnttm.rssi.ru (8.8.7/8.8.5) with ESMTP id WAA15486; Sun, 31 Aug 1997 22:07:38 +0400 (MSD) Message-Id: <199708311807.WAA15486@tejblum.dnttm.rssi.ru> X-Mailer: exmh version 2.0gamma 1/27/96 To: Peter Wemm cc: "Jonathan M. Bresler" , max@wide.ad.jp (Masafumi) Sender: owner-cvs-share@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk NAKANE/=?ISO-2022-JP?B?GyRCQ2Y6LDJtSjgbKEI=?=), peter@FreeBSD.ORG, cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-share@FreeBSD.ORG Subject: Re: cvs commit: src/share/mk bsd.lib.mk bsd.prog.mk sys.mk In-reply-to: Your message of "Mon, 01 Sep 1997 01:24:53 +0800." <199708311724.BAA21480@spinner.dialix.com.au> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sun, 31 Aug 1997 22:07:34 +0400 From: Dmitrij Tejblum Peter Wemm wrote: > > > # make buildworld > > > -------------------------------------------------------------- > > > Making make > > > -------------------------------------------------------------- > > > mkdir -p /usr/obj/usr/src/tmp/usr/bin > > [snip] > > > "/usr/src/share/mk/bsd.prog.mk", line 149: Malformed conditional (${BINFORM > AT} != aout) > > > "/usr/src/share/mk/bsd.prog.mk", line 151: if-less endif > > > "/usr/src/share/mk/bsd.prog.mk", line 151: Need an operator > > > make: fatal errors encountered -- cannot continue > > > *** Error code 1 > I don't understand what's going wrong there. It seems to be working fine > for me. > > sys.mk is implicitly included by make *before* reading the user Makefile. > bsd.prog.mk should always be able to see it. Remember, sys.mk includes > /etc/make.conf, which bsd.prog.mk refers to. Here make implicitly included /usr/share/mk/sys.mk, not /usr/src/share/sys.mk --- /usr/src/Makefile.00 Sun Aug 31 20:44:16 1997 +++ /usr/src/Makefile Sun Aug 31 20:44:32 1997 @@ -223,9 +223,9 @@ @echo "--------------------------------------------------------------" mkdir -p ${WORLDTMP}/usr/bin cd ${.CURDIR}/usr.bin/make && \ - ${IBMAKE} -I${.CURDIR}/share/mk \ + ${IBMAKE} -m${.CURDIR}/share/mk \ ${OBJDIR} clean cleandepend depend && \ - ${IBMAKE} -I${.CURDIR}/share/mk ${MK_FLAGS} \ + ${IBMAKE} -m${.CURDIR}/share/mk ${MK_FLAGS} \ all install clean cleandepend @echo @echo "--------------------------------------------------------------" I have no idea why Satoshi wrote -I here. Dima From owner-cvs-share Sun Aug 31 13:42:17 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id NAA17722 for cvs-share-outgoing; Sun, 31 Aug 1997 13:42:17 -0700 (PDT) Received: (from jmb@localhost) by hub.freebsd.org (8.8.7/8.8.7) id NAA17585; Sun, 31 Aug 1997 13:40:07 -0700 (PDT) From: "Jonathan M. Bresler" Message-Id: <199708312040.NAA17585@hub.freebsd.org> Subject: Re: cvs commit: src/share/mk bsd.lib.mk bsd.prog.mk sys.mk To: dima@tejblum.dnttm.rssi.ru (Dmitrij Tejblum) Date: Sun, 31 Aug 1997 13:40:07 -0700 (PDT) Cc: peter@spinner.dialix.com.au, jmb@FreeBSD.ORG, max@wide.ad.jp, peter@FreeBSD.ORG, cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-share@FreeBSD.ORG In-Reply-To: <199708311807.WAA15486@tejblum.dnttm.rssi.ru> from "Dmitrij Tejblum" at Aug 31, 97 10:07:34 pm X-Mailer: ELM [version 2.4 PL24] Content-Type: text Sender: owner-cvs-share@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk including /usr/share/mk/sys.mk in place of /usr/src/share/mk/sys.mk would explain the problem. peter, can you check your copy of /usr/share/mk/sys.mk? if it contains the definition for BINFORMAT, please revert your /usr/share/mk/sys.mk to version 1.23 which is the most recent version that *does*not* include BINFORMAT. that should allow you to reproduce the problem. jmb Dmitrij Tejblum wrote: > > Peter Wemm wrote: > > > > # make buildworld > > > > -------------------------------------------------------------- > > > > Making make > > > > -------------------------------------------------------------- > > > > mkdir -p /usr/obj/usr/src/tmp/usr/bin > > > [snip] > > > > "/usr/src/share/mk/bsd.prog.mk", line 149: Malformed conditional (${BINFORM > > AT} != aout) > > > > "/usr/src/share/mk/bsd.prog.mk", line 151: if-less endif > > > > "/usr/src/share/mk/bsd.prog.mk", line 151: Need an operator > > > > make: fatal errors encountered -- cannot continue > > > > *** Error code 1 > > > I don't understand what's going wrong there. It seems to be working fine > > for me. > > > > sys.mk is implicitly included by make *before* reading the user Makefile. > > bsd.prog.mk should always be able to see it. Remember, sys.mk includes > > /etc/make.conf, which bsd.prog.mk refers to. > > Here make implicitly included /usr/share/mk/sys.mk, not /usr/src/share/sys.mk > > --- /usr/src/Makefile.00 Sun Aug 31 20:44:16 1997 > +++ /usr/src/Makefile Sun Aug 31 20:44:32 1997 > @@ -223,9 +223,9 @@ > @echo "--------------------------------------------------------------" > mkdir -p ${WORLDTMP}/usr/bin > cd ${.CURDIR}/usr.bin/make && \ > - ${IBMAKE} -I${.CURDIR}/share/mk \ > + ${IBMAKE} -m${.CURDIR}/share/mk \ > ${OBJDIR} clean cleandepend depend && \ > - ${IBMAKE} -I${.CURDIR}/share/mk ${MK_FLAGS} \ > + ${IBMAKE} -m${.CURDIR}/share/mk ${MK_FLAGS} \ > all install clean cleandepend > @echo > @echo "--------------------------------------------------------------" > > I have no idea why Satoshi wrote -I here. > > Dima From owner-cvs-share Sun Aug 31 18:22:56 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id SAA28204 for cvs-share-outgoing; Sun, 31 Aug 1997 18:22:56 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id SAA28105; Sun, 31 Aug 1997 18:21:00 -0700 (PDT) From: Brian Somers Received: (from brian@localhost) by freefall.freebsd.org (8.8.6/8.8.5) id SAA01320; Sun, 31 Aug 1997 18:19:28 -0700 (PDT) Date: Sun, 31 Aug 1997 18:19:28 -0700 (PDT) Message-Id: <199709010119.SAA01320@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-include@FreeBSD.ORG, cvs-lib@FreeBSD.ORG, cvs-share@FreeBSD.ORG Subject: cvs commit: src/include resolv.h src/lib/libc/net res_init.c res_query.c src/share/man/man5 resolver.5 Sender: owner-cvs-share@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk brian 1997/08/31 18:19:28 PDT Modified files: include resolv.h lib/libc/net res_init.c res_query.c share/man/man5 resolver.5 Log: Add "options no_tld_query" to resolv.conf. Mention the capability in resolver(5). Mention that RES_OPTIONS can be used in resolver(5). Discussed with: -hackers Revision Changes Path 1.14 +2 -1 src/include/resolv.h 1.14 +3 -1 src/lib/libc/net/res_init.c 1.15 +3 -3 src/lib/libc/net/res_query.c 1.5 +13 -8 src/share/man/man5/resolver.5 From owner-cvs-share Wed Sep 3 13:46:01 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id NAA06321 for cvs-share-outgoing; Wed, 3 Sep 1997 13:46:01 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id NAA06123; Wed, 3 Sep 1997 13:42:08 -0700 (PDT) From: John Polstra Received: (from jdp@localhost) by freefall.freebsd.org (8.8.6/8.8.5) id NAA07677; Wed, 3 Sep 1997 13:40:13 -0700 (PDT) Date: Wed, 3 Sep 1997 13:40:13 -0700 (PDT) Message-Id: <199709032040.NAA07677@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-share@FreeBSD.ORG Subject: cvs commit: src/share/examples/cvsup secure-stable-supfile stable-supfile Sender: owner-cvs-share@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk jdp 1997/09/03 13:40:13 PDT Modified files: share/examples/cvsup secure-stable-supfile stable-supfile Log: "Stable" now means RELENG_2_2. Revision Changes Path 1.8 +4 -4 src/share/examples/cvsup/secure-stable-supfile 1.10 +4 -4 src/share/examples/cvsup/stable-supfile From owner-cvs-share Wed Sep 3 13:48:41 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id NAA06461 for cvs-share-outgoing; Wed, 3 Sep 1997 13:48:41 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id NAA06297; Wed, 3 Sep 1997 13:45:36 -0700 (PDT) From: John Polstra Received: (from jdp@localhost) by freefall.freebsd.org (8.8.6/8.8.5) id NAA07750; Wed, 3 Sep 1997 13:43:42 -0700 (PDT) Date: Wed, 3 Sep 1997 13:43:42 -0700 (PDT) Message-Id: <199709032043.NAA07750@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-share@FreeBSD.ORG Subject: cvs commit: src/share/examples/cvsup secure-stable-supfile stable-supfile Sender: owner-cvs-share@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk jdp 1997/09/03 13:43:42 PDT Modified files: (Branch: RELENG_2_2) share/examples/cvsup secure-stable-supfile stable-supfile Log: Sync with main branch: "stable" now means RELENG_2_2. Revision Changes Path 1.2.2.4 +4 -4 src/share/examples/cvsup/secure-stable-supfile 1.2.2.6 +4 -4 src/share/examples/cvsup/stable-supfile From owner-cvs-share Thu Sep 4 11:53:55 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id LAA16524 for cvs-share-outgoing; Thu, 4 Sep 1997 11:53:55 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id LAA16405; Thu, 4 Sep 1997 11:51:55 -0700 (PDT) From: Søren Schmidt Received: (from sos@localhost) by freefall.freebsd.org (8.8.6/8.8.5) id LAA29655; Thu, 4 Sep 1997 11:49:53 -0700 (PDT) Date: Thu, 4 Sep 1997 11:49:53 -0700 (PDT) Message-Id: <199709041849.LAA29655@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-sys@FreeBSD.ORG, cvs-share@FreeBSD.ORG Subject: cvs commit: src/sys/pci ide_pci.c src/sys/i386/isa wd.c wdreg.h src/sys/i386/conf LINT src/share/man/man4/man4.i386 wd.4 Sender: owner-cvs-share@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk sos 1997/09/04 11:49:53 PDT Modified files: sys/pci ide_pci.c sys/i386/isa wd.c wdreg.h sys/i386/conf LINT share/man/man4/man4.i386 wd.4 Log: Upgrade of EIDE DMA support, Johns comments: * lots of fixes to error handling-- mostly works now * improve DMA timing config for Triton chipsets-- PIIX4 and UDMA drive still untested * generally improve DMA config in many ways-- mostly cleanup * clean up boot-time messages * rewrite PRD generation algorithm * first wd timeout is now longer, to handle drive spinup Submitted by: John Hood Revision Changes Path 1.3 +389 -247 src/sys/pci/ide_pci.c 1.136 +62 -29 src/sys/i386/isa/wd.c 1.19 +10 -10 src/sys/i386/isa/wdreg.h 1.361 +5 -4 src/sys/i386/conf/LINT 1.7 +4 -1 src/share/man/man4/man4.i386/wd.4 From owner-cvs-share Thu Sep 4 14:03:45 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id OAA22992 for cvs-share-outgoing; Thu, 4 Sep 1997 14:03:45 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id OAA22877; Thu, 4 Sep 1997 14:01:37 -0700 (PDT) From: John Polstra Received: (from jdp@localhost) by freefall.freebsd.org (8.8.6/8.8.5) id NAA29878; Thu, 4 Sep 1997 13:59:35 -0700 (PDT) Date: Thu, 4 Sep 1997 13:59:35 -0700 (PDT) Message-Id: <199709042059.NAA29878@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-share@FreeBSD.ORG Subject: cvs commit: src/share/man/man7 clocks.7 Sender: owner-cvs-share@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk jdp 1997/09/04 13:59:34 PDT Modified files: share/man/man7 clocks.7 Log: "It's" -> "Its" in two places. Revision Changes Path 1.7 +3 -3 src/share/man/man7/clocks.7 From owner-cvs-share Thu Sep 4 14:05:00 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id OAA23094 for cvs-share-outgoing; Thu, 4 Sep 1997 14:05:00 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id OAA22922; Thu, 4 Sep 1997 14:03:09 -0700 (PDT) From: John Polstra Received: (from jdp@localhost) by freefall.freebsd.org (8.8.6/8.8.5) id OAA29941; Thu, 4 Sep 1997 14:01:07 -0700 (PDT) Date: Thu, 4 Sep 1997 14:01:07 -0700 (PDT) Message-Id: <199709042101.OAA29941@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-share@FreeBSD.ORG Subject: cvs commit: src/share/man/man7 clocks.7 Sender: owner-cvs-share@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk jdp 1997/09/04 14:01:06 PDT Modified files: (Branch: RELENG_2_2) share/man/man7 clocks.7 Log: Merge from main branch 1.6 -> 1.7: "It's" becomes "Its". Revision Changes Path 1.3.2.2 +3 -3 src/share/man/man7/clocks.7 From owner-cvs-share Thu Sep 4 23:29:16 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id XAA15037 for cvs-share-outgoing; Thu, 4 Sep 1997 23:29:16 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id WAA25402; Thu, 4 Sep 1997 22:03:24 -0700 (PDT) From: John Polstra Received: (from jdp@localhost) by freefall.freebsd.org (8.8.6/8.8.5) id WAA02986; Thu, 4 Sep 1997 22:01:16 -0700 (PDT) Date: Thu, 4 Sep 1997 22:01:16 -0700 (PDT) Message-Id: <199709050501.WAA02986@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-share@FreeBSD.ORG Subject: cvs commit: src/share/examples/cvsup README Sender: owner-cvs-share@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk jdp 1997/09/04 22:01:16 PDT Modified files: (Branch: RELENG_2_2) share/examples/cvsup README Log: Merge from main branch 1.10 -> 1.11: add cvsup.ca.FreeBSD.org. Revision Changes Path 1.2.2.7 +4 -1 src/share/examples/cvsup/README From owner-cvs-share Fri Sep 5 00:08:48 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id WAA27860 for cvs-share-outgoing; Thu, 4 Sep 1997 22:11:43 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id WAA26976; Thu, 4 Sep 1997 22:08:29 -0700 (PDT) From: John Polstra Received: (from jdp@localhost) by freefall.freebsd.org (8.8.6/8.8.5) id VAA02929; Thu, 4 Sep 1997 21:59:23 -0700 (PDT) Date: Thu, 4 Sep 1997 21:59:23 -0700 (PDT) Message-Id: <199709050459.VAA02929@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-share@FreeBSD.ORG Subject: cvs commit: src/share/examples/cvsup README Sender: owner-cvs-share@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk jdp 1997/09/04 21:59:23 PDT Modified files: share/examples/cvsup README Log: Add cvsup.ca.FreeBSD.org. Revision Changes Path 1.11 +4 -1 src/share/examples/cvsup/README From owner-cvs-share Fri Sep 5 02:14:21 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id CAA27013 for cvs-share-outgoing; Fri, 5 Sep 1997 02:14:21 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id CAA26893; Fri, 5 Sep 1997 02:12:04 -0700 (PDT) From: Peter Wemm Received: (from peter@localhost) by freefall.freebsd.org (8.8.6/8.8.5) id CAA03531; Fri, 5 Sep 1997 02:09:57 -0700 (PDT) Date: Fri, 5 Sep 1997 02:09:57 -0700 (PDT) Message-Id: <199709050909.CAA03531@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-share@FreeBSD.ORG Subject: cvs commit: src/share/mk bsd.lib.mk bsd.prog.mk sys.mk Sender: owner-cvs-share@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 1997/09/05 02:09:57 PDT Modified files: share/mk bsd.lib.mk bsd.prog.mk sys.mk Log: Change the BINFORMAT definitions so that they do not depend on sys.mk, since 2.1.x make(1) apparently does not have the -m switch to set both the the bsd.*.mk and sys.mk location, and this breaks 'make world' from a 2.1.x system. Revision Changes Path 1.62 +4 -1 src/share/mk/bsd.lib.mk 1.56 +4 -1 src/share/mk/bsd.prog.mk 1.25 +1 -4 src/share/mk/sys.mk From owner-cvs-share Fri Sep 5 04:49:10 1997 Return-Path: Received: (from root@localhost) by hub.freebsd.org (8.8.7/8.8.7) id EAA02564 for cvs-share-outgoing; Fri, 5 Sep 1997 04:49:10 -0700 (PDT) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id EAA02486; Fri, 5 Sep 1997 04:47:23 -0700 (PDT) From: Peter Wemm Received: (from peter@localhost) by freefall.freebsd.org (8.8.6/8.8.5) id EAA05272; Fri, 5 Sep 1997 04:45:16 -0700 (PDT) Date: Fri, 5 Sep 1997 04:45:16 -0700 (PDT) Message-Id: <199709051145.EAA05272@freefall.freebsd.org> To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-share@FreeBSD.ORG Subject: cvs commit: src/share/mk bsd.lib.mk sys.mk Sender: owner-cvs-share@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk peter 1997/09/05 04:45:16 PDT Modified files: share/mk bsd.lib.mk sys.mk Log: Restore the BINFORMAT?= in sys.mk, or it's painfully difficult to use .if in Makefiles. bsd.prog.mk and bsd.lib.mk do not depend on it however. Allow overriding of the -soname arg when building the lib*crypt.so* libs since libdescrypt.so and libscrupt.so both need a -soname of libcrypt.so so that the symlink is obeyed at runtime rather than at compile time. Revision Changes Path 1.63 +6 -3 src/share/mk/bsd.lib.mk 1.26 +4 -1 src/share/mk/sys.mk