bind - Removed version tag from contrib directory and updated README.DRAGONFLY.

diff --git a/contrib/bind-9.5.2/README.DRAGONFLY b/contrib/bind-9.5.2/README.DRAGONFLY
deleted file mode 100644 (file)
index 1fe245f..0000000
--- a/contrib/bind-9.5.2/README.DRAGONFLY
+++ /dev/null
@@ -1,58 +0,0 @@
-
-                       BIND-9.5.2 AS USED BY DRAGONFLY
-
-    This directory contains a selected set of files from the ISC
-    bind-9.5.2.tar.gz distribution.  No files have been moved
-    or modified from their extracted position.
-
-    This distribution was downloaded from the following site:
-
-       https://www.isc.org/downloadables/11
-
-    DO NOT CREATE ANY FILES IN THIS DIRECTORY HIERARCHY!  THIS
-    HIERARCHY REPRESENTS AN EXACT COPY, MINUS UNNEEDED FILES PLUS CHANGES
-    IN BASE TO FIT IT INTO BASE, OF THE ORIGINAL ARCHIVE.
-    All modifications are made in the 
-    DragonFly build wrapper, in:
-
-       /usr/src/usr.sbin/named
-       /usr/src/usr.sbin/(various)
-       /usr/src/usr.bin/(various)
-       /usr/src/lib/libbind
-       /usr/src/lib/libbind9
-       /usr/src/lib/libisc
-
-    The only additional files added to this directory are README.DRAGONFLY
-    and README.DELETED. 
-    
-    All changes to original files need to be made in base. Read development(7)
-    for further information.
-
-    UPGRADE PROCEDURE:
-
-       * download a new bind distribution
-
-       * extract the archive into /usr/src/contrib of vendor/BIND, using the subdirectory
-         that the archive extracts as.
-
-       * redirect the build directory to the new directory in base:
-
-         /usr/src/usr.sbin/named/Makefile.inc
-         /usr/src/lib/libbind/Makefile
-         /usr/src/lib/libisc/Makefile
-
-       * in vendor/BIND remove files that are not used (or run a build and figure out
-         what files are not used and remove them).
-
-       * Add the remainder to git.
-
-       * Once the new archive is in place, the old one can be physically
-         removed from the DragonFly CVS repository.  The CVS meister would
-         have to do the physical removal.
-
-         DO NOT MAKE ANY EDITS TO THE DISTRIBUTION IN THIS CONTRIB
-         DIRECTORY, OTHER THEN TO ADD OR DELETE FILES ASSOCIATED WITH THE
-         DISTRIBUTION.
-
-    The file README.DELETED contains a list of deleted files.
-

diff --git a/contrib/bind-9.5.2/CHANGES b/contrib/bind/CHANGES
similarity index 100%
rename from contrib/bind-9.5.2/CHANGES
rename to contrib/bind/CHANGES

diff --git a/contrib/bind-9.5.2/COPYRIGHT b/contrib/bind/COPYRIGHT
similarity index 100%
rename from contrib/bind-9.5.2/COPYRIGHT
rename to contrib/bind/COPYRIGHT

diff --git a/contrib/bind-9.5.2/FAQ b/contrib/bind/FAQ
similarity index 100%
rename from contrib/bind-9.5.2/FAQ
rename to contrib/bind/FAQ

diff --git a/contrib/bind-9.5.2/README b/contrib/bind/README
similarity index 100%
rename from contrib/bind-9.5.2/README
rename to contrib/bind/README

diff --git a/contrib/bind-9.5.2/README.DELETED b/contrib/bind/README.DELETED
similarity index 100%
rename from contrib/bind-9.5.2/README.DELETED
rename to contrib/bind/README.DELETED

