Module Name:    src
Committed By:   yamt
Date:           Thu May 22 11:27:14 UTC 2014

Modified Files:
        src/doc [yamt-pagecache]: 3RDPARTY BRANCHES BUILDING.mdoc CHANGES HACKS
            Makefile RESPONSIBLE TODO.clang TODO.kqueue
Removed Files:
        src/doc [yamt-pagecache]: NetBSD-6

Log Message:
sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")


To generate a diff of this commit:
cvs rdiff -u -r1.884.2.6 -r1.884.2.7 src/doc/3RDPARTY
cvs rdiff -u -r1.310.2.5 -r1.310.2.6 src/doc/BRANCHES
cvs rdiff -u -r1.85.2.3 -r1.85.2.4 src/doc/BUILDING.mdoc
cvs rdiff -u -r1.1621.2.6 -r1.1621.2.7 src/doc/CHANGES
cvs rdiff -u -r1.120.2.4 -r1.120.2.5 src/doc/HACKS
cvs rdiff -u -r1.1 -r1.1.2.1 src/doc/Makefile
cvs rdiff -u -r1.9.2.1 -r0 src/doc/NetBSD-6
cvs rdiff -u -r1.95.4.4 -r1.95.4.5 src/doc/RESPONSIBLE
cvs rdiff -u -r1.3.2.1 -r1.3.2.2 src/doc/TODO.clang
cvs rdiff -u -r1.8 -r1.8.8.1 src/doc/TODO.kqueue

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.884.2.6 src/doc/3RDPARTY:1.884.2.7
--- src/doc/3RDPARTY:1.884.2.6	Wed Jan 23 00:04:28 2013
+++ src/doc/3RDPARTY	Thu May 22 11:27:14 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.884.2.6 2013/01/23 00:04:28 yamt Exp $
+#	$NetBSD: 3RDPARTY,v 1.884.2.7 2014/05/22 11:27:14 yamt Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -40,21 +40,22 @@
 #
 
 Package:	acpica
-Version:	20110623
-Current Vers:	20120620
+Version:	20131218
+Current Vers:	20140424
 Maintainer:	Intel
-Archive Site:	http://www.acpica.org/downloads/unix2_source_code.php
+Archive Site:	http://www.acpica.org/downloads/
 Home Page:	http://www.acpica.org/
 Mailing List:	de...@acpica.org
 License:	BSD-like
 Responsible:	jruoho
 Location:	sys/external/bsd/acpica/dist
 Notes:
+You want the unix2 (dual-licensed) tar file.
 Please read src/sys/dev/acpi/acpica/README before any modification.
 
 Package:	am-utils [amd]
-Version:	6.2a3
-Current Vers:	6.2a3
+Version:	6.2
+Current Vers:	6.2rc1
 Maintainer:	Erez Zadok <e...@cs.columbia.edu>
 Archive Site:	ftp://ftp.am-utils.org/pub/am-utils/
 Home Page:	http://www.am-utils.org/
@@ -68,11 +69,11 @@ Fix symbolic links before import.
 Check external/bsd/am-utils/include/config.h is correct after import.
 
 Package:	Automated Testing Framework (ATF)
-Version:	0.16
-Current Vers:	0.16
+Version:	0.20
+Current Vers:	0.20
 Maintainer:	Julio Merino <j...@netbsd.org>
-Archive site:	http://code.google.com/p/kyua/downloads/list?can=1
-Home page:	http://code.google.com/p/kyua/wiki/ATF
+Archive site:	https://github.com/jmmv/atf/releases
+Home page:	https://github.com/jmmv/atf
 Mailing List:	atf-de...@netbsd.org
 Responsible:	jmmv
 License:	The NetBSD Foundation's license (BSD 2-clause)
@@ -80,9 +81,11 @@ Location:	external/bsd/atf/dist
 Notes:
 The source files are in external/bsd/atf/dist.
 Use external/bsd/atf/prepare-import.sh to regenerate the dist/ directory.
-Given that the primary goal of ATF is to provide a testing framework for
-NetBSD, no local changes should be ever needed.  Always direct them to the
-maintainer for integration in official releases.
+Please avoid performing local changes to this package without discussing
+them with the responsible person and/or the mailing list shown above.
+Note that the external/bsd/atf/dist/tools is owned by NetBSD and does not
+exist upstream; however, please continue to discuss any desired changes
+upfront.
 
 Package:	ath-hal
 Version:	FreeBSD SVN revision number 185521
@@ -110,8 +113,8 @@ Notes:
 bc includes dc, both of which are in the NetBSD tree.
 
 Package:	bind [named and utils]
-Version:	9.9.2-P1
-Current Vers:	9.9.2-P1
+Version:	9.10.0b1
+Current Vers:	9.10.0b1
 Maintainer:	Paul Vixie <vi...@vix.com>
 Archive Site:	ftp://ftp.isc.org/isc/bind9/
 Home Page:	http://www.isc.org/software/bind/
