IFC @ r244983.

35 files changed, 349 insertions, 187 deletions

diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 6ba5a4e..9a74298 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -28,24 +28,25 @@
 # of CFLAGS to contain the appropriate optimization directive to cc.
 # The automatic setting of CFLAGS may be overridden using the
 # NO_CPU_CFLAGS variable below.
-# Currently the following CPU types are recognized by gcc:
+# Currently the following CPU types are recognized:
 #   Intel x86 architecture:
 #       (AMD CPUs)	opteron-sse3, athlon64-sse3, k8-sse3, opteron,
-#			athlon64, k8, athlon-mp, athlon-xp, athlon-4,
-#			athlon-tbird, athlon, k7, geode, k6-3, k6-2, k6, k5
+#			athlon64, athlon-fx, k8, athlon-mp, athlon-xp,
+#			athlon-4, athlon-tbird, athlon, k7, geode, k6-3,
+#			k6-2, k6
 #       (Intel CPUs)	core2, core, nocona, pentium4m, pentium4, prescott,
 #			pentium3m, pentium3, pentium-m, pentium2,
 #			pentiumpro, pentium-mmx, pentium, i486
 #       (VIA CPUs)	c7, c3-2, c3
 #   AMD64 architecture:	opteron-sse3, athlon64-sse3, k8-sse3, opteron,
-#			athlon64, k8, core2, nocona, prescott
+#			athlon64, k8, core2, nocona
 #   Intel ia64 architecture:	itanium2, itanium
 #   SPARC-V9 architecture:	v9 (generic 64-bit V9), ultrasparc (default
 #				if omitted), ultrasparc3
 # Additionally the following CPU types are recognized by clang:
 #   Intel x86 architecture (for both amd64 and i386):
 #       (AMD CPUs)	bdver2, bdver1, btver1, amdfam10
-#       (Intel CPUs)	core-avx-i, corei7-avx, corei7
+#       (Intel CPUs)	core-avx2, core-avx-i, corei7-avx, corei7, atom
 #
 # (?= allows to buildworld for a different CPUTYPE.)
 #
@@ -56,21 +57,20 @@
 # CFLAGS controls the compiler settings used when compiling C code.
 # Note that optimization settings other than -O and -O2 are not recommended
 # or supported for compiling the world or the kernel - please revert any
-# nonstandard optimization settings to "-O" or "-O2 -fno-strict-aliasing"
+# nonstandard optimization settings
 # before submitting bug reports without patches to the developers.
 #
-# Compiling with -fstrict-aliasing optimization breaks some [notable] ports.
-# GCC turns on -fstrict-aliasing optimization at all levels above -O[1], so
-# explicitly turn it off when using compiling with the -O2 optimization level.
-#
-#CFLAGS= -O2 -fno-strict-aliasing -pipe
-#
 # CXXFLAGS controls the compiler settings used when compiling C++ code.
 # Note that CXXFLAGS is initially set to the value of CFLAGS.  If you wish
 # to add to CXXFLAGS value, "+=" must be used rather than "=".  Using "="
 # alone will remove the often needed contents of CFLAGS from CXXFLAGS.
 #
-#CXXFLAGS+= -fconserve-space
+# Additional compiler flags can be specified that extend or override
+# default ones. However, neither the base system nor ports are guaranteed
+# to build and function without problems with non-default settings.
+#
+# CFLAGS+=	-msse3
+# CXXFLAGS+=	-msse3
 #
 # MAKE_SHELL controls the shell used internally by make(1) to process the
 # command scripts in makefiles.  Three shells are supported, sh, ksh, and
diff --git a/share/examples/ppp/ppp.conf.sample b/share/examples/ppp/ppp.conf.sample
index 7863eaa..2572644 100644
--- a/share/examples/ppp/ppp.conf.sample
+++ b/share/examples/ppp/ppp.conf.sample
@@ -29,7 +29,7 @@
 #
 default:
  set log Phase Chat LCP IPCP CCP tun command
- set device /dev/cuad1
+ set device /dev/cuau1
  set speed 115200
  set dial "ABORT BUSY ABORT NO\\sCARRIER TIMEOUT 5 \"\" AT \
            OK-AT-OK ATE1Q0 OK \\dATDT\\T TIMEOUT 40 CONNECT"
@@ -145,7 +145,7 @@ TA:
  set timeout 60 300	# The minimum charge period is 5 minutes, so don't
 			# hangup before then
 
- set device /dev/cuad0	# Or whatever
+ set device /dev/cuau0	# Or whatever
  set speed 115200	# Use as high a speed as possible
 
  enable dns		# Ask the peer what to put in resolv.conf
@@ -315,7 +315,7 @@ dodgy:
 dodgynet:
     set log Phase                               # Log link uptime
     allow mode auto                             # For autoconnect only
-    set device /dev/cuad1                       # Define modem device and speed
+    set device /dev/cuau1                       # Define modem device and speed
     set speed 115200
     deny lqr                                    # Don't support LQR
     set phone 0W1194                            # Remote system phone number,
@@ -472,7 +472,7 @@ radius-server:
 #
 direct-client:
  set dial
- set device /dev/cuad0
+ set device /dev/cuau0
  set sp 115200
  set timeout 900
  set lqrperiod 10
@@ -651,7 +651,7 @@ callback-server:
  set cbcp
  set log +cbcp
  set redial 3 1
- set device /dev/cuad0
+ set device /dev/cuau0
  set speed 115200
  set dial "TIMEOUT 10 \"\" AT OK-AT-OK ATDT\\T CONNECT"
 
@@ -678,7 +678,7 @@ callback-server-client-decides:
 #
 mloop:
  load loop
- set device /dev/cuad0 /dev/cuad1 /dev/cuad2   # Use any of these devices
+ set device /dev/cuau0 /dev/cuau1 /dev/cuau2   # Use any of these devices
  set mode interactive
  set mrru 1500
  set mru 1504                                  # Room for the MP header
diff --git a/share/examples/ppp/ppp.conf.span-isp b/share/examples/ppp/ppp.conf.span-isp
index 446cee3..11084de 100644
--- a/share/examples/ppp/ppp.conf.span-isp
+++ b/share/examples/ppp/ppp.conf.span-isp
@@ -104,7 +104,7 @@
 
 default:
   set speed 115200
-  set device /dev/cuad0 /dev/cuad1 /dev/cuad2 /dev/cuad3
+  set device /dev/cuau0 /dev/cuau1 /dev/cuau2 /dev/cuau3
   set dial "ABORT BUSY ABORT NO\\sCARRIER ABORT NO\\sDIAL\\sTONE TIMEOUT 4 \
             \"\" ATZ OK-ATZ-OK ATDT\\T TIMEOUT 60 CONNECT \\c \\n"
   set login
diff --git a/share/i18n/csmapper/Makefile.part b/share/i18n/csmapper/Makefile.part
index 24696e4..fe4b084 100644
--- a/share/i18n/csmapper/Makefile.part
+++ b/share/i18n/csmapper/Makefile.part
@@ -28,9 +28,9 @@ mapper.dir.${ESUBDIR}: ${CODE}.part
 	echo "# ${ESUBDIR}" > ${.TARGET}
 .for i in ${PART}
 	printf "%-32s%-32s%s\n" ${ENCID:S@%%PART%%@${i}@}/UCS ${MAPPER} \
-		${ESUBDIR}/${TABLENAME:S@%%PART%%@${i}@}${ENCEXT} >> ${.TARGET}
+		${ESUBDIR}/${TABLENAME:S@%%PART%%@${i}@:S/:/@/}${ENCEXT} >> ${.TARGET}
 	printf "%-32s%-32s%s\n" UCS/${ENCID:S@%%PART%%@${i}@} ${MAPPER} \
-		${REVSYMBOL}${ESUBDIR}/${RTABLENAME:S@%%PART%%@${i}@}${ENCEXT} >> ${.TARGET}
+		${REVSYMBOL}${ESUBDIR}/${RTABLENAME:S@%%PART%%@${i}@:S/:/@/}${ENCEXT} >> ${.TARGET}
 .endfor
 	echo >> ${.TARGET}
 .else