diff --git a/contrib/bind/README.DRAGONFLY b/contrib/bind/README.DRAGONFLY
new file mode 100644 (file)
index 0000000..8b4718e
--- /dev/null
+++ b/contrib/bind/README.DRAGONFLY
@@ -0,0 +1,32 @@
+
+                       BIND-9.5.2 AS USED BY DRAGONFLY
+
+    This directory contains a selected set of files from the ISC
+    bind-9.5.2-P1.tar.gz distribution.  No files have been moved
+    or modified from their extracted position.
+
+    This distribution was downloaded from the following site:
+
+       https://www.isc.org/downloadables/11
+
+    MD5  (bind-9.5.2-P1.tar.gz) = e3c691aa8d6b1a7ad4691fbb49f3cc58
+    SHA1 (bind-9.5.2-P1.tar.gz) = 532d448554601cec13a645df812638d46fd41743
+
+    DO NOT CREATE ANY FILES IN THIS DIRECTORY HIERARCHY!  THIS HIERARCHY
+    REPRESENTS AN EXACT COPY, MINUS UNNEEDED OF THE ORIGINAL ARCHIVE.
+
+    All modifications are made in the 
+    DragonFly build wrapper, in:
+
+       /usr/src/usr.sbin/named
+       /usr/src/usr.sbin/(various)
+       /usr/src/usr.bin/(various)
+       /usr/src/lib/libbind
+       /usr/src/lib/libbind9
+       /usr/src/lib/libisc
+    
+    All modifications are made in the master or release branches!
+    Read development(7) for further information.
+
+    The file README.DELETED contains a list of deleted files.
+

diff --git a/contrib/bind-9.5.2/README.idnkit b/contrib/bind/README.idnkit
similarity index 100%
rename from contrib/bind-9.5.2/README.idnkit
rename to contrib/bind/README.idnkit

diff --git a/contrib/bind-9.5.2/bin/check/check-tool.c b/contrib/bind/bin/check/check-tool.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/check/check-tool.c
rename to contrib/bind/bin/check/check-tool.c

diff --git a/contrib/bind-9.5.2/bin/check/check-tool.h b/contrib/bind/bin/check/check-tool.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/check/check-tool.h
rename to contrib/bind/bin/check/check-tool.h

diff --git a/contrib/bind-9.5.2/bin/check/named-checkconf.8 b/contrib/bind/bin/check/named-checkconf.8
similarity index 100%
rename from contrib/bind-9.5.2/bin/check/named-checkconf.8
rename to contrib/bind/bin/check/named-checkconf.8

diff --git a/contrib/bind-9.5.2/bin/check/named-checkconf.c b/contrib/bind/bin/check/named-checkconf.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/check/named-checkconf.c
rename to contrib/bind/bin/check/named-checkconf.c

diff --git a/contrib/bind-9.5.2/bin/check/named-checkconf.html b/contrib/bind/bin/check/named-checkconf.html
similarity index 100%
rename from contrib/bind-9.5.2/bin/check/named-checkconf.html
rename to contrib/bind/bin/check/named-checkconf.html

diff --git a/contrib/bind-9.5.2/bin/check/named-checkzone.8 b/contrib/bind/bin/check/named-checkzone.8
similarity index 100%
rename from contrib/bind-9.5.2/bin/check/named-checkzone.8
rename to contrib/bind/bin/check/named-checkzone.8

diff --git a/contrib/bind-9.5.2/bin/check/named-checkzone.c b/contrib/bind/bin/check/named-checkzone.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/check/named-checkzone.c
rename to contrib/bind/bin/check/named-checkzone.c

diff --git a/contrib/bind-9.5.2/bin/check/named-checkzone.html b/contrib/bind/bin/check/named-checkzone.html
similarity index 100%
rename from contrib/bind-9.5.2/bin/check/named-checkzone.html
rename to contrib/bind/bin/check/named-checkzone.html

diff --git a/contrib/bind-9.5.2/bin/dig/dig.1 b/contrib/bind/bin/dig/dig.1
similarity index 100%
rename from contrib/bind-9.5.2/bin/dig/dig.1
rename to contrib/bind/bin/dig/dig.1

diff --git a/contrib/bind-9.5.2/bin/dig/dig.c b/contrib/bind/bin/dig/dig.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/dig/dig.c
rename to contrib/bind/bin/dig/dig.c

diff --git a/contrib/bind-9.5.2/bin/dig/dig.html b/contrib/bind/bin/dig/dig.html
similarity index 100%
rename from contrib/bind-9.5.2/bin/dig/dig.html
rename to contrib/bind/bin/dig/dig.html

diff --git a/contrib/bind-9.5.2/bin/dig/dighost.c b/contrib/bind/bin/dig/dighost.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/dig/dighost.c
rename to contrib/bind/bin/dig/dighost.c