@@ -153,8 +156,8 @@ Todo[4]: Re-entrant functions of net/*
 Todo[5]: Reconcile the doc directory.
 
 Package:	binutils
-Version:	2.21.1a
-Current Vers:	2.23.1
+Version:	2.23.2
+Current Vers:	2.24
 Maintainer:	FSF
 Archive Site:	ftp://ftp.gnu.org/gnu/binutils/
 Home Page:	http://www.gnu.org/software/binutils/
@@ -188,10 +191,13 @@ Responsible:
 License:	BSD (2-clause) (see http://www.freebsd.org/cgi/cvsweb.cgi/src/COPYRIGHT)
 Location:	share/misc/bsd-family-tree
 Notes:
+Please send all updates upstream.  Eitan Adler <li...@eitanadler.com>
+is a FreeBSD committer who has been helpful with incorporating changes
+in the past.
 
 Package:	byacc
-Version:	20110908
-Current Vers:	20110908
+Version:	20130304
+Current Vers:	20130925
 Maintainer:	Thomas Dickey <dic...@invisible-island.net>
 Archive Site:	http://www.invisible-island.net/byacc/byacc.html
 Home Page:	http://www.invisible-island.net/byacc/byacc.html
@@ -283,8 +289,8 @@ distribution into the netbsd format.  Th
 src/lib/libc/db/db2netbsd.
 
 Package:	dhcp
-Version:	3.0.3
-Current Vers:	4.1-ESV-R6/4.2.4-P1
+Version:	4.2.5-P1
+Current Vers:	4.2.5-P1
 Maintainer:	mellon
 Archive Site:	ftp://ftp.isc.org/isc/dhcp/
 Home Page:	http://www.isc.org/software/dhcp/
@@ -294,14 +300,13 @@ Mailing List:	dhcp-annou...@isc.org
 Mailing List:	dhcp-b...@isc.org
 Responsible:	mellon
 License:	BSD (3-clause)
-Location:	dist/dhcp
+Location:	external/bsd/dhcp
 Notes:
-No changes for NetBSD integration - just import the new distribution on
-top of the current tree.
+Use the dhcp2netbsd script.
 
 Package:	dhcpcd
-Version:	5.6.6
-Current Vers:	5.6.6
+Version:	6.3.2
+Current Vers:	6.3.2
 Maintainer:	roy
 Archive Site:	ftp://roy.marples.name/pub/dhcpcd/
 Home Page:	http://roy.marples.name/projects/dhcpcd/
@@ -314,7 +319,7 @@ The distribution doesn't include the Lin
 
 Package:	diffutils
 Version:	2.8.1
-Current Vers:	3.2
+Current Vers:	3.3
 Maintainer:	FSF
 Archive Site:	ftp://ftp.gnu.org/gnu/diffutils/
 Home Page:	http://www.gnu.org/software/diffutils/
@@ -340,8 +345,8 @@ Notes:
 Please use "expat" as the vendor tag for CVS imports.
 
 Package:	file
-Version:	5.12
-Current Vers:	5.12
+Version:	5.16
+Current Vers:	5.18
 Maintainer:	Christos Zoulas <chris...@zoulas.com>
 Archive Site:	ftp://ftp.astron.com/pub/file/
 Home Page:	http://www.darwinsys.com/file/
@@ -353,8 +358,8 @@ Notes:
 use file2netbsd
 
 Package:	flex
-Version:	2.5.35
-Current Vers:	2.5.35
+Version:	2.5.37
+Current Vers:	2.5.37
 Maintainer:	Will Estes <wles...@users.sourceforge.net>
 Archive Site:	http://flex.sourceforge.net/
 Home Page:	http://flex.sourceforge.net/
@@ -366,33 +371,37 @@ Notes:
 There is a flex2netbsd script to help newer imports.
 
 Package:	gcc
-Version:	4.1.3-20080831/4.5.4
-Current Vers:	4.7.2
+Version:	4.1.3-20080831/4.5.4/4.8.2r206687
+Current Vers:	4.8.2
 Maintainer:	FSF
 Archive Site:	ftp://ftp.gnu.org/gnu/gcc/
 Home Page:	http://www.gnu.org/software/gcc/
 Mailing List:	gcc-b...@gnu.org
 Responsible:	thorpej, mrg
 License:	GPLv3, LGPLv3.1
+Location:	gnu/dist/gcc4
+Location:	external/gpl3/gcc.old/dist
 Location:	external/gpl3/gcc/dist
 Notes:
-before importing:
-	- delete all .cvsignore and .brik files
-	- delete gcc/java gcc/ada libffi zlib boehm-gc libjava fastjar
-	- delete all related testsuites
-for GCC4:
-	- delete all fortran and testsuites
+As of April 2014, there are three versions of gcc in the NetBSD tree.
+In the long term, we expect that there will often be two versions,
+in the "gcc" and "gcc.old" directories.  Having two versions allows
+migration from one version of gcc to another to happen for one port
+at a time, instead of for all ports simultaneously.
+When importing a new version of external/gpl3/gcc.old:
+	- copy the current version of external/gpl3/gcc
+	- import it to a "NETBSD" vendor branch in externalgpl3/gcc.old
+Before importing a new version of external/gpl3/gcc:
+	- delete all .cvsignore and .gitignore files
+	- delete java ada fortran their libraries and testsuites
+	- delete libffi zlib boehm-gc 
 	- update gcc/version.c for the NetBSD GCC date
-for GCC 4.5:
 	- use core/c++/objc/testsuite tarballs
-	- delete:
-		gcc/testsuite/ada
-		gcc/testsuite/gfortran*
-		gcc/testsuite/gnat.dg
+	- you can use the gcc2netbsd script for the above (except version)
 
 Package:	gdb
-Version:	6.5/7.3.1
-Current Vers:	7.5
+Version:	7.6.1
+Current Vers:	7.7.1
 Maintainer:	FSF
 Archive Site:	ftp://ftp.gnu.org/gnu/gdb/
 Home Page:	http://www.gnu.org/software/gdb/
@@ -423,7 +432,7 @@ Only double-precision addressed at this 
 
 Package:	gettext
 Version:	0.14.4
-Current Vers:	0.17
+Current Vers:	0.18
 Maintainer:	FSF
 Archive Site:	ftp://ftp.gnu.org/gnu/gettext/
 Home Page:	http://www.gnu.org/software/gettext/
@@ -450,7 +459,7 @@ Notes:
 
 Package:	grep
 Version:	2.5.1
-Current Vers:	2.14
+Current Vers:	2.17
 Maintainer:	FSF
 Archive Site:	ftp://ftp.gnu.org/gnu/grep/
 Home Page:	http://www.gnu.org/software/grep/
@@ -470,7 +479,7 @@ in src/usr.bin/grep, replacing FreeGrep
 
 Package:	groff
 Version:	1.19.2
-Current Vers:	1.21
+Current Vers:	1.22.2
 Maintainer:	Werner Lemberg/FSF
 Archive Site:	ftp://ftp.gnu.org/gnu/groff/
 Home Page:	http://www.gnu.org/software/groff/
@@ -484,7 +493,7 @@ for import.
 
 Package:	heimdal
 Version:	1.5pre1
-Current Vers:	1.5pre1
+Current Vers:	1.5.2
 Maintainer:	Heimdal <heim...@pdc.kth.se>
 Archive Site:	ftp://ftp.pdc.kth.se/pub/heimdal/src/
 Home Page:	http://www.pdc.kth.se/heimdal/
@@ -507,7 +516,7 @@ Notes:
 
 Package:	ipf
 Version:	5.1.1
-Current Vers:	5.1.1
+Current Vers:	5.1.2
 Maintainer:	Darren Reed
 Archive Site:	http://coombs.anu.edu.au/~avalon/
 Home Page:	http://coombs.anu.edu.au/~avalon/
@@ -569,9 +578,53 @@ in sys/netinet6/in6.h.  No script is ava
 http://www.kame.net/dev/cvsweb.cgi/kame/COVERAGE has functionality comparison
 among KAME/*BSD, *BSD-current and recent *BSD releases.
 
+Package:	kyua-atf-compat
+Version:	0.1
+Current Vers:	0.1
+Maintainer:	Julio Merino <j...@netbsd.org>
+Archive site:	http://code.google.com/p/kyua/downloads/list?can=1
+Home page:	http://code.google.com/p/kyua/
+Mailing List:	kyua-disc...@googlegroups.com
+Responsible:	jmmv
+License:	BSD 3-clause
+Location:	external/bsd/kyua-atf-compat/dist
+Notes:
+The source files are in external/bsd/kyua-atf-compat/dist.
+Use external/bsd/kyua-atf-compat/prepare-import.sh to regenerate the dist/
+directory.
+
+Package:	kyua-cli
+Version:	0.7
+Current Vers:	0.7
+Maintainer:	Julio Merino <j...@netbsd.org>
+Archive site:	http://code.google.com/p/kyua/downloads/list?can=1
+Home page:	http://code.google.com/p/kyua/
+Mailing List:	kyua-disc...@googlegroups.com
+Responsible:	jmmv
+License:	BSD 3-clause
+Location:	external/bsd/kyua-cli/dist
+Notes:
+The source files are in external/bsd/kyua-cli/dist.
+Use external/bsd/kyua-cli/prepare-import.sh to regenerate the dist/ directory.
+
+Package:	kyua-testers
+Version:	0.1
+Current Vers:	0.1
+Maintainer:	Julio Merino <j...@netbsd.org>
+Archive site:	http://code.google.com/p/kyua/downloads/list?can=1
+Home page:	http://code.google.com/p/kyua/
+Mailing List:	kyua-disc...@googlegroups.com
+Responsible:	jmmv
+License:	BSD 3-clause
+Location:	external/bsd/kyua-testers/dist
+Notes:
+The source files are in external/bsd/kyua-testers/dist.
+Use external/bsd/kyua-testers/prepare-import.sh to regenerate the dist/
+directory.
+
 Package:	less
-Version:	less-444
-Current Vers:	less-451
+Version:	less-458
+Current Vers:	less-458
 Maintainer:	Mark Nudelman <ma...@greenwoodsoftware.com>
 Archive Site:	http://www.greenwoodsoftware.com/less/download.html
 Home Page:	http://www.greenwoodsoftware.com/less/
@@ -587,7 +640,7 @@ Talk to mrg before importing any new ver
 
 Package:	libarchive
 Version:	2.8.4
-Current Vers:	2.8.5 (legacy) / 3.0.3 (stable)
+Current Vers:	2.8.5 (legacy) / 3.0.4 (stable)
 Maintainer:	kient...@freebsd.org, jo...@netbsd.org
 Archive Site:	https://github.com/libarchive/libarchive/downloads
 Home Page: 	http://libarchive.github.com/
@@ -599,7 +652,7 @@ Distribution is stripped down to the rel
 
 Package:	libdevmapper
 Version:	1.02.40
-Current Vers:	1.02.40
+Current Vers:	2.02.98
 Maintainer:	lvm-de...@redhat.com
 Archive Site:	ftp://sources.redhat.com/pub/lvm2/
 Home Page:	http://sources.redhat.com/lvm2/
@@ -611,8 +664,8 @@ The lvm2tools and the libdevmapper are n
 repository. See the lvm2tools Notes for more information.
 
 Package:	libevent
-Version:	1.4.12-stable
-Current Vers:	2.0.2-alpha
+Version:	2.0.21-stable
+Current Vers:	2.0.21-stable
 Maintainer:	Niels Provos <pro...@citi.umich.edu>
 Archive Site:	http://www.monkey.org/~provos/libevent/
 Home Page:	http://www.monkey.org/~provos/libevent/
@@ -620,6 +673,22 @@ Responsible:	provos
 License:	BSD (3/4-clause)
 Location:	external/bsd/libevent/dist
 Notes:
+- Run the libevent2netbsd script
+- Build the doxygen man pages. Edit the Doxyfile to GENERATE_MAN=yes.
+  man pages are in doxygen/man/man3. Remove the extra man pages that are
+  .so'ing only. Copy the rest to man.
+
+Package:	llvm
+Version:	3.4rc1 (r195771)
+Current Vers.:	3.4rc1
+Maintainer:	llvm...@cs.uiuc.edu
+Home Page:	http://llvm.org
+Responsible:	joerg
+License:	BSD/MIT
+Location:	external/bsd/llvm/dist
+Notes:
+A CVS ACL is in place for the location to prevent unintentioned commits.
+All changes should come via import from upstream SVN.
 
 Package:	lvm2tools
 Version:	2.02.56
@@ -637,8 +706,8 @@ We maintain our own version of libdevmap
 should test it before import. Talk to haad before importing new version.
 
 Package:	libpcap
-Version:	1.1.1
-Current Vers:	1.1.1
+Version:	1.5.2
+Current Vers:	1.5.2
 Maintainer:	tcpdump-work...@tcpdump.org
 Archive Site:	http://www.tcpdump.org/release/
 Home Page:	http://www.tcpdump.org/
@@ -647,8 +716,8 @@ Responsible:	dyoung
 License:	BSD (3/4-clause)
 Location:	external/bsd/libpcap/dist
 Notes:
-Use the src/external/bsd/libpcap/dist/libpcap2netbsd script to prepare source
-tree.
+Use the src/external/bsd/libpcap/libpcap2netbsd script to prepare source
+tree. sys/net/dlt.h is a copy of the dlt constants from pcap.h
 
 Package:	libwrap
 Version:	tcp_wrappers 7.6 w/ large amount of IPv6 changes
@@ -666,8 +735,8 @@ under src/usr.sbin). We don't use tcpd; 
 into inetd. The provided libwrap2netbsd script handles just libwrap.
 
 Package:	Lua
-Version:	Lua 5.1.4
-Current Vers:	Lua 5.2.1
+Version:	Lua 5.1.5
+Current Vers:	Lua 5.2.2
 Maintainer:	PUC Rio
 Home Page:	http://www.lua.org/
 Mailing List:
@@ -678,6 +747,20 @@ Notes:
 The default module paths have been changed to not include the current
 working directory '.' to avoid potential security problems.
 
+Package:	Lutok
+Version:	0.3
+Current Vers:	0.3
+Maintainer:	Julio Merino <j...@netbsd.org>
+Archive site:	http://code.google.com/p/lutok/downloads/list?can=1
+Home page:	http://code.google.com/p/lutok/
+Mailing List:	lutok-disc...@googlegroups.com
+Responsible:	jmmv
+License:	BSD 3-clause
+Location:	external/bsd/lutok/dist
+Notes:
+The source files are in external/bsd/lutok/dist.
+Use external/bsd/lutok/prepare-import.sh to regenerate the dist/ directory.
+
 Package:	m4
 Version:	20091026
 Current Vers:	20091026
@@ -693,7 +776,7 @@ Uses libc's ohash, and strtonum
 
 Package:	mDNSResponder
 Version:	212.1
-Current Vers:	258.14
+Current Vers:	541
 Maintainer:	Apple
 Archive Site:	http://www.opensource.apple.com/tarballs/mDNSResponder/
 Home Page:	http://developer.apple.com/opensource/internet/bonjour.html
@@ -705,8 +788,8 @@ Location:	external/apache2/mDNSResponder
 Notes:
 
 Package:	mdocml
-Version:	1.12.0
-Current Vers:	1.12.1
+Version:	1.12.1
+Current Vers:	1.12.2
 Maintainer:	Kristaps Džonsons
 Archive Site:	http://mdocml.bsd.lv/snapshots/
 Home Page:	http://mdocml.bsd.lv/
@@ -771,10 +854,10 @@ and ndbootd-raw.c.  Restore saved config
 HAVE_STRICT_ALIGNMENT.  Fix RCS IDs, import.
 
 Package:	ntp
-Version:	4.2.6p5
-Current Vers:	4.2.6p5
+Version:	4.2.7p404
+Current Vers:	4.2.6p5/4.2.7p404
 Maintainer:	David L. Mills <mi...@udel.edu>
-Archive Site:	ftp://ftp.udel.edu/pub/ntp/ntp4/
+Archive Site:	http://www.ntp.org/
 Home Page:	http://www.ntp.org/, http://support.ntp.org/
 Mailing List:
 Responsible:	simonb, jonathan, kardel
@@ -784,33 +867,33 @@ Notes:
 See /usr/src/dist/ntp/ntp2netbsd for update instructions.
 
 Package:	nvi
-Version:	1.81.6
+Version:	1.81.6, HEAD as of 2013-11-20
 Current Vers:	1.81.6
-Maintainer:	Keith Bostic <bos...@bsdi.com>
-Archive Site:	ftp://ftp.bostic.com/pub/
-Home Page:	http://www.bostic.com/vi/
+Maintainer:	Sven Verdoolaege <sk...@kotnet.org>, Keith Bostic
+Archive Site:	git://repo.or.cz/nvi.git, ftp://ftp.bostic.com/pub/
+Home Page:	https://repo.or.cz/w/nvi.git http://www.bostic.com/vi/
 Mailing List:
-Responsible:	aymeric, christos
+Responsible:	christos
 License:	BSD (3/4-clause)
-Location:	dist/nvi
+Location:	external/bsd/nvi/dist
 Notes:
 We have lots of local fixes.
 
 Package:	OpenLDAP
 Version:	2.4.23
-Current Vers:	2.4.32
+Current Vers:	2.4.38
 Maintainer:	OpenLDAP Foundation
 Archive Site:	http://www.openldap.org/
 Home Page:	http://www.openldap.org/
 Mailing List:
-Responsible:	lukem
+Responsible:	
 License:	BSD (3-clause)
 Location:	external/bsd/openldap/dist
 Notes:
 
 Package:	OpenPAM
-Version:	20111218 (Lycopsida)
-Current Vers:	20120526 (Micrampelis)
+Version:	20130907 (Nummularia)
+Current Vers:	20130907 (Nummularia)
 Maintainer:	Dag-Erling Smørgrav <d...@freebsd.org>
 Archive Site:	http://www.openpam.org/
 Home Page:	http://www.openpam.org/
@@ -819,11 +902,11 @@ Responsible:	christos
 License:	BSD (3-clause)
 Location:	external/bsd/openpam/dist
 Notes:
-Next import will need $ Id removal..
+Next import will need moving lib sources to lib/libpam
 
 Package:	openresolv
-Version:	3.5.3
-Current Vers:	3.5.3
+Version:	3.5.6
+Current Vers:	3.5.6
 Maintainer:	roy
 Archive Site:	ftp://roy.marples.name/pub/openresolv/
 Home Page:	http://roy.marples.name/projects/openresolv/
@@ -835,7 +918,7 @@ Please submit all changes to the author.
 
 Package:	HPN-SSH
 Version:	6.1p1 13 v14
-Current Vers:	6.1p1 13 v14
+Current Vers:	6.3p1 v14
 Maintainer:	www.psc.edu
 Archive Site:	No direct link anymore, @#$#$ psc.
 Home Page:	http://www.psc.edu/index.php/hpn-ssh
@@ -847,8 +930,8 @@ Notes:
 Patch applied after OpenSSH import.
 
 Package:	OpenSSH
-Version:	6.1
-Current Vers:	6.1 / portable 6.1p1
+Version:	6.4
+Current Vers:	6.4 / portable 6.4p1
 Maintainer:	OpenSSH
 Archive Site:	http://www.openssh.com/ftp.html
 Home Page:	http://www.openssh.com/portable.html
@@ -888,8 +971,8 @@ markus is very cooperative about it):
 - make compile with gcc-4.5; const fixes, fileno() checks, shadow fixes.
 
 Package:	OpenSSL
-Version:	1.0.1c
-Current Vers:	1.0.1c with AES-NI patch
+Version:	1.0.1g
+Current Vers:	1.0.1g with AES-NI patch
 Maintainer:	The OpenSSL Project
 Archive Site:	ftp://ftp.openssl.org/source/
 Home Page:	http://www.openssl.org/
@@ -928,11 +1011,10 @@ Home Page:	http://cantaforda.com/cfcl/er
 Mailing List:
 Responsible:	dbj
 License:	BSD-like
-Location:	dist/pdisk
+Location:	external/bsd/pdisk
 Notes:
 This is the disk partition utility used by Apple's mkLinux and OS X
-It is imported into dist/pdisk, with a reachover makefile in
-src/sbin/pdisk builds for macppc and mac68k.
+It is imported into external/bsd/pdisk.
 
 Package:	pdksh
 Version:	5.2.14p2
@@ -991,8 +1073,8 @@ and more. Vern's ping is gone. We are to
 now to do a new import.
 
 Package:	Postfix
-Version:	2.9.5
-Current Vers:	2.9.5
+Version:	2.10.3
+Current Vers:	2.11.0/2.10.3
 Maintainer:	Wietse Venema <wie...@porcupine.org>
 Archive Site:	ftp://postfix.cloud9.net/official/
 Home Page:	http://www.postfix.org/
@@ -1007,16 +1089,16 @@ directory layout (the easiest way to che
 set-permissions'').
 
 Package:	ppp
-Version:	2.4.4
-Current Vers:	2.4.4
+Version:	2.4.5
+Current Vers:	2.4.6
 Maintainer:	Paul Mackerras <pau...@samba.org>
 Archive Site:	ftp://ftp.samba.org/pub/ppp/
 Home Page:
-CVS root:	:pserver:c...@pserver.samba.org:/cvsroot (password: cvs)
+GIT root:	git://ozlabs.org/~paulus/ppp.git
 Mailing List:
 Responsible:	christos, cube
 License:	BSD (3-clause)
-Location:	dist/pppd
+Location:	external/bsd/ppp/dist
 Notes:
 BSD support was removed from 2.4.0; I added it back and removed
 some GPL pieces. Multilink support is missing. Repeated pings to
@@ -1030,7 +1112,7 @@ using the version found in 2.4.1.
 
 Package:	rcs
 Version:	5.7
-Current Vers:	5.8.1
+Current Vers:	5.9.2
 Maintainer:	FSF
 Archive Site:	ftp://ftp.gnu.org/gnu/rcs/
 Mailing List:	bug-gnu-ut...@gnu.org
@@ -1099,20 +1181,19 @@ arithmetic code is unchanged, though, an
 original.
 
 Package:	sqlite
-Version:	pre-3.6.9 snapshot
-Current Vers:	3.7.15
+Version:	3.8.3.1
+Current Vers:	3.8.3.1
 Maintainer:	Richard Hipp <d...@sqlite.org>
 Home Page:	http://www.sqlite.org
 Responsible:	joerg
 License:	Public domain
 Location:	external/public-domain/sqlite/dist
 Notes:
-Initial import uses a pre-release with a number of bug fixes to avoid
-unnecessary local changes.
+Run cleantags before inporting because sqlite3.c has an RCSID
 
 Package:	tcpdump
-Version:	4.1.1
-Current Vers:	4.1.1
+Version:	4.5.1
+Current Vers:	4.5.1
 Maintainer:	tcpdump-work...@lists.tcpdump.org
 Archive Site:	http://www.tcpdump.org/release/
 Home Page:	http://www.tcpdump.org/
@@ -1121,7 +1202,7 @@ Responsible:
 License:	BSD (3-clause)
 Location:	external/bsd/tcpdump/dist
 Notes:
-Use the src/external/bsd/tcpdump/dist/tcpdump2netbsd script to prepare source
+Use the src/external/bsd/tcpdump/tcpdump2netbsd script to prepare source
 tree.
 
 Package:	TestFloat
@@ -1138,7 +1219,7 @@ Notes:
 
 Package:	texinfo
 Version:	4.8
-Current Vers:	4.13
+Current Vers:	5.2
 Maintainer:	FSF
 Archive Site:	ftp://ftp.gnu.org/gnu/texinfo/
 Home Page:	http://www.gnu.org/software/texinfo/
@@ -1152,7 +1233,7 @@ for the import.
 
 Package:	tmux
 Version:	1.5
-Current Vers:	1.7
+Current Vers:	1.9a
 Maintainer:	Nicholas Marriott <n...@users.sourceforge.net>
 Archive site:	http://downloads.sourceforge.net/tmux/
 Home page:	http://tmux.sourceforge.net/
@@ -1190,8 +1271,8 @@ Notes:
 Added changes from a5 -> a12 manually.
 
 Package:	tz
-Version:	tzcode2012h / tzdata2012j
-Current Vers:	tzcode2012j / tzdata2012j
+Version:	tzcode2013i / tzdata2013i
+Current Vers:	tzcode2013i / tzdata2013i
 Maintainer:	Paul Eggert <egg...@cs.ucla.edu>
 Archive Site:	ftp://ftp.iana.org/tz/releases/
 Archive Site:	ftp://munnari.oz.au/pub/oldtz/
@@ -1202,15 +1283,14 @@ Responsible:	kleink, christos, apb
 License:	Public domain
 Location:	lib/libc/time,share/zoneinfo
 Notes:
-Use src/lib/libc/time/tzcode2netbsd to prepare the source tree for import.
-The tzcode2012f -> 2012g patch was applied by hand, since we have too
-many diffs (re-entrant tzcode) to apply. The diffs have been submitted
-upstream but there is too much inertia to apply them. Check for .gitignore
-files.
+Don't use src/lib/libc/time/tzcode2netbsd to prepare the source tree for import.
+Diffs are now applied by hand, since we have too many diffs (re-entrant tzcode,
+register removal) to apply. The diffs have been submitted upstream but there
+is too much inertia to apply them. Check for .gitignore files.
 
 Package:	wpa_supplicant/hostapd
-Version:	1.0
-Current Vers:	1.0
+Version:	2.0
+Current Vers:	2.0
 Maintainer:	Jouni Malinen <jkmal...@cc.hut.fi>
 Archive Site:	http://hostap.epitest.fi/releases/
 Home Page:	http://hostap.epitest.fi/wpa_supplicant/
@@ -1240,7 +1320,7 @@ Notes:
 
 Package:	zlib
 Version:	1.2.3
-Current Vers:	1.2.7
+Current Vers:	1.2.8
 Maintainer:	Jean-loup Gailly and Mark Adler <z...@gzip.org>
 Archive Site:	http://www.zlib.net/
 Home Page:	http://www.zlib.net/
@@ -1252,8 +1332,8 @@ Notes:
 Imported to src/common/dist/zlib and shared by the kernel and userland.
 
 Package:	services, protocols
-Version:	2012-08-24 (services), 2012-08-21 (protocols)
-Current Vers:	2012-08-24 (services), 2012-08-21 (protocols)
+Version:	2013-02-21 (services), 2013-02-17 (protocols)
+Current Vers:	2013-11-27 (services), 2013-11-12 (protocols)
 Maintainer:	IANA
 Archive Site:	http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.txt (services)
 Archive Site:	http://www.iana.org/assignments/protocol-numbers/protocol-numbers.txt (protocols)
@@ -1278,7 +1358,7 @@ Notes:
 
 Package:	pigz
 Version:	2.1.6
-Current Vers:	2.1.6
+Current Vers:	2.3.1
 Maintainer:	Mark Adler <mad...@alumni.caltech.edu>
 Archive Site:	http://zlib.net/pigz/
 Home Page:	http://zlib.net/pigz/
@@ -1290,7 +1370,7 @@ Notes:
 
 Package:	xz
 Version:	5.0.0
-Current Vers:	5.0.4
+Current Vers:	5.0.5 (stable) / 5.1.3alpha (devel)
 Maintainer:	Lasse Collin <lasse.col...@tukanni.org>
 Archive Site:	http://tukaani.org/xz/
 Home Page:	http://tukaani.org/xz/
@@ -1303,20 +1383,20 @@ Notes:
 3. Carefully check for GPL components leaked into the dist area.
 
 Package:	mpc
-Version:	0.9
-Current Vers:	0.9
+Version:	1.0.1
+Current Vers:	1.0.1
 Maintainer:	
 Archive Site:	http://www.multiprecision.org/mpc/download/
 Home Page:	http://www.multiprecision.org/mpc/
 Mailing List:	http://www.multiprecision.org/index.php?prog=mpc&page=development
 Responsible:	mrg
-License:	LGPL2
-Location:	external/lgpl2/mpc/dist
+License:	LGPL3
+Location:	external/lgpl3/mpc/dist
 Notes:
 
 Package:	mpfr
-Version:	3.0.1
-Current Vers:	3.0.1
+Version:	3.1.2
+Current Vers:	3.1.2
 Maintainer:	
 Archive Site:	http://www.mpfr.org/mpfr-current/
 Home Page:	http://www.mpfr.org/
@@ -1327,8 +1407,8 @@ Location:	external/lgpl3/mpfr/dist
 Notes:
 
 Package:	GNU MP
-Version:	5.0.2
-Current Vers:	5.0.2
+Version:	5.1.3
+Current Vers:	5.1.3
 Maintainer:	http://gmplib.org/mailman/listinfo/gmp-devel
 Archive Site:	http://gmplib.org/
 Home Page:	http://gmplib.org/
@@ -1338,9 +1418,21 @@ License:	LGPL3
 Location:	external/lgpl3/gmp/dist
 Notes:
 
+Package:	osnet
+Version:	osnet-20100224
+Current Vers:	?
+Maintainer:	?
+Archive Site:	?
+Home Page:	?
+Mailing List:	?
+Responsible:	?
+License:	CDDL
+Location:	external/cddl/osnet
+Notes:
+
 Package:	sljit
 Version:	svn revision 186
-Current Vers:	svn revision 201
+Current Vers:	svn revision 226
 Maintainer:	Zoltán Herczeg <hzmes...@freemail.hu
 Archive Site:	http://sourceforge.net/projects/sljit/
 Home Page:	http://sljit.sourceforge.net/
@@ -1390,16 +1482,30 @@ Location:	crypto/external/cpl/tpm-tools/
 Notes:
 		Need to feed back local changes
 
-Package:	libdwarf
-Version:	FreeBSD-2013-01-17
+Package:	elftoolchain (libelf/libdwarf)
+Version:	FreeBSD-2014-03-08
 Current Vers:	FreeBSD-XXXX-YY-ZZ
-Maintainer:	John Birrell <j...@freebsd.org>
+Maintainer:	Joseph Koshi <jko...@freebsd.org>
 Archive Site:	none
 Home Page:	none
 Mailing List:	none
 Responsible:	christos
 License:	BSD-like (2-clause)
-Location:	sys/external/bsd/libdwarf/dist
+Location:	sys/external/bsd/elftoolchain/dist
 Notes:
 		Run prepare-import.sh; next time use svn id.
-		Ask jkoshy who the upstream will be.
+
+Package:	smbfs
+Version:	smbfs-1.4.1.tar.gz + FreeBSD-2003-02-16
+Current Vers:	FreeBSD-XXXX-YY-ZZ
+Maintainer:	Boris Popov <b...@freebsd.org>
+Archive Site:	none
+Home Page:	http://people.freebsd.org/~bp/pub/smbfs/smbfs-1.4.1.tar.gz
+Mailing List:	?
+Responsible:	christos
+License:	BSD-like (4-clause)
+Location:	external/bsd/smbfs
+Notes:
+		The kernel portion has been removed from the tar file.
+		Our kernel smbfs and netsmb directories could move to
+		external, but this is just make-work.

Index: src/doc/BRANCHES
diff -u src/doc/BRANCHES:1.310.2.5 src/doc/BRANCHES:1.310.2.6
--- src/doc/BRANCHES:1.310.2.5	Wed Jan 16 05:26:12 2013
+++ src/doc/BRANCHES	Thu May 22 11:27:14 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: BRANCHES,v 1.310.2.5 2013/01/16 05:26:12 yamt Exp $
+#	$NetBSD: BRANCHES,v 1.310.2.6 2014/05/22 11:27:14 yamt Exp $
 #
 # This file contains a list of branches that exist in the NetBSD CVS
 # tree and their current state.
@@ -297,6 +297,17 @@ Notes:		This branch is used to develop t
 		libraries, so that it is able to operate without openssl
 		being in place.
 
+Branch:		agc-symver
+Description:	Add library symbol versioning information
+Status:		Active
+Start Date:	24 March 2013
+End Date:
+Base Tag:	agc-symver-base
+Maintainer:	Alistair Crooks <a...@netbsd.org>
+Scope:		src
+Notes:		This branch is used to develop DSO symbol versioning, allowing
+		symbols to be added, modified and removed from shared libraries.
+
 Branch:		bjh21-hydra
 Description:	Simtec Hydra support and ARM SMP in general
 Status:		Dormant
@@ -431,6 +442,15 @@ Notes:		http://mail-index.netbsd.org/tec
 		to this branch.
 		This branch is not expected to be compilable yet.
 
+Branch:		khorben-n900
+Description:	Supporting the Nokia N900 smartphone
+Status:		Active
+Start Date:	2013-05-07
+Maintainer:	Pierre Pronchery <khor...@netbsd.org>
+Scope:		kernel (OMAP3 support, device drivers)
+Notes:		Do not hesitate to communicate any change that would be welcome
+		in HEAD.
+
 Branch:		matt-timespec
 Description:	Convert the kernel to struct timespec as its primary time
 		storage mechanism.
@@ -519,6 +539,21 @@ Notes:		A more flexible infrastructure f
 		allowing multiple conflicting packages and versions to co-exist
 		within the same tree
 
+Branch:		rmind-smpnet
+Description:	MP safe network stack (milestone 1): IPv4, UDP and ICMP
+Status:		Active
+Start Date:	17 July 2013
+End Date:	
+Base Tag:	rmind-smpnet-base
+Maintainer:	Mindaugas Rasiukevicius <rm...@netbsd.org>
+Scope:		Kernel: src/sys (src/common is tagged but not branched)
+Notes:		Goals:
+
+		- Improve the abstraction of PCB and other interfaces.
+		- Add PCB and route cache locking, adjust socket locking.
+		- Rework IPv4, UDP and ICMP paths to be MP safe.
+		- Switch UDP sockets to a separate lock, test and benchmark.
+
 Branch:		rpaulo-netinet-merge-pcb
 Description:	merge in6pcb with inpcb
 Status:		Dormant
@@ -617,7 +652,7 @@ Description:	page cache related changes
 Status:		Active
 Start Date:	Wed Nov 2 2011
 End Date:	
-Base Tag:	yamt-pagecache-base6
+Base Tag:	yamt-pagecache-base8
 Maintainer:	YAMAMOTO Takashi <y...@netbsd.org>
 Scope:		src
 Notes:		- maintain object pages in radix tree rather than rb tree.

Index: src/doc/BUILDING.mdoc
diff -u src/doc/BUILDING.mdoc:1.85.2.3 src/doc/BUILDING.mdoc:1.85.2.4
--- src/doc/BUILDING.mdoc:1.85.2.3	Wed Jan 16 05:26:12 2013
+++ src/doc/BUILDING.mdoc	Thu May 22 11:27:14 2014
@@ -1,4 +1,4 @@
-.\"	$NetBSD: BUILDING.mdoc,v 1.85.2.3 2013/01/16 05:26:12 yamt Exp $
+.\"	$NetBSD: BUILDING.mdoc,v 1.85.2.4 2014/05/22 11:27:14 yamt Exp $
 .\"
 .\" Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -33,7 +33,7 @@
 .\" Toolchain prefix for commands
 .ds toolprefix nb
 .
-.Dd September 19, 2012
+.Dd November 8, 2012
 .Dt BUILDING 8
 .Os NetBSD
 .
@@ -156,12 +156,11 @@ build tree is described in
 .Xr hier 7 ,
 and the release layout is described in
 .Xr release 7 .
-.Pp
 .
 .Sh CONFIGURATION
 .
 .Ss Environment variables
-..
+.
 Several environment variables control the behaviour of
 .Nx
 builds.
@@ -1575,7 +1574,7 @@ to
 Unsets
 .Sy MAKEOBJDIR .
 See
-.Dq Fl O obj
+.Dq Fl O Ar obj
 for more information.
 .Pp
 For instance, if the source directory is

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1621.2.6 src/doc/CHANGES:1.1621.2.7
--- src/doc/CHANGES:1.1621.2.6	Wed Jan 23 00:04:29 2013
+++ src/doc/CHANGES	Thu May 22 11:27:14 2014
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1621.2.6 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1621.2.7 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -53,6 +53,9 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	kernel: Add support for 256 CPUs on amd64. [rmind 20120420]
 	OpenSSH: Imported 6.0 [christos 20120501]
 	bzip2: Imported 1.0.6 [wiz 20120507]
+	kernel: Add a genfs_rename abstraction to help file systems correctly
+		implement rename, and use it for tmpfs, ffs, and ext2fs.
+		[riastradh 20120508]
 	amiga: Rework X-Surf driver as xsurf(4). Add support for clockport(4)
 		on top of xsurf(4). [rkujawa 20120515]
 	backtrace(3): Add <execinfo.h> and the backtrace family of functions
@@ -94,13 +97,14 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	kernel: Add malo(4), a driver for Marvell Libertas IEEE 802.11b/g
 		wireless network devices, ported from OpenBSD.
 		[degroote 20120730]
-	kernel: Add BPF JIT compiler, currently supporting amd64 and i386.
-		[rmind 20120802]
 	kernel, libc: Add modctl(MODCTL_EXISTS, ...) to determine if modules
 		can be loaded. [jnemeth 20120803]
 	modstat(8): Add -A, -a, and -e options for testing module loadability.
 		[jnemeth 20120803]
+	uatp(4): Add driver for USB Apple trackpads. [riastradh 20120804]
 	libc: Update to tzcode2012e. [christos 20120809]
+	arm: Add support for the Beaglebone (TI AM335x-based board).
+		[matt 20120820]
 	arm: Add support for BEAGLEBOARDXM (TI DM37XX cpus) boards.
 		[matt 20120822]
 	mfi(8): Added tagged queuing support.  [bouyer 20120823]
@@ -134,6 +138,7 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	libc: Import tzcode2012g. [christos 20121023]
 	zoneinfo: Import tzdata2012h. [apb 20121027]
 	libc: Update to tzcode2012h. [christos 20121028]
+	kernel: Import sljit and add BPF JIT compiler. [alnsn 20121028]
 	flock(1): Add a utility to provide locks to shell scripts similar
 		to shlock(1) [christos 20121101]
 	zoneinfo: Import tzdata2012i. [apb 20121104]
@@ -171,6 +176,8 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 		ported from FreeBSD. [skrll 20130109]
 	kernel: Add usmsc(4), a driver for SMSC LAN95xx USB LAN devices, 
 		ported from OpenBSD. [skrll 20130109]
+	atactl(8): Add support for ATA SECURITY commands including setting
+		firmware passwords and erasing disks. [riastradh 20130109]
 	hp300: Add support for sti(4) framebuffer at sgc bus on some 425t.
 		Ported by kiyohara@ from OpenBSD. [tsutsui 20130111]
 	arm: kill userland FPA support, replace with VFP. [matt 20130111]
@@ -178,3 +185,233 @@ Changes from NetBSD 6.0 to NetBSD 7.0:
 	luna68k: Fix bootloader to make secondary SPC SCSI on LUNA-II work
 		properly.  [tsutsui 20130114]
 	libdwarf: Sync with FreeBSD [christos 20130117]
+	empm(4): Add driver for power manager present on Mediator 1200 TX and
+		SX bridges. [rkujawa 20130128]
+	amiga: Support software power-off with empm(4). [rkujawa 20130128]
+	dhcpcd(8): Import dhcpcd-5.6.7 [roy 20130128]
+	em4k(4): Add driver for Mediator 4000 PCI bridges. [rkujawa 20130129]
+	makefs(8): Add support for msdos, creating filesystems at an offset,
+		merging directories with common files.  [christos 20130202]
+	openssl: update to 1.0.1d [christos 20130205]
+	sparc: Add hardware acceleration for cgfourteen(4) using SX
+		[macallan 20130207]
+	openssl: update to 1.0.1e [christos 20130212]
+	atf(7): Import 0.17.  [jmmv 20130215]
+	lutok: Import 0.2.  This is a new import that provides a C++ wrapper
+		for the Lua API and will be used by Kyua.  Its build depends
+		on the MKKYUA knob.  [jmmv 20130216]
+	kyua(1): Import kyua-testers 0.1.  This is a new import that provides
+		scriptable utilities to invoke test programs that implement
+		different interfaces.  [jmmv 20130217]
+	services(5), protocols(5): Pull iana-generated services and protocols
+		[christos 20130221]
+	kyua(1): Import kyua-cli 0.6.  This is a new import that provides the
+		command-line interface to Kyua.  Its build depends on the
+		MKKYUA knob.  [jmmv 20130223]
+	kyua(1): Import kyua-atf-compat 0.1.  This is a new import that
+		provides the last piece of Kyua, namely a compatibility
+		version of atf-run and atf-report that use kyua(1) internally.
+		[jmmv 20130223]
+	kernel: Retire OSI protocol support.  [joerg 20130301]
+	libc: Update to tzcode2013a. [christos 20130302]
+	zoneinfo: Import tzdata2013a. [apb 20130303]
+	zoneinfo: Import tzdata2013b. [apb 20130312]
+	libc: Update to tzcode2013b. [christos 20130315]
+	brgphy(4): Add support for BCM5756, BCM5717C, BCM5719C, BCM5720C and
+		BCM57780. [msaitoh 20130315]
+	vmt(4): Synchronize the clock periodically to ensure it remains
+		up-to-date even when the host is suspended.  [jmmv 20130316]
+	file(1): upgraded to 5.14 [christos 20130323]
+	dhcp: upgrade to 4.2.5 [christos 20130324]
+	vchiq(4): Add support for Broadcom VideoCore IV firmware interface.
+		[jmcneill 20130325]
+	vcaudio(4): Add support for Broadcom VideoCore IV audio service.
+		[jmcneill 20130325]
+	openssh: Import 6.2. [christos 20130329]
+	mdocml: Import 1.12.1 [christos 20130402]
+	openpam: Import 20120526 (Micrampelis) [christos 20130405]
+	flex: Import 2.5.37 [christos 20130405]
+	byacc: Import 20130304 [christos 20130405]
+	libpcap: Import 1.3.0 [christos 20130406]
+	tcpdump(8): Import 4.3.0 [christos 20130406]
+	libevent: Upgrade 2.0.21-stable [christos 20130411]
+	wm(4): Add support for I210 and I211 [msaitoh 20130419]
+	m68k: Add inverse trigonometric functions, hyperbolic arctangent,
+		exponential and power functions to m68k FPE.  As a result,
+		m68k FPE supports all mathematics functions. [isaki 20130420]
+	tps65217pmic(4): Add support for TPS65217 PMIC as found on BeagleBone
+		and other AM335x based boards. [rkujawa 20130425]
+	amiga: Add minimal support for Thylacine USB card using slhci(4).
+		Works at least with some keyboards and mice. [rkujawa 20130428]
+	epoc32: Add new port NetBSD/epoc32. [kiyohara 20130428]
+	arm: Make all arm ports with a command MACHINE_ARCH generate the same
+		userspace.  All sets are the same except for etc.tgz.
+		[matt 20130501]
+	disklabel: this is now a MI tool like installboot.  [matt 20130503]
+	vndcompress(1): Add support for restarting after interrupt.
+		[riastradh 20130503]
+	mcp980x(4): Add driver for Microchip MCP9800/1/2/3 I2C temperature
+		sensor. [rkujawa 20130507]
+	zoneinfo: Import tzdata2013c. [apb 20130508]
+	arm: Add support for Marvell Armada XP SoCs. From Marvell and Semihalf.
+		[rkujawa 20130530]
+	wm(4): Add support for I217 and I218 [msaitoh 20130602]
+	X11: Updated all Xorg packages that could be, for Xorg SA 2003-05-23,
+		and general.  [mrg 20130605]
+	ipsec(4): FAST_IPSEC is now named IPSEC, old IPSEC is gone.
+		[christos 20130605]
+	kernel: Add driver soekrisgpio for Soekris net6501 
+		Ported by kardel@ from a patch for OpenBSD. [kardel 20130609]
+	cgfourteen: both kernel and Xorg driver now support hardware
+		acceleration using SX [macallan 20130619]
+	dhcpcd(8): Import dhcpcd-6.0.0 [roy 20130621]
+	zoneinfo: Import tzdata2013d. [apb 20130707]
+	bge(4): Add support for Altima AC1003, Apple BCM5701,
+		Broadcom BCM5787F, BCM5787G, BCM5787F, BCM5719, BCM5720,
+		BCM57766, BCM57782 and BCM57786. [msaitoh 20130708]
+	openresolv(8): Import openresolv-3.5.6 [roy 20130712]
+	libc: Update to tzcode2013d. [christo 20130717]
+	wpa:	Import wpa_supplicant and hostapd 1.1 [adam 20130717]
+	dhcpcd(8): Import dhcpcd-6.0.3 [roy 20130719]
+	coldfire: add userland and toolchain support for FreeScale Coldfire
+		CPUs (which implement a subset of m68k instructions and
+		addressing modes). [matt 20130719]
+	bind: update to 9.9.3-P2 to fix CVE-2013-4854 remote query can cause
+		named to terminate [christos 20130727]
+	iwn(4): Add support for Centrino Wireless-N 1030 and Centrino
+		Advanced-N 6230 [prlw1 20130728]
+	dhcpcd(8): Import dhcpcd-6.0.5 [roy 20130803]
+	makefs(8): Added UDF support for makefs(8). It allows for the creation
+		of images for both read-only, rewritable or recordable media.
+		[reinoud 20130805]
+	xsh(4): Add driver for Individual Computers X-Surf 100 network interface
+		card. [rkujawa 20130808]
+	postfix(1): Import version 2.9.7 [tron 20130821]
+	libc: Add consttime_memequal and explicit_memset for crypto
+		applications. [riastradh 20130828]
+	kernel: Add BPF coprocessor support (BPF_COP/BPF_COPX instructions).
+		[rmind 20130829]
+	npf: Convert NPF to use BPF byte-code by default.  Many other
+		improvements. [rmind 20130929]
+	less(1): Import version 458 [tron 20130804]
+	mpl115a(4): Add driver for Freescale MPL115A2 I2C absolute pressure 
+		sensor. [rkujawa 20130908]
+	dhcpcd(8): Import dhcpcd-6.1.0 [roy 20130920]
+	alpha: Add support for AlphaStation DS15.  Ported from OpenBSD via
+		PR port-alpha/48148 by nullnilaki. [tsutsui 20130923]
+	postfix(1): Import version 2.10.2 [tron 20130925]
+	binutils: updated to FSF binutils 2.23.2.  [christos 20130929]
+	getaddrinfo(1): Add utility for querying the system's name resolver.
+		[riastradh 20130929]
+	gdb(1): Updated to 7.6.1.  [christos 20131003]
+	httpd(8): Added Lua scripting for content creation. [mbalmer 20131012]
+	lutok: Update to 0.3.  [jmmv 20131018]
+	kyua-cli: Update to 0.7.  [jmmv 20131018]
+	netstat(1): Accept -faddress_family[,family ...]. [bad 20131019]
+	systat(1): Accept shell patterns to select drives. [bad 20131019]
+	gffb: add a driver for NVIDIA GeForce2 MX graphics controllers.
+		[macallan 20131023]
+	axen(4): Add a driver for ASIX AX88178a and AX88179 Ethernet interface.
+		Ported from OpenBSD. [nonaka 20131026]
+	x68k: Support upto 1008 MB extended memory that is found on the XM6i
+		emulator. [tsutsui 20131027]
+	OpenSSH: Imported 6.4 [christos 20131108]
+	x86: Default rounding mode of the x87 changed to long double precision.
+		[joerg 20131111]
+	zless(1): Added via lastest version of zmore(1) from OpenBSD
+		[pettai 20131112]
+	libm: Added basic long double support for elementary functions.
+		Most transcendent functions are stubbed out. [joerg 20131119]
+	nvi(1): Upgrade to the latest git source [christos 20131122]
+	MPC: Updated to MPC 1.0.1.  [mrg 20131128]
+	MPFR: Updated to MPFR 3.1.2.  [mrg 20131128]
+	GMP: Updated to GMP 5.1.3.  [mrg 20131129]
+	file(1): Updated to 5.16. [christos 20131201]
+	librt: Added shm_open(3) and shm_unlink(3). [rmind 20131219]
+	acafh(4): Added driver for Individual Computers ACA500. Enjoy NetBSD
+		on an Amiga 500.  [rkujawa 20131222] 
+	libc: Update to tzcode2013i. [christos 20131226]
+	zoneinfo: Import tzdata2013i. [apb 20131226]
+	acpi(4): Updated ACPICA to 20131218. [christos 20131227]
+	openpam: Import 20130907 (Nummularia) [christos 20131227]
+	ntp: import ntp 4.2.7p404.  [christos 20131227]
+	luna68k: Add preleminary support of 4bpp framebuffer.
+		[tsutsui 20131227]
+	wm(4): Add support for I354 (C2000 Internal) Ethernet
+		[msaitoh 20131230]
+	tcpdump(8): Import 4.5.1 [christos 20131231]
+	libpcap: Import 1.5.2 [christos 20131231]
+	bind: update to 9.9.5b1 [christos 20131231]
+	wpa: Import wpa_supplicant and hostapd 2.0 [christos 20140102]
+	dhcpcd: Import dhcpcd-6.2.0 [roy 20140103]
+	luna68k: Make bootloader to detect booted device on ROM monitor's
+		load command and set proper default boot device.
+		[tsutsui 20140105]
+	luna68k: Reorganize bootloader device configuration.  I.e. use
+		(controller * 10 + id) for sd unit number, rather than
+		static numbers against probed disks at ID 5 and 6.
+		[tsutsui 20140110]
+	luna68k: Add support to pass boothowto and boot device info from
+		 bootloader to kernel. [tsutsui 20140111]
+	OpenSSL: Imported 1.0.1f [christos 20130111]
+	postfix(1): Import version 2.10.3 [tron 20140118]
+	igmafb(4): Added framebuffer driver for Intel Graphics
+		[mlelstv 20140121]
+	vndcompress(1): Add support for constant memory, so 32-bit systems
+		should in theory now be able to compress or uncompress
+		multi-terabyte disks. [riastradh 20140122]
+	ohci(4): Support the National Semiconductor PC87560 as found in
+		many hppa machines. [skrll 20140128]
+	ews4800mips: Switch to X11FLAVOUR=Xorg. Untested. [tsutsui 20140131]
+	newsmips: Switch to X11FLAVOUR=Xorg. Untested. [tsutsui 20140131]
+	npf: Added support for CDB based tables. [rmind 20140206]
+	npf: Added support for static (stateless) NAT. [rmind 20140207]
+	atf(7): Import atf 0.19.  [jmmv 20140208]
+	atf(7): Import atf 0.20.  [jmmv 20140211]
+	npf: Added support for IPv6-to-IPv6 Network Prefix Translation
+		(NPTv6), as per RFC 6296. [rmind 20140213]
+	sqlite3: Import 3.8.3.1 [christos 20140216]
+	luna68k: Make sysinst to create a boot UFS partition and install
+		the native bootloader during installation. [tsutsui 20140219]
+	dhcpcd(8): Import dhcpcd-6.3.0 [roy 20140225]
+	mcp48x1dac(4): Add preliminary support for Microchip MCP48x1 family of
+		Digital-to-Analog converters. [rkujawa 20140225]
+	bind: update to 9.10.0b1 [christos 20130228]
+	dhcpcd(8): Import dhcpcd-6.3.1 [roy 20140301]
+	x68k: Switch to X11FLAVOUR=Xorg, including X68k monolithic server.
+		[tsutsui 20140301]
+	macppc: add support for ppc601-based machines
+		from scole_mail via PR48600 [macallan 20140303]
+	hppa: Switched to GCC 4.8.  [skrll 20140306]
+	sparc: Switched to GCC 4.8.  [mrg 20140306]
+	sparc64: Switched to GCC 4.8.  [mrg 20140306]
+	alpha: Switched to GCC 4.8.  [martin 20140307]
+	arm: Switched to GCC 4.8.  [skrll 20140307]
+	elftoolchain: import FreeBSD-2014-03-08 [christos 20140309]
+	amd64: Switched to GCC 4.8.  [christos 20140311]
+	dhcpcd(8): Import dhcpcd-6.3.2 [roy 20140314]
+	rtsx(4): Add a driver for Realtek RTS5209/RTS5229 Card Reader.
+		Ported from OpenBSD. [nonaka 20140319]
+	mdnsd(8), dns-sd(1), libdns_sd: import mDNSResponder 258.14
+		[pettai 20140324]
+	arm: add support for ARMv6+ MMU features ASIDS, XN, split TTBR.
+		add support for SMP. [matt 20140330]
+	applesmc(4): Add drivers for the Apple System Management Controller.
+		[riastradh 20140401]
+	ptyfs: Allow multiple mounts and support proper device visibility
+		in chroots (Ilya Zykov) [christos 20140404]
+	i386: Switched to GCC 4.8.  [christos 20140404]
+	mcp23s17gpio(4): Add Microchip MCP23S17 16-bit GPIO chip driver.
+		e.g. Raspberry Pi interface boards [kardel 20140406]
+	OpenSSL: Imported 1.0.1g [christos 20140407]
+	sparc64: Switched to TOPDOWN_VM [martin 20140414]
+	hp300: Fix broken apci console support of bootloader. [tsutsui 20140410]
+	hp300: Add sti(4) at sgc screen console support to bootloader.
+		[tsutsui 20140413]
+	hp300: Add HP9000/425e RTC support. [tsutsui 20140419]
+	ubsec(4): Add support for AES-CBC modes and BCM586x chips.
+		[bad 20140419]
+	bcmgpio(4): Add BCM2835 GPIO obio driver.
+		[kardel 20140422]
+	kerberos(8): Update to latest Heimdal-1-5-branch.
+		[pettai 20140424]

Index: src/doc/HACKS
diff -u src/doc/HACKS:1.120.2.4 src/doc/HACKS:1.120.2.5
--- src/doc/HACKS:1.120.2.4	Wed Jan 23 00:04:29 2013
+++ src/doc/HACKS	Thu May 22 11:27:14 2014
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.120.2.4 2013/01/23 00:04:29 yamt Exp $
+# $NetBSD: HACKS,v 1.120.2.5 2014/05/22 11:27:14 yamt Exp $
 #
 # This file is intended to document workarounds for currently unsolved
 # (mostly) compiler bugs.
@@ -280,6 +280,17 @@ descr
 	-fno-strict-aliasing.
 kcah
 
+hack	disable ctf for gcc-4.8 build
+mdate	April 3 2014
+who	christos
+file	external/gpl3/gcc/usr.bin/Makefile.frontend	: 1.4
+file	external/gpl3/gcc/usr.bin/Makefile.backend	: 1.5
+descr
+	nbctfconvert -g -L VERSION -g fold-const.o
+	ERROR: fold-const.c: failed to get mapping for tid 79154 \
+		((null)) <13532>
+kcak
+
 hack	emacs aborting on exit (libgcc issue)
 mdate	7 November 2011
 who	christos
@@ -343,6 +354,33 @@ descr
 	sections
 kcah
 
+hack	Disable fortification for /usr/bin/makeinfo
+cdata	24 Mar 2014
+who	tron
+file	src/gnu/usr.bin/texinfo/makeinfo/Makefile	: 1.8
+pr	N/A
+descr
+	If "makeinfo" is compiled with "-D_FORTIFY_SOURCE=2" using GCC 4.8.3
+	it fails to process certain texinfo files, e.g. "cl.texi"
+	included in the Emacs 24.3 distribution.
+kcah
+
+hack	Disable Stack Smash Protection for /usr/X11R7/bin/xauth
+cdata	05 Apr 2014
+who	tron
+file	src/external/mit/xorg/bin/xauth/Makefile	: 1.4
+pr	N/A
+descr
+	If "xauth" is compile with "USE_SSP" set to "yes" it fails
+	mysteriously with an error message like this:
+
+	/usr/X11R7/bin/xauth:  file /foo/bar/.Xauthority does not exist
+	/usr/X11R7/bin/xauth:  unable to link authority file /foo/bar/.Xauthority, use /foo/bar/.Xauthority
+
+	The compiler seems to get confused about the two filename variables
+	used in the link(2) system call.
+kcah
+
 port	vax
 
 	hack	gcc4/vax ICE
@@ -485,10 +523,10 @@ port	vax
 	kcah
 
 	hack	xorg warnings
-	cdat	30 July 2008
+	cdat	30 July 2008, 3 June, 2013
 	who	mrg
 	file	external/mit/xorg/lib/libSM/Makefile : 1.2
-		external/mit/xorg/lib/libX11/Makefile.libx11 : 1.2
+		external/mit/xorg/lib/libX11/Makefile.libx11 : 1.10
 		external/mit/xorg/lib/libXext/Makefile : 1.2
 		external/mit/xorg/lib/libXfont/Makefile : 1.2
 	descr
@@ -517,6 +555,55 @@ port	vax
 		Many filesystem on-disk formats have 32 bit times.
 	kcah
 
+	hack	gcc 4.5 fsdb miscompile
+	date	Sat Nov  9 11:03:02 EST 2013
+	who	christos
+	file	src/sbin/fsdb/Makefile : 1.36 (and earlier)
+	descr
+		src/sbin/fsdb/fsdb.c: In function 'findblk':
+		src/sbin/fsdb/fsdb.c:610:1: error: unrecognizable insn:
+		(insn 941 940 942 134 src/sbin/fsdb/fsdb.c:589 (set (reg:SI 604)
+		    (subreg:SI (mem/s/j:DI (plus:SI (mult:SI (reg:SI 602)
+                        (const_int 8 [0x8]))
+                    (reg/f:SI 601)) [0 curinode.99_378->dp2.di_ib S8 A32]) 4)) \
+			-1 (nil))
+		src/sbin/fsdb/fsdb.c:610:1: internal compiler error: in \
+		extract_insn, at recog.c:2103
+	kcah
+
+	hack	gcc 4.8 gcc miscompiles
+	date	Sat Nov  9 16:35:18 EST 2013
+	who	christos
+	file	distrib/utils/x_ping/Makefile
+	file	distrib/vax/miniroot/Makefile.inc
+	file	distrib/vax/ramdisk/Makefile
+	file	external/gpl3/gdb/lib/libdecnumber/Makefile
+	file	sbin/fsdb/Makefile
+	file	sbin/newfs_ext2fs/Makefile
+	file	sbin/ping/Makefile
+	file	usr.sbin/lmcconfig/Makefile
+	file	usr.sbin/mtrace/Makefile
+	descr
+		external/gpl3/gcc/dist/gcc/expmed.c:2781:1:
+		internal compiler error: in change_address_1, at emit-rtl.c:2019
+		external/gpl3/gcc/dist/gcc/recog.c:770:1:
+		internal compiler error: in change_address_1, at emit-rtl.c:2019
+		external/gpl3/gcc/dist/libdecnumber/decNumber.c:7214:3:
+		internal compiler error: in change_address_1, at emit-rtl.c:2019
+		sbin/ping/ping.c:679:1:
+		internal compiler error: in change_address_1, at emit-rtl.c:2019
+		sbin/newfs_ext2fs/mke2fs.c:681:1:
+		internal compiler error: in reload_combine_note_use,
+		at postreload.c:1561
+		external/gpl3/gdb/dist/libdecnumber/decNumber.c:7214:3:
+		internal compiler error: in change_address_1, at emit-rtl.c:2019
+		usr.sbin/lmcconfig/lmcconfig.c:939:3:
+		internal compiler error: in reload_combine_note_use,
+		at postreload.c:1561
+		usr.sbin/mtrace/mtrace.c:1655:1:
+		internal compiler error: in change_address_1, at emit-rtl.c:2019
+	kcah
+
 port	arm
 
 	hack	gcc-unsigned-compare
@@ -586,6 +673,46 @@ port	sh3
 		-fno-loop-optimize.
 	kcah
 
+port	sh3eb
+	hack	gcc4.8.1
+	cdate	Thu Nov  7 16:31:23 EST 2013
+	who	christos
+	file	src/sys/rump/net/lib/libnetbt/Makefile	: 1.2
+	desrc
+		for profiling
+		compile l2cap_signal.c with -O0 to avoid:
+		./netbt/l2cap_signal.c:36:
+		/p/netbsd/cvsroot/src/sys/rump/net/lib/libnetbt/../../../../\
+		netbt/l2cap_signal.c: In function 'l2cap_recv_signal':
+		./sh3/byte_swap.h:20:2: error: 'asm' operand requires \
+		impossible reload
+		  __asm volatile ("swap.b %1,%0" : "=r"(rval) : "r"(x));
+	kcah
+
+port	sh3el
+	hack	gcc4.8.1
+	cdate	Fri Nov  8 19:27:01 EST 2013
+	who	christos
+	file	src/external/bsd/libevent/lib/libevent/Makefile	: 1.2
+	desrc
+		for profiling
+		compile evdns.c with -O0 to avoid:
+		./sh3/byte_swap.h:20:2: error: 'asm' operand requires \
+		impossible reload
+		  __asm volatile ("swap.b %1,%0" : "=r"(rval) : "r"(x));
+	kcah
+	
+	hack	gcc4.8.1
+	cdate	Fri Nov  8 19:34:48 EST 2013
+	who	christos
+	file	src/usr.sbin/racoon/Makefile	: 1.27
+	desrc
+		for profiling
+		compile ipsec_doi.c with -O0 to avoid:
+		./sh3/byte_swap.h:20:2: error: 'asm' operand requires \
+		impossible reload
+		  __asm volatile ("swap.b %1,%0" : "=r"(rval) : "r"(x));
+	kcah
 
 port	m68000
 
@@ -607,6 +734,17 @@ port	m68000
 		This might be related with GCC Bugzilla Bug 32424.
 	kcah
 
+port	m68k,sh3,vax
+
+	hack	gcc-4.8.1
+	cdate	Wed Nov  6 20:41:35 EST 2013
+	who	christos
+	file	src/external/gpl3/gcc/libstdc++-v3/Makefile : 1.6
+	descr
+		compile hashtable_c++0x.cc with -O2 instead of -Os to
+		produce missing instantiation of std::lower_bound expansion
+		for unsigned long.
+	kcah
 
 port	sparc
 
@@ -677,6 +815,18 @@ port	i386
 		the i387 FPU without rounding the intermediate results
 	kcah
 
+port	x86
+	hack	turn off optimization for biosdisk_ll.c because otherwise
+		we are pass the wrong arguments to biosdisk_read(). 
+		$ cd /usr/src/sys/arch/i386/floppies/bootflopp-com
+		$ qemu-system-i386 -nographic -fda boot-com1.fs -boot a
+	who	christos
+	file	src/sys/arch/i386/stand/lib/Makefile : 1.38
+	descr
+		Turning on DISK_DEBUG shows the problem. We should find
+		out which option is causing this.
+	hcah
+
 port	powerpc
 
 	hack	avoid using __builtin_return_address(0) because it fails in
@@ -778,4 +928,36 @@ port	ia64
 		{standard input}:22978: Warning: This is the location of the conflicting usage
 	kcah
 
+port	x68k
+
+	hack	compiler error with gcc 4.5.x
+	cdate	Fri May 24 13:23:01 EDT 2013
+	who	christos
+	file	src/external/gpl3/gcc/usr.bin/bakend/Makefile: 1.17
+		xsrc/external/mit/xorg/lib/libGLU/Makefile: 1.11
+		src/x11/lib/GLU/Makefile: 1.9
+	descr
+		workaround for:
+		internal compiler error: in cselib_record_set, at cselib.c:1999
+	kcah
+
+hack	fallback to /usr/bin/clang-cpp in rpcgen
+cdate	Wed Jun  5 15:49:27 CEST 2013
+who	joerg
+file	src/usr.bin/rpcgen/rpc_main.c
+descr
+	It is undecided which compiler owns /usr/bin/cpp and whether it should
+	exist in a MKGCC=no world. To allow rpcgen to work out-of-the-box,
+	if either gcc or clang is installed, use /usr/bin/clang-cpp as fallback.
+	This applies only if RPCGEN_CPP is not set and /usr/bin/cpp is not executable.
+kcah
+
+port	hp700
 
+	hack	compiler error with gcc 4.5.x
+	cdate	Tue Jul 23 07:42:28 BST 2013
+	who	skrll
+	file	src/sys/lib/libkern/Makefile.libkern: 1.26
+	descr
+		workaround for unanalysed codegen bug affecting md5c.c.
+	kcah

Index: src/doc/Makefile
diff -u src/doc/Makefile:1.1 src/doc/Makefile:1.1.2.1
--- src/doc/Makefile:1.1	Fri Sep  9 14:23:38 2011
+++ src/doc/Makefile	Thu May 22 11:27:14 2014
@@ -1,8 +1,9 @@
-#	$NetBSD: Makefile,v 1.1 2011/09/09 14:23:38 apb Exp $
+#	$NetBSD: Makefile,v 1.1.2.1 2014/05/22 11:27:14 yamt Exp $
 
 .include <bsd.own.mk>
 
 regen: .PHONY regen-BUILDING
 regen-BUILDING: .PHONY
-	${TOOL_GROFF} -mdoc -Tascii -P-bou ${.CURDIR}/BUILDING.mdoc \
+	${TOOL_MANDOC_ASCII} ${.CURDIR}/BUILDING.mdoc \
+		| ${TOOL_SED} -e "s,.$$(printf '\b'),,g" \
 		>${.CURDIR}/../BUILDING

Index: src/doc/RESPONSIBLE
diff -u src/doc/RESPONSIBLE:1.95.4.4 src/doc/RESPONSIBLE:1.95.4.5
--- src/doc/RESPONSIBLE:1.95.4.4	Wed Jan 16 05:26:13 2013
+++ src/doc/RESPONSIBLE	Thu May 22 11:27:14 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: RESPONSIBLE,v 1.95.4.4 2013/01/16 05:26:13 yamt Exp $
+#	$NetBSD: RESPONSIBLE,v 1.95.4.5 2014/05/22 11:27:14 yamt Exp $
 
 List of sections of the system, and who is responsible for them (or at
 least considered an expert on them).
@@ -275,10 +275,10 @@ evbppc		scw
 evbsh3		core
 ews4800mips	tsutsui
 hp300		tsutsui
-hp700		skrll
 hpcarm		core
 hpcmips		core
 hpcsh		uwe
+hppa		skrll
 i386		dsl
 ibmnws		matt
 iyonix		gavan
@@ -294,6 +294,7 @@ news68k		tsutsui
 newsmips	core
 next68k		core
 ofppc		garbled
+playstation2	martin
 pmax		simonb
 pmax		simonb
 pmppc		core

Index: src/doc/TODO.clang
diff -u src/doc/TODO.clang:1.3.2.1 src/doc/TODO.clang:1.3.2.2
--- src/doc/TODO.clang:1.3.2.1	Tue Apr 17 00:02:55 2012
+++ src/doc/TODO.clang	Thu May 22 11:27:14 2014
@@ -1,17 +1,11 @@
-$NetBSD: TODO.clang,v 1.3.2.1 2012/04/17 00:02:55 yamt Exp $
+$NetBSD: TODO.clang,v 1.3.2.2 2014/05/22 11:27:14 yamt Exp $
 
 Hacks for the clang integration
 -------------------------------
 
-"-no-integrated-as" in src/sys/arch/amd64 and src/sys/arch/i386
-to compensate for the missing .code16 support in LLVM MC
-and slightly different encoding of the lock stubs.
+"-no-integrated-as" is used in src/sys/arch/i386/stand to compensate
+for the incomplete explicit positioning support in LLVM MC.
 
-Various places use NOCLANGERROR or CWARNFLAGS.clang to disable errors or
-warnings.
-
-Issues with CMSG_SPACE() used inside a union:
-src/external/tmux/dist/compat/imsg-buffer.c
-src/external/tmux/dist/compat/imsg.c
-src/external/ibm-public/postfix/dist/src/util/unix_recv_fd.c
-src/external/ibm-public/postfix/dist/src/util/unix_send_fd.c
+Missing atomic support in ARM libgcc, -march=armv6 "workaround":
+    src/external/bsd/libc++/lib
+    src/external/bsd/lllvm/lib/libLLVMSupport

Index: src/doc/TODO.kqueue
diff -u src/doc/TODO.kqueue:1.8 src/doc/TODO.kqueue:1.8.8.1
--- src/doc/TODO.kqueue:1.8	Wed Nov 12 12:35:52 2008
+++ src/doc/TODO.kqueue	Thu May 22 11:27:14 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: TODO.kqueue,v 1.8 2008/11/12 12:35:52 ad Exp $
+#	$NetBSD: TODO.kqueue,v 1.8.8.1 2014/05/22 11:27:14 yamt Exp $
 
 items todo:
 	- dir watched - what happens if something is mounted over it?
@@ -17,7 +17,8 @@ items todo:
 
 merge in from FreeBSD:
 	pkgsrc/net/bsdproxy
-	lib/libc/net/res_send.c
+	lib/libc/net/res_send.c, this has been merged but not turned on
+	   I don't think it gains anything performance-wise
 	sys/netinet/tcp_subr.c	1.93 (?)
 	libc/libc_r/uthread (?)
 	pkgsrc/security/l0pht-watch (?)

Reply via email to