@@ -59,13 +59,13 @@ CLEANFILES+= charset.pivot.${ESUBDIR}
 
 .if !defined(MAPS)
 .for i in ${PART}
-.if exists(${TABLENAME:S@%%PART%%@${i}@}.src)
-FILES+=	${TABLENAME:S@%%PART%%@${i}@}.mps
-CLEANFILES+= ${TABLENAME:S@%%PART%%@${i}@}.mps
+.if exists(${TABLENAME:S@%%PART%%@${i}@:S/:/@/}.src)
+FILES+=	${TABLENAME:S@%%PART%%@${i}@:S/:/@/}.mps
+CLEANFILES+= ${TABLENAME:S@%%PART%%@${i}@:S/:/@/}.mps
 .endif
-.if exists(${RTABLENAME:S@%%PART%%@${i}@}.src)
-FILES+=	${RTABLENAME:S@%%PART%%@${i}@}.mps
-CLEANFILES+= ${RTABLENAME:S@%%PART%%@${i}@}.mps
+.if exists(${RTABLENAME:S@%%PART%%@${i}@:S/:/@/}.src)
+FILES+=	${RTABLENAME:S@%%PART%%@${i}@:S/:/@/}.mps
+CLEANFILES+= ${RTABLENAME:S@%%PART%%@${i}@:S/:/@/}.mps
 .endif
 .endfor
 .else
diff --git a/share/man/man4/arcmsr.4 b/share/man/man4/arcmsr.4
index 1e92e3b..71b5faa 100644
--- a/share/man/man4/arcmsr.4
+++ b/share/man/man4/arcmsr.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 3, 2012
+.Dd December 18, 2012
 .Dt ARCMSR 4
 .Os
 .Sh NAME
@@ -100,6 +100,8 @@ ARC-1212
 .It
 ARC-1213
 .It
+ARC-1214
+.It
 ARC-1220
 .It
 ARC-1222
diff --git a/share/man/man4/carp.4 b/share/man/man4/carp.4
index c1dfa57..d051377 100644
--- a/share/man/man4/carp.4
+++ b/share/man/man4/carp.4
@@ -26,7 +26,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 29, 2012
+.Dd December 25, 2012
 .Dt CARP 4
 .Os
 .Sh NAME
@@ -125,15 +125,14 @@ experiences problem with sending announcements, when an interface
 running a vhid goes down, or while the
 .Xr pfsync 4
 interface is not synchronized.
-The demotion value is writable, so that user may alter it
-depending on some external conditions, for example on the status of some
-daemon utility.
-However, altering the value should be performed with care, so as to
-not conflict with subsystems that adjust demotion factor
-automatically:
+The demotion factor can be adjusted writing to the sysctl oid.
+The signed value supplied to the
+.Xr sysctl 8
+command is added to current demotion factor.
+This allows to control
 .Nm
-and
-.Xr pfsync 4 .
+behaviour depending on some external conditions, for example on the status
+of some daemon utility.
 .It Va net.inet.carp.ifdown_demotion_factor
 This value is added to
 .Va net.inet.carp.demotion
diff --git a/share/man/man4/gdb.4 b/share/man/man4/gdb.4
index 3a502c8..f81ef40 100644
--- a/share/man/man4/gdb.4
+++ b/share/man/man4/gdb.4
@@ -252,7 +252,7 @@ Finally, establish connection:
 GNU gdb 5.2.1 (FreeBSD)
 .Em "(political statements omitted)"
 Ready to go.  Enter 'tr' to connect to the remote target
-with /dev/cuad0, 'tr /dev/cuad1' to connect to a different port
+with /dev/cuau0, 'tr /dev/cuau1' to connect to a different port
 or 'trf portno' to connect to the remote target with the firewire
 interface.  portno defaults to 5556.
 
@@ -370,10 +370,10 @@ instead.
 Debug a remote system via the specified serial or firewire interface.
 .It Ic tr0
 Debug a remote system via serial interface
-.Pa /dev/cuad0 .
+.Pa /dev/cuau0 .
 .It Ic tr1
 Debug a remote system via serial interface
-.Pa /dev/cuad1 .
+.Pa /dev/cuau1 .
 .It Ic trf
 Debug a remote system via firewire interface at default port 5556.
 .El
diff --git a/share/man/man4/mouse.4 b/share/man/man4/mouse.4
index f50fc01..816936a 100644
--- a/share/man/man4/mouse.4
+++ b/share/man/man4/mouse.4
@@ -379,7 +379,7 @@ command.
 .El
 .Sh FILES
 .Bl -tag -width /dev/sysmouseXX -compact
-.It Pa /dev/cuad%d
+.It Pa /dev/cuau%d
 serial ports
 .It Pa /dev/mse%d
 bus and InPort mouse device
diff --git a/share/man/man4/ng_netflow.4 b/share/man/man4/ng_netflow.4
index b88c017..3c710dc 100644
--- a/share/man/man4/ng_netflow.4
+++ b/share/man/man4/ng_netflow.4
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd Nov 2, 2012
+.Dd December 10, 2012
 .Dt NG_NETFLOW 4
 .Os
 .Sh NAME
@@ -254,9 +254,6 @@ It is called from
 .Xr flowctl 8 ,
 not directly from
 .Xr ngctl 8 .
-See also
-.Sx BUGS
-section.
 .It Dv NGM_NETFLOW_V9INFO Pq Ic v9info
 Returns some NetFlow v9 related values in a
 .Bd -literal -offset 4n
@@ -349,7 +346,6 @@ written by
 Cache snapshot obtained via
 .Dv NGM_NETFLOW_SHOW
 command may lack some percentage of entries under severe load.
-IPv6 flows are not shown.
 .Pp
 The
 .Nm
diff --git a/share/man/man4/ng_ubt.4 b/share/man/man4/ng_ubt.4
index 6a39ddd..ef8a57e 100644
--- a/share/man/man4/ng_ubt.4
+++ b/share/man/man4/ng_ubt.4
@@ -25,7 +25,7 @@
 .\" $Id: ng_ubt.4,v 1.3 2003/05/21 19:37:35 max Exp $
 .\" $FreeBSD$
 .\"
-.Dd September 13, 2004
+.Dd December 26, 2012
 .Dt NG_UBT 4
 .Os
 .Sh NAME
@@ -73,6 +73,8 @@ Mitsumi Bluetooth USB adapter
 MSI MS-6967
 .It
 TDK Bluetooth USB adapter
+.It
+Broadcom Bluetooth USB adapter
 .El
 .Sh HOOKS
 This node type supports the following hooks:
diff --git a/share/man/man4/stf.4 b/share/man/man4/stf.4
index 1178e03..5e32763 100644
--- a/share/man/man4/stf.4
+++ b/share/man/man4/stf.4
@@ -29,7 +29,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd July 23, 2011
+.Dd December 28, 2012
 .Dt STF 4
 .Os
 .Sh NAME
@@ -180,6 +180,22 @@ Note, however, there are other security risks exist.
 If you wish to use the configuration,
 you must not advertise your 6to4 address to others.
 .\"
+.Sh SYSCTL VARIABLES
+The following
+.Xr sysctl 8
+variables can be used to control the behavior of the
+.Nm stf .
+The default value is shown next to each variable.
+.Bl -tag -width indent
+.It Va net.link.stf.permit_rfc1918 : No 0
+The RFC3056 requires the use of globally unique 32-bit IPv4
+addresses. This sysctl variable controls the behaviour of this
+requirement. When it set to not 0, 
+.Nm stf 
+allows the use of private IPv4 addresses described in the RFC1918.
+This may be useful for an Intranet environment or when some mechanisms
+of network address translation (NAT) are used.
+.El
 .Sh EXAMPLES
 Note that
 .Li 8504:0506
diff --git a/share/man/man4/wbwd.4 b/share/man/man4/wbwd.4
index 67af2ec..49290ff 100644
--- a/share/man/man4/wbwd.4
+++ b/share/man/man4/wbwd.4
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd March 6, 2012
+.Dd December 28, 2012
 .Dt WBWD 4
 .Os
 .Sh NAME
