diff --git a/crypto/external/bsd/heimdal/heimdal2netbsd b/crypto/external/bsd/heimdal/heimdal2netbsd
deleted file mode 100755
index 8bfdc435f..000000000
--- a/crypto/external/bsd/heimdal/heimdal2netbsd
+++ /dev/null
@@ -1,244 +0,0 @@
-#! /bin/sh
-#
-#	$NetBSD: heimdal2netbsd,v 1.6 2014/04/22 14:07:31 pettai Exp $
-#
-# Copyright (c) 2011 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# heimdal2netbsd:  convert a heimdal source tree into a
-# netbsd heimdal source tree, under src/crypto/external/bsd/heimdal/dist
-# based on bind2netbsd by Bernd Ernesti and changes by Simon Burge
-#
-# Rough instructions for importing new heimdal release from their git
-# repository:
-#
-#	$ export SRCDIR=/usr/src
-#	$ export HEIMDAL_SRCDIR=src/crypto/external/bsd/heimdal
-#	$ cd /some/where/temporary
-#	$ git clone git@github.com:heimdal/heimdal.git
-#	$ sh $SRCDIR/../$HEIMDAL_SRCDIR/heimdal2netbsd heimdal `pwd`
-#	$ cd $HEIMDAL_SRCDIR/dist
-#       $ cvs -d ... import $HEIMDAL_SRCDIR/dist HEIMDAL head-20110317
-#	>>> if any conflicts, merge, fix and commit them.
-#	$ cd /some/where/temporary/heimdal
-#	$ autoreconf -f -i
-#	$ ./configure
-#	$ make
-#	>>> merge newly generated config.h
-#	>>> with $HEIMDAL_SRCDIR/include/config.h
-#	>>> and check out diffs in generated headers
-#	>>> and C files.
-#	$ cd ..
-#	$ rm -r src heimdal
-#	$ cd $SRCDIR/$HEIMDAL_SRCDIR
-#	$ cvs commit -m "Updated generated files for Heimdal head-20110317"
-#
-#	- check makefiles to see if any extra sources have been added.
-#	- update distrib/sets if necessary.
-
-prog="$(basename "$0")"
-r=$1
-d=$2/src/crypto/external/bsd/heimdal/dist
-
-if [ $# -ne 2 ]; then echo "${prog} src dest"; exit 1; fi
-
-
-case "$d" in
-	/*)
-		;;
-	*)
-		d="$(pwd)/$d"
-		;;
-esac
-
-case "$r" in
-	/*)
-		;;
-	*)
-		r=$(pwd)/$r
-		;;
-esac
-
-echo preparing directory $d
-rm -rf $d
-mkdir -p $d
-
-### Copy the files and directories
-echo copying $r to $d
-cd $r
-pax -rw * $d
-
-### Remove unneeded files
-#echo removing unneeded directories and files
-#find $d/po -name '*[0-9] XXX:
-find $d -name '*.cat[0-9]' | xargs rm -f && echo removed catman pages
-find $d -name '*.info' | xargs rm -f	 && echo removed info pages
-rm -rf $d/appl				 && echo removed appl
-rm -rf $d/lib/libedit			 && echo removed lib/libedit
-rm -rf $d/lib/sqlite			 && echo removed lib/sqlite
-rm -rf $d/doc/standardisation		 && echo removed doc/standardisation
-
-# Fix man pages
-find $d -type f -name '*.[1358]' -print | while read f; do
-	sed \
-	    -e 's,\.Os HEIMDAL,.Os,' \
-	    -e 's,\.Pa krb5.h,.Pa krb5/krb5.h,' \
-	    -e 's,\.In krb5.h,.In krb5/krb5.h,' \
-	    -e 's,\.Pa gssapi.h,.Pa gssapi/gssapi.h,' \
-	    -e 's,\.In gssapi.h,.In gssapi/gssapi.h,' \
-	    -e 's,#include <krb5.h>,#include <krb5/krb5.h>,' \
-	    < $f > /tmp/heimdal1f$$ && mv /tmp/heimdal1f$$ $f && \
-	echo fixing man page $f
-done
-
-# Fix include usage
-
-KRB5_INCRE="asn1-common|asn1_err"
-KRB5_INCRE="$KRB5_INCRE|base64"
-KRB5_INCRE="$KRB5_INCRE|cms_asn1"
-KRB5_INCRE="$KRB5_INCRE|com_err"
-KRB5_INCRE="$KRB5_INCRE|com_right"
-KRB5_INCRE="$KRB5_INCRE|crmf_asn1"
-KRB5_INCRE="$KRB5_INCRE|der|der-protos"
-KRB5_INCRE="$KRB5_INCRE|digest_asn1"
-KRB5_INCRE="$KRB5_INCRE|getarg"
-KRB5_INCRE="$KRB5_INCRE|hdb|hdb_err|hdb-protos|hdb_asn1"
-KRB5_INCRE="$KRB5_INCRE|heim_asn1|heim_err"
-KRB5_INCRE="$KRB5_INCRE|heimbase"
-KRB5_INCRE="$KRB5_INCRE|heimntlm|heimntlm-protos"
-KRB5_INCRE="$KRB5_INCRE|hex"
-KRB5_INCRE="$KRB5_INCRE|hx509|hx509-protos|hx509_err"
-KRB5_INCRE="$KRB5_INCRE|k524_err"
-KRB5_INCRE="$KRB5_INCRE|kafs"
-KRB5_INCRE="$KRB5_INCRE|kcm|kcm-protos"
-KRB5_INCRE="$KRB5_INCRE|kdc|kdc-protos"
-KRB5_INCRE="$KRB5_INCRE|krb5|krb5-private|krb5-protos|krb5-types"
-KRB5_INCRE="$KRB5_INCRE|krb5_asn1|krb5_err|krb5_ccapi"
-KRB5_INCRE="$KRB5_INCRE|krb5-v4compat"
-KRB5_INCRE="$KRB5_INCRE|krb_err"
-KRB5_INCRE="$KRB5_INCRE|kx509_asn1"
-KRB5_INCRE="$KRB5_INCRE|ntlm_err"
-KRB5_INCRE="$KRB5_INCRE|ocsp_asn1"
-KRB5_INCRE="$KRB5_INCRE|parse_bytes|parse_time|parse_units"
-KRB5_INCRE="$KRB5_INCRE|pkcs8_asn1|pkcs9_asn1|pkcs10_asn1|pkcs12_asn1"
-KRB5_INCRE="$KRB5_INCRE|pkinit_asn1"
-KRB5_INCRE="$KRB5_INCRE|resolve"
-KRB5_INCRE="$KRB5_INCRE|rfc2459_asn1"
-KRB5_INCRE="$KRB5_INCRE|roken|roken-common"
-KRB5_INCRE="$KRB5_INCRE|rtbl"
-KRB5_INCRE="$KRB5_INCRE|sl|ss"
-KRB5_INCRE="$KRB5_INCRE|wind|wind_err"
-KRB5_INCRE="$KRB5_INCRE|xdbm"
-
-GSS_INCRE="gssapi|gssapi_krb5|gssapi_spnego|gssapi_ntlm|gssapi_oid"
-
-KADM5_INCRE="admin|kadm5-protos|kadm5-pwcheck|kadm5_err"
-
-find $d -type f -name '*.[ch]' -a ! -name compile_et.? -print | while read f; do
-	sed -E \
-	    -e "s,#include <($GSS_INCRE)\\.h>,#include <gssapi/\\1.h>,"	   \
-	    -e "s,#include \"($KRB5_INCRE)\\.h\",#include <krb5/\\1.h>,"   \
-	    -e "s,#include <($KRB5_INCRE)\\.h>,#include <krb5/\\1.h>,"	   \
-	    -e "s,#include <($KADM5_INCRE)\\.h>,#include <kadm5/\\1.h>,"   \
-	    < $f > /tmp/heimdal1f$$ && mv /tmp/heimdal1f$$ $f && \
-	echo fixing include paths in $f
-done
-
-#
-# In these files, we want only to fix the paths in the generated files, not
-# in the file itself.  To do this, we search for "#include meaning that
-# it can't be on the left column.
-
-for f in $d/lib/sl/slc-gram.y $d/lib/com_err/compile_et.c; do
-	sed -E -e "s,(.#include <)($KRB5_INCRE)\\.h>,\\1krb5/\\2.h>," \
-	    < $f > /tmp/heimdal1f$$ && mv /tmp/heimdal1f$$ $f && \
-	echo fixing include paths in $f
-done
-
-# Freeze imported NetBSD RCSID's.
-find $d -type f -print | xargs egrep -l '\$NetBSD:' | while read f; do
-	sed \
-	    -e 's/\$\(NetBSD.*\) \$/\1/' \
-	    < $f > /tmp/heimdal1f$$ && mv /tmp/heimdal1f$$ $f && \
-	echo froze NetBSD RCSID for $f
-done
-
-# Convert unexpanded RCSID's to the NetBSD way.
-find $d -type f -print | xargs egrep -l 'RCSID\("\$Id\$"\)' | while read f; do
-	sed -e 's/RCSID("\$\Id\$")/__RCSID("\$NetBSD\$")/' \
-	    < $f > /tmp/heimdal1f$$ && mv /tmp/heimdal1f$$ $f && \
-	echo converted RCSID to NetBSD for $f
-done
-
-### Remove the $'s around RCS tags
-cleantags $d
-
-### Add our NetBSD RCS Id
-find $d -type f -name '*.[chly]' -print | while read c; do
-	sed 1q < $c | grep -q '\$NetBSD' || (
-echo "/*	\$NetBSD\$	*/" >/tmp/${prog}3n$$
-echo "" >>/tmp/${prog}3n$$
-cat $c  >> /tmp/${prog}3n$$
-mv /tmp/${prog}3n$$ $c && echo added NetBSD RCS tag to $c
-	)
-done
-
-find $d -type f -name '*.[0-9]' -print | while read m; do
-	sed 1q < $m | grep -q '\$NetBSD' || (
-echo ".\\\"	\$NetBSD\$" >/tmp/${prog}2m$$
-echo ".\\\"" >>/tmp/${prog}2m$$
-cat $m >> /tmp/${prog}2m$$
-mv /tmp/${prog}2m$$ $m && echo added NetBSD RCS tag to $m
-	)
-done
-
-find $d -type f -name '*.texi' -print | while read t; do
-        sed "2 s/^/@c \$NetBSD\$\\
-/" < $t > /tmp/${prog}4t$$
-	mv /tmp/${prog}4t$$ $t && echo added NetBSD RCS tag to $t
-done
-
-echo done
-
-### Clean up any CVS directories that might be around.
-echo "cleaning up CVS residue."
-(
-	cd $d
-	find . -type d -name "CVS" -print | xargs rm -r
-)
-echo done
-
-echo "cleaning up git residue."
-rm -rf $d/.git
-
-### Fixing file and directory permissions.
-echo "Fixing file/directory permissions."
-(
-	cd $d
-	find . -type f -print | xargs chmod u+rw,go+r
-	find . -type d -print | xargs chmod u+rwx,go+rx
-)
-echo done
-
-exit 0
diff --git a/crypto/external/bsd/openssl/openssl2netbsd b/crypto/external/bsd/openssl/openssl2netbsd
deleted file mode 100755
index 4901d057b..000000000
--- a/crypto/external/bsd/openssl/openssl2netbsd
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-#
-#	$NetBSD: openssl2netbsd,v 1.2 2011/10/08 19:30:02 christos Exp $
-#
-# Copyright (c) 2005 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-if [ -z $1 ]
-then
-	echo "Usage: $0 <dir>" 1>&2
-	exit 1
-fi
-### Remove the $'s around RCS tags
-cleantags $1
diff --git a/external/bsd/bind/binclude4netbsd b/external/bsd/bind/binclude4netbsd
deleted file mode 100755
index 1dcc063ab..000000000
--- a/external/bsd/bind/binclude4netbsd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-#
-# Use this script to update the bind include files used in the nameserver,
-# after you've imported and built the latest bind code. After you run this,
-# cvs import the resulting directory
-#
-# $ cd bind-X.Y.Z
-# $ configure
-# $ make
-# $ ./binclude4netbsd . /tmp/include
-# Fix manually the config.h file to disable things controlled by the Makefiles
-# $ cd /tmp/include
-# $ cvs -d cvs.netbsd.org:/cvsroot import src/external/bsd/bind/include -m "Include files for bind-X-Y-Z" ISC bind-X-Y-Z
-#
-
-PROG=$(basename $0)
-if [ \( -z "$1" \) -o \( -z "$2" \) ]
-then
-	echo "Usage: $PROG <bind-src> <include-dest>" 1>&2
-	exit 1
-fi
-
-BIND=$1
-INCLUDE=$2
-
-mkdir -p $INCLUDE
-cp $BIND/config.h $INCLUDE
-
-mkdir -p $INCLUDE/dns
-
-cp $BIND/lib/dns/code.h $INCLUDE/dns
-
-for i in enumclass.h enumtype.h rdatastruct.h
-do
-	cp $BIND/lib/dns/include/dns/$i $INCLUDE/dns
-done
-
-mkdir -p $INCLUDE/isc
-
-cp $BIND/lib/isc/include/isc/platform.h $INCLUDE/isc
-
-mkdir -p $INCLUDE/lwres
-
-for i in netdb.h platform.h
-do
-	cp $BIND/lib/lwres/include/lwres/$i $INCLUDE/lwres
-done
-
-cleantags $INCLUDE
diff --git a/external/bsd/bind/bind2netbsd b/external/bsd/bind/bind2netbsd
deleted file mode 100755
index 0d01a004e..000000000
--- a/external/bsd/bind/bind2netbsd
+++ /dev/null
@@ -1,134 +0,0 @@
-#! /bin/sh
-#
-#	$NetBSD: bind2netbsd,v 1.2 2014/03/06 02:12:56 christos Exp $
-#
-# Copyright (c) 2000 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# bind2netbsd:  convert a bind tree into a
-# netbsd bind source tree, under src/external/bsd/bind/dist,
-# based on bind2netbsd by Bernd Ernesti and changes by Simon Burge
-#
-# Rough instructions for importing new bind release:
-#
-#	$ cd /some/where/temporary
-#	$ tar xpfz /new/bind/release/tar/file
-#	$ sh /usr/src/external/bsd/bind/dist/bind2netbsd bind-9.x.y `pwd`
-#	$ cd src/external/bsd/bind/dist
-#	$ cvs -d cvs.netbsd.org:/cvsroot import -m "Import bind 9.x.y" src/external/bsd/bind/dist ISC bind-9-x-y
-#	$ cd ../../../../../bind-9.x.y
-#	$ run ./configure
-#	$ run make
-#	- use the binclude4netbsd to create and import the new headers in
-#	  /usr/src/external/bsd/bind/include
-#	- check makefiles to see if any extra sources have been added.
-#	- update distrib/sets if necessary.
-#
-# Note that properly the import message should include a short summary
-# of changes since the previous import rather than just "Import bind 9.x.y".
-#
-
-if [ $# -ne 2 ]; then echo "bind2netbsd src dest"; exit 1; fi
-
-r=$1
-d=$2/src/external/bsd/bind/dist
-
-case "$d" in
-	/*)
-		;;
-	*)
-		d=`/bin/pwd`/$d
-		;;
-esac
-
-case "$r" in
-	/*)
-		;;
-	*)
-		r=`/bin/pwd`/$r
-		;;
-esac
-
-echo preparing directory $d
-rm -rf $d
-mkdir -p $d
-
-### Copy the files and directories
-echo copying $r to $d
-cd $r
-pax -rw * $d
-
-if [ -d $d/libtool.m4 ]
-then
-	mv $d/libtool.m4 $d/m4
-fi
-
-### Remove the $'s around RCS tags
-cleantags $d
-
-### Add our NetBSD RCS Id
-find $d -type f -name '*.[chly]' -print | while read c; do
-	sed 1q < $c | grep -q '\$NetBSD' || (
-echo "/*	\$NetBSD\$	*/" >/tmp/bind3n$$
-echo "" >>/tmp/bind3n$$
-cat $c  >> /tmp/bind3n$$
-mv /tmp/bind3n$$ $c && echo added NetBSD RCS tag to $c
-	)
-done
-
-find $d -type f -name '*.[0-9]' -print | while read m; do
-	sed 1q < $m | grep -q '\$NetBSD' || (
-echo ".\\\"	\$NetBSD\$" >/tmp/bind2m$$
-echo ".\\\"" >>/tmp/bind2m$$
-cat $m >> /tmp/bind2m$$
-mv /tmp/bind2m$$ $m && echo added NetBSD RCS tag to $m
-	)
-done
-
-find $d -type f -name '*.texi' -print | while read t; do
-        sed "2 s/^/@c \$NetBSD\$\\
-/" < $t > /tmp/bind4t$$
-	mv /tmp/bind4t$$ $t && echo added NetBSD RCS tag to $t
-done
-
-echo done
-
-### Clean up any CVS directories that might be around.
-echo "cleaning up CVS residue."
-(
-	cd $d
-	find . -type d -name "CVS" -print | xargs rm -r
-)
-echo done
-
-### Fixing file and directory permissions.
-echo "Fixing file/directory permissions."
-(
-	cd $d
-	find . -type f -print | xargs chmod u+rw,go+r
-	find . -type d -print | xargs chmod u+rwx,go+rx
-)
-echo done
-
-exit 0
diff --git a/external/bsd/dhcp/dhcp2netbsd b/external/bsd/dhcp/dhcp2netbsd
deleted file mode 100755
index d66f5b750..000000000
--- a/external/bsd/dhcp/dhcp2netbsd
+++ /dev/null
@@ -1,102 +0,0 @@
-#! /bin/sh
-#
-#	$NetBSD: dhcp2netbsd,v 1.2 2013/03/27 00:38:41 christos Exp $
-#
-# Copyright (c) 2003, 2011 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# dhcp2netbsd:  convert a dhcp source tree into a
-# format suitable for import.  Works on current dir.
-# You can run this only once if you want it to work.
-#
-# based on file2netbsd
-#
-PROG="$(basename "$0")"
-
-if [ -z "$1" ]
-then
-	echo "Usage: $PROG <directory>" 1>&2
-	exit 1
-fi
-FILE="$1"
-
-### Wipe out stuff we don't want
-rm -fr bind
-
-### Remove the $'s around RCS tags
-cleantags "$FILE"
-
-### Add NetBSD RCS Id
-find "$FILE" -type f -name '*.[chly]' -print | while read c; do
-	sed -e '1{/$NetBSD/!{i\
-/*	\$NetBSD\$	*/\
-
-};}' $c > /tmp/dhcp1$$
-mv /tmp/dhcp1$$ $c && echo did source mods for $c
-done
-
-find "$FILE" -type f -name '*.[cly]' -print | while read c; do
-sed -e \
-'/:\/\/www.isc.org/,/^ \*\// {
-    /^ \*\//a\
-\
-#include <sys/cdefs.h>\
-__RCSID("\$NetBSD\$");
-}' $c > /tmp/dhcp1$$
-mv /tmp/dhcp1$$ $c && echo did source mods for $c
-done
-
- for f in dst/dst_api.c dst/dst_support.c dst/hmac_link.c dst/prandom.c \
-     omapip/inet_addr.c omapip/iscprint.c server/dhcpv6.c \
-     server/dhcpleasequery.c server/ldap.c server/mdb6.c; do
-	c=$FILE/$f
-	sed -E -e \
-'/\* TH(E|IS) SOFTWARE/,/^ \*\// {
-    /^ \*\//a\
-\
-#include <sys/cdefs.h>\
-__RCSID("\$NetBSD\$");\
-
-}' $c > /tmp/dhcp1$$
-    mv /tmp/dhcp1$$ $c && echo did source mods for $c
-done
-
-
-
-#### Add RCS tags to man pages
-find "$FILE" -type f -name '*.[0-9]' -print | while read m; do
-	sed -e '1{/$NetBSD/!i\
-.\\"	\$NetBSD\$\
-.\\"
-
-}' $m > /tmp/dhcp2$$
-mv /tmp/dhcp2$$ $m && echo did manpage mods for $m
-done
-
-echo done
-
-echo You can import now.  Use the following command:
-echo cvs -d cvs.netbsd.org:/cvsroot import src/external/bsd/dhcp/dist ISC DHCPX_Y_Z
-
-exit 0
diff --git a/external/bsd/flex/flex2netbsd b/external/bsd/flex/flex2netbsd
deleted file mode 100755
index 95a857f18..000000000
--- a/external/bsd/flex/flex2netbsd
+++ /dev/null
@@ -1,63 +0,0 @@
-#! /bin/sh
-#
-#	$NetBSD: flex2netbsd,v 1.3 2014/10/29 18:28:36 christos Exp $
-#
-# Copyright (c) 2000 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# flex2netbsd:  convert a flex tree into a
-# netbsd flex source tree, under src/external/bsd/flex/dist,
-# based on flex2netbsd by Bernd Ernesti and changes by Simon Burge
-#
-# Rough instructions for importing new flex release:
-#
-#	$ cd /some/where/temporary
-#	$ tar xpfz /new/flex/release/tar/file
-#	$ sh /usr/src/external/bsd/flex/dist/flex2netbsd flex-2.5.x
-#	$ cd flex-2.5.x
-#	$ cvs import -m "Import flex 2.5.x" src/external/bsd/flex/dist FLEX flex-2-5-x
-#	$ run ./configure
-#	$ run make
-#	check the config file and copy it to /usr/src/external/bsd/flex/include
-#	check the manual page against our copy if there are new options and
-#	update
-
-if [ $# -ne 1 ]; then echo "flex2netbsd src"; exit 1; fi
-
-r=$1
-
-case "$r" in
-	/*)
-		;;
-	*)
-		r=`/bin/pwd`/$r
-		;;
-esac
-
-cd "$r"
-
-### Remove the $'s around RCS tags
-cleantags .
-
-exit 0
diff --git a/external/bsd/libevent/libevent2netbsd b/external/bsd/libevent/libevent2netbsd
deleted file mode 100755
index 2551618cb..000000000
--- a/external/bsd/libevent/libevent2netbsd
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-# $NetBSD: libevent2netbsd,v 1.2 2015/01/29 07:26:02 spz Exp $
-
-# Extract the new tarball and rename the libevent-X.Y.Z directory
-# to dist.  Run this script and check for additional files and
-# directories to prune, only relevant content is included.
-#
-# lib/ is built as SUBDIR from lib/Makefile, and
-# the regression tests are used from tests/lib/libevent
-#
-# Use the following template to import
-#  cvs import src/external/bsd/libevent/dist LIBEVENT libevent-X-Y-Z-stable
-#
-# don't forget to bump the shlib version in Makefile.inc and
-# commit the include/ files
-# XXX: Automate the man page generation
-
-if [ -z "$1" ]
-then
-    echo "Usage $0 <dir>" 1>&2
-    exit 1
-fi
-
-case $1 in
-/*)
-	d=$1;;
-*)
-	d=$(pwd)/$1;;
-esac
-
-if [ -f $d/configure ]; then
-	mkdir -p tmp
-	cd tmp
-	$d/configure
-	make include/event2/event-config.h
-	sed -e '
-/_EVENT_SIZEOF_SIZE_T/ {
-	a\
-#ifdef _LP64\
-#define _EVENT_SIZEOF_SIZE_T 8\
-#else\
-#define _EVENT_SIZEOF_SIZE_T 4\
-#endif
-	d
-}
-/_EVENT_SIZEOF_LONG_LONG/ {
-	a\
-#define _EVENT_SIZEOF_LONG_LONG 8
-	d
-}
-/_EVENT_SIZEOF_LONG/ {
-	a\
-#ifdef _LP64\
-#define _EVENT_SIZEOF_LONG 8\
-#else\
-#define _EVENT_SIZEOF_LONG 4\
-#endif
-	d
-}
-/_EVENT_SIZEOF_PTHREAD_T/ {
-	a\
-#ifdef _LP64\
-#define _EVENT_SIZEOF_PTHREAD_T 8\
-#else\
-#define _EVENT_SIZEOF_PTHREAD_T 4\
-#endif
-	d
-}
-/_EVENT_SIZEOF_VOID_P/ {
-	a\
-#ifdef _LP64\
-#define _EVENT_SIZEOF_VOID_P 8\
-#else\
-#define _EVENT_SIZEOF_VOID_P 4\
-#endif
-	d
-}' < include/event2/event-config.h > ../include/event2/event-config.h
-	cd ..
-	rm -Rf tmp
-fi
-
-echo "Removing RCS tags..."
-cleantags $d
-
-echo "Adding RCS tags .."
-for f in $(grep -RL '\$NetBSD.*\$' $d include | grep -v CVS); do
-	case $f in
-	*.c)
-		sed -e '1i\
-/*	\$NetBSD\$	*/
-' -e '/#include "event2\/event-config.h"/ {
-    a\
-#include <sys/cdefs.h>\
-__RCSID("\$NetBSD\$");
-}' < "$f" > tmp$$ && mv tmp$$ "$f"
-		;;
-	*.h)
-		cat - ${f} > ${f}_tmp <<- EOF
-			/*	\$NetBSD\$	*/
-		EOF
-		mv ${f}_tmp ${f}
-		;;
-	*.[0-9])
-		cat - ${f} > ${f}_tmp <<- EOF
-			.\"	\$NetBSD\$
-			.\"
-		EOF
-		mv ${f}_tmp ${f}
-		;;
-	*)
-		echo "No RCS tag added to ${f}"
-		;;
-	esac
-done
diff --git a/external/bsd/nvi/nvi2netbsd b/external/bsd/nvi/nvi2netbsd
deleted file mode 100755
index 84685e541..000000000
--- a/external/bsd/nvi/nvi2netbsd
+++ /dev/null
@@ -1,112 +0,0 @@
-#! /bin/sh
-#
-#	$NetBSD: nvi2netbsd,v 1.1 2013/11/22 16:00:45 christos Exp $
-#
-# Copyright (c) 2000 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# based on amd2netbsd,
-# itself based on bind2netbsd by Bernd Ernesti and changes by Simon Burge
-#
-# Rough instructions for importing new nvi release:
-#
-#	$ cd /some/where/temporary
-#	$ tar xpfz /new/nvi/release/tar/file
-#	$ sh /usr/src/external/bsd/nvi/nvi2netbsd nvi-x.y.z `pwd`
-#	$ cd src/external/bsd/nvi/dist
-#	$ cvs import -m "Import nvi x.y.z" src/external/bsd/nvi/dist NVI nvi-x-y-z
-#	$ cd ../../../nvi/build.unix
-#	$ run ../dist/configure --with-db_type=db1 --enable-widechar
-#	... to be continued
-#
-
-if [ $# -ne 2 ]; then echo "nvi2netbsd src dest"; exit 1; fi
-
-r="$1"
-d="$2"/src/external/bsd/nvi/dist
-
-case "$d" in
-	/*)
-		;;
-	*)
-		d="`/bin/pwd`/$d"
-		;;
-esac
-
-case "$r" in
-	/*)
-		;;
-	*)
-		r="`/bin/pwd`/$r"
-		;;
-esac
-
-echo preparing directory "$d"
-rm -rf "$d"
-mkdir -p "$d"
-
-### Copy the files and directories
-echo copying "$r" to "$d"
-cd "$r"
-pax -rw * "$d"
-
-echo removing unneeded directories and files
-
-### Remove unneeded files
-cd "$d"
-rm -f catalog/english.base		# we generate it
-rm -fr dist/autom4te.cache
-rm -f dist/tags
-rm -fr docs/html
-rm -f docs/*/*.ps docs/*/grohtml* docs/*/*.0 docs/*/*.txt
-rm -f common/options_def.h		# must be removed: we generate it
-rm -fr include compat db.1.85
-rm -fr .git
-
-cd catalog
-for f in *.base; do
-	f2="`echo "$f" | sed -e 's/\.base$//'`"
-	rm -f "$f2" "$f2".check
-done
-
-cleantags "$d"
-
-### Clean up any CVS directories that might be around.
-echo "cleaning up CVS residue."
-(
-	cd "$d"
-	find . -type d -name "CVS" -print | xargs rm -r
-)
-echo done
-
-### Fixing file and directory permissions.
-echo "Fixing file/directory permissions."
-(
-	cd "$d"
-	find . -type f -print | xargs chmod u+rw,go+r
-	find . -type d -print | xargs chmod u+rwx,go+rx
-)
-echo done
-
-exit 0
diff --git a/external/lgpl3/gmp/Makefile.netbsd-gmp b/external/lgpl3/gmp/Makefile.netbsd-gmp
deleted file mode 100644
index dd6b49bf5..000000000
--- a/external/lgpl3/gmp/Makefile.netbsd-gmp
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: Makefile.netbsd-gmp,v 1.4 2014/03/18 18:20:36 riastradh Exp $
-
-# hack makefile to help build gmp ./configure
-
-.include <bsd.own.mk>
-
-CCADDFLAGS=	--sysroot=${DESTDIR} -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/ -I${.OBJDIR}/.native/gcc/include
-
-TARGET?=${MACHINE_GNU_PLATFORM}
-#TARGET=mips64el-netbsd
-ENV_ARGS=\
-			CC=${CC:Q}' '${CCADDFLAGS:Q} \
-			CPP=${CPP:Q}' '-I${DESTDIR}/usr/include \
-			AS=${AS:Q} AWK=${TOOL_AWK:Q} LD=${LD:Q} \
-			NM=${NM:Q} OBJDUMP=${OBJDUMP:Q} \
-			LIBS=-lintl
-
-all:
-	env ${ENV_ARGS} ${NETBSDSRCDIR}/external/lgpl3/gmp/dist/configure --host=${TARGET} --target=${TARGET}
diff --git a/external/public-domain/tz/tzdata2netbsd b/external/public-domain/tz/tzdata2netbsd
deleted file mode 100644
index 03da91fc2..000000000
--- a/external/public-domain/tz/tzdata2netbsd
+++ /dev/null
@@ -1,375 +0,0 @@
-# $NetBSD: tzdata2netbsd,v 1.7 2015/08/11 18:10:13 apb Exp $
-
-# For use by NetBSD developers when updating to new versions of tzdata.
-#
-# 0. Be in an up-to-date checkout of src/external/public-domain/tz
-#    from NetBSD-current.
-# 1. Edit OLDVER and NEWVER below.
-# 2. Run this script.  You will be prompted for confirmation before
-#    anything major (such as a cvs operation).
-# 3. If something fails, abort the script and fix it.
-# 4. Re-run this script until you are happy.  It's designed to
-#    be re-run over and over, and later runs will try not to
-#    redo non-trivial work done by earlier runs.
-#
-
-OLDVER=2015e
-NEWVER=2015f
-
-# Uppercase variants of OLDVER and NEWVER
-OLDVER_UC="$( echo "${OLDVER}" | tr '[a-z]' '[A-Z]' )"
-NEWVER_UC="$( echo "${NEWVER}" | tr '[a-z]' '[A-Z]' )"
-
-# Tags for use with version control systems
-CVSOLDTAG="TZDATA${OLDVER_UC}"
-CVSNEWTAG="TZDATA${NEWVER_UC}"
-CVSBRANCHTAG="TZDATA"
-GITHUBTAG="${NEWVER}"
-
-# URLs for fetching distribution files, etc.
-DISTURL="ftp://ftp.iana.org/tz/releases/tzdata${NEWVER}.tar.gz"
-SIGURL="${DISTURL}.asc"
-NEWSURL="https://github.com/eggert/tz/raw/${GITHUBTAG}/NEWS"
-
-# Directories
-REPODIR="src/external/public-domain/tz/dist" # relative to the NetBSD CVS repo
-TZDISTDIR="$(pwd)/dist" # should be .../external/public-domain/tz/dist
-WORKDIR="$(pwd)/update-work/${NEWVER}"
-EXTRACTDIR="${WORKDIR}/extract"
-
-# Files in the work directory
-DISTFILE="${WORKDIR}/${DISTURL##*/}"
-SIGFILE="${DISTFILE}.sig"
-PGPVERIFYLOG="${WORKDIR}/pgpverify.log"
-NEWSFILE="${WORKDIR}/NEWS"
-NEWSTRIMFILE="${WORKDIR}/NEWS.trimmed"
-IMPORTMSGFILE="${WORKDIR}/import.msg"
-IMPORTDONEFILE="${WORKDIR}/import.done"
-MERGSMSGFILE="${WORKDIR}/merge.msg"
-MERGEDONEFILE="${WORKDIR}/merge.done"
-COMMITMERGEDONEFILE="${WORKDIR}/commitmerge.done"
-
-DOIT()
-{
-	local really_do_it=false
-	local reply
-
-	echo "In directory $(pwd)"
-	echo "ABOUT TO DO:" "$(shell_quote "$@")"
-	read -p "Really do it? [yes/no/quit] " reply
-	case "${reply}" in
-	[yY]*)	really_do_it=true ;;
-	[nN]*)	really_do_it=false ;;
-	[qQ]*)
-		echo "Aborting"
-		return 1
-		;;
-	esac
-	if $really_do_it; then
-		echo "REALLY DOING IT NOW..."
-		"$@"
-	else
-		echo "NOT REALLY DOING THE ABOVE COMMAND"
-	fi
-}
-
-# Quote args to make them safe in the shell.
-# Usage: quotedlist="$(shell_quote args...)"
-#
-# After building up a quoted list, use it by evaling it inside
-# double quotes, like this:
-#    eval "set -- $quotedlist"
-# or like this:
-#    eval "\$command $quotedlist \$filename"
-#
-shell_quote()
-{(
-	local result=''
-	local arg qarg
-	LC_COLLATE=C ; export LC_COLLATE # so [a-zA-Z0-9] works in ASCII
-	for arg in "$@" ; do
-		case "${arg}" in
-		'')
-			qarg="''"
-			;;
-		*[!-./a-zA-Z0-9]*)
-			# Convert each embedded ' to '\'',
-			# then insert ' at the beginning of the first line,
-			# and append ' at the end of the last line.
-			# Finally, elide unnecessary '' pairs at the
-			# beginning and end of the result and as part of
-			# '\'''\'' sequences that result from multiple
-			# adjacent quotes in he input.
-			qarg="$(printf "%s\n" "$arg" | \
-			    ${SED:-sed} -e "s/'/'\\\\''/g" \
-				-e "1s/^/'/" -e "\$s/\$/'/" \
-				-e "1s/^''//" -e "\$s/''\$//" \
-				-e "s/'''/'/g"
-				)"
-			;;
-		*)
-			# Arg is not the empty string, and does not contain
-			# any unsafe characters.  Leave it unchanged for
-			# readability.
-			qarg="${arg}"
-			;;
-		esac
-		result="${result}${result:+ }${qarg}"
-	done
-	printf "%s\n" "$result"
-)}
-
-findcvsroot()
-{
-	[ -n "${CVSROOT}" ] && return 0
-	CVSROOT="$( cat ./CVS/Root )"
-	[ -n "${CVSROOT}" ] && return 0
-	echo >&2 "Failed to set CVSROOT value"
-	return 1
-}
-
-mkworkdir()
-{
-	mkdir -p "${WORKDIR}"
-}
-
-fetch()
-{
-	[ -f "${DISTFILE}" ] || ftp -o "${DISTFILE}" "${DISTURL}"
-	[ -f "${SIGFILE}" ] || ftp -o "${SIGFILE}" "${SIGURL}"
-	[ -f "${NEWSFILE}" ] || ftp -o "${NEWSFILE}" "${NEWSURL}"
-}
-
-checksig()
-{
-	{ gpg --verify "${SIGFILE}" "${DISTFILE}"
-	  echo gpg exit status $?
-	} 2>&1 | tee "${PGPVERIFYLOG}"
-
-	# The output should contain lines that match all the following regexps
-	#
-	while read line; do
-		if ! grep -q -e "^${line}\$" "${PGPVERIFYLOG}"; then
-			echo >&2 "Failed to verify signature: ${line}"
-			return 1
-		fi
-	done <<'EOF'
-gpg: Signature made .* using RSA key ID 62AA7E34
-gpg: Good signature from "Paul Eggert <eggert@cs.ucla.edu>"
-Primary key fingerprint: 7E37 92A9 D8AC F7D6 33BC  1588 ED97 E90E 62AA 7E34
-gpg exit status 0
-EOF
-}
-
-extract()
-{
-	[ -f "${EXTRACTDIR}/zone.tab" ] && return
-	mkdir -p "${EXTRACTDIR}"
-	tar -z -xf "${DISTFILE}" -C "${EXTRACTDIR}"
-}
-
-addnews()
-{
-	[ -f "${EXTRACTDIR}/NEWS" ] && return
-	cp -p "${NEWSFILE}" "${EXTRACTDIR}"/NEWS
-}
-
-# Find the relevant part of the NEWS file for all releases between
-# OLDVER and NEWVER, and save them to NEWSTRIMFILE.
-#
-trimnews()
-{
-	[ -s "${NEWSTRIMFILE}" ] && return
-	awk -v oldver="${OLDVER}" -v newver="${NEWVER}" \
-	    '
-		BEGIN {inrange = 0}
-		/^Release [0-9]+[a-z]+ - .*/ {
-			# "Release <version> - <date>"
-			inrange = ($2 > oldver && $2 <= newver)
-		}
-		// { if (inrange) print; }
-		' \
-		<"${NEWSFILE}" >"${NEWSTRIMFILE}"
-}
-
-# Create IMPORTMSGFILE from NEWSTRIMFILE, by ignoring some sections,
-# keeping only the first sentence from paragraphs in other sections,
-# and changing the format.
-#
-# The result should be edited by hand before performing a cvs commit.
-# A message to that effect is inserted at the beginning of the file.
-#
-mkimportmsg()
-{
-	[ -s "${IMPORTMSGFILE}" ] && return
-	{ cat <<EOF
-EDIT ME: Edit this file and then delete the lines marked "EDIT ME".
-EDIT ME: This file will be used as a log message for the "cvs commit" that
-EDIT ME: imports tzdata${NEWVER}.  The initial contents of this file were
-EDIT ME: generated from ${NEWSFILE}.
-EDIT ME: 
-EOF
-	awk -v oldver="${OLDVER}" -v newver="${NEWVER}" \
-	    -v disturl="${DISTURL}" -v newsurl="${NEWSURL}" \
-	    '
-		BEGIN {
-			bullet = "  * ";
-			indent = "    ";
-			blankline = 0;
-			goodsection = 0;
-			havesentence = 0;
-			print "Import tzdata"newver" from "disturl;
-			#print "and NEWS file from "newsurl;
-		}
-		/^Release/ {
-			# "Release <version> - <date>"
-			ver = $2;
-			date = gensub(".* - ", "", 1, $0);
-			print "";
-			print "Summary of changes in tzdata"ver \
-				" ("date"):";
-		}
-		/^$/ { blankline = 1; havesentence = 0; }
-		/^  Changes affecting/ { goodsection = 0; }
-		/^  Changes affecting.*time/ { goodsection = 1; }
-		/^  Changes affecting.*data/ { goodsection = 1; }
-		/^  Changes affecting.*documentation/ || \
-		/^  Changes affecting.*commentary/ {
-			t = gensub("^ *", "", 1, $0);
-			t = gensub("\\.*$", ".", 1, t);
-			print bullet t;
-			goodsection = 0;
-		}
-		/^    .*/ && goodsection {
-			# In a paragraph in a "good" section.
-			# Ignore leading spaces, and ignore anything
-			# after the first sentence.
-			# First line of paragraph gets a bullet.
-			t = gensub("^ *", "", 1, $0);
-			t = gensub("\\. .*", ".", 1, t);
-			if (blankline) print bullet t;
-			else if (! havesentence) print indent t;
-			havesentence = (havesentence || (t ~ "\\.$"));
-		}
-		/./ { blankline = 0; }
-		' \
-		<"${NEWSTRIMFILE}"
-	} >"${IMPORTMSGFILE}"
-}
-
-editimportmsg()
-{
-	if [ -s "${IMPORTMSGFILE}" ] \
-	&& ! grep -q '^EDIT' "${IMPORTMSGFILE}"
-	then
-		return 0 # file has already been edited
-	fi
-	# Pass both IMPORTMSGFILE and NEWSFILE to the editor, so that the
-	# user can easily consult NEWSFILE while editing IMPORTMSGFILE.
-	vi "${IMPORTMSGFILE}" "${NEWSFILE}"
-}
-
-cvsimport()
-{
-	if [ -e "${IMPORTDONEFILE}" ]; then
-		cat >&2 <<EOF
-The CVS import has already been performed.
-EOF
-		return 0
-	fi
-	if ! [ -s "${IMPORTMSGFILE}" ] \
-	|| grep -q '^EDIT' "${IMPORTMSGFILE}"
-	then
-		cat >&2 <<EOF
-The message file ${IMPORTMSGFILE}
-has not been properly edited.
-Not performing cvs import.
-EOF
-		return 1
-	fi
-	( cd "${EXTRACTDIR}" &&
-	  DOIT cvs -d "${CVSROOT}" import -m "$(cat "${IMPORTMSGFILE}")" \
-		"${REPODIR}" "${CVSBRANCHTAG}" "${CVSNEWTAG}"
-	) && touch "${IMPORTDONEFILE}"
-}
-
-cvsmerge()
-{
-
-	cd "${TZDISTDIR}" || exit 1
-	if [ -e "${MERGEDONEFILE}" ]; then
-		cat >&2 <<EOF
-The CVS merge has already been performed.
-EOF
-		return 0
-	fi
-	DOIT cvs -d "${CVSROOT}" update -j"${CVSOLDTAG}" -j"${CVSNEWTAG}" \
-	&& touch "${MERGEDONEFILE}"
-}
-
-resolveconflicts()
-{
-	cd "${TZDISTDIR}" || exit 1
-	if grep -l '^[<=>][<=>][<=>]' *
-	then
-		cat <<EOF
-There appear to be conflicts in the files listed above.
-Resolve conflicts, then re-run this script.
-EOF
-		return 1
-	fi
-}
-
-cvscommitmerge()
-{
-	cd "${TZDISTDIR}" || exit 1
-	if grep -l '^[<=>][<=>][<=>]' *
-	then
-		cat >&2 <<EOF
-There still appear to be conflicts in the files listed above.
-Not performing cvs commit.
-EOF
-		return 1
-	fi
-	if [ -e "${COMMITMERGEDONEFILE}" ]; then
-		cat >&2 <<EOF
-The CVS commmit (of the merge result) has already been performed.
-EOF
-		return 0
-	fi
-	DOIT cvs -d "${CVSROOT}" commit -m "Merge tzdata${NEWVER}" \
-	&& touch "${COMMITMERGEDONEFILE}"
-}
-
-extra()
-{
-	cat <<EOF
-Also do the following:
- * Edit src/doc/3RDPARTY
- * Edit src/doc/CHANGES
- * Edit src/distrib/sets/base/mi if the set of installed files has changed.
- * Submit pullup requests for all active release branches.
- * rm -rf ${WORKDIR}
-EOF
-}
-
-main()
-{
-	set -e
-	findcvsroot
-	mkworkdir
-	fetch
-	checksig
-	extract
-	addnews
-	trimnews
-	mkimportmsg
-	editimportmsg
-	cvsimport
-	cvsmerge
-	resolveconflicts
-	cvscommitmerge
-	extra
-}
-
-main "$@"
diff --git a/lib/libc/db/db2netbsd b/lib/libc/db/db2netbsd
deleted file mode 100755
index d5abedaa9..000000000
--- a/lib/libc/db/db2netbsd
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#	$NetBSD: db2netbsd,v 1.2 1999/02/16 18:01:37 kleink Exp $
-
-# This version transforms a Berkeley DB distribution into something
-# which can be 'cvs import'ed into the NetBSD source repository.
-# It is to be run in the untarred Berkeley DB distribution directory
-# (e.g. the "db.1.85" directory created by tar xvf), and sets up
-# the destination tree in place.
-
-version=`basename $PWD | sed -e 's/db\.//'`
-releasetag=`basename $PWD | sed -e 's/\./-/g'`
-
-CLEANFILES="PORT docs hash/search.h test/btree.tests test/hash.tests"
-
-# clean up pieces that we never import
-/bin/rm -rf $CLEANFILES
-find . -type l -o -name tags | xargs /bin/rm -f
-
-# The include files are already in place
-
-# Put the regression tests in the right place
-mkdir -p regress/lib/libc
-mv test regress/lib/libc/db
-
-# Put the libc pieces in the right place.
-mkdir -p lib/libc/db
-mv Makefile.inc README btree changelog db hash man mpool recno lib/libc/db
-
-echo "import with:"
-echo "cvs import -m \"Import of Berkeley DB version $version\" \
-src CSRG $releasetag"
diff --git a/lib/libc/time/tzcode2netbsd b/lib/libc/time/tzcode2netbsd
deleted file mode 100755
index 350bee639..000000000
--- a/lib/libc/time/tzcode2netbsd
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-
-#
-# $NetBSD: tzcode2netbsd,v 1.6 2015/07/11 16:09:15 christos Exp $
-#
-# Convert an extracted tzcode distribution into the format suitable
-# for importing it into the NetBSD source tree.
-# Last updated for: tzcode2004a.
-# 
-
-NOIMPORT="Makefile
-	date.1 date.1.txt date.c
-	gccdiffs
-	itca.jpg
-	logwtmp.c
-	newctime.3.txt
-	newstrftime.3 newstrftime.3.txt
-	newtzset.3.txt
-	time2posix.3.txt
-	tzfile.5.txt
-	tzselect.8.txt
-	usno1988 usno1989 usno1989a usno1995 usno1997 usno1998
-	zdump.8.txt
-	zic.8.txt"
-
-#rm -f ${NOIMPORT}
-#mv tzfile.h ../../../include
-
-echo remember to check tzfile.h in ../../../include
-echo you can find the current version in the Makefile
-echo we don't use this script anymore to import, but diff against the
-echo current version and apply patches.
diff --git a/lib/libwrap/libwrap2netbsd b/lib/libwrap/libwrap2netbsd
deleted file mode 100755
index 1364cbca8..000000000
--- a/lib/libwrap/libwrap2netbsd
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /bin/sh
-#
-#	$NetBSD: libwrap2netbsd,v 1.6 2008/05/29 14:51:25 mrg Exp $
-#
-# Copyright (c) 1996 Matthew R. Green
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-
-# libwrap2netbsd:  convert a libwrap tcp_wrappers source tree into a
-# netbsd libwrap source tree, ready for importing.
-
-if [ $# -ne 2 ]; then echo "libwrap2netbsd src dest"; exit 1; fi
-
-r=$1
-d=$2/libwrap
-
-
-echo preparing directory $d
-rm -rf $d
-mkdir -p $d
-
-# lame to have these files duplicated.  but, what the hell.
-echo copying tree from $r into $d
-cd $r
-src='hosts_access.c options.c shell_cmd.c rfc931.c eval.c hosts_ctl.c
-refuse.c percent_x.c clean_exit.c fix_options.c socket.c workarounds.c
-update.c misc.c diag.c'
-man='hosts_access.3 hosts_access.5 hosts_options.5'
-inc='tcpd.h mystdarg.h'
-misc='DISCLAIMER'
-pax -rvw $src $man $inc $misc $d
-
-cd $d
-
-echo done
-exit 0
diff --git a/releasetools/netbsd-resync.sh b/releasetools/netbsd-resync.sh
deleted file mode 100755
index 2ba11966a..000000000
--- a/releasetools/netbsd-resync.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-: ${BUILDSH=build.sh}
-
-if [ ! -f ${BUILDSH} ]
-then
-	echo "Please invoke me from the root source dir, where ${BUILDSH} is."
-	exit 1
-fi
-
-if [ -z "${NETBSD_BRANCH}" ]
-then
-	echo "NETBSD_BRANCH is undefined."
-	exit 1
-fi
-
-find . -type f    | cut -c 3-   | grep -v '\.git' | grep -v '\./minix' | sort -u > files.all
-git grep -i minix | cut -d: -f1 | grep -v '\.git' | grep -v '\./minix' | sort -u > files.minix
-diff files.all files.minix |grep '^<'| cut -c 3- > files.netbsd
-
-while read file
-do
-    git checkout ${NETBSD_BRANCH} ${file}
-done < files.netbsd
-
diff --git a/tests/usr.sbin/mtree/netbsd6_d_create.out b/tests/usr.sbin/mtree/netbsd6_d_create.out
deleted file mode 100644
index 389ec653e..000000000
--- a/tests/usr.sbin/mtree/netbsd6_d_create.out
+++ /dev/null
@@ -1,55 +0,0 @@
-#	   user: x
-#	machine: x
-#	   tree: x
-#	   date: x
-
-# .
-/set type=file nlink=1
-.               type=dir nlink=4
-    a.symlink.1 type=link link=a.file.1
-    top.dangling \
-                type=link link=nonexistent
-    top.file.1  size=18 \
-                sha256=74c53aaf0cd9543b7efad969de1058ee38859134ba467500b849811fc3513195
-    top.symlink.b \
-                type=link link=b
-
-# ./a
-a               type=dir nlink=4
-    a.file.1    size=18 \
-                sha256=bdbea62f7ccdf862f22254ea871d523845250010d5f233896e800142a859eef2
-    a.file.2    size=18 \
-                sha256=77876d113fe1b45a41f8d1d3e178aaad7f91fcd93d3df782690625b74ad90fe6
-    a.hardlink.b2 \
-                nlink=2 size=18 \
-                sha256=784fd6b95fe5054d87bf268de51dea043031c5e985f668d4f51e1c759b0f9333
-
-# ./a/1
-1               type=dir nlink=2
-    a1.file.1   size=21 \
-                sha256=a062cd272facdd38c4fdeff2a18947b28c99a28a8fe51f88468978740382e592
-# ./a/1
-..
-
-
-# ./a/2
-2               type=dir nlink=2
-# ./a/2
-..
-
-# ./a
-..
-
-
-# ./b
-b               type=dir nlink=2
-    b.file.1    nlink=2 size=18 \
-                sha256=5754b0d97a8238ea0e495ab871667dcab8f1d684e323290ae76f70c47de18998
-    b.file.2    nlink=2 size=18 \
-                sha256=784fd6b95fe5054d87bf268de51dea043031c5e985f668d4f51e1c759b0f9333
-    b.hardlink.1 \
-                nlink=2 size=18 \
-                sha256=5754b0d97a8238ea0e495ab871667dcab8f1d684e323290ae76f70c47de18998
-# ./b
-..
-
diff --git a/usr.bin/calendar/calendars/calendar.netbsd b/usr.bin/calendar/calendars/calendar.netbsd
deleted file mode 100644
index 76de1cd7d..000000000
--- a/usr.bin/calendar/calendars/calendar.netbsd
+++ /dev/null
@@ -1,127 +0,0 @@
-01/04   NetBSD 1.3 released, 1998
-01/05   NetBSD/luna68k port started, 2000
-01/07   NetBSD/dreamcast port started, 2001
-01/17   NetBSD/hpcsh port started, 2001
-01/23   NetBSD/arc port started, 2000
-01/27   NetBSD 5.1.4 released, 2014
-01/27   NetBSD 5.2.2 released, 2014
-01/27   NetBSD 6.0.4 released, 2014
-01/27   NetBSD 6.1.3 released, 2014
-01/31   NetBSD/shark port started, 1996
-02/02   NetBSD 5.1.2 released, 2012
-02/06   NetBSD/evbsh3 port started, 2001
-02/11   NetBSD/sandpoint port started, 2001
-02/12   NetBSD 5.0.2 released, 2010
-02/13   NetBSD/alpha port started, 1995
-02/18   NetBSD/newsmips port started, 1998
-02/20   NetBSD/hpcarm port started, 2001
-02/24   NetBSD/hp700 port renamed NetBSD/hppa, 2014
-02/27   NetBSD/mvmeppc, port started, 2002
-02/29   NetBSD/prep port started, 2000
-03/01   NetBSD 1.6.2 released, 2004
-03/06   NetBSD/sbmips port started, 2002
-03/07   NetBSD/evbmips port started, 2002
-03/08   pkgsrc/Solaris support added, 1999
-03/09   NetBSD 1.3.1 released, 1998
-03/11   NetBSD/xen port started, 2004
-03/11   pkgsrc/Interix support added, 2004
-03/19   NetBSD/cobalt port started, 2000
-03/21   NetBSD 1.4.2 released, 2000
-03/21   NetBSD/i386 port started, 1993
-03/26   NetBSD/atari port started, 1995
-03/28   NetBSD/sun2 port started, 2001
-04/12   NetBSD 6.0.5 released, 2014
-04/12   NetBSD 6.1.4 released, 2014
-04/14   NetBSD 2.0.2 released, 2005
-04/20   NetBSD 0.8 released, 1993
-04/21   NetBSD 1.6.1 released, 2003
-04/29   NetBSD 5.0 released, 2009
-05/05   NetBSD/x68k port started, 1996
-05/09   NetBSD/acorn26 port started, 2000
-05/12   NetBSD 1.4 released, 1999
-05/12   NetBSD/hp300 port started, 1993
-05/14   NetBSD/cesfic port started, 2001
-05/15   NetBSD/macppc port started, 1998
-05/20   NetBSD 6.0.2 released, 2013
-05/20   NetBSD 6.1 released, 2013
-05/20   NetBSD 1.2.1 released, 1997
-05/25   NetBSD/amigappc port started, 2000
-05/28   NetBSD/algor port started, 2001
-05/28   NetBSD/ofppc port started, 1998
-05/29   NetBSD 1.3.2 released, 1998
-05/31   NetBSD/pmppc port started, 2002
-06/04   pkgsrc/Bitrig support added, 2015
-06/05   NetBSD gets its own package system, 1997
-06/06   NetBSD/hp700 port started, 2002
-06/09   NetBSD/netwinder port started, 2001
-06/09   NetBSD/next68k port started, 1998
-06/13   NetBSD/walnut port started, 2001
-06/14   NetBSD/sgimips port started, 2000
-06/19   NetBSD/x86_64 port started, 2001
-06/20   NetBSD/sparc64 port started, 1998
-06/23   pkgsrc/Linux support added, 1999
-06/25   NetBSD/sun3 port started, 1993
-07/05   NetBSD/evbsh5 port started, 2002
-07/11   NetBSD 1.5.1 released, 2001
-07/22   NetBSD 1.5.3 released, 2002
-07/24   NetBSD 3.0.1 released, 2006
-07/25   NetBSD/mvme68k port started, 1995
-08/02   NetBSD 5.0.1 released, 2009
-08/02   NetBSD/vax port started, 1994
-08/12   NetBSD/mipsco port started, 2000
-08/20   pkgsrc forked from FreeBSD Ports, 1997
-08/22   NetBSD 6.1.1 released, 2013
-08/23   NetBSD 0.9 released, 1993
-08/26   NetBSD 1.4.1 released, 1999
-09/02   NetBSD/amiga port started, 1993
-09/05   NetBSD/evbarm port started, 2001
-09/09   NetBSD/pc532 port started, 1993
-09/13   NetBSD 1.5.2 released, 2001
-09/14   NetBSD 1.6 released, 2002
-09/22   NetBSD 6.0.6 released, 2014
-09/22   NetBSD 6.1.5 released, 2014
-09/25   NetBSD/hpcmips port started, 1999
-09/25   NetBSD 7.0 released, 2015
-09/28   NetBSD 5.1.3 released, 2013
-09/28   NetBSD 5.2.1 released, 2013
-09/29   NetBSD/mac68k port started, 1993
-09/30   NetBSD 6.0.3 released, 2013
-09/30   NetBSD 6.1.2 released, 2013
-10/02   NetBSD/sparc port started, 1993
-10/04   NetBSD 1.2 released, 1996
-10/05   NetBSD/cats port started, 1998
-10/12   NetBSD/pmax port started, 1993
-10/13   NetBSD/iyonix port started, 2004
-10/14   NetBSD 4.0.1 released, 2008
-10/14   NetBSD/bebox port started, 1997
-10/16   NetBSD/playstation2 port started, 2001
-10/17   NetBSD 6.0 released, 2012
-10/26   NetBSD 1.0 released, 1994
-10/30   pkgsrc/Darwin support added, 2001
-10/31   NetBSD 2.0.3 released, 2005
-11/02   NetBSD 2.1 released, 2005
-11/04   NetBSD 3.0.2 released, 2006
-11/04   NetBSD 3.1 released, 2006
-11/15   NetBSD 5.1.5 released, 2014
-11/15   NetBSD 5.2.3 released, 2014
-11/17   pkgsrc/FreeBSD support added, 2002
-11/18   NetBSD/acorn32 port started, 2001
-11/19   NetBSD 5.1 released, 2010
-11/20   pkgsrc/OSF1 support added, 2004
-11/25   NetBSD 1.4.3 released, 2000
-11/26   NetBSD 1.1 released, 1995
-11/30   pkgsrc/OpenBSD support added, 2002
-12/02   pkgsrc/IRIX support added, 2002
-12/03   pkgsrc/AIX support added, 2003
-12/03   pkgsrc/BSDI support added, 2003
-12/03   NetBSD 5.2 released, 2012
-12/06   NetBSD 1.5 released, 2000
-12/09   NetBSD 2.0 released, 2004
-12/09   NetBSD/news68k port started, 1999
-12/09   NetBSD/evbppc port started, 2002
-12/17   NetBSD/zaurus port started, 2006
-12/19   NetBSD 4.0 released, 2007
-12/23   NetBSD 1.3.3 released, 1998
-12/23   NetBSD 3.0 released, 2005
-12/26   NetBSD 6.0.1 released, 2012
-12/29   NetBSD/ews4800mips port started, 2005