Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 9 Jan 2013 02:26:50 +0000 (UTC)
From:      Neel Natu <neel@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r245205 - in projects/bhyve: bin/ls contrib/one-true-awk etc/namedb etc/sendmail gnu/usr.bin/binutils/ld lib/csu/amd64 lib/csu/arm lib/csu/common lib/csu/i386-elf lib/csu/mips lib/csu/p...
Message-ID:  <201301090226.r092Qodh096907@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: neel
Date: Wed Jan  9 02:26:50 2013
New Revision: 245205
URL: http://svnweb.freebsd.org/changeset/base/245205

Log:
  IFC @ r245178

Added:
  projects/bhyve/tools/build/options/WITHOUT_LZMA_SUPPORT
     - copied unchanged from r245178, head/tools/build/options/WITHOUT_LZMA_SUPPORT
  projects/bhyve/usr.sbin/bsdconfig/share/script.subr
     - copied unchanged from r245178, head/usr.sbin/bsdconfig/share/script.subr
  projects/bhyve/usr.sbin/bsdconfig/share/variable.subr
     - copied unchanged from r245178, head/usr.sbin/bsdconfig/share/variable.subr
Deleted:
  projects/bhyve/share/examples/cvsup/gnats-supfile
  projects/bhyve/sys/dev/xen/evtchn/
  projects/bhyve/sys/dev/xen/xenpci/machine_reboot.c
Modified:
  projects/bhyve/bin/ls/util.c
  projects/bhyve/contrib/one-true-awk/FIXES
  projects/bhyve/contrib/one-true-awk/main.c
  projects/bhyve/contrib/one-true-awk/makefile
  projects/bhyve/contrib/one-true-awk/proto.h
  projects/bhyve/contrib/one-true-awk/run.c
  projects/bhyve/contrib/one-true-awk/tran.c
  projects/bhyve/etc/namedb/named.root
  projects/bhyve/etc/sendmail/freefall.mc
  projects/bhyve/gnu/usr.bin/binutils/ld/armelf_fbsd.sh
  projects/bhyve/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh
  projects/bhyve/lib/csu/amd64/crt1.c
  projects/bhyve/lib/csu/arm/crt1.c
  projects/bhyve/lib/csu/common/ignore_init.c
  projects/bhyve/lib/csu/i386-elf/crt1_c.c
  projects/bhyve/lib/csu/mips/crt1.c
  projects/bhyve/lib/csu/powerpc/crt1.c
  projects/bhyve/lib/csu/powerpc64/crt1.c
  projects/bhyve/lib/csu/sparc64/crt1.c
  projects/bhyve/lib/libc/arm/softfloat/arm-gcc.h
  projects/bhyve/release/amd64/mkisoimages.sh
  projects/bhyve/release/i386/mkisoimages.sh
  projects/bhyve/release/ia64/mkisoimages.sh
  projects/bhyve/release/pc98/mkisoimages.sh
  projects/bhyve/release/powerpc/mkisoimages.sh
  projects/bhyve/release/sparc64/mkisoimages.sh
  projects/bhyve/sbin/geom/class/journal/geom_journal_ufs.c
  projects/bhyve/sbin/geom/class/part/gpart.8
  projects/bhyve/sbin/mount_nullfs/mount_nullfs.c
  projects/bhyve/sbin/route/route.c
  projects/bhyve/share/examples/Makefile
  projects/bhyve/share/examples/cvsup/README
  projects/bhyve/share/examples/cvsup/cvs-supfile
  projects/bhyve/share/examples/cvsup/ports-supfile
  projects/bhyve/share/examples/cvsup/stable-supfile
  projects/bhyve/share/examples/cvsup/standard-supfile
  projects/bhyve/share/man/man4/mps.4
  projects/bhyve/share/man/man9/sleep.9
  projects/bhyve/share/misc/committers-ports.dot
  projects/bhyve/share/mk/bsd.cpu.mk
  projects/bhyve/sys/amd64/conf/GENERIC
  projects/bhyve/sys/arm/arm/machdep.c
  projects/bhyve/sys/arm/arm/pl310.c
  projects/bhyve/sys/arm/arm/pmap-v6.c
  projects/bhyve/sys/arm/broadcom/bcm2835/bcm2835_fb.c
  projects/bhyve/sys/arm/broadcom/bcm2835/bcm2835_machdep.c
  projects/bhyve/sys/arm/conf/BEAGLEBONE
  projects/bhyve/sys/arm/include/atomic.h
  projects/bhyve/sys/arm/include/machdep.h
  projects/bhyve/sys/arm/include/pl310.h
  projects/bhyve/sys/arm/include/pmap.h
  projects/bhyve/sys/arm/ti/cpsw/if_cpsw.c
  projects/bhyve/sys/arm/ti/cpsw/if_cpswvar.h
  projects/bhyve/sys/arm/ti/ti_cpuid.c
  projects/bhyve/sys/arm/ti/ti_cpuid.h
  projects/bhyve/sys/arm/versatile/versatile_clcd.c
  projects/bhyve/sys/boot/common/interp_forth.c
  projects/bhyve/sys/conf/options.mips
  projects/bhyve/sys/contrib/octeon-sdk/cvmx-app-init.h
  projects/bhyve/sys/contrib/octeon-sdk/cvmx-helper-board.c
  projects/bhyve/sys/dev/ath/if_ath_rx.c
  projects/bhyve/sys/dev/ath/if_ath_spectral.c
  projects/bhyve/sys/dev/ath/if_athvar.h
  projects/bhyve/sys/dev/nvme/nvme_test.c
  projects/bhyve/sys/dev/pci/pci.c
  projects/bhyve/sys/dev/usb/controller/xhci.c
  projects/bhyve/sys/dev/usb/wlan/if_run.c
  projects/bhyve/sys/dev/xen/control/control.c
  projects/bhyve/sys/dev/xen/netfront/netfront.c
  projects/bhyve/sys/fs/ext2fs/ext2_dinode.h
  projects/bhyve/sys/fs/fuse/fuse_io.c
  projects/bhyve/sys/fs/nandfs/nandfs_segment.c
  projects/bhyve/sys/fs/nullfs/null.h
  projects/bhyve/sys/fs/nullfs/null_subr.c
  projects/bhyve/sys/fs/nullfs/null_vfsops.c
  projects/bhyve/sys/fs/nullfs/null_vnops.c
  projects/bhyve/sys/fs/tmpfs/tmpfs.h
  projects/bhyve/sys/fs/tmpfs/tmpfs_subr.c
  projects/bhyve/sys/fs/tmpfs/tmpfs_vfsops.c
  projects/bhyve/sys/fs/tmpfs/tmpfs_vnops.c
  projects/bhyve/sys/i386/conf/GENERIC
  projects/bhyve/sys/i386/xen/xen_machdep.c
  projects/bhyve/sys/ia64/conf/GENERIC
  projects/bhyve/sys/kern/kern_exit.c
  projects/bhyve/sys/kern/kern_lock.c
  projects/bhyve/sys/kern/kern_synch.c
  projects/bhyve/sys/kern/subr_param.c
  projects/bhyve/sys/kern/vfs_mount.c
  projects/bhyve/sys/mips/atheros/ar71xx_pci.c
  projects/bhyve/sys/mips/conf/OCTEON1
  projects/bhyve/sys/net/if_pfsync.h
  projects/bhyve/sys/net/zlib.c
  projects/bhyve/sys/net/zlib.h
  projects/bhyve/sys/net80211/ieee80211_hostap.c
  projects/bhyve/sys/net80211/ieee80211_hwmp.c
  projects/bhyve/sys/net80211/ieee80211_radiotap.h
  projects/bhyve/sys/netinet/in.c
  projects/bhyve/sys/netinet6/in6.c
  projects/bhyve/sys/pc98/conf/GENERIC
  projects/bhyve/sys/powerpc/conf/GENERIC
  projects/bhyve/sys/powerpc/conf/GENERIC64
  projects/bhyve/sys/sparc64/conf/GENERIC
  projects/bhyve/sys/sparc64/sparc64/interrupt.S
  projects/bhyve/sys/sys/mount.h
  projects/bhyve/tools/build/make_check/Makefile
  projects/bhyve/usr.bin/apply/apply.c
  projects/bhyve/usr.bin/grep/Makefile
  projects/bhyve/usr.bin/grep/file.c
  projects/bhyve/usr.bin/grep/grep.c
  projects/bhyve/usr.bin/grep/regex/tre-fastmatch.c
  projects/bhyve/usr.bin/ul/ul.c
  projects/bhyve/usr.bin/xargs/strnsubst.c
  projects/bhyve/usr.sbin/bsdconfig/USAGE
  projects/bhyve/usr.sbin/bsdconfig/bsdconfig
  projects/bhyve/usr.sbin/bsdconfig/bsdconfig.8
  projects/bhyve/usr.sbin/bsdconfig/include/messages.subr
  projects/bhyve/usr.sbin/bsdconfig/share/Makefile
  projects/bhyve/usr.sbin/bsdconfig/share/common.subr
  projects/bhyve/usr.sbin/bsdconfig/share/dialog.subr
  projects/bhyve/usr.sbin/daemon/daemon.c
  projects/bhyve/usr.sbin/gssd/Makefile
  projects/bhyve/usr.sbin/gssd/gssd.8
  projects/bhyve/usr.sbin/gssd/gssd.c
  projects/bhyve/usr.sbin/ifmcstat/ifmcstat.c
  projects/bhyve/usr.sbin/newsyslog/newsyslog.8
  projects/bhyve/usr.sbin/newsyslog/newsyslog.c
  projects/bhyve/usr.sbin/pw/pw_user.c