@@ -44,10 +44,6 @@ line in
 .Bd -literal -offset indent
 wbwd_load="YES"
 .Ed
-.Pp
-In
-.Pa /boot/device.hints :
-.Cd hint.wbwd.0.at="isa"
 .Sh DESCRIPTION
 The
 .Nm
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index d9497b9..5024b2c 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -3324,7 +3324,7 @@ is set to
 .Dq Li YES ,
 this is the actual port the mouse is on.
 It might be
-.Pa /dev/cuad0
+.Pa /dev/cuau0
 for a COM1 serial mouse,
 .Pa /dev/psm0
 for a PS/2 mouse or
diff --git a/share/man/man5/remote.5 b/share/man/man5/remote.5
index 666608d..1eb9bfc 100644
--- a/share/man/man5/remote.5
+++ b/share/man/man5/remote.5
@@ -194,7 +194,7 @@ the phone number for arpavax (in this case an @ character so that it
 is retrieved from the environment).
 .Bd -literal
 UNIX-57600:\e
-:dv=/dev/cuad0:el=^D^U^C^S^Q^O@:oe=^D:du:at=hayes:br#115200:pa=none:
+:dv=/dev/cuau0:el=^D^U^C^S^Q^O@:oe=^D:du:at=hayes:br#115200:pa=none:
 arpavax|ax:\e
 :pn=\e@:tc=UNIX-57600
 .Ed
diff --git a/share/man/man7/tuning.7 b/share/man/man7/tuning.7
index 36544bb..5e228dd9 100644
--- a/share/man/man7/tuning.7
+++ b/share/man/man7/tuning.7
@@ -23,7 +23,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 20, 2012
+.Dd December 8, 2012
 .Dt TUNING 7
 .Os
 .Sh NAME
@@ -459,52 +459,6 @@ the
 sysctl rather than disable delayed acks.
 .Pp
 The
-.Va net.inet.tcp.inflight.enable
-sysctl turns on bandwidth delay product limiting for all TCP connections.
-The system will attempt to calculate the bandwidth delay product for each
-connection and limit the amount of data queued to the network to just the
-amount required to maintain optimum throughput.
-This feature is useful
-if you are serving data over modems, GigE, or high speed WAN links (or
-any other link with a high bandwidth*delay product), especially if you are
-also using window scaling or have configured a large send window.
-If you enable this option, you should also be sure to set
-.Va net.inet.tcp.inflight.debug
-to 0 (disable debugging), and for production use setting
-.Va net.inet.tcp.inflight.min
-to at least 6144 may be beneficial.
-Note however, that setting high
-minimums may effectively disable bandwidth limiting depending on the link.
-The limiting feature reduces the amount of data built up in intermediate
-router and switch packet queues as well as reduces the amount of data built
-up in the local host's interface queue.
-With fewer packets queued up,
-interactive connections, especially over slow modems, will also be able
-to operate with lower round trip times.
-However, note that this feature
-only affects data transmission (uploading / server-side).
-It does not
-affect data reception (downloading).
-.Pp
-Adjusting
-.Va net.inet.tcp.inflight.stab
-is not recommended.
-This parameter defaults to 20, representing 2 maximal packets added
-to the bandwidth delay product window calculation.
-The additional
-window is required to stabilize the algorithm and improve responsiveness
-to changing conditions, but it can also result in higher ping times
-over slow links (though still much lower than you would get without
-the inflight algorithm).
-In such cases you may
-wish to try reducing this parameter to 15, 10, or 5, and you may also
-have to reduce
-.Va net.inet.tcp.inflight.min
-(for example, to 3500) to get the desired effect.
-Reducing these parameters
-should be done as a last resort only.
-.Pp
-The
 .Va net.inet.ip.portrange.*
 sysctls control the port number ranges automatically bound to TCP and UDP
 sockets.
diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile
index 84c0f56..8e96d64 100644
--- a/share/man/man9/Makefile
+++ b/share/man/man9/Makefile
@@ -620,6 +620,7 @@ MLINKS+=domain.9 DOMAIN_SET.9 \
 	domain.9 domain_add.9 \
 	domain.9 pfctlinput.9 \
 	domain.9 pfctlinput2.9 \
+	domain.9 pffinddomain.9 \
 	domain.9 pffindproto.9 \
 	domain.9 pffindtype.9
 MLINKS+=drbr.9 drbr_free.9 \
diff --git a/share/man/man9/domain.9 b/share/man/man9/domain.9
index 2a710d0..e07bded 100644
--- a/share/man/man9/domain.9
+++ b/share/man/man9/domain.9
@@ -26,13 +26,14 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 5, 2012
+.Dd December 7, 2012
 .Dt DOMAIN 9
 .Os
 .Sh NAME
 .Nm domain_add ,
 .Nm pfctlinput ,
 .Nm pfctlinput2 ,
+.Nm pffinddomain ,
 .Nm pffindproto ,
 .Nm pffindtype ,
 .Nm DOMAIN_SET
@@ -48,6 +49,8 @@
 .Fn pfctlinput "int cmd" "struct sockaddr *sa"
 .Ft void
 .Fn pfctlinput2 "int cmd" "struct sockaddr *sa" "void *ctlparam"
+.Ft struct domain *
+.Fn pffinddomain "int family"
 .Ft struct protosw *
 .Fn pffindproto "int family" "int protocol" "int type"
 .Ft struct protosw *
@@ -176,6 +179,12 @@ This is because there is
 no reference counting system in place to determine if there are any
 active references from sockets within that domain.
 .Pp
+.Fn pffinddomain
+finds a domain by family.
+If the domain cannot be found,
+.Dv NULL
+is returned.
+.Pp
 .Fn pffindtype
 and
 .Fn pffindproto
diff --git a/share/man/man9/lock.9 b/share/man/man9/lock.9
index bbcf5e8..fd608d4 100644
--- a/share/man/man9/lock.9
+++ b/share/man/man9/lock.9
@@ -148,7 +148,9 @@ Flags indicating what action is to be taken.
 .Bl -tag -width ".Dv LK_CANRECURSE"
 .It Dv LK_SHARED
 Acquire a shared lock.
-If an exclusive lock is currently held, it will be downgraded.
+If an exclusive lock is currently held,
+.Dv EDEADLK
+will be returned.
 .It Dv LK_EXCLUSIVE
 Acquire an exclusive lock.
 If an exclusive lock is already held, and
@@ -158,7 +160,8 @@ is not set, the system will
 .It Dv LK_DOWNGRADE
 Downgrade exclusive lock to a shared lock.
 Downgrading a shared lock is not permitted.
-If an exclusive lock has been recursed, all references will be downgraded.
+If an exclusive lock has been recursed, the system will
+.Xr panic 9 .
 .It Dv LK_UPGRADE
 Upgrade a shared lock to an exclusive lock.
 If this call fails, the shared lock is lost.
diff --git a/share/man/man9/make_dev.9 b/share/man/man9/make_dev.9
index 2827235..78345fa 100644
--- a/share/man/man9/make_dev.9
+++ b/share/man/man9/make_dev.9
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd May 3, 2011
+.Dd Dec 22, 2012
 .Dt MAKE_DEV 9
 .Os
 .Sh NAME
@@ -364,6 +364,10 @@ or
 .Qq ..
 path component or ends with
 .Ql / .
+.It Bq Er EINVAL
+The
+.Dv MAKEDEV_CHECKNAME
+flag was specified and the provided device name contains invalid characters.
 .It Bq Er EEXIST
 The
 .Dv MAKEDEV_CHECKNAME
diff --git a/share/man/man9/taskqueue.9 b/share/man/man9/taskqueue.9
index f1a43b6..c8e21d3 100644
--- a/share/man/man9/taskqueue.9
+++ b/share/man/man9/taskqueue.9
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 26, 2011
+.Dd December 4, 2012
 .Dt TASKQUEUE 9
 .Os
 .Sh NAME
@@ -180,6 +180,13 @@ is used to schedule the enqueue after the specified amount of
 Only non-fast task queues can be used for
 .Va timeout_task
 scheduling.