diff --git a/contrib/bind-9.5.2/bin/dig/host.1 b/contrib/bind/bin/dig/host.1
similarity index 100%
rename from contrib/bind-9.5.2/bin/dig/host.1
rename to contrib/bind/bin/dig/host.1

diff --git a/contrib/bind-9.5.2/bin/dig/host.c b/contrib/bind/bin/dig/host.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/dig/host.c
rename to contrib/bind/bin/dig/host.c

diff --git a/contrib/bind-9.5.2/bin/dig/host.html b/contrib/bind/bin/dig/host.html
similarity index 100%
rename from contrib/bind-9.5.2/bin/dig/host.html
rename to contrib/bind/bin/dig/host.html

diff --git a/contrib/bind-9.5.2/bin/dig/include/dig/dig.h b/contrib/bind/bin/dig/include/dig/dig.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/dig/include/dig/dig.h
rename to contrib/bind/bin/dig/include/dig/dig.h

diff --git a/contrib/bind-9.5.2/bin/dig/nslookup.1 b/contrib/bind/bin/dig/nslookup.1
similarity index 100%
rename from contrib/bind-9.5.2/bin/dig/nslookup.1
rename to contrib/bind/bin/dig/nslookup.1

diff --git a/contrib/bind-9.5.2/bin/dig/nslookup.c b/contrib/bind/bin/dig/nslookup.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/dig/nslookup.c
rename to contrib/bind/bin/dig/nslookup.c

diff --git a/contrib/bind-9.5.2/bin/dig/nslookup.html b/contrib/bind/bin/dig/nslookup.html
similarity index 100%
rename from contrib/bind-9.5.2/bin/dig/nslookup.html
rename to contrib/bind/bin/dig/nslookup.html

diff --git a/contrib/bind-9.5.2/bin/dnssec/dnssec-keygen.8 b/contrib/bind/bin/dnssec/dnssec-keygen.8
similarity index 100%
rename from contrib/bind-9.5.2/bin/dnssec/dnssec-keygen.8
rename to contrib/bind/bin/dnssec/dnssec-keygen.8

diff --git a/contrib/bind-9.5.2/bin/dnssec/dnssec-keygen.c b/contrib/bind/bin/dnssec/dnssec-keygen.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/dnssec/dnssec-keygen.c
rename to contrib/bind/bin/dnssec/dnssec-keygen.c

diff --git a/contrib/bind-9.5.2/bin/dnssec/dnssec-keygen.html b/contrib/bind/bin/dnssec/dnssec-keygen.html
similarity index 100%
rename from contrib/bind-9.5.2/bin/dnssec/dnssec-keygen.html
rename to contrib/bind/bin/dnssec/dnssec-keygen.html

diff --git a/contrib/bind-9.5.2/bin/dnssec/dnssec-signzone.8 b/contrib/bind/bin/dnssec/dnssec-signzone.8
similarity index 100%
rename from contrib/bind-9.5.2/bin/dnssec/dnssec-signzone.8
rename to contrib/bind/bin/dnssec/dnssec-signzone.8

diff --git a/contrib/bind-9.5.2/bin/dnssec/dnssec-signzone.c b/contrib/bind/bin/dnssec/dnssec-signzone.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/dnssec/dnssec-signzone.c
rename to contrib/bind/bin/dnssec/dnssec-signzone.c

diff --git a/contrib/bind-9.5.2/bin/dnssec/dnssec-signzone.html b/contrib/bind/bin/dnssec/dnssec-signzone.html
similarity index 100%
rename from contrib/bind-9.5.2/bin/dnssec/dnssec-signzone.html
rename to contrib/bind/bin/dnssec/dnssec-signzone.html

diff --git a/contrib/bind-9.5.2/bin/dnssec/dnssectool.c b/contrib/bind/bin/dnssec/dnssectool.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/dnssec/dnssectool.c
rename to contrib/bind/bin/dnssec/dnssectool.c

diff --git a/contrib/bind-9.5.2/bin/dnssec/dnssectool.h b/contrib/bind/bin/dnssec/dnssectool.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/dnssec/dnssectool.h
rename to contrib/bind/bin/dnssec/dnssectool.h