Directory Properties:
  projects/bhyve/   (props changed)
  projects/bhyve/contrib/one-true-awk/   (props changed)
  projects/bhyve/gnu/usr.bin/binutils/   (props changed)
  projects/bhyve/lib/libc/   (props changed)
  projects/bhyve/sbin/   (props changed)
  projects/bhyve/share/man/man4/   (props changed)
  projects/bhyve/sys/   (props changed)
  projects/bhyve/sys/boot/   (props changed)
  projects/bhyve/sys/conf/   (props changed)
  projects/bhyve/sys/contrib/octeon-sdk/   (props changed)

Modified: projects/bhyve/bin/ls/util.c
==============================================================================
--- projects/bhyve/bin/ls/util.c	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/bin/ls/util.c	Wed Jan  9 02:26:50 2013	(r245205)
@@ -184,7 +184,10 @@ prn_octal(const char *s)
 			for (i = 0; i < (int)clen; i++)
 				putchar((unsigned char)s[i]);
 			len += wcwidth(wc);
-		} else if (goodchar && f_octal_escape && wc >= 0 &&
+		} else if (goodchar && f_octal_escape &&
+#if WCHAR_MIN < 0
+                    wc >= 0 &&
+#endif
 		    wc <= (wchar_t)UCHAR_MAX &&
 		    (p = strchr(esc, (char)wc)) != NULL) {
 			putchar('\\');

Modified: projects/bhyve/contrib/one-true-awk/FIXES
==============================================================================
--- projects/bhyve/contrib/one-true-awk/FIXES	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/contrib/one-true-awk/FIXES	Wed Jan  9 02:26:50 2013	(r245205)
@@ -25,6 +25,22 @@ THIS SOFTWARE.
 This file lists all bug fixes, changes, etc., made since the AWK book
 was sent to the printers in August, 1987.
 
+Dec 20, 2012:
+	fiddled makefile to get correct yacc and bison flags.  pick yacc
+	(linux) or bison (mac) as necessary.
+
+	added  __attribute__((__noreturn__)) to a couple of lines in
+	proto.h, to silence someone's enthusiastic checker.
+
+	fixed obscure call by value bug in split(a[1],a) reported on
+	9fans.  the management of temporary values is just a mess; i
+	took a shortcut by making an extra string copy.  thanks
+	to paul patience and arnold robbins for passing it on and for
+	proposed patches.
+
+	tiny fiddle in setfval to eliminate -0 results in T.expr, which
+	has irritated me for 20+ years.
+
 Aug 10, 2011:
 	another fix to avoid core dump with delete(ARGV); again, many thanks
 	to ruslan ermilov.

Modified: projects/bhyve/contrib/one-true-awk/main.c
==============================================================================
--- projects/bhyve/contrib/one-true-awk/main.c	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/contrib/one-true-awk/main.c	Wed Jan  9 02:26:50 2013	(r245205)
@@ -25,7 +25,7 @@ THIS SOFTWARE.
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-const char	*version = "version 20110810 (FreeBSD)";
+const char	*version = "version 20121220 (FreeBSD)";
 
 #define DEBUG
 #include <stdio.h>

Modified: projects/bhyve/contrib/one-true-awk/makefile
==============================================================================
--- projects/bhyve/contrib/one-true-awk/makefile	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/contrib/one-true-awk/makefile	Wed Jan  9 02:26:50 2013	(r245205)
@@ -26,15 +26,15 @@ CFLAGS = -g
 CFLAGS = -O2
 CFLAGS =
 
-CC = gcc -Wall -g
-CC = cc
 CC = gcc -Wall -g -Wwrite-strings
 CC = gcc -fprofile-arcs -ftest-coverage # then gcov f1.c; cat f1.c.gcov
+CC = gcc -g -Wall -pedantic 
 CC = gcc -O4 -Wall -pedantic -fno-strict-aliasing
 
-YACC = bison -y
-YACC = yacc
-YFLAGS = -d
+YACC = bison -d -y
+YACC = yacc -d -S
+#YFLAGS = -d -S
+		# -S uses sprintf in yacc parser instead of sprint
 
 OFILES = b.o main.o parse.o proctab.o tran.o lib.o run.o lex.o
 

Modified: projects/bhyve/contrib/one-true-awk/proto.h
==============================================================================
--- projects/bhyve/contrib/one-true-awk/proto.h	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/contrib/one-true-awk/proto.h	Wed Jan  9 02:26:50 2013	(r245205)
@@ -46,7 +46,7 @@ extern	void	freetr(Node *);
 extern	int	hexstr(uschar **);
 extern	int	quoted(uschar **);
 extern	char	*cclenter(const char *);
-extern	void	overflo(const char *);
+extern	void	overflo(const char *) __attribute__((__noreturn__));
 extern	void	cfoll(fa *, Node *);
 extern	int	first(Node *);
 extern	void	follow(Node *);
@@ -132,7 +132,7 @@ extern	void	fpecatch(int);
 extern	void	bracecheck(void);
 extern	void	bcheck2(int, int, int);
 extern	void	SYNTAX(const char *, ...);
-extern	void	FATAL(const char *, ...);
+extern	void	FATAL(const char *, ...) __attribute__((__noreturn__));
 extern	void	WARNING(const char *, ...);
 extern	void	error(void);
 extern	void	eprint(void);

Modified: projects/bhyve/contrib/one-true-awk/run.c
==============================================================================
--- projects/bhyve/contrib/one-true-awk/run.c	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/contrib/one-true-awk/run.c	Wed Jan  9 02:26:50 2013	(r245205)
@@ -1213,13 +1213,13 @@ Cell *dopa2(Node **a, int n)	/* a[0], a[
 Cell *split(Node **a, int nnn)	/* split(a[0], a[1], a[2]); a[3] is type */
 {
 	Cell *x = 0, *y, *ap;
-	char *s;
+	char *s, *origs;
 	int sep;
 	char *t, temp, num[50], *fs = 0;
 	int n, tempstat, arg3type;
 
 	y = execute(a[0]);	/* source string */
-	s = getsval(y);
+	origs = s = strdup(getsval(y));
 	arg3type = ptoi(a[3]);
 	if (a[2] == 0)		/* fs string */
 		fs = *FS;
@@ -1339,6 +1339,7 @@ Cell *split(Node **a, int nnn)	/* split(
 	}
 	tempfree(ap);
 	tempfree(y);
+	free(origs);
 	if (a[2] != 0 && arg3type == STRING) {
 		tempfree(x);
 	}

Modified: projects/bhyve/contrib/one-true-awk/tran.c
==============================================================================
--- projects/bhyve/contrib/one-true-awk/tran.c	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/contrib/one-true-awk/tran.c	Wed Jan  9 02:26:50 2013	(r245205)
@@ -298,6 +298,8 @@ Awkfloat setfval(Cell *vp, Awkfloat f)	/
 		xfree(vp->sval); /* free any previous string */
 	vp->tval &= ~STR;	/* mark string invalid */
 	vp->tval |= NUM;	/* mark number ok */
+	if (f == -0)  /* who would have thought this possible? */
+		f = 0;
 	   dprintf( ("setfval %p: %s = %g, t=%o\n", (void*)vp, NN(vp->nval), f, vp->tval) );
 	return vp->fval = f;
 }

Modified: projects/bhyve/etc/namedb/named.root
==============================================================================
--- projects/bhyve/etc/namedb/named.root	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/etc/namedb/named.root	Wed Jan  9 02:26:50 2013	(r245205)
@@ -7,14 +7,14 @@
 ;       (e.g. reference this file in the "cache  .  <file>"
 ;       configuration file of BIND domain name servers).
 ;
-;       This file is made available by InterNIC
+;       This file is made available by InterNIC 
 ;       under anonymous FTP as
-;           file                /domain/named.root
+;           file                /domain/named.cache
 ;           on server           FTP.INTERNIC.NET
 ;       -OR-                    RS.INTERNIC.NET
 ;
-;       last update:    Jun 8, 2011
-;       related version of root zone:   2011060800
+;       last update:    Jan 3, 2013
+;       related version of root zone:   2013010300
 ;
 ; formerly NS.INTERNIC.NET
 ;
@@ -35,7 +35,7 @@ C.ROOT-SERVERS.NET.      3600000      A 
 ; FORMERLY TERP.UMD.EDU
 ;
 .                        3600000      NS    D.ROOT-SERVERS.NET.
-D.ROOT-SERVERS.NET.      3600000      A     128.8.10.90
+D.ROOT-SERVERS.NET.      3600000      A     199.7.91.13
 D.ROOT-SERVERS.NET.	 3600000      AAAA  2001:500:2D::D
 ;
 ; FORMERLY NS.NASA.GOV

Modified: projects/bhyve/etc/sendmail/freefall.mc
==============================================================================
--- projects/bhyve/etc/sendmail/freefall.mc	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/etc/sendmail/freefall.mc	Wed Jan  9 02:26:50 2013	(r245205)
@@ -43,5 +43,5 @@ divert(0)dnl
 VERSIONID(`$FreeBSD$')
 
 OSTYPE(freebsd6)
-FEATURE(nullclient, smarthost.ysv.$m)
+FEATURE(nullclient, smarthost.ysv.freebsd.org)
 MASQUERADE_AS(FreeBSD.org)

Modified: projects/bhyve/gnu/usr.bin/binutils/ld/armelf_fbsd.sh
==============================================================================
--- projects/bhyve/gnu/usr.bin/binutils/ld/armelf_fbsd.sh	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/gnu/usr.bin/binutils/ld/armelf_fbsd.sh	Wed Jan  9 02:26:50 2013	(r245205)
@@ -1,6 +1,7 @@
 # $FreeBSD$
 . ${srcdir}/emulparams/armelf.sh
 . ${srcdir}/emulparams/elf_fbsd.sh
+TARGET2_TYPE=got-rel
 MAXPAGESIZE=0x8000
 GENERATE_PIE_SCRIPT=yes
 

Modified: projects/bhyve/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh
==============================================================================
--- projects/bhyve/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/gnu/usr.bin/binutils/ld/armelfb_fbsd.sh	Wed Jan  9 02:26:50 2013	(r245205)
@@ -5,6 +5,7 @@
 #OUTPUT_FORMAT="elf32-bigarm"
 . ${srcdir}/emulparams/armelf.sh
 . ${srcdir}/emulparams/elf_fbsd.sh
+TARGET2_TYPE=got-rel
 MAXPAGESIZE=0x8000
 GENERATE_PIE_SCRIPT=yes
 

Modified: projects/bhyve/lib/csu/amd64/crt1.c
==============================================================================
--- projects/bhyve/lib/csu/amd64/crt1.c	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/lib/csu/amd64/crt1.c	Wed Jan  9 02:26:50 2013	(r245205)
@@ -61,9 +61,7 @@ _start(char **ap, void (*cleanup)(void))
 	argc = *(long *)(void *)ap;
 	argv = ap + 1;
 	env = ap + 2 + argc;
-	environ = env;
-	if (argc > 0 && argv[0] != NULL)
-		handle_progname(argv[0]);
+	handle_argv(argc, argv, env);
 
 	if (&_DYNAMIC != NULL)
 		atexit(cleanup);

Modified: projects/bhyve/lib/csu/arm/crt1.c
==============================================================================
--- projects/bhyve/lib/csu/arm/crt1.c	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/lib/csu/arm/crt1.c	Wed Jan  9 02:26:50 2013	(r245205)
@@ -98,10 +98,7 @@ __start(int argc, char **argv, char **en
     const struct Struct_Obj_Entry *obj __unused, void (*cleanup)(void))
 {
 
-	environ = env;
-
-	if (argc > 0 && argv[0] != NULL)
-		handle_progname(argv[0]);
+	handle_argv(argc, argv, env);
 
 	if (ps_strings != (struct ps_strings *)0)
 		__ps_strings = ps_strings;

Modified: projects/bhyve/lib/csu/common/ignore_init.c
==============================================================================
--- projects/bhyve/lib/csu/common/ignore_init.c	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/lib/csu/common/ignore_init.c	Wed Jan  9 02:26:50 2013	(r245205)
@@ -87,14 +87,18 @@ handle_static_init(int argc, char **argv
 }
 
 static inline void
-handle_progname(const char *v)
+handle_argv(int argc, char *argv[], char **env)
 {
 	const char *s;
 
-	__progname = v;
-	for (s = __progname; *s != '\0'; s++) {
-		if (*s == '/')
-			__progname = s + 1;
+	if (environ == NULL)
+		environ = env;
+	if (argc > 0 && argv[0] != NULL) {
+		__progname = argv[0];
+		for (s = __progname; *s != '\0'; s++) {
+			if (*s == '/')
+				__progname = s + 1;
+		}
 	}
 }
 

Modified: projects/bhyve/lib/csu/i386-elf/crt1_c.c
==============================================================================
--- projects/bhyve/lib/csu/i386-elf/crt1_c.c	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/lib/csu/i386-elf/crt1_c.c	Wed Jan  9 02:26:50 2013	(r245205)
@@ -61,10 +61,7 @@ _start1(fptr cleanup, int argc, char *ar
 	char **env;
 
 	env = argv + argc + 1;
-	environ = env;
-	if (argc > 0 && argv[0] != NULL)
-		handle_progname(argv[0]);
-
+	handle_argv(argc, argv, env);
 	if (&_DYNAMIC != NULL)
 		atexit(cleanup);
 	else

Modified: projects/bhyve/lib/csu/mips/crt1.c
==============================================================================
--- projects/bhyve/lib/csu/mips/crt1.c	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/lib/csu/mips/crt1.c	Wed Jan  9 02:26:50 2013	(r245205)
@@ -71,9 +71,7 @@ __start(char **ap,
 	argc = * (long *) ap;
 	argv = ap + 1;
 	env  = ap + 2 + argc;
-	environ = env;
-	if (argc > 0 && argv[0] != NULL)
-		handle_progname(argv[0]);
+	handle_argv(argc, argv, env);
 
 	if (&_DYNAMIC != NULL)
 		atexit(cleanup);

Modified: projects/bhyve/lib/csu/powerpc/crt1.c
==============================================================================
--- projects/bhyve/lib/csu/powerpc/crt1.c	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/lib/csu/powerpc/crt1.c	Wed Jan  9 02:26:50 2013	(r245205)
@@ -81,10 +81,8 @@ _start(int argc, char **argv, char **env
     struct ps_strings *ps_strings)
 {
 
-	environ = env;
 
-	if (argc > 0 && argv[0] != NULL)
-		handle_progname(argv[0]);
+	handle_argv(argc, argv, env);
 
 	if (ps_strings != (struct ps_strings *)0)
 		__ps_strings = ps_strings;

Modified: projects/bhyve/lib/csu/powerpc64/crt1.c
==============================================================================
--- projects/bhyve/lib/csu/powerpc64/crt1.c	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/lib/csu/powerpc64/crt1.c	Wed Jan  9 02:26:50 2013	(r245205)
@@ -81,10 +81,7 @@ _start(int argc, char **argv, char **env
     struct ps_strings *ps_strings)
 {
 
-	environ = env;
-
-	if (argc > 0 && argv[0] != NULL)
-		handle_progname(argv[0]);
+	handle_argv(argc, argv, env);
 
 	if (ps_strings != (struct ps_strings *)0)
 		__ps_strings = ps_strings;

Modified: projects/bhyve/lib/csu/sparc64/crt1.c
==============================================================================
--- projects/bhyve/lib/csu/sparc64/crt1.c	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/lib/csu/sparc64/crt1.c	Wed Jan  9 02:26:50 2013	(r245205)
@@ -85,9 +85,7 @@ _start(char **ap, void (*cleanup)(void),
 	argc = *(long *)(void *)ap;
 	argv = ap + 1;
 	env  = ap + 2 + argc;
-	environ = env;
-	if (argc > 0 && argv[0] != NULL)
-		handle_progname(argv[0]);
+	handle_argv(argc, argv, env);
 
 	if (&_DYNAMIC != NULL)
 		atexit(cleanup);

Modified: projects/bhyve/lib/libc/arm/softfloat/arm-gcc.h
==============================================================================
--- projects/bhyve/lib/libc/arm/softfloat/arm-gcc.h	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/lib/libc/arm/softfloat/arm-gcc.h	Wed Jan  9 02:26:50 2013	(r245205)
@@ -95,7 +95,7 @@ what the endianness of the CPU.  VFP is 
 #define FLOAT64_DEMANGLE(a)	(a)
 #define FLOAT64_MANGLE(a)	(a)
 #else
-#define FLOAT64_DEMANGLE(a)	(((a) << 32) | ((a) >> 32))
+#define FLOAT64_DEMANGLE(a)	((((a) & 0xfffffffful) << 32) | ((a) >> 32))
 #define FLOAT64_MANGLE(a)	FLOAT64_DEMANGLE(a)
 #endif
 #endif

Modified: projects/bhyve/release/amd64/mkisoimages.sh
==============================================================================
--- projects/bhyve/release/amd64/mkisoimages.sh	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/release/amd64/mkisoimages.sh	Wed Jan  9 02:26:50 2013	(r245205)
@@ -36,9 +36,9 @@ if [ $# -lt 3 ]; then
 	exit 1
 fi
 
-LABEL=$1; shift
+LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift
 NAME=$1; shift
 
-echo "/dev/iso9660/`echo $LABEL | tr '[:lower:]' '[:upper:]'` / cd9660 ro 0 0" > $1/etc/fstab
+echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
 makefs -t cd9660 $bootable -o rockridge -o label=$LABEL $NAME $*
 rm $1/etc/fstab

Modified: projects/bhyve/release/i386/mkisoimages.sh
==============================================================================
--- projects/bhyve/release/i386/mkisoimages.sh	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/release/i386/mkisoimages.sh	Wed Jan  9 02:26:50 2013	(r245205)
@@ -36,9 +36,9 @@ if [ $# -lt 3 ]; then
 	exit 1
 fi
 
-LABEL=$1; shift
+LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift
 NAME=$1; shift
 
-echo "/dev/iso9660/`echo $LABEL | tr '[:lower:]' '[:upper:]'` / cd9660 ro 0 0" > $1/etc/fstab
+echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
 makefs -t cd9660 $bootable -o rockridge -o label=$LABEL $NAME $*
 rm $1/etc/fstab

Modified: projects/bhyve/release/ia64/mkisoimages.sh
==============================================================================
--- projects/bhyve/release/ia64/mkisoimages.sh	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/release/ia64/mkisoimages.sh	Wed Jan  9 02:26:50 2013	(r245205)
@@ -37,7 +37,7 @@ if [ $# -lt 3 ]; then
     exit 1
 fi
 
-LABEL=$1; shift
+LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift
 NAME=$1; shift
 BASE=$1; shift
 

Modified: projects/bhyve/release/pc98/mkisoimages.sh
==============================================================================
--- projects/bhyve/release/pc98/mkisoimages.sh	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/release/pc98/mkisoimages.sh	Wed Jan  9 02:26:50 2013	(r245205)
@@ -36,9 +36,9 @@ if [ $# -lt 3 ]; then
 	exit 1
 fi
 
-LABEL=$1; shift
+LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift
 NAME=$1; shift
 
-echo "/dev/iso9660/`echo $LABEL | tr '[:lower:]' '[:upper:]'` / cd9660 ro 0 0" > $1/etc/fstab
+echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
 makefs -t cd9660 $bootable -o rockridge -o label=$LABEL $NAME $*
 rm $1/etc/fstab

Modified: projects/bhyve/release/powerpc/mkisoimages.sh
==============================================================================
--- projects/bhyve/release/powerpc/mkisoimages.sh	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/release/powerpc/mkisoimages.sh	Wed Jan  9 02:26:50 2013	(r245205)
@@ -58,10 +58,10 @@ if [ $# -lt 3 ]; then
 	exit 1
 fi
 
-LABEL=$1; shift
+LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift
 NAME=$1; shift
 
-echo "/dev/iso9660/`echo $LABEL | tr '[:lower:]' '[:upper:]'` / cd9660 ro 0 0" > $1/etc/fstab
+echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
 makefs -t cd9660 $bootable -o rockridge -o label=$LABEL $NAME $*
 rm $1/etc/fstab
 rm /tmp/hfs-boot-block

Modified: projects/bhyve/release/sparc64/mkisoimages.sh
==============================================================================
--- projects/bhyve/release/sparc64/mkisoimages.sh	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/release/sparc64/mkisoimages.sh	Wed Jan  9 02:26:50 2013	(r245205)
@@ -63,7 +63,7 @@ if [ $? -ne 0 ]; then
 	fi
 fi
 
-LABEL=$1; shift
+LABEL=`echo $1 | tr '[:lower:]' '[:upper:]'`; shift
 NAME=$1; shift
 
 echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab

Modified: projects/bhyve/sbin/geom/class/journal/geom_journal_ufs.c
==============================================================================
--- projects/bhyve/sbin/geom/class/journal/geom_journal_ufs.c	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/sbin/geom/class/journal/geom_journal_ufs.c	Wed Jan  9 02:26:50 2013	(r245205)
@@ -73,6 +73,6 @@ g_journal_ufs_using_last_sector(const ch
 	/* Provider size in 512 bytes blocks. */
 	psize = g_get_mediasize(prov) / DEV_BSIZE;
 	/* File system size in 512 bytes blocks. */
-	fssize = fsbtodb(fs, dbtofsb(fs, psize));
-	return (psize == fssize);
+	fssize = fsbtodb(fs, fs->fs_size);
+	return (psize <= fssize);
 }

Modified: projects/bhyve/sbin/geom/class/part/gpart.8
==============================================================================
--- projects/bhyve/sbin/geom/class/part/gpart.8	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/sbin/geom/class/part/gpart.8	Wed Jan  9 02:26:50 2013	(r245205)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 19, 2012
+.Dd January 3, 2013
 .Dt GPART 8
 .Os
 .Sh NAME
@@ -453,8 +453,14 @@ about its use.
 .El
 .\" ==== SHOW ====
 .It Cm show
-Show the current partition information of the specified geoms
-or all geoms if none are specified.
+Show current partition information for the specified geoms, or all
+geoms if none are specified.
+The default output includes the logical starting block of each
+partition, the partition size in blocks, the partition index number,
+the partition type, and a human readable partition size.
+Block sizes and locations are based on the device's Sectorsize
+as shown by
+.Cm gpart list .
 Additional options include:
 .Bl -tag -width 10n
 .It Fl l
@@ -919,7 +925,7 @@ and
 .Cm list
 will report about corrupt tables.
 .Pp
-If the size of the device has changed (e.g.\& volume expansion) the
+If the size of the device has changed (e.g.,\& volume expansion) the
 secondary GPT header will no longer be located in the last sector.
 This is not a metadata corruption, but it is dangerous because any
 corruption of the primary GPT will lead to loss of the partition table.
@@ -979,14 +985,14 @@ This may break a mirrored volume and lea
 Exit status is 0 on success, and 1 if the command fails.
 .Sh EXAMPLES
 Create a GPT scheme on
-.Pa ad0 :
+.Pa ada0 :
 .Bd -literal -offset indent
-/sbin/gpart create -s GPT ad0
+/sbin/gpart create -s GPT ada0
 .Ed
 .Pp
 Embed GPT bootstrap code into a protective MBR:
 .Bd -literal -offset indent
-/sbin/gpart bootcode -b /boot/pmbr ad0
+/sbin/gpart bootcode -b /boot/pmbr ada0
 .Ed
 .Pp
 Create a dedicated
@@ -1011,15 +1017,15 @@ aligned on a 64 kB boundary without the 
 offset or alignment.
 The boot partition itself is aligned on a 4 kB boundary.
 .Bd -literal -offset indent
-/sbin/gpart add -b 40 -s 88 -t freebsd-boot ad0
-/sbin/gpart bootcode -p /boot/gptboot -i 1 ad0
+/sbin/gpart add -b 40 -s 88 -t freebsd-boot ada0
+/sbin/gpart bootcode -p /boot/gptboot -i 1 ada0
 .Ed
 .Pp
 Create a 512MB-sized
 .Cm freebsd-ufs
 partition to contain a UFS filesystem from which the system can boot.
 .Bd -literal -offset indent
-/sbin/gpart add -s 512M -t freebsd-ufs ad0
+/sbin/gpart add -s 512M -t freebsd-ufs ada0
 .Ed
 .Pp
 Create an MBR scheme on

Modified: projects/bhyve/sbin/mount_nullfs/mount_nullfs.c
==============================================================================
--- projects/bhyve/sbin/mount_nullfs/mount_nullfs.c	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/sbin/mount_nullfs/mount_nullfs.c	Wed Jan  9 02:26:50 2013	(r245205)
@@ -57,27 +57,35 @@ static const char rcsid[] =
 
 #include "mntopts.h"
 
-static struct mntopt mopts[] = {
-	MOPT_STDOPTS,
-	MOPT_END
-};
-
 int	subdir(const char *, const char *);
 static void	usage(void) __dead2;
 
 int
 main(int argc, char *argv[])
 {
-	struct iovec iov[6];
-	int ch, mntflags;
+	struct iovec *iov;
+	char *p, *val;
 	char source[MAXPATHLEN];
 	char target[MAXPATHLEN];
+	char errmsg[255];
+	int ch, mntflags, iovlen;
+	char nullfs[] = "nullfs";
 
+	iov = NULL;
+	iovlen = 0;
 	mntflags = 0;
+	errmsg[0] = '\0';
 	while ((ch = getopt(argc, argv, "o:")) != -1)
 		switch(ch) {
 		case 'o':
-			getmntopts(optarg, mopts, &mntflags, 0);
+			val = strdup("");
+			p = strchr(optarg, '=');
+			if (p != NULL) {
+				free(val);
+				*p = '\0';
+				val = p + 1;
+			}
+			build_iovec(&iov, &iovlen, optarg, val, (size_t)-1);
 			break;
 		case '?':
 		default:
@@ -99,21 +107,16 @@ main(int argc, char *argv[])
 		errx(EX_USAGE, "%s (%s) and %s are not distinct paths",
 		    argv[0], target, argv[1]);
 
-	iov[0].iov_base = strdup("fstype");
-	iov[0].iov_len = sizeof("fstype");
-	iov[1].iov_base = strdup("nullfs");
-	iov[1].iov_len = strlen(iov[1].iov_base) + 1;
-	iov[2].iov_base = strdup("fspath");
-	iov[2].iov_len = sizeof("fspath");
-	iov[3].iov_base = source;
-	iov[3].iov_len = strlen(source) + 1;
-	iov[4].iov_base = strdup("target");
-	iov[4].iov_len = sizeof("target");
-	iov[5].iov_base = target;
-	iov[5].iov_len = strlen(target) + 1;
-
-	if (nmount(iov, 6, mntflags))
-		err(1, NULL);
+	build_iovec(&iov, &iovlen, "fstype", nullfs, (size_t)-1);
+	build_iovec(&iov, &iovlen, "fspath", source, (size_t)-1);
+	build_iovec(&iov, &iovlen, "target", target, (size_t)-1);
+	build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg));
+	if (nmount(iov, iovlen, mntflags) < 0) {
+		if (errmsg[0] != 0)
+			err(1, "%s: %s", source, errmsg);
+		else
+			err(1, "%s", source);
+	}
 	exit(0);
 }
 

Modified: projects/bhyve/sbin/route/route.c
==============================================================================
--- projects/bhyve/sbin/route/route.c	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/sbin/route/route.c	Wed Jan  9 02:26:50 2013	(r245205)
@@ -94,7 +94,7 @@ typedef union sockunion *sup;
 int	pid, rtm_addrs;
 int	s;
 int	forcehost, forcenet, doflush, nflag, af, qflag, tflag;
-int	iflag, verbose, aflen = sizeof (struct sockaddr_in);
+int	verbose, aflen = sizeof (struct sockaddr_in);
 int	locking, lockrest, debugonly;
 struct	rt_metrics rt_metrics;
 u_long  rtm_inits;
@@ -107,7 +107,7 @@ static char	*atalk_ntoa(struct at_addr);
 static void	bprintf(FILE *, int, u_char *);
 static void	flushroutes(int argc, char *argv[]);
 static int	flushroutes_fib(int);
-static int	getaddr(int, char *, struct hostent **);
+static int	getaddr(int, char *, struct hostent **, int);
 static int	keyword(const char *);
 static void	inet_makenetandmask(u_long, struct sockaddr_in *, u_long);
 #ifdef INET6
@@ -833,34 +833,34 @@ newroute(int argc, char **argv)
 			case K_IFA:
 				if (!--argc)
 					usage(NULL);
-				(void) getaddr(RTA_IFA, *++argv, 0);
+				getaddr(RTA_IFA, *++argv, 0, nrflags);
 				break;
 			case K_IFP:
 				if (!--argc)
 					usage(NULL);
-				(void) getaddr(RTA_IFP, *++argv, 0);
+				getaddr(RTA_IFP, *++argv, 0, nrflags);
 				break;
 			case K_GENMASK:
 				if (!--argc)
 					usage(NULL);
-				(void) getaddr(RTA_GENMASK, *++argv, 0);
+				getaddr(RTA_GENMASK, *++argv, 0, nrflags);
 				break;
 			case K_GATEWAY:
 				if (!--argc)
 					usage(NULL);
-				(void) getaddr(RTA_GATEWAY, *++argv, 0);
+				getaddr(RTA_GATEWAY, *++argv, 0, nrflags);
 				break;
 			case K_DST:
 				if (!--argc)
 					usage(NULL);
-				if (getaddr(RTA_DST, *++argv, &hp))
+				if (getaddr(RTA_DST, *++argv, &hp, nrflags))
 					nrflags |= F_ISHOST;
 				dest = *argv;
 				break;
 			case K_NETMASK:
 				if (!--argc)
 					usage(NULL);
-				(void) getaddr(RTA_NETMASK, *++argv, 0);
+				getaddr(RTA_NETMASK, *++argv, 0, nrflags);
 				/* FALLTHROUGH */
 			case K_NET:
 				nrflags |= F_FORCENET;
@@ -895,13 +895,13 @@ newroute(int argc, char **argv)
 		} else {
 			if ((rtm_addrs & RTA_DST) == 0) {
 				dest = *argv;
-				if (getaddr(RTA_DST, *argv, &hp))
+				if (getaddr(RTA_DST, *argv, &hp, nrflags))
 					nrflags |= F_ISHOST;
 			} else if ((rtm_addrs & RTA_GATEWAY) == 0) {
 				gateway = *argv;
-				(void) getaddr(RTA_GATEWAY, *argv, &hp);
+				getaddr(RTA_GATEWAY, *argv, &hp, nrflags);
 			} else {
-				(void) getaddr(RTA_NETMASK, *argv, 0);
+				getaddr(RTA_NETMASK, *argv, 0, nrflags);
 				nrflags |= F_FORCENET;
 			}
 		}
@@ -1116,7 +1116,7 @@ inet6_makenetandmask(struct sockaddr_in6
  * returning 1 if a host address, 0 if a network address.
  */
 static int
-getaddr(int which, char *str, struct hostent **hpp)
+getaddr(int which, char *str, struct hostent **hpp, int nrflags)
 {
 	sup su;
 	struct hostent *hp;
@@ -1137,7 +1137,7 @@ getaddr(int which, char *str, struct hos
 		break;
 	case RTA_GATEWAY:
 		su = &so_gate;
-		if (iflag) {
+		if (nrflags & F_INTERFACE) {
 			struct ifaddrs *ifap, *ifa;
 			struct sockaddr_dl *sdl = NULL;
 
@@ -1197,7 +1197,7 @@ getaddr(int which, char *str, struct hos
 #if 0
 			bzero(su, sizeof(*su));	/* for readability */
 #endif
-			getaddr(RTA_NETMASK, str, 0);
+			getaddr(RTA_NETMASK, str, 0, nrflags);
 			break;
 #if 0
 		case RTA_NETMASK:

Modified: projects/bhyve/share/examples/Makefile
==============================================================================
--- projects/bhyve/share/examples/Makefile	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/share/examples/Makefile	Wed Jan  9 02:26:50 2013	(r245205)
@@ -52,7 +52,6 @@ XFILES=	BSD_daemon/FreeBSD.pfa \
 	csh/dot.cshrc \
 	cvsup/README \
 	cvsup/cvs-supfile \
-	cvsup/gnats-supfile \
 	cvsup/ports-supfile \
 	cvsup/refuse \
 	cvsup/refuse.README \

Modified: projects/bhyve/share/examples/cvsup/README
==============================================================================
--- projects/bhyve/share/examples/cvsup/README	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/share/examples/cvsup/README	Wed Jan  9 02:26:50 2013	(r245205)
@@ -1,5 +1,15 @@
 # $FreeBSD$
 
+BEWARE, CVS is deprecated and no longer supported by the FreeBSD project.
+
+The primary development work happens in Subversion and is temporarily
+exported to the legacy CVS system with significant time delays.
+
+You should NOT set up a new consumer of FreeBSD source code via CVS.
+Please see:
+http://www.freebsd.org/doc/handbook/svn.html
+http://www.freebsd.org/doc/handbook/svn-mirrors.html
+
 This directory contains sample "supfiles" for obtaining and updating
 the FreeBSD sources via the Internet.  These supfiles will work
 with CVSup version 14.0 or later.  For general information on CVSup
@@ -20,10 +30,6 @@ FreeBSD, use:
 
     cvs-supfile			Main source tree and ports collection
 
-To maintain a copy of the FreeBSD bug database, use the file:
-
-    gnats-supfile               FreeBSD bug database
-
 IMPORTANT: Before you use any of the supfiles in this directory,
 you will need to edit in an appropriate "host" setting.  See:
 

Modified: projects/bhyve/share/examples/cvsup/cvs-supfile
==============================================================================
--- projects/bhyve/share/examples/cvsup/cvs-supfile	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/share/examples/cvsup/cvs-supfile	Wed Jan  9 02:26:50 2013	(r245205)
@@ -1,7 +1,14 @@
 # $FreeBSD$
 #
-# This file contains all of the "CVSup collections" that make up the
-# CVS development tree of the FreeBSD system.
+# BEWARE, CVS is deprecated and no longer supported by the FreeBSD project.
+#
+# The primary development work happens in Subversion and is temporarily
+# exported to the legacy CVS system with significant time delays.
+#
+# You should NOT set up a new consumer of FreeBSD source code via CVS.
+# Please see:
+# http://www.freebsd.org/doc/handbook/svn.html
+# http://www.freebsd.org/doc/handbook/svn-mirrors.html
 #
 # csup (CVS Update Protocol) allows you to download the latest CVS
 # tree (or any branch of development therefrom) to your system easily
@@ -61,36 +68,6 @@
 # mega-collection.  It includes all of the individual "src-*" collections.
 src-all
 
-# These are the individual collections that make up "src-all".  If you
-# use these, be sure to comment out "src-all" above.
-#src-base
-#src-bin
-#src-cddl
-#src-contrib
-#src-etc
-#src-games
-#src-gnu
-#src-include
-#src-kerberos5
-#src-kerberosIV
-#src-lib
-#src-libexec
-#src-release
-#src-rescue
-#src-sbin
-#src-share
-#src-sys
-#src-tools
-#src-usrbin
-#src-usrsbin
-# These are the individual collections that make up FreeBSD's crypto
-# collection. They are no longer export-restricted and are a part of
-# src-all
-#src-crypto
-#src-eBones
-#src-secure
-#src-sys-crypto
-
 ## Ports Collection.
 #
 # The easiest way to get the ports tree is to use the "ports-all"
@@ -98,77 +75,6 @@ src-all
 # collections,
 ports-all
 
-# These are the individual collections that make up "ports-all".  If you
-# use these, be sure to comment out "ports-all" above and always include
-# "ports-base" if you use any of the other individual collections below.
-# Your ports may not build correctly without an up-to-date "ports-base".
-#
-#ports-base
-#
-#ports-accessibility
-#ports-arabic
-#ports-archivers
-#ports-astro
-#ports-audio
-#ports-benchmarks
-#ports-biology
-#ports-cad
-#ports-chinese
-#ports-comms
-#ports-converters
-#ports-databases
-#ports-deskutils
-#ports-devel
-#ports-dns
-#ports-editors
-#ports-emulators
-#ports-finance
-#ports-french
-#ports-ftp
-#ports-games
-#ports-german
-#ports-graphics
-#ports-hebrew
-#ports-hungarian
-#ports-irc
-#ports-japanese
-#ports-java
-#ports-korean
-#ports-lang
-#ports-mail
-#ports-math
-#ports-misc
-#ports-multimedia
-#ports-net
-#ports-net-im
-#ports-net-mgmt
-#ports-net-p2p
-#ports-news
-#ports-palm
-#ports-picobsd
-#ports-polish
-#ports-ports-mgmt
-#ports-portuguese
-#ports-print
-#ports-russian
-#ports-science
-#ports-security
-#ports-shells
-#ports-sysutils
-#ports-textproc
-#ports-ukrainian
-#ports-vietnamese
-#ports-www
-#ports-x11
-#ports-x11-clocks
-#ports-x11-drivers
-#ports-x11-fm
-#ports-x11-fonts
-#ports-x11-servers
-#ports-x11-themes
-#ports-x11-toolkits
-#ports-x11-wm
-
 ## Projects
 #
 # This collection retrieves the projects tree of the FreeBSD
@@ -179,11 +85,3 @@ projects-all
 #
 # This is to get the control files that cvs(1) needs and the commit logs.
 cvsroot-all
-
-# These are the individual collections that make up "cvsroot-all"  If you
-# use these, be sure to comment out "cvsroot-all" above.  "cvsroot-common"
-# is a synthetic CVSROOT that has all the modules from the other CVSROOT-*
-# directories merged into one, and merged commitlogs via symlinks.
-#cvsroot-common
-#cvsroot-src
-#cvsroot-ports

Modified: projects/bhyve/share/examples/cvsup/ports-supfile
==============================================================================
--- projects/bhyve/share/examples/cvsup/ports-supfile	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/share/examples/cvsup/ports-supfile	Wed Jan  9 02:26:50 2013	(r245205)
@@ -1,7 +1,14 @@
 # $FreeBSD$
 #
-# This file contains all of the "CVSup collections" that make up the
-# ports collection.
+# BEWARE, CVS is deprecated and no longer supported by the FreeBSD project.
+#
+# The primary development work happens in Subversion and is temporarily
+# exported to the legacy CVS system with significant time delays.
+#
+# You should NOT set up a new consumer of FreeBSD source code via CVS.
+# Please see:
+# http://www.freebsd.org/doc/handbook/svn.html
+# http://www.freebsd.org/doc/handbook/svn-mirrors.html
 #
 # csup (CVS Update Protocol) allows you to download the latest CVS
 # tree (or any branch of development therefrom) to your system easily
@@ -65,76 +72,3 @@
 # mega-collection.  It includes all of the individual "ports-*"
 # collections,
 ports-all
-
-# These are the individual collections that make up "ports-all".  If you
-# use these, be sure to comment out "ports-all" above.
-
-# Be sure to ALWAYS cvsup the ports-base collection if you use any of the
-# other individual collections below. ports-base is a mandatory collection
-# for the ports collection, and your ports may not build correctly if it
-# is not kept up to date.
-#
-# Use of individual collections is not a supported configuration.
-#ports-base
-#ports-accessibility
-#ports-arabic
-#ports-archivers
-#ports-astro
-#ports-audio
-#ports-benchmarks
-#ports-biology
-#ports-cad
-#ports-chinese
-#ports-comms
-#ports-converters
-#ports-databases
-#ports-deskutils
-#ports-devel
-#ports-dns
-#ports-editors
-#ports-emulators
-#ports-finance
-#ports-french
-#ports-ftp
-#ports-games
-#ports-german
-#ports-graphics
-#ports-hebrew
-#ports-hungarian
-#ports-irc
-#ports-japanese
-#ports-java
-#ports-korean
-#ports-lang
-#ports-mail
-#ports-math
-#ports-misc
-#ports-multimedia
-#ports-net
-#ports-net-im
-#ports-net-mgmt
-#ports-net-p2p
-#ports-news
-#ports-palm
-#ports-polish
-#ports-ports-mgmt
-#ports-portuguese
-#ports-print
-#ports-russian
-#ports-science
-#ports-security
-#ports-shells
-#ports-sysutils
-#ports-textproc
-#ports-ukrainian
-#ports-vietnamese
-#ports-www
-#ports-x11
-#ports-x11-clocks
-#ports-x11-drivers
-#ports-x11-fm
-#ports-x11-fonts
-#ports-x11-servers
-#ports-x11-themes
-#ports-x11-toolkits
-#ports-x11-wm

Modified: projects/bhyve/share/examples/cvsup/stable-supfile
==============================================================================
--- projects/bhyve/share/examples/cvsup/stable-supfile	Wed Jan  9 02:11:16 2013	(r245204)
+++ projects/bhyve/share/examples/cvsup/stable-supfile	Wed Jan  9 02:26:50 2013	(r245205)
@@ -1,7 +1,14 @@
 # $FreeBSD$
 #
-# This file contains all of the "CVSup collections" that make up the
-# FreeBSD-stable source tree.
+# BEWARE, CVS is deprecated and no longer supported by the FreeBSD project.
+#
+# The primary development work happens in Subversion and is temporarily
+# exported to the legacy CVS system with significant time delays.
+#
+# You should NOT set up a new consumer of FreeBSD source code via CVS.
+# Please see:
+# http://www.freebsd.org/doc/handbook/svn.html
+# http://www.freebsd.org/doc/handbook/svn-mirrors.html
 #
 # csup (CVS Update Protocol) allows you to download the latest CVS
 # tree (or any branch of development therefrom) to your system easily
@@ -80,33 +87,3 @@
 # mega-collection.  It includes all of the individual "src-*" collections.
 # Please note:  If you want to track -STABLE, leave this uncommented.
 src-all
-
-# These are the individual collections that make up "src-all".  If you
-# use these, be sure to comment out "src-all" above.
-#src-base
-#src-bin
-#src-cddl
-#src-contrib
-#src-etc
-#src-games
-#src-gnu
-#src-include
-#src-kerberos5
-#src-kerberosIV
-#src-lib
-#src-libexec
-#src-release
-#src-rescue
-#src-sbin
-#src-share
-#src-sys
-#src-tools
-#src-usrbin
-#src-usrsbin
-# These are the individual collections that make up FreeBSD's crypto
-# collection. They are no longer export-restricted and are a part of
-# src-all
-#src-crypto
-#src-eBones

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301090226.r092Qodh096907>