+If the
+.Va ticks
+argument is negative, the already scheduled enqueueing is not re-scheduled.
+Otherwise, the task is scheduled for enqueueing in the future,
+after the absolute value of
+.Va ticks
+is passed.
 .Pp
 The
 .Fn taskqueue_cancel
diff --git a/share/man/man9/zone.9 b/share/man/man9/zone.9
index a3efd83..51a1049 100644
--- a/share/man/man9/zone.9
+++ b/share/man/man9/zone.9
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 28, 2012
+.Dd December 7, 2012
 .Dt ZONE 9
 .Os
 .Sh NAME
@@ -37,7 +37,8 @@
 .Nm uma_zdestroy ,
 .Nm uma_zone_set_max,
 .Nm uma_zone_get_max,
-.Nm uma_zone_get_cur
+.Nm uma_zone_get_cur,
+.Nm uma_zone_set_warning
 .Nd zone allocator
 .Sh SYNOPSIS
 .In sys/param.h
@@ -65,6 +66,8 @@
 .Fn uma_zone_get_max "uma_zone_t zone"
 .Ft int
 .Fn uma_zone_get_cur "uma_zone_t zone"
+.Ft void
+.Fn uma_zone_set_warning "uma_zone_t zone" "const char *warning"
 .Sh DESCRIPTION
 The zone allocator provides an efficient interface for managing
 dynamically-sized collections of items of similar size.
@@ -213,6 +216,16 @@ The returned value is approximate because appropriate synchronisation to
 determine an exact value is not performed by the implementation.
 This ensures low overhead at the expense of potentially stale data being used
 in the calculation.
+.Pp
+The
+.Fn uma_zone_set_warning
+function sets a warning that will be printed on the system console when the
+given zone becomes full and fails to allocate an item.
+The warning will be printed not often than every five minutes.
+Warnings can be turned off globally by setting the
+.Va vm.zone_warnings
+sysctl tunable to
+.Va 0 .
 .Sh RETURN VALUES
 The
 .Fn uma_zalloc
diff --git a/share/misc/Makefile b/share/misc/Makefile
index 305baf6..3e2afc4 100644
--- a/share/misc/Makefile
+++ b/share/misc/Makefile
@@ -6,7 +6,8 @@
 FILES=	ascii birthtoken bsd-family-tree committers-doc.dot committers-ports.dot \
 	committers-src.dot eqnchar flowers init.ee \
 	iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \
-	scsi_modes usb_hid_usages usbdevs
+	scsi_modes usb_hid_usages usbdevs \
+	organization.dot
 
 NO_OBJ=
 FILESDIR=	${BINDIR}/misc
diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot
index c3bbfe9..f3756e8 100644
--- a/share/misc/committers-src.dot
+++ b/share/misc/committers-src.dot
@@ -194,6 +194,7 @@ le [label="Lukas Ertl\nle@FreeBSD.org\n2004/02/02"]
 lstewart [label="Lawrence Stewart\nlstewart@FreeBSD.org\n2008/10/06"]
 marcel [label="Marcel Moolenaar\nmarcel@FreeBSD.org\n1999/07/03"]
 marius [label="Marius Strobl\nmarius@FreeBSD.org\n2004/04/17"]
+markj [label="Mark Johnston\nmarkj@FreeBSD.org\n2012/12/18"]
 markm [label="Mark Murray\nmarkm@FreeBSD.org\n199?/??/??"]
 markus [label="Markus Brueffer\nmarkus@FreeBSD.org\n2006/06/01"]
 matteo [label="Matteo Riondato\nmatteo@FreeBSD.org\n2006/01/18"]
@@ -241,6 +242,7 @@ rstone [label="Ryan Stone\nrstone@FreeBSD.org\n2010/04/19"]
 ru [label="Ruslan Ermilov\nru@FreeBSD.org\n1999/05/27"]
 rwatson [label="Robert N. M. Watson\nrwatson@FreeBSD.org\n1999/12/16"]
 sam [label="Sam Leffler\nsam@FreeBSD.org\n2002/07/02"]
+sbruno [label="Sean Bruno\nsbruno@FreeBSD.org\n????/??/??"]
 sanpei [label="MIHIRA Sanpei Yoshiro\nsanpei@FreeBSD.org\n2000/06/19"]
 scf [label="Sean C. Farley\nscf@FreeBSD.org\n2007/06/24"]
 schweikh [label="Jens Schweikhardt\nschweikh@FreeBSD.org\n2001/04/06"]
@@ -249,6 +251,7 @@ sephe [label="Sepherosa Ziehau\nsephe@FreeBSD.org\n2007/03/28"]
 sepotvin [label="Stephane E. Potvin\nsepotvin@FreeBSD.org\n2007/02/15"]
 simon [label="Simon L. Nielsen\nsimon@FreeBSD.org\n2006/03/07"]
 sjg [label="Simon J. Gerraty\nsjg@FreeBSD.org\n2012/10/23"]
+smh [label="Steven Hartland\nsmh@FreeBSD.org\n2012/11/12"]
 sobomax [label="Maxim Sobolev\nsobomax@FreeBSD.org\n2001/07/25"]
 sos [label="Soren Schmidt\nsos@FreeBSD.org\n????/??/??"]
 sson [label="Stacey Son\nsson@FreeBSD.org\n2008/07/08"]
@@ -307,6 +310,7 @@ anholt -> jkim
 
 avg -> art
 avg -> pluknet
+avg -> smh
 
 benno -> grehan
 
@@ -375,6 +379,7 @@ eivind -> rwatson
 
 emaste -> rstone
 emaste -> dteske
+emaste -> markj
 
 emax -> markus
 
@@ -555,6 +560,7 @@ philip -> uqs
 
 pjd -> kib
 pjd -> lulf
+pjd -> smh
 pjd -> trociny
 
 rgrimes -> markm
@@ -569,6 +575,8 @@ rrs -> brucec
 rrs -> jchandra
 rrs -> tuexen
 
+rstone -> markj
+
 ru -> ceri
 ru -> cjc
 ru -> eik
@@ -599,8 +607,11 @@ sam -> andre
 sam -> benjsc
 sam -> sephe
 
+sbruno -> jimharris
+
 schweikh -> dds
 
+scottl -> jimharris
 scottl -> pjd
 scottl -> sah
 scottl -> yongari
diff --git a/share/misc/iso639 b/share/misc/iso639
index 467add4..5793421 100644
--- a/share/misc/iso639
+++ b/share/misc/iso639
@@ -12,11 +12,11 @@
 #   existing ones according to criteria indicated in the standard. It
 #   maintains an accurate list of information associated with registered
 #   language codes, processes updates of registered language codes, and
-#   distributes them on a regular basis to subscribers and other parties. 
+#   distributes them on a regular basis to subscribers and other parties.
 #
 #   This is the official site of the ISO 639-2 Registration Authority and thus
 #   is the only one authorized by ISO. If you have questions concerning ISO
-#   639-2 please contact us at: 
+#   639-2 please contact us at:
 #
 #     Library of Congress
 #     Network Development and MARC Standards Office
@@ -90,7 +90,7 @@ be	bel	bel	Belarusian
 bn	ben	ben	Bengali
 	ber	ber	Berber languages
 	bho	bho	Bhojpuri
-bh	bih	bih	Bihari
+bh	bih	bih	Bihari languages
 	bik	bik	Bikol
 	bin	bin	Bini; Edo
 bi	bis	bis	Bislama
@@ -213,10 +213,10 @@ ha	hau	hau	Hausa
 he	heb	heb	Hebrew
 hz	her	her	Herero
 	hil	hil	Hiligaynon
-	him	him	Himachali
+	him	him	Himachali languages; Western Pahari languages
 hi	hin	hin	Hindi
 	hit	hit	Hittite
-	hmn	hmn	Hmong
+	hmn	hmn	Hmong; Mong
 ho	hmo	hmo	Hiri Motu
 hr	hrv	hrv	Croatian
 	hsb	hsb	Upper Sorbian