diff --git a/contrib/bind-9.5.2/bin/named/bind9.xsl b/contrib/bind/bin/named/bind9.xsl
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/bind9.xsl
rename to contrib/bind/bin/named/bind9.xsl

diff --git a/contrib/bind-9.5.2/bin/named/bind9.xsl.h b/contrib/bind/bin/named/bind9.xsl.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/bind9.xsl.h
rename to contrib/bind/bin/named/bind9.xsl.h

diff --git a/contrib/bind-9.5.2/bin/named/builtin.c b/contrib/bind/bin/named/builtin.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/builtin.c
rename to contrib/bind/bin/named/builtin.c

diff --git a/contrib/bind-9.5.2/bin/named/client.c b/contrib/bind/bin/named/client.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/client.c
rename to contrib/bind/bin/named/client.c

diff --git a/contrib/bind-9.5.2/bin/named/config.c b/contrib/bind/bin/named/config.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/config.c
rename to contrib/bind/bin/named/config.c

diff --git a/contrib/bind-9.5.2/bin/named/control.c b/contrib/bind/bin/named/control.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/control.c
rename to contrib/bind/bin/named/control.c

diff --git a/contrib/bind-9.5.2/bin/named/controlconf.c b/contrib/bind/bin/named/controlconf.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/controlconf.c
rename to contrib/bind/bin/named/controlconf.c

diff --git a/contrib/bind-9.5.2/bin/named/convertxsl.pl b/contrib/bind/bin/named/convertxsl.pl
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/convertxsl.pl
rename to contrib/bind/bin/named/convertxsl.pl

diff --git a/contrib/bind-9.5.2/bin/named/include/named/builtin.h b/contrib/bind/bin/named/include/named/builtin.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/builtin.h
rename to contrib/bind/bin/named/include/named/builtin.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/client.h b/contrib/bind/bin/named/include/named/client.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/client.h
rename to contrib/bind/bin/named/include/named/client.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/config.h b/contrib/bind/bin/named/include/named/config.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/config.h
rename to contrib/bind/bin/named/include/named/config.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/control.h b/contrib/bind/bin/named/include/named/control.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/control.h
rename to contrib/bind/bin/named/include/named/control.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/globals.h b/contrib/bind/bin/named/include/named/globals.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/globals.h
rename to contrib/bind/bin/named/include/named/globals.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/interfacemgr.h b/contrib/bind/bin/named/include/named/interfacemgr.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/interfacemgr.h
rename to contrib/bind/bin/named/include/named/interfacemgr.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/listenlist.h b/contrib/bind/bin/named/include/named/listenlist.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/listenlist.h
rename to contrib/bind/bin/named/include/named/listenlist.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/log.h b/contrib/bind/bin/named/include/named/log.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/log.h
rename to contrib/bind/bin/named/include/named/log.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/logconf.h b/contrib/bind/bin/named/include/named/logconf.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/logconf.h
rename to contrib/bind/bin/named/include/named/logconf.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/lwaddr.h b/contrib/bind/bin/named/include/named/lwaddr.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/lwaddr.h
rename to contrib/bind/bin/named/include/named/lwaddr.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/lwdclient.h b/contrib/bind/bin/named/include/named/lwdclient.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/lwdclient.h
rename to contrib/bind/bin/named/include/named/lwdclient.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/lwresd.h b/contrib/bind/bin/named/include/named/lwresd.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/lwresd.h
rename to contrib/bind/bin/named/include/named/lwresd.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/lwsearch.h b/contrib/bind/bin/named/include/named/lwsearch.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/lwsearch.h
rename to contrib/bind/bin/named/include/named/lwsearch.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/main.h b/contrib/bind/bin/named/include/named/main.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/main.h
rename to contrib/bind/bin/named/include/named/main.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/notify.h b/contrib/bind/bin/named/include/named/notify.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/notify.h
rename to contrib/bind/bin/named/include/named/notify.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/ns_smf_globals.h b/contrib/bind/bin/named/include/named/ns_smf_globals.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/ns_smf_globals.h
rename to contrib/bind/bin/named/include/named/ns_smf_globals.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/query.h b/contrib/bind/bin/named/include/named/query.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/query.h
rename to contrib/bind/bin/named/include/named/query.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/server.h b/contrib/bind/bin/named/include/named/server.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/server.h
rename to contrib/bind/bin/named/include/named/server.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/sortlist.h b/contrib/bind/bin/named/include/named/sortlist.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/sortlist.h
rename to contrib/bind/bin/named/include/named/sortlist.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/statschannel.h b/contrib/bind/bin/named/include/named/statschannel.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/statschannel.h
rename to contrib/bind/bin/named/include/named/statschannel.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/tkeyconf.h b/contrib/bind/bin/named/include/named/tkeyconf.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/tkeyconf.h
rename to contrib/bind/bin/named/include/named/tkeyconf.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/tsigconf.h b/contrib/bind/bin/named/include/named/tsigconf.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/tsigconf.h
rename to contrib/bind/bin/named/include/named/tsigconf.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/types.h b/contrib/bind/bin/named/include/named/types.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/types.h
rename to contrib/bind/bin/named/include/named/types.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/update.h b/contrib/bind/bin/named/include/named/update.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/update.h
rename to contrib/bind/bin/named/include/named/update.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/xfrout.h b/contrib/bind/bin/named/include/named/xfrout.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/xfrout.h
rename to contrib/bind/bin/named/include/named/xfrout.h

