Date: Thu, 22 May 2003 00:56:00 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 31618 for review Message-ID: <200305220756.h4M7u072011717@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=31618 Change 31618 by peter@peter_daintree on 2003/05/22 00:55:12 IFC @31614 Affected files ... .. //depot/projects/hammer/Makefile.inc1#17 integrate .. //depot/projects/hammer/release/Makefile#22 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#11 integrate .. //depot/projects/hammer/share/man/man5/make.conf.5#9 integrate .. //depot/projects/hammer/usr.bin/ipcs/ipcs.1#3 integrate .. //depot/projects/hammer/usr.bin/mt/mt.1#4 integrate .. //depot/projects/hammer/usr.bin/netstat/netstat.1#3 integrate .. //depot/projects/hammer/usr.bin/stat/stat.1#4 integrate .. //depot/projects/hammer/usr.bin/xargs/xargs.1#4 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#17 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.361 2003/05/19 15:51:58 des Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.362 2003/05/21 21:47:20 ru Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -695,7 +695,7 @@ .endif .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && !defined(NO_KERBEROS) + !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS) _libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \ kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl .endif @@ -782,7 +782,8 @@ _generic_libs= gnu/lib -.if !defined(NOCRYPT) && !defined(NO_KERBEROS) +.if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ + !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS) _prebuild_libs+= kerberos5/lib/libasn1 _prebuild_libs+= kerberos5/lib/libgssapi _prebuild_libs+= kerberos5/lib/libkrb5 ==== //depot/projects/hammer/release/Makefile#22 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.778 2003/05/20 01:46:09 scottl Exp $ +# $FreeBSD: src/release/Makefile,v 1.779 2003/05/21 21:19:54 obrien Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] ==== //depot/projects/hammer/share/examples/etc/make.conf#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/etc/make.conf,v 1.215 2003/05/19 15:51:59 des Exp $ +# $FreeBSD: src/share/examples/etc/make.conf,v 1.216 2003/05/21 21:47:20 ru Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -113,7 +113,8 @@ #NO_MODULES= true # do not build modules with the kernel #NO_OBJC= true # do not build Objective C support #NO_OPENSSH= true # do not build OpenSSH -#NO_OPENSSL= true # do not build OpenSSL (implies NO_OPENSSH) +#NO_OPENSSL= true # do not build OpenSSL (implies NO_KERBEROS and +# NO_OPENSSH) #NO_SENDMAIL= true # do not build sendmail and related programs #NO_SHAREDOCS= true # do not build the 4.4BSD legacy docs #NO_TCSH= true # do not build and install /bin/csh (which is tcsh) ==== //depot/projects/hammer/share/man/man5/make.conf.5#9 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.73 2003/05/19 15:51:59 des Exp $ +.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.74 2003/05/21 21:47:20 ru Exp $ .\" .Dd November 3, 2000 .Dt MAKE.CONF 5 @@ -481,6 +481,8 @@ .It Va NO_OPENSSL .Pq Vt bool Set to not build OpenSSL (implies +.Va NO_KERBEROS +and .Va NO_OPENSSH ) . .It Va NO_SENDMAIL .Pq Vt bool ==== //depot/projects/hammer/usr.bin/ipcs/ipcs.1#3 (text+ko) ==== @@ -27,7 +27,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/usr.bin/ipcs/ipcs.1,v 1.15 2003/03/24 10:45:12 tjr Exp $ +.\" $FreeBSD: src/usr.bin/ipcs/ipcs.1,v 1.16 2003/05/21 21:07:28 ru Exp $ .\" .Dd June 18, 1994 .Dt "IPCS" 1 @@ -100,7 +100,7 @@ .It Fl C Ar core Extract values associated with the name list from the specified core instead of the default -.Dq Pa /dev/kmem . +.Pa /dev/kmem . Implies .Fl y . .It Fl M @@ -108,7 +108,7 @@ .It Fl N Ar system Extract the name list from the specified system instead of the default -.Dq Pa /boot/kernel/kernel . +.Pa /boot/kernel/kernel . Implies .Fl y . .It Fl Q ==== //depot/projects/hammer/usr.bin/mt/mt.1#4 (text+ko) ==== @@ -31,7 +31,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mt.1 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/usr.bin/mt/mt.1,v 1.36 2003/04/30 19:18:50 schweikh Exp $ +.\" $FreeBSD: src/usr.bin/mt/mt.1,v 1.37 2003/05/21 21:07:28 ru Exp $ .\" .Dd June 6, 1993 .Dt MT 1 @@ -352,7 +352,9 @@ .Xr st 4 driver appeared in .Bx 386 0.1 -as a separate st(1) command, and have been merged into the +as a separate +.Nm st +command, and have been merged into the .Nm command in .Fx 2.1 . ==== //depot/projects/hammer/usr.bin/netstat/netstat.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)netstat.1 8.8 (Berkeley) 4/18/94 -.\" $FreeBSD: src/usr.bin/netstat/netstat.1,v 1.43 2003/03/26 02:00:35 keramida Exp $ +.\" $FreeBSD: src/usr.bin/netstat/netstat.1,v 1.44 2003/05/21 20:52:57 ru Exp $ .\" .Dd September 7, 2001 .Dt NETSTAT 1 @@ -49,7 +49,7 @@ .It Xo .Bk -words .Nm -.Op Fl AaLlnSW +.Op Fl AaLnSW .Op Fl f Ar protocol_family | Fl p Ar protocol .Op Fl M Ar core .Op Fl N Ar system @@ -189,7 +189,7 @@ .Bk -words .Nm .Fl r -.Op Fl AalnW +.Op Fl AanW .Op Fl f Ar address_family .Op Fl M Ar core .Op Fl N Ar system @@ -213,8 +213,6 @@ normally these routes are not shown. When .Fl W -or -.Fl l is also present, show the path MTU for each route. @@ -235,7 +233,7 @@ .Bk -words .Nm .Fl g -.Op Fl lW +.Op Fl W .Op Fl f Ar address_family .Op Fl M Ar core .Op Fl N Ar system @@ -295,11 +293,6 @@ The program will complain if .Ar protocol is unknown or if there is no statistics routine for it. -.It Fl l -The -.Fl l -option is equivalent to -.Fl W . .It Fl M Extract values associated with the name list from the specified core instead of the default ==== //depot/projects/hammer/usr.bin/stat/stat.1#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/usr.bin/stat/stat.1,v 1.4 2003/05/11 23:07:07 dougb Exp $ +.\" $FreeBSD: src/usr.bin/stat/stat.1,v 1.5 2003/05/21 21:07:28 ru Exp $ .\" .Dd May 8, 2003 .Dt STAT 1 @@ -119,8 +119,9 @@ error messages are automatically suppressed. .It Fl f Ar format Display information using the specified format. -See the FORMATS section -for a description of valid formats. +See the +.Sx FORMATS +section for a description of valid formats. .It Fl l Display output in .Ic ls Fl lT ==== //depot/projects/hammer/usr.bin/xargs/xargs.1#4 (text+ko) ==== @@ -34,7 +34,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)xargs.1 8.1 (Berkeley) 6/6/93 -.\" $FreeBSD: src/usr.bin/xargs/xargs.1,v 1.29 2003/03/23 18:29:52 mux Exp $ +.\" $FreeBSD: src/usr.bin/xargs/xargs.1,v 1.30 2003/05/21 21:07:28 ru Exp $ .\" $xMach: xargs.1,v 1.2 2002/02/23 05:23:37 tim Exp $ .\" .Dd May 7, 2001 @@ -194,7 +194,7 @@ is 5000. .It Fl o Reopen stdin as -.Dq /dev/tty +.Pa /dev/tty in the child process before executing the command. This is useful if you want .Nm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305220756.h4M7u072011717>