@@ -349,11 +349,11 @@ ne	nep	nep	Nepali
 	nia	nia	Nias
 	nic	nic	Niger-Kordofanian languages
 	niu	niu	Niuean
+nn	nno	nno	Norwegian Nynorsk; Nynorsk, Norwegian
+nb	nob	nob	Bokmål, Norwegian; Norwegian Bokmål
 	nog	nog	Nogai
 	non	non	Norse, Old
 no	nor	nor	Norwegian
-nn	nno	nno	Norwegian Nynorsk; Nynorsk, Norwegian
-nb	nob	nob	Bokmål, Norwegian; Norwegian Bokmål
 	nqo	nqo	N'Ko
 	nso	nso	Pedi; Sepedi; Northern Sotho
 	nub	nub	Nubian languages
@@ -469,8 +469,8 @@ bo	tib	bod	Tibetan
 ti	tir	tir	Tigrinya
 	tiv	tiv	Tiv
 	tkl	tkl	Tokelau
-	tli	tli	Tlingit
 	tlh	tlh	Klingon; tlhIngan-Hol
+	tli	tli	Tlingit
 	tmh	tmh	Tamashek
 	tog	tog	Tonga (Nyasa)
 to	ton	ton	Tonga (Tonga Islands)
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index af39561..21e70ad 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -27,9 +27,13 @@ MACHINE_CPU = mips
 # between e.g. i586 and pentium)
 
 . if ${MACHINE_CPUARCH} == "i386"
-.  if ${CPUTYPE} == "nocona" || ${CPUTYPE} == "core" || \
-    ${CPUTYPE} == "core2" || ${CPUTYPE} == "corei7" || \
-    ${CPUTYPE} == "corei7-avx" || ${CPUTYPE} == "core-avx-i"
+.  if ${CPUTYPE} == "barcelona"
+CPUTYPE = amdfam10
+.  elif ${CPUTYPE} == "k7"
+CPUTYPE = athlon
+.  elif ${CPUTYPE} == "westmere" || ${CPUTYPE} == "nehalem"
+CPUTYPE = corei7
+.  elif ${CPUTYPE} == "core"
 CPUTYPE = prescott
 .  elif ${CPUTYPE} == "p4"
 CPUTYPE = pentium4
@@ -49,18 +53,13 @@ CPUTYPE = pentiumpro
 CPUTYPE = pentium-mmx
 .  elif ${CPUTYPE} == "i586"
 CPUTYPE = pentium
-.  elif ${CPUTYPE} == "opteron-sse3" || ${CPUTYPE} == "athlon64-sse3" || \
-    ${CPUTYPE} == "k8-sse3" || ${CPUTYPE} == "amdfam10" || \
-    ${CPUTYPE} == "btver1" || ${CPUTYPE} == "bdver1" || ${CPUTYPE} == "bdver2"
-CPUTYPE = prescott
-.  elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || \
-    ${CPUTYPE} == "k8"
-CPUTYPE = athlon-mp
-.  elif ${CPUTYPE} == "k7"
-CPUTYPE = athlon
 .  endif
 . elif ${MACHINE_CPUARCH} == "amd64"
-.  if ${CPUTYPE} == "prescott"
+.  if ${CPUTYPE} == "barcelona"
+CPUTYPE = amdfam10
+.  elif ${CPUTYPE} == "westmere" || ${CPUTYPE} == "nehalem"
+CPUTYPE = corei7
+.  elif ${CPUTYPE} == "prescott"
 CPUTYPE = nocona
 .  endif
 . elif ${MACHINE_ARCH} == "sparc64"
@@ -87,11 +86,11 @@ CPUTYPE = ultrasparc3
 _CPUCFLAGS = -march=i686 -falign-functions=0 -falign-jumps=0 -falign-loops=0
 .  elif ${CPUTYPE} == "k5"
 _CPUCFLAGS = -march=pentium
-.  elif ${CPUTYPE} == "core2"
-_CPUCFLAGS = -march=prescott
+.  elif ${CPUTYPE} == "c7"
+_CPUCFLAGS = -march=c3-2
 .  else
 _CPUCFLAGS = -march=${CPUTYPE}
-.  endif # GCC on 'i386'
+.  endif
 . elif ${MACHINE_CPUARCH} == "amd64"
 _CPUCFLAGS = -march=${CPUTYPE}
 . elif ${MACHINE_CPUARCH} == "arm"
@@ -143,7 +142,7 @@ _CPUCFLAGS = -mcpu=ultrasparc3
 # presence of a CPU feature.
 
 . if ${MACHINE_CPUARCH} == "i386"
-.  if ${CPUTYPE} == "bdver1" || ${CPUTYPE} == "bdver2"
+.  if ${CPUTYPE} == "bdver2" || ${CPUTYPE} == "bdver1"
 MACHINE_CPU = xop avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586
 .  elif ${CPUTYPE} == "btver1"
 MACHINE_CPU = ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586
@@ -151,7 +150,8 @@ MACHINE_CPU = ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586
 MACHINE_CPU = athlon-xp athlon k7 3dnow sse4a sse3 sse2 sse mmx k6 k5 i586
 .  elif ${CPUTYPE} == "opteron-sse3" || ${CPUTYPE} == "athlon64-sse3"
 MACHINE_CPU = athlon-xp athlon k7 3dnow sse3 sse2 sse mmx k6 k5 i586
-.  elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64"
+.  elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || \
+    ${CPUTYPE} == "athlon-fx"
 MACHINE_CPU = athlon-xp athlon k7 3dnow sse2 sse mmx k6 k5 i586
 .  elif ${CPUTYPE} == "athlon-mp" || ${CPUTYPE} == "athlon-xp" || \
     ${CPUTYPE} == "athlon-4"
@@ -164,19 +164,17 @@ MACHINE_CPU = 3dnow mmx k6 k5 i586
 MACHINE_CPU = mmx k6 k5 i586
 .  elif ${CPUTYPE} == "k5"
 MACHINE_CPU = k5 i586
-.  elif ${CPUTYPE} == "c3"
-MACHINE_CPU = 3dnow mmx i586
-.  elif ${CPUTYPE} == "c3-2"
-MACHINE_CPU = sse mmx i586
-.  elif ${CPUTYPE} == "c7"
-MACHINE_CPU = sse3 sse2 sse i686 mmx i586
-.  elif ${CPUTYPE} == "corei7-avx" || ${CPUTYPE} == "core-avx-i"
+.  elif ${CPUTYPE} == "core-avx2"
+MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586
+.  elif ${CPUTYPE} == "core-avx-i" || ${CPUTYPE} == "corei7-avx"
 MACHINE_CPU = avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "corei7"
 MACHINE_CPU = sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586
-.  elif ${CPUTYPE} == "core2"
+.  elif ${CPUTYPE} == "penryn"
+MACHINE_CPU = sse41 ssse3 sse3 sse2 sse i686 mmx i586
+.  elif ${CPUTYPE} == "atom" || ${CPUTYPE} == "core2"
 MACHINE_CPU = ssse3 sse3 sse2 sse i686 mmx i586
-.  elif ${CPUTYPE} == "prescott"
+.  elif ${CPUTYPE} == "yonah" || ${CPUTYPE} == "prescott"
 MACHINE_CPU = sse3 sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "pentium4" || ${CPUTYPE} == "pentium4m" || \
     ${CPUTYPE} == "pentium-m"
@@ -191,10 +189,20 @@ MACHINE_CPU = i686 i586
 MACHINE_CPU = mmx i586
 .  elif ${CPUTYPE} == "pentium"
 MACHINE_CPU = i586
+.  elif ${CPUTYPE} == "c7"
+MACHINE_CPU = sse3 sse2 sse i686 mmx i586
+.  elif ${CPUTYPE} == "c3-2"
+MACHINE_CPU = sse i686 mmx i586
+.  elif ${CPUTYPE} == "c3"
+MACHINE_CPU = 3dnow mmx i586
+.  elif ${CPUTYPE} == "winchip2"
+MACHINE_CPU = 3dnow mmx
+.  elif ${CPUTYPE} == "winchip-c6"
+MACHINE_CPU = mmx
 .  endif
 MACHINE_CPU += i486
 . elif ${MACHINE_CPUARCH} == "amd64"