diff --git a/contrib/bind-9.5.2/bin/named/include/named/zoneconf.h b/contrib/bind/bin/named/include/named/zoneconf.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/include/named/zoneconf.h
rename to contrib/bind/bin/named/include/named/zoneconf.h

diff --git a/contrib/bind-9.5.2/bin/named/interfacemgr.c b/contrib/bind/bin/named/interfacemgr.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/interfacemgr.c
rename to contrib/bind/bin/named/interfacemgr.c

diff --git a/contrib/bind-9.5.2/bin/named/listenlist.c b/contrib/bind/bin/named/listenlist.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/listenlist.c
rename to contrib/bind/bin/named/listenlist.c

diff --git a/contrib/bind-9.5.2/bin/named/log.c b/contrib/bind/bin/named/log.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/log.c
rename to contrib/bind/bin/named/log.c

diff --git a/contrib/bind-9.5.2/bin/named/logconf.c b/contrib/bind/bin/named/logconf.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/logconf.c
rename to contrib/bind/bin/named/logconf.c

diff --git a/contrib/bind-9.5.2/bin/named/lwaddr.c b/contrib/bind/bin/named/lwaddr.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/lwaddr.c
rename to contrib/bind/bin/named/lwaddr.c

diff --git a/contrib/bind-9.5.2/bin/named/lwdclient.c b/contrib/bind/bin/named/lwdclient.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/lwdclient.c
rename to contrib/bind/bin/named/lwdclient.c

diff --git a/contrib/bind-9.5.2/bin/named/lwderror.c b/contrib/bind/bin/named/lwderror.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/lwderror.c
rename to contrib/bind/bin/named/lwderror.c

diff --git a/contrib/bind-9.5.2/bin/named/lwdgabn.c b/contrib/bind/bin/named/lwdgabn.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/lwdgabn.c
rename to contrib/bind/bin/named/lwdgabn.c

diff --git a/contrib/bind-9.5.2/bin/named/lwdgnba.c b/contrib/bind/bin/named/lwdgnba.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/lwdgnba.c
rename to contrib/bind/bin/named/lwdgnba.c

diff --git a/contrib/bind-9.5.2/bin/named/lwdgrbn.c b/contrib/bind/bin/named/lwdgrbn.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/lwdgrbn.c
rename to contrib/bind/bin/named/lwdgrbn.c

diff --git a/contrib/bind-9.5.2/bin/named/lwdnoop.c b/contrib/bind/bin/named/lwdnoop.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/lwdnoop.c
rename to contrib/bind/bin/named/lwdnoop.c

diff --git a/contrib/bind-9.5.2/bin/named/lwresd.8 b/contrib/bind/bin/named/lwresd.8
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/lwresd.8
rename to contrib/bind/bin/named/lwresd.8

diff --git a/contrib/bind-9.5.2/bin/named/lwresd.c b/contrib/bind/bin/named/lwresd.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/lwresd.c
rename to contrib/bind/bin/named/lwresd.c

diff --git a/contrib/bind-9.5.2/bin/named/lwresd.html b/contrib/bind/bin/named/lwresd.html
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/lwresd.html
rename to contrib/bind/bin/named/lwresd.html

diff --git a/contrib/bind-9.5.2/bin/named/lwsearch.c b/contrib/bind/bin/named/lwsearch.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/lwsearch.c
rename to contrib/bind/bin/named/lwsearch.c

diff --git a/contrib/bind-9.5.2/bin/named/main.c b/contrib/bind/bin/named/main.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/main.c
rename to contrib/bind/bin/named/main.c

diff --git a/contrib/bind-9.5.2/bin/named/named.8 b/contrib/bind/bin/named/named.8
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/named.8
rename to contrib/bind/bin/named/named.8

diff --git a/contrib/bind-9.5.2/bin/named/named.conf.5 b/contrib/bind/bin/named/named.conf.5
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/named.conf.5
rename to contrib/bind/bin/named/named.conf.5

diff --git a/contrib/bind-9.5.2/bin/named/named.conf.html b/contrib/bind/bin/named/named.conf.html
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/named.conf.html
rename to contrib/bind/bin/named/named.conf.html

diff --git a/contrib/bind-9.5.2/bin/named/named.html b/contrib/bind/bin/named/named.html
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/named.html
rename to contrib/bind/bin/named/named.html

diff --git a/contrib/bind-9.5.2/bin/named/notify.c b/contrib/bind/bin/named/notify.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/notify.c
rename to contrib/bind/bin/named/notify.c

diff --git a/contrib/bind-9.5.2/bin/named/query.c b/contrib/bind/bin/named/query.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/query.c
rename to contrib/bind/bin/named/query.c

diff --git a/contrib/bind-9.5.2/bin/named/server.c b/contrib/bind/bin/named/server.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/server.c
rename to contrib/bind/bin/named/server.c

diff --git a/contrib/bind-9.5.2/bin/named/sortlist.c b/contrib/bind/bin/named/sortlist.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/sortlist.c
rename to contrib/bind/bin/named/sortlist.c

diff --git a/contrib/bind-9.5.2/bin/named/statschannel.c b/contrib/bind/bin/named/statschannel.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/statschannel.c
rename to contrib/bind/bin/named/statschannel.c

diff --git a/contrib/bind-9.5.2/bin/named/tkeyconf.c b/contrib/bind/bin/named/tkeyconf.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/tkeyconf.c
rename to contrib/bind/bin/named/tkeyconf.c

diff --git a/contrib/bind-9.5.2/bin/named/tsigconf.c b/contrib/bind/bin/named/tsigconf.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/tsigconf.c
rename to contrib/bind/bin/named/tsigconf.c

diff --git a/contrib/bind-9.5.2/bin/named/unix/include/named/os.h b/contrib/bind/bin/named/unix/include/named/os.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/unix/include/named/os.h
rename to contrib/bind/bin/named/unix/include/named/os.h

diff --git a/contrib/bind-9.5.2/bin/named/unix/os.c b/contrib/bind/bin/named/unix/os.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/unix/os.c
rename to contrib/bind/bin/named/unix/os.c

diff --git a/contrib/bind-9.5.2/bin/named/update.c b/contrib/bind/bin/named/update.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/update.c
rename to contrib/bind/bin/named/update.c

diff --git a/contrib/bind-9.5.2/bin/named/xfrout.c b/contrib/bind/bin/named/xfrout.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/xfrout.c
rename to contrib/bind/bin/named/xfrout.c

diff --git a/contrib/bind-9.5.2/bin/named/zoneconf.c b/contrib/bind/bin/named/zoneconf.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/named/zoneconf.c
rename to contrib/bind/bin/named/zoneconf.c

diff --git a/contrib/bind-9.5.2/bin/nsupdate/nsupdate.1 b/contrib/bind/bin/nsupdate/nsupdate.1
similarity index 100%
rename from contrib/bind-9.5.2/bin/nsupdate/nsupdate.1
rename to contrib/bind/bin/nsupdate/nsupdate.1

diff --git a/contrib/bind-9.5.2/bin/nsupdate/nsupdate.c b/contrib/bind/bin/nsupdate/nsupdate.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/nsupdate/nsupdate.c
rename to contrib/bind/bin/nsupdate/nsupdate.c