-.  if ${CPUTYPE} == "bdver1" || ${CPUTYPE} == "bdver2"
+.  if ${CPUTYPE} == "bdver2" || ${CPUTYPE} == "bdver1"
 MACHINE_CPU = xop avx sse42 sse41 ssse3 sse4a sse3
 .  elif ${CPUTYPE} == "btver1"
 MACHINE_CPU = ssse3 sse4a sse3
@@ -204,13 +212,17 @@ MACHINE_CPU = k8 3dnow sse4a sse3
     ${CPUTYPE} == "k8-sse3"
 MACHINE_CPU = k8 3dnow sse3
 .  elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || \
-    ${CPUTYPE} == "k8"
+    ${CPUTYPE} == "athlon-fx" || ${CPUTYPE} == "k8"
 MACHINE_CPU = k8 3dnow
-.  elif ${CPUTYPE} == "corei7-avx" || ${CPUTYPE} == "core-avx-i"
+.  elif ${CPUTYPE} == "core-avx2"
+MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse3
+.  elif ${CPUTYPE} == "core-avx-i" || ${CPUTYPE} == "corei7-avx"
 MACHINE_CPU = avx sse42 sse41 ssse3 sse3
 .  elif ${CPUTYPE} == "corei7"
 MACHINE_CPU = sse42 sse41 ssse3 sse3
-.  elif ${CPUTYPE} == "core2"
+.  elif ${CPUTYPE} == "penryn"
+MACHINE_CPU = sse41 ssse3 sse3
+.  elif ${CPUTYPE} == "atom" || ${CPUTYPE} == "core2"
 MACHINE_CPU = ssse3 sse3
 .  elif ${CPUTYPE} == "nocona"
 MACHINE_CPU = sse3
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index efaf9dc..1335964 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -39,9 +39,7 @@ CFLAGS+= ${DEBUG_FLAGS}
 .if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
 CTFFLAGS+= -g
 .endif
-.endif
-
-.if !defined(DEBUG_FLAGS)
+.else
 STRIP?=	-s
 .endif
 
@@ -135,9 +133,9 @@ lib${LIB}.a: ${OBJS} ${STATICOBJS}
 	@${ECHO} building static ${LIB} library
 	@rm -f ${.TARGET}
 .if !defined(NM)
-	@${AR} cq ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
+	@${AR} ${ARFLAGS} ${.TARGET} `lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
 .else
-	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
+	@${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${OBJS} ${STATICOBJS} | tsort -q` ${ARADD}
 .endif
 	${RANLIB} ${.TARGET}
 .endif
@@ -152,9 +150,9 @@ lib${LIB}_p.a: ${POBJS}
 	@${ECHO} building profiled ${LIB} library
 	@rm -f ${.TARGET}
 .if !defined(NM)
-	@${AR} cq ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
+	@${AR} ${ARFLAGS} ${.TARGET} `lorder ${POBJS} | tsort -q` ${ARADD}
 .else
-	@${AR} cq ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
+	@${AR} ${ARFLAGS} ${.TARGET} `NM='${NM}' lorder ${POBJS} | tsort -q` ${ARADD}
 .endif
 	${RANLIB} ${.TARGET}
 .endif
@@ -167,20 +165,26 @@ SOBJS+=		${OBJS:.o=.So}
 .if defined(SHLIB_NAME)
 _LIBS+=		${SHLIB_NAME}
 
+.if defined(DEBUG_FLAGS)
+SHLIB_NAME_FULL=${SHLIB_NAME}.debug
+.else
+SHLIB_NAME_FULL=${SHLIB_NAME}
+.endif
+
 SOLINKOPTS=	-shared -Wl,-x
 .if !defined(ALLOW_SHARED_TEXTREL)
 SOLINKOPTS+=	-Wl,--fatal-warnings -Wl,--warn-shared-textrel
 .endif
 
 .if target(beforelinking)
-${SHLIB_NAME}: ${SOBJS} beforelinking
-.else
-${SHLIB_NAME}: ${SOBJS}
+beforelinking: ${SOBJS}
+${SHLIB_NAME_FULL}: beforelinking
 .endif
+${SHLIB_NAME_FULL}: ${SOBJS}
 	@${ECHO} building shared library ${SHLIB_NAME}
-	@rm -f ${.TARGET} ${SHLIB_LINK}
+	@rm -f ${SHLIB_NAME} ${SHLIB_LINK}
 .if defined(SHLIB_LINK)
-	@ln -fs ${.TARGET} ${SHLIB_LINK}
+	@ln -fs ${SHLIB_NAME} ${SHLIB_LINK}
 .endif
 .if !defined(NM)
 	@${CC} ${LDFLAGS} ${SSP_CFLAGS} ${SOLINKOPTS} \
@@ -194,6 +198,15 @@ ${SHLIB_NAME}: ${SOBJS}
 .if ${MK_CTF} != "no"
 	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
 .endif
+
+.if defined(DEBUG_FLAGS)
+${SHLIB_NAME}: ${SHLIB_NAME_FULL} ${SHLIB_NAME}.symbols
+	${OBJCOPY} --strip-debug --add-gnu-debuglink=${SHLIB_NAME}.symbols \
+	    ${SHLIB_NAME_FULL} ${.TARGET}
+
+${SHLIB_NAME}.symbols: ${SHLIB_NAME_FULL}
+	${OBJCOPY} --only-keep-debug ${SHLIB_NAME_FULL} ${.TARGET}
+.endif
 .endif
 
 .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"
@@ -202,7 +215,7 @@ _LIBS+=		lib${LIB}_pic.a
 lib${LIB}_pic.a: ${SOBJS}
 	@${ECHO} building special pic ${LIB} library
 	@rm -f ${.TARGET}
-	@${AR} cq ${.TARGET} ${SOBJS} ${ARADD}
+	@${AR} ${ARFLAGS} ${.TARGET} ${SOBJS} ${ARADD}
 	${RANLIB} ${.TARGET}
 .endif
 
@@ -270,6 +283,11 @@ _libinstall:
 	${INSTALL} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
 	    ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
+.if defined(DEBUG_FLAGS)
+	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
+	    ${_INSTALLFLAGS} \
+	    ${SHLIB_NAME}.symbols ${DESTDIR}${SHLIBDIR}
+.endif
 .if defined(SHLIB_LINK)
 # ${_SHLIBDIRPREFIX} and ${_LDSCRIPTROOT} are both needed when cross-building
 # and when building 32 bits library shims.  ${_SHLIBDIRPREFIX} is the directory
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index d6a2628..95f9064 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -45,7 +45,6 @@ LIBCURSES?=	${DESTDIR}${LIBDIR}/libcurses.a
 LIBDEVINFO?=	${DESTDIR}${LIBDIR}/libdevinfo.a
 LIBDEVSTAT?=	${DESTDIR}${LIBDIR}/libdevstat.a
 LIBDIALOG?=	${DESTDIR}${LIBDIR}/libdialog.a
-LIBDISK?=	${DESTDIR}${LIBDIR}/libdisk.a
 LIBDNS?=	${DESTDIR}${LIBDIR}/libdns.a
 LIBDTRACE?=	${DESTDIR}${LIBDIR}/libdtrace.a
 LIBDWARF?=	${DESTDIR}${LIBDIR}/libdwarf.a
@@ -54,7 +53,6 @@ LIBELF?=	${DESTDIR}${LIBDIR}/libelf.a
 LIBFETCH?=	${DESTDIR}${LIBDIR}/libfetch.a
 LIBFL?=		"don't use LIBFL, use LIBL"
 LIBFORM?=	${DESTDIR}${LIBDIR}/libform.a
-LIBFTPIO?=	${DESTDIR}${LIBDIR}/libftpio.a
 LIBG2C?=	${DESTDIR}${LIBDIR}/libg2c.a
 LIBGCC?=	${DESTDIR}${LIBDIR}/libgcc.a
 LIBGCC_PIC?=	${DESTDIR}${LIBDIR}/libgcc_pic.a
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 669043f..78af8fb 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -322,9 +322,6 @@ __DEFAULT_YES_OPTIONS = \
     BOOT \
     BSD_CPIO \
     BSNMP \