diff --git a/contrib/bind-9.5.2/bin/nsupdate/nsupdate.html b/contrib/bind/bin/nsupdate/nsupdate.html
similarity index 100%
rename from contrib/bind-9.5.2/bin/nsupdate/nsupdate.html
rename to contrib/bind/bin/nsupdate/nsupdate.html

diff --git a/contrib/bind-9.5.2/bin/rndc/include/rndc/os.h b/contrib/bind/bin/rndc/include/rndc/os.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/rndc/include/rndc/os.h
rename to contrib/bind/bin/rndc/include/rndc/os.h

diff --git a/contrib/bind-9.5.2/bin/rndc/rndc-confgen.8 b/contrib/bind/bin/rndc/rndc-confgen.8
similarity index 100%
rename from contrib/bind-9.5.2/bin/rndc/rndc-confgen.8
rename to contrib/bind/bin/rndc/rndc-confgen.8

diff --git a/contrib/bind-9.5.2/bin/rndc/rndc-confgen.c b/contrib/bind/bin/rndc/rndc-confgen.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/rndc/rndc-confgen.c
rename to contrib/bind/bin/rndc/rndc-confgen.c

diff --git a/contrib/bind-9.5.2/bin/rndc/rndc-confgen.html b/contrib/bind/bin/rndc/rndc-confgen.html
similarity index 100%
rename from contrib/bind-9.5.2/bin/rndc/rndc-confgen.html
rename to contrib/bind/bin/rndc/rndc-confgen.html

diff --git a/contrib/bind-9.5.2/bin/rndc/rndc.8 b/contrib/bind/bin/rndc/rndc.8
similarity index 100%
rename from contrib/bind-9.5.2/bin/rndc/rndc.8
rename to contrib/bind/bin/rndc/rndc.8

diff --git a/contrib/bind-9.5.2/bin/rndc/rndc.c b/contrib/bind/bin/rndc/rndc.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/rndc/rndc.c
rename to contrib/bind/bin/rndc/rndc.c

diff --git a/contrib/bind-9.5.2/bin/rndc/rndc.conf b/contrib/bind/bin/rndc/rndc.conf
similarity index 100%
rename from contrib/bind-9.5.2/bin/rndc/rndc.conf
rename to contrib/bind/bin/rndc/rndc.conf

diff --git a/contrib/bind-9.5.2/bin/rndc/rndc.conf.5 b/contrib/bind/bin/rndc/rndc.conf.5
similarity index 100%
rename from contrib/bind-9.5.2/bin/rndc/rndc.conf.5
rename to contrib/bind/bin/rndc/rndc.conf.5

diff --git a/contrib/bind-9.5.2/bin/rndc/rndc.conf.html b/contrib/bind/bin/rndc/rndc.conf.html
similarity index 100%
rename from contrib/bind-9.5.2/bin/rndc/rndc.conf.html
rename to contrib/bind/bin/rndc/rndc.conf.html

diff --git a/contrib/bind-9.5.2/bin/rndc/rndc.html b/contrib/bind/bin/rndc/rndc.html
similarity index 100%
rename from contrib/bind-9.5.2/bin/rndc/rndc.html
rename to contrib/bind/bin/rndc/rndc.html

diff --git a/contrib/bind-9.5.2/bin/rndc/unix/os.c b/contrib/bind/bin/rndc/unix/os.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/rndc/unix/os.c
rename to contrib/bind/bin/rndc/unix/os.c

diff --git a/contrib/bind-9.5.2/bin/rndc/util.c b/contrib/bind/bin/rndc/util.c
similarity index 100%
rename from contrib/bind-9.5.2/bin/rndc/util.c
rename to contrib/bind/bin/rndc/util.c

diff --git a/contrib/bind-9.5.2/bin/rndc/util.h b/contrib/bind/bin/rndc/util.h
similarity index 100%
rename from contrib/bind-9.5.2/bin/rndc/util.h
rename to contrib/bind/bin/rndc/util.h

diff --git a/contrib/bind-9.5.2/bind.keys b/contrib/bind/bind.keys
similarity index 100%
rename from contrib/bind-9.5.2/bind.keys
rename to contrib/bind/bind.keys

diff --git a/contrib/bind-9.5.2/lib/bind/README b/contrib/bind/lib/bind/README
similarity index 100%
rename from contrib/bind-9.5.2/lib/bind/README
rename to contrib/bind/lib/bind/README

diff --git a/contrib/bind-9.5.2/lib/bind/api b/contrib/bind/lib/bind/api
similarity index 100%
rename from contrib/bind-9.5.2/lib/bind/api
rename to contrib/bind/lib/bind/api

diff --git a/contrib/bind-9.5.2/lib/bind/bsd/daemon.c b/contrib/bind/lib/bind/bsd/daemon.c
similarity index 100%
rename from contrib/bind-9.5.2/lib/bind/bsd/daemon.c
rename to contrib/bind/lib/bind/bsd/daemon.c

diff --git a/contrib/bind-9.5.2/lib/bind/bsd/ftruncate.c b/contrib/bind/lib/bind/bsd/ftruncate.c
similarity index 100%
rename from contrib/bind-9.5.2/lib/bind/bsd/ftruncate.c
rename to contrib/bind/lib/bind/bsd/ftruncate.c

diff --git a/contrib/bind-9.5.2/lib/bind/bsd/gettimeofday.c b/contrib/bind/lib/bind/bsd/gettimeofday.c
similarity index 100%
rename from contrib/bind-9.5.2/lib/bind/bsd/gettimeofday.c
rename to contrib/bind/lib/bind/bsd/gettimeofday.c

diff --git a/contrib/bind-9.5.2/lib/bind/bsd/mktemp.c b/contrib/bind/lib/bind/bsd/mktemp.c
similarity index 100%
rename from contrib/bind-9.5.2/lib/bind/bsd/mktemp.c
rename to contrib/bind/lib/bind/bsd/mktemp.c

diff --git a/contrib/bind-9.5.2/lib/bind/bsd/putenv.c b/contrib/bind/lib/bind/bsd/putenv.c
similarity index 100%
rename from contrib/bind-9.5.2/lib/bind/bsd/putenv.c
rename to contrib/bind/lib/bind/bsd/putenv.c

diff --git a/contrib/bind-9.5.2/lib/bind/bsd/readv.c b/contrib/bind/lib/bind/bsd/readv.c
similarity index 100%
rename from contrib/bind-9.5.2/lib/bind/bsd/readv.c
rename to contrib/bind/lib/bind/bsd/readv.c

diff --git a/contrib/bind-9.5.2/lib/bind/bsd/setenv.c b/contrib/bind/lib/bind/bsd/setenv.c
similarity index 100%
rename from contrib/bind-9.5.2/lib/bind/bsd/setenv.c
rename to contrib/bind/lib/bind/bsd/setenv.c

diff --git a/contrib/bind-9.5.2/lib/bind/bsd/setitimer.c b/contrib/bind/lib/bind/bsd/setitimer.c
similarity index 100%
rename from contrib/bind-9.5.2/lib/bind/bsd/setitimer.c
rename to contrib/bind/lib/bind/bsd/setitimer.c

diff --git a/contrib/bind-9.5.2/lib/bind/bsd/strcasecmp.c b/contrib/bind/lib/bind/bsd/strcasecmp.c
similarity index 100%
rename from contrib/bind-9.5.2/lib/bind/bsd/strcasecmp.c
rename to contrib/bind/lib/bind/bsd/strcasecmp.c

diff --git a/contrib/bind-9.5.2/lib/bind/bsd/strdup.c b/contrib/bind/lib/bind/bsd/strdup.c
similarity index 100%
rename from contrib/bind-9.5.2/lib/bind/bsd/strdup.c
rename to contrib/bind/lib/bind/bsd/strdup.c

diff --git a/contrib/bind-9.5.2/lib/bind/bsd/strerror.c b/contrib/bind/lib/bind/bsd/strerror.c
similarity index 100%
rename from contrib/bind-9.5.2/lib/bind/bsd/strerror.c
rename to contrib/bind/lib/bind/bsd/strerror.c

diff --git a/contrib/bind-9.5.2/lib/bind/bsd/strpbrk.c b/contrib/bind/lib/bind/bsd/strpbrk.c
similarity index 100%
rename from contrib/bind-9.5.2/lib/bind/bsd/strpbrk.c
rename to contrib/bind/lib/bind/bsd/strpbrk.c