-    SOURCELESS \
-    SOURCELESS_HOST \
-    SOURCELESS_UCODE \
     BZIP2 \
     CALENDAR \
     CAPSICUM \
@@ -401,10 +398,13 @@ __DEFAULT_YES_OPTIONS = \
     SENDMAIL \
     SETUID_LOGIN \
     SHAREDOCS \
+    SOURCELESS \
+    SOURCELESS_HOST \
+    SOURCELESS_UCODE \
     SSP \
-    SYSINSTALL \
     SYMVER \
     SYSCONS \
+    SYSINSTALL \
     TCSH \
     TELNET \
     TEXTPROC \
@@ -417,14 +417,14 @@ __DEFAULT_YES_OPTIONS = \
     ZONEINFO
 
 __DEFAULT_NO_OPTIONS = \
-    BMAKE \
-    BSD_GREP \
     BIND_IDN \
     BIND_LARGE_FILE \
     BIND_LIBS \
     BIND_SIGCHASE \
     BIND_XML \
+    BMAKE \
     BSDCONFIG \
+    BSD_GREP \
     CLANG_EXTRAS \
     CTF \
     HESIOD \
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 3c306eb..cfa07a3 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -46,10 +46,10 @@ PROG=	${PROG_CXX}
 OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}
 
 .if target(beforelinking)
-${PROG}: ${OBJS} beforelinking
-.else
-${PROG}: ${OBJS}
+beforelinking: ${OBJS}
+${PROG}: beforelinking
 .endif
+${PROG}: ${OBJS}
 .if defined(PROG_CXX)
 	${CXX} ${CXXFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
 .else
@@ -76,10 +76,10 @@ SRCS=	${PROG}.c
 OBJS=	${PROG}.o
 
 .if target(beforelinking)
-${PROG}: ${OBJS} beforelinking
-.else
-${PROG}: ${OBJS}
+beforelinking: ${OBJS}
+${PROG}: beforelinking
 .endif
+${PROG}: ${OBJS}
 .if defined(PROG_CXX)
 	${CXX} ${CXXFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
 .else
@@ -90,7 +90,7 @@ ${PROG}: ${OBJS}
 .endif
 .endif
 
-.endif
+.endif # !defined(SRCS)
 
 .if	${MK_MAN} != "no" && !defined(MAN) && \
 	!defined(MAN1) && !defined(MAN2) && !defined(MAN3) && \
@@ -100,7 +100,7 @@ ${PROG}: ${OBJS}
 MAN=	${PROG}.1
 MAN1=	${MAN}
 .endif
-.endif
+.endif # defined(PROG)
 
 all: objwarn ${PROG} ${SCRIPTS}
 .if ${MK_MAN} != "no"
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 0e8dc95..2f67903 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -39,7 +39,7 @@ AR		?=	ar
 .if defined(%POSIX)
 ARFLAGS		?=	-rv
 .else
-ARFLAGS		?=	rl
+ARFLAGS		?=	cru
 .endif
 RANLIB		?=	ranlib
 
@@ -129,16 +129,18 @@ MAKE		?=	make
 
 .if !defined(%POSIX)
 NM		?=	nm
-.endif
 
 OBJC		?=	cc
 OBJCFLAGS	?=	${OBJCINCLUDES} ${CFLAGS} -Wno-import
 
+OBJCOPY		?=	objcopy
+
 PC		?=	pc
 PFLAGS		?=
 
 RC		?=	f77
 RFLAGS		?=
+.endif
 
 SHELL		?=	sh
 
diff --git a/share/skel/dot.cshrc b/share/skel/dot.cshrc
index 5ce3e36..3e94371 100644
--- a/share/skel/dot.cshrc
+++ b/share/skel/dot.cshrc
@@ -23,10 +23,7 @@ setenv	BLOCKSIZE	K
 
 if ($?prompt) then
 	# An interactive shell -- set some stuff up
-	if ($uid == 0) then
-		set user = root
-	endif
-	set prompt = "%n@%m:%~ %# "
+	set prompt = "%N@%m:%~ %# "
 	set promptchars = "%#"
 
 	set filec
diff --git a/share/syscons/keymaps/INDEX.keymaps b/share/syscons/keymaps/INDEX.keymaps
index 3911c4b..70bfd4e 100644
--- a/share/syscons/keymaps/INDEX.keymaps
+++ b/share/syscons/keymaps/INDEX.keymaps
@@ -520,6 +520,8 @@ us.dvorakl.kbd:fr:États Unis d'Amérique dvorakl
 us.dvorakl.kbd:pt:Estados Unidos da América dvorakl
 us.dvorakl.kbd:es:Estadounidense dvorak zurdo
 
+us.dvorakp.kbd:en:United States of America Programmer Dvorak
+
 us.dvorakx.kbd:en:United States of America dvorakx
 us.dvorakx.kbd:de:US-amerikanisch dvorakx
 us.dvorakx.kbd:fr:États Unis d'Amérique dvorakx
diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile
index 6861b26..bcf7dcc 100644
--- a/share/syscons/keymaps/Makefile
+++ b/share/syscons/keymaps/Makefile
@@ -47,8 +47,8 @@ FILES=	INDEX.keymaps \
 	ua.koi8-u.kbd ua.koi8-u.shift.alt.kbd ua.iso5.kbd \
 	uk.iso.kbd uk.iso-ctrl.kbd uk.cp850.kbd uk.cp850-ctrl.kbd \
 	uk.dvorak.kbd \
-	us.iso.kbd us.dvorak.kbd us.dvorakl.kbd us.dvorakr.kbd us.dvorakx.kbd \
-	us.emacs.kbd us.pc-ctrl.kbd us.unix.kbd us.iso.acc.kbd
+	us.iso.kbd us.dvorak.kbd us.dvorakl.kbd us.dvorakr.kbd us.dvorakp.kbd \
+	us.dvorakx.kbd us.emacs.kbd us.pc-ctrl.kbd us.unix.kbd us.iso.acc.kbd
 
 FILESDIR= ${SHAREDIR}/syscons/keymaps
 
diff --git a/share/syscons/keymaps/spanish.dvorak.kbd b/share/syscons/keymaps/spanish.dvorak.kbd
index 022a87d..fa5900d 100644
--- a/share/syscons/keymaps/spanish.dvorak.kbd
+++ b/share/syscons/keymaps/spanish.dvorak.kbd
@@ -1,4 +1,6 @@
 # $FreeBSD$
+#
+# Submitted by:	Álvaro Castillo <netsys@fedoraproject.org>
 #                                                         alt
 # scan                       cntrl          alt    alt   cntrl lock
 # code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
diff --git a/share/syscons/keymaps/us.dvorakp.kbd b/share/syscons/keymaps/us.dvorakp.kbd
new file mode 100644
index 0000000..e6d4d91
--- /dev/null
+++ b/share/syscons/keymaps/us.dvorakp.kbd
@@ -0,0 +1,117 @@
+# A Programmer Dvorak keyboard for US English
+#
+# $FreeBSD$
+#                                                         alt
+# scan                       cntrl          alt    alt   cntrl lock
+# code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
+# ------------------------------------------------------------------
+  000   nop    nop    nop    nop    nop    nop    nop    nop     O
+  001   esc    esc    esc    esc    esc    esc    debug  esc     O
+  002   '&'    '%'    nop    nop    '&'    '%'    nop    nop     O
+  003   '['    '7'    nul    nul    '['    '7'    nul    nul     O
+  004   '{'    '5'    nop    nop    '{'    '5'    nop    nop     O
+  005   '}'    '3'    nop    nop    '}'    '3'    nop    nop     O
+  006   '('    '1'    nop    nop    '('    '1'    nop    nop     O
+  007   '='    '9'    rs     rs     '='    '9'    rs     rs      O
+  008   '*'    '0'    nop    nop    '*'    '0'    nop    nop     O
+  009   ')'    '2'    nop    nop    ')'    '2'    nop    nop     O
+  010   '+'    '4'    nop    nop    '+'    '4'    nop    nop     O
+  011   ']'    '6'    nop    nop    ']'    ')'    nop    nop     O
+  012   '!'    '8'    esc    esc    '!'    '8'    esc    esc     O
+  013   '#'    '`'    gs     gs     '#'    '`'    gs     gs      O
+  014   bs     bs     del    del    bs     bs     del    del     O
+  015   ht     btab   nop    nop    ht     btab   nop    nop     O
+  016   ';'    ':'    nop    nop    ';'    ':'    nop    nop     O
+  017   ','    '<'    nop    nop    ','    '<'    nop    nop     O
+  018   '.'    '>'    nop    nop    '.'    '>'    nop    nop     O
+  019   'p'    'P'    dle    dle    'p'    'P'    dle    dle     C
+  020   'y'    'Y'    em     em     'y'    'Y'    em     em      C
+  021   'f'    'F'    ack    ack    'f'    'F'    ack    ack     C
+  022   'g'    'G'    bel    bel    'g'    'G'    bel    bel     C
+  023   'c'    'C'    etx    etx    'c'    'C'    etx    etx     C
+  024   'r'    'R'    dc2    dc2    'r'    'R'    dc2    dc2     C
+  025   'l'    'L'    ff     ff     'l'    'L'    ff     ff      C
+  026   '/'    '?'    nop    nop    '/'    '?'    nop    nop     O
+  027   '@'    '^'    nop    nop    '@'    '^'    nop    nop     O
+  028   cr     cr     nl     nl     cr     cr     nl     nl      O
+  029   lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl   O
+  030   'a'    'A'    soh    soh    'a'    'A'    soh    soh     C
+  031   'o'    'O'    si     si     'o'    'O'    si     si      C
+  032   'e'    'E'    enq    enq    'e'    'E'    enq    enq     C
+  033   'u'    'U'    nak    nak    'u'    'U'    nak    nak     C
+  034   'i'    'I'    ht     ht     'i'    'I'    ht     ht      C
+  035   'd'    'D'    eot    eot    'd'    'D'    eot    eot     C
+  036   'h'    'H'    bs     bs     'h'    'H'    bs     bs      C
+  037   't'    'T'    dc4    dc4    't'    'T'    dc4    dc4     C
+  038   'n'    'N'    so     so     'n'    'N'    so     so      C
+  039   's'    'S'    dc3    dc3    's'    'S'    dc3    dc3     C
+  040   '-'    '_'    us     us     '-'    '_'    us     us      O
+  041   '$'    '~'    nop    nop    '$'    '~'    nop    nop     O
+  042   lshift lshift lshift lshift lshift lshift lshift lshift  O
+  043   '\'    '|'    fs     fs     '\'    '|'    fs     fs      O
+  044   '''    '"'    nop    nop    '''    '"'    nop    nop     O
+  045   'q'    'Q'    dc1    dc1    'q'    'Q'    dc1    dc1     C
+  046   'j'    'J'    nl     nl     'j'    'J'    nl     nl      C
+  047   'k'    'K'    vt     vt     'k'    'K'    vt     vt      C
+  048   'x'    'X'    can    can    'x'    'X'    can    can     C
+  049   'b'    'B'    stx    stx    'b'    'B'    stx    stx     C
+  050   'm'    'M'    cr     cr     'm'    'M'    cr     cr      C
+  051   'w'    'W'    etb    etb    'w'    'W'    etb    etb     C
+  052   'v'    'V'    syn    syn    'v'    'V'    syn    syn     C
+  053   'z'    'Z'    sub    sub    'z'    'Z'    sub    sub     C
+  054   rshift rshift rshift rshift rshift rshift rshift rshift  O
+  055   '*'    '*'    '*'    '*'    '*'    '*'    '*'    '*'     O
+  056   lalt   lalt   lalt   lalt   lalt   lalt   lalt   lalt    O
+  057   ' '    ' '    nul    ' '    ' '    ' '    susp   ' '     O
+  058   clock  clock  clock  clock  clock  clock  clock  clock   O
+  059   fkey01 fkey13 fkey25 fkey37 scr01  scr11  scr01  scr11   O
+  060   fkey02 fkey14 fkey26 fkey38 scr02  scr12  scr02  scr12   O
+  061   fkey03 fkey15 fkey27 fkey39 scr03  scr13  scr03  scr13   O
+  062   fkey04 fkey16 fkey28 fkey40 scr04  scr14  scr04  scr14   O
+  063   fkey05 fkey17 fkey29 fkey41 scr05  scr15  scr05  scr15   O
+  064   fkey06 fkey18 fkey30 fkey42 scr06  scr16  scr06  scr16   O
+  065   fkey07 fkey19 fkey31 fkey43 scr07  scr07  scr07  scr07   O
+  066   fkey08 fkey20 fkey32 fkey44 scr08  scr08  scr08  scr08   O
+  067   fkey09 fkey21 fkey33 fkey45 scr09  scr09  scr09  scr09   O
+  068   fkey10 fkey22 fkey34 fkey46 scr10  scr10  scr10  scr10   O
+  069   nlock  nlock  nlock  nlock  nlock  nlock  nlock  nlock   O
+  070   slock  slock  slock  slock  slock  slock  slock  slock   O
+  071   fkey49 '7'    '7'    '7'    '7'    '7'    '7'    '7'     N
+  072   fkey50 '8'    '8'    '8'    '8'    '8'    '8'    '8'     N
+  073   fkey51 '9'    '9'    '9'    '9'    '9'    '9'    '9'     N
+  074   fkey52 '-'    '-'    '-'    '-'    '-'    '-'    '-'     N
+  075   fkey53 '4'    '4'    '4'    '4'    '4'    '4'    '4'     N
+  076   fkey54 '5'    '5'    '5'    '5'    '5'    '5'    '5'     N
+  077   fkey55 '6'    '6'    '6'    '6'    '6'    '6'    '6'     N
+  078   fkey56 '+'    '+'    '+'    '+'    '+'    '+'    '+'     N
+  079   fkey57 '1'    '1'    '1'    '1'    '1'    '1'    '1'     N
+  080   fkey58 '2'    '2'    '2'    '2'    '2'    '2'    '2'     N
+  081   fkey59 '3'    '3'    '3'    '3'    '3'    '3'    '3'     N
+  082   fkey60 '0'    '0'    '0'    '0'    '0'    '0'    '0'     N
+  083   del    '.'    '.'    '.'    '.'    '.'    boot   boot    N
+  084   nop    nop    nop    nop    nop    nop    nop    nop     O
+  085   nop    nop    nop    nop    nop    nop    nop    nop     O
+  086   nop    nop    nop    nop    nop    nop    nop    nop     O
+  087   fkey11 fkey23 fkey35 fkey47 scr11  scr11  scr11  scr11   O
+  088   fkey12 fkey24 fkey36 fkey48 scr12  scr12  scr12  scr12   O
+  089   cr     cr     nl     nl     cr     cr     nl     nl      O
+  090   rctrl  rctrl  rctrl  rctrl  rctrl  rctrl  rctrl  rctrl   O
+  091   '/'    '/'    '/'    '/'    '/'    '/'    '/'    '/'     N
+  092   nscr   pscr   debug  debug  nop    nop    nop    nop     O
+  093   ralt   ralt   ralt   ralt   ralt   ralt   ralt   ralt    O
+  094   fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49  O
+  095   fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50  O
+  096   fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51  O
+  097   fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53  O
+  098   fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55  O
+  099   fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57  O
+  100   fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58  O
+  101   fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59  O
+  102   fkey60 paste  fkey60 fkey60 fkey60 fkey60 fkey60 fkey60  O
+  103	fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 boot   fkey61  O
+  104   slock  saver  slock  saver  susp   nop    susp   nop     O
+  105   fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62  O
+  106   fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63  O
+  107   fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64  O
+  108   nop    nop    nop    nop    nop    nop    nop    nop
+