From 145ff8cc1d0ae241c5a55da53f5fc2529014dcd2 Mon Sep 17 00:00:00 2001 From: Jan Lentfer Date: Thu, 3 Dec 2009 14:46:20 +0100 Subject: [PATCH] bind - Removed version tag from contrib directory and updated README.DRAGONFLY. --- contrib/bind-9.5.2/README.DRAGONFLY | 58 ------------------- contrib/{bind-9.5.2 => bind}/CHANGES | 0 contrib/{bind-9.5.2 => bind}/COPYRIGHT | 0 contrib/{bind-9.5.2 => bind}/FAQ | 0 contrib/{bind-9.5.2 => bind}/README | 0 contrib/{bind-9.5.2 => bind}/README.DELETED | 0 contrib/bind/README.DRAGONFLY | 32 ++++++++++ contrib/{bind-9.5.2 => bind}/README.idnkit | 0 .../bin/check/check-tool.c | 0 .../bin/check/check-tool.h | 0 .../bin/check/named-checkconf.8 | 0 .../bin/check/named-checkconf.c | 0 .../bin/check/named-checkconf.html | 0 .../bin/check/named-checkzone.8 | 0 .../bin/check/named-checkzone.c | 0 .../bin/check/named-checkzone.html | 0 contrib/{bind-9.5.2 => bind}/bin/dig/dig.1 | 0 contrib/{bind-9.5.2 => bind}/bin/dig/dig.c | 0 contrib/{bind-9.5.2 => bind}/bin/dig/dig.html | 0 .../{bind-9.5.2 => bind}/bin/dig/dighost.c | 0 contrib/{bind-9.5.2 => bind}/bin/dig/host.1 | 0 contrib/{bind-9.5.2 => bind}/bin/dig/host.c | 0 .../{bind-9.5.2 => bind}/bin/dig/host.html | 0 .../bin/dig/include/dig/dig.h | 0 .../{bind-9.5.2 => bind}/bin/dig/nslookup.1 | 0 .../{bind-9.5.2 => bind}/bin/dig/nslookup.c | 0 .../bin/dig/nslookup.html | 0 .../bin/dnssec/dnssec-keygen.8 | 0 .../bin/dnssec/dnssec-keygen.c | 0 .../bin/dnssec/dnssec-keygen.html | 0 .../bin/dnssec/dnssec-signzone.8 | 0 .../bin/dnssec/dnssec-signzone.c | 0 .../bin/dnssec/dnssec-signzone.html | 0 .../bin/dnssec/dnssectool.c | 0 .../bin/dnssec/dnssectool.h | 0 .../{bind-9.5.2 => bind}/bin/named/bind9.xsl | 0 .../bin/named/bind9.xsl.h | 0 .../{bind-9.5.2 => bind}/bin/named/builtin.c | 0 .../{bind-9.5.2 => bind}/bin/named/client.c | 0 .../{bind-9.5.2 => bind}/bin/named/config.c | 0 .../{bind-9.5.2 => bind}/bin/named/control.c | 0 .../bin/named/controlconf.c | 0 .../bin/named/convertxsl.pl | 0 .../bin/named/include/named/builtin.h | 0 .../bin/named/include/named/client.h | 0 .../bin/named/include/named/config.h | 0 .../bin/named/include/named/control.h | 0 .../bin/named/include/named/globals.h | 0 .../bin/named/include/named/interfacemgr.h | 0 .../bin/named/include/named/listenlist.h | 0 .../bin/named/include/named/log.h | 0 .../bin/named/include/named/logconf.h | 0 .../bin/named/include/named/lwaddr.h | 0 .../bin/named/include/named/lwdclient.h | 0 .../bin/named/include/named/lwresd.h | 0 .../bin/named/include/named/lwsearch.h | 0 .../bin/named/include/named/main.h | 0 .../bin/named/include/named/notify.h | 0 .../bin/named/include/named/ns_smf_globals.h | 0 .../bin/named/include/named/query.h | 0 .../bin/named/include/named/server.h | 0 .../bin/named/include/named/sortlist.h | 0 .../bin/named/include/named/statschannel.h | 0 .../bin/named/include/named/tkeyconf.h | 0 .../bin/named/include/named/tsigconf.h | 0 .../bin/named/include/named/types.h | 0 .../bin/named/include/named/update.h | 0 .../bin/named/include/named/xfrout.h | 0 .../bin/named/include/named/zoneconf.h | 0 .../bin/named/interfacemgr.c | 0 .../bin/named/listenlist.c | 0 contrib/{bind-9.5.2 => bind}/bin/named/log.c | 0 .../{bind-9.5.2 => bind}/bin/named/logconf.c | 0 .../{bind-9.5.2 => bind}/bin/named/lwaddr.c | 0 .../bin/named/lwdclient.c | 0 .../{bind-9.5.2 => bind}/bin/named/lwderror.c | 0 .../{bind-9.5.2 => bind}/bin/named/lwdgabn.c | 0 .../{bind-9.5.2 => bind}/bin/named/lwdgnba.c | 0 .../{bind-9.5.2 => bind}/bin/named/lwdgrbn.c | 0 .../{bind-9.5.2 => bind}/bin/named/lwdnoop.c | 0 .../{bind-9.5.2 => bind}/bin/named/lwresd.8 | 0 .../{bind-9.5.2 => bind}/bin/named/lwresd.c | 0 .../bin/named/lwresd.html | 0 .../{bind-9.5.2 => bind}/bin/named/lwsearch.c | 0 contrib/{bind-9.5.2 => bind}/bin/named/main.c | 0 .../{bind-9.5.2 => bind}/bin/named/named.8 | 0 .../bin/named/named.conf.5 | 0 .../bin/named/named.conf.html | 0 .../{bind-9.5.2 => bind}/bin/named/named.html | 0 .../{bind-9.5.2 => bind}/bin/named/notify.c | 0 .../{bind-9.5.2 => bind}/bin/named/query.c | 0 .../{bind-9.5.2 => bind}/bin/named/server.c | 0 .../{bind-9.5.2 => bind}/bin/named/sortlist.c | 0 .../bin/named/statschannel.c | 0 .../{bind-9.5.2 => bind}/bin/named/tkeyconf.c | 0 .../{bind-9.5.2 => bind}/bin/named/tsigconf.c | 0 .../bin/named/unix/include/named/os.h | 0 .../{bind-9.5.2 => bind}/bin/named/unix/os.c | 0 .../{bind-9.5.2 => bind}/bin/named/update.c | 0 .../{bind-9.5.2 => bind}/bin/named/xfrout.c | 0 .../{bind-9.5.2 => bind}/bin/named/zoneconf.c | 0 .../bin/nsupdate/nsupdate.1 | 0 .../bin/nsupdate/nsupdate.c | 0 .../bin/nsupdate/nsupdate.html | 0 .../bin/rndc/include/rndc/os.h | 0 .../bin/rndc/rndc-confgen.8 | 0 .../bin/rndc/rndc-confgen.c | 0 .../bin/rndc/rndc-confgen.html | 0 contrib/{bind-9.5.2 => bind}/bin/rndc/rndc.8 | 0 contrib/{bind-9.5.2 => bind}/bin/rndc/rndc.c | 0 .../{bind-9.5.2 => bind}/bin/rndc/rndc.conf | 0 .../{bind-9.5.2 => bind}/bin/rndc/rndc.conf.5 | 0 .../bin/rndc/rndc.conf.html | 0 .../{bind-9.5.2 => bind}/bin/rndc/rndc.html | 0 .../{bind-9.5.2 => bind}/bin/rndc/unix/os.c | 0 contrib/{bind-9.5.2 => bind}/bin/rndc/util.c | 0 contrib/{bind-9.5.2 => bind}/bin/rndc/util.h | 0 contrib/{bind-9.5.2 => bind}/bind.keys | 0 contrib/{bind-9.5.2 => bind}/lib/bind/README | 0 contrib/{bind-9.5.2 => bind}/lib/bind/api | 0 .../lib/bind/bsd/daemon.c | 0 .../lib/bind/bsd/ftruncate.c | 0 .../lib/bind/bsd/gettimeofday.c | 0 .../lib/bind/bsd/mktemp.c | 0 .../lib/bind/bsd/putenv.c | 0 .../{bind-9.5.2 => bind}/lib/bind/bsd/readv.c | 0 .../lib/bind/bsd/setenv.c | 0 .../lib/bind/bsd/setitimer.c | 0 .../lib/bind/bsd/strcasecmp.c | 0 .../lib/bind/bsd/strdup.c | 0 .../lib/bind/bsd/strerror.c | 0 .../lib/bind/bsd/strpbrk.c | 0 .../lib/bind/bsd/strsep.c | 0 .../lib/bind/bsd/strtoul.c | 0 .../lib/bind/bsd/utimes.c | 0 .../lib/bind/bsd/writev.c | 0 .../{bind-9.5.2 => bind}/lib/bind/config.h.in | 0 .../lib/bind/dst/dst_api.c | 0 .../lib/bind/dst/dst_internal.h | 0 .../lib/bind/dst/hmac_link.c | 0 .../{bind-9.5.2 => bind}/lib/bind/dst/md5.h | 0 .../lib/bind/dst/md5_dgst.c | 0 .../lib/bind/dst/md5_locl.h | 0 .../lib/bind/dst/support.c | 0 .../lib/bind/include/arpa/inet.h | 0 .../lib/bind/include/arpa/nameser.h | 0 .../lib/bind/include/arpa/nameser_compat.h | 0 .../lib/bind/include/fd_setsize.h | 0 .../lib/bind/include/hesiod.h | 0 .../lib/bind/include/irp.h | 0 .../lib/bind/include/irs.h | 0 .../lib/bind/include/isc/assertions.h | 0 .../lib/bind/include/isc/ctl.h | 0 .../lib/bind/include/isc/dst.h | 0 .../lib/bind/include/isc/eventlib.h | 0 .../lib/bind/include/isc/heap.h | 0 .../lib/bind/include/isc/irpmarshall.h | 0 .../lib/bind/include/isc/list.h | 0 .../lib/bind/include/isc/logging.h | 0 .../lib/bind/include/isc/memcluster.h | 0 .../lib/bind/include/isc/misc.h | 0 .../lib/bind/include/isc/platform.h.in | 0 .../lib/bind/include/isc/tree.h | 0 .../lib/bind/include/netdb.h | 0 .../lib/bind/include/netgroup.h | 0 .../lib/bind/include/res_update.h | 0 .../lib/bind/include/resolv.h | 0 .../lib/bind/include/resolv_mt.h | 0 .../lib/bind/inet/inet_addr.c | 0 .../lib/bind/inet/inet_cidr_ntop.c | 0 .../lib/bind/inet/inet_cidr_pton.c | 0 .../lib/bind/inet/inet_data.c | 0 .../lib/bind/inet/inet_lnaof.c | 0 .../lib/bind/inet/inet_makeaddr.c | 0 .../lib/bind/inet/inet_net_ntop.c | 0 .../lib/bind/inet/inet_net_pton.c | 0 .../lib/bind/inet/inet_neta.c | 0 .../lib/bind/inet/inet_netof.c | 0 .../lib/bind/inet/inet_network.c | 0 .../lib/bind/inet/inet_ntoa.c | 0 .../lib/bind/inet/inet_ntop.c | 0 .../lib/bind/inet/inet_pton.c | 0 .../lib/bind/inet/nsap_addr.c | 0 .../{bind-9.5.2 => bind}/lib/bind/irs/dns.c | 0 .../lib/bind/irs/dns_gr.c | 0 .../lib/bind/irs/dns_ho.c | 0 .../lib/bind/irs/dns_nw.c | 0 .../{bind-9.5.2 => bind}/lib/bind/irs/dns_p.h | 0 .../lib/bind/irs/dns_pr.c | 0 .../lib/bind/irs/dns_pw.c | 0 .../lib/bind/irs/dns_sv.c | 0 .../lib/bind/irs/gai_strerror.c | 0 .../{bind-9.5.2 => bind}/lib/bind/irs/gen.c | 0 .../lib/bind/irs/gen_gr.c | 0 .../lib/bind/irs/gen_ho.c | 0 .../lib/bind/irs/gen_ng.c | 0 .../lib/bind/irs/gen_nw.c | 0 .../{bind-9.5.2 => bind}/lib/bind/irs/gen_p.h | 0 .../lib/bind/irs/gen_pr.c | 0 .../lib/bind/irs/gen_pw.c | 0 .../lib/bind/irs/gen_sv.c | 0 .../lib/bind/irs/getaddrinfo.c | 0 .../lib/bind/irs/getgrent.c | 0 .../lib/bind/irs/getgrent_r.c | 0 .../lib/bind/irs/gethostent.c | 0 .../lib/bind/irs/gethostent_r.c | 0 .../lib/bind/irs/getnameinfo.c | 0 .../lib/bind/irs/getnetent.c | 0 .../lib/bind/irs/getnetent_r.c | 0 .../lib/bind/irs/getnetgrent.c | 0 .../lib/bind/irs/getnetgrent_r.c | 0 .../lib/bind/irs/getprotoent.c | 0 .../lib/bind/irs/getprotoent_r.c | 0 .../lib/bind/irs/getpwent.c | 0 .../lib/bind/irs/getpwent_r.c | 0 .../lib/bind/irs/getservent.c | 0 .../lib/bind/irs/getservent_r.c | 0 .../lib/bind/irs/hesiod.c | 0 .../lib/bind/irs/hesiod_p.h | 0 .../{bind-9.5.2 => bind}/lib/bind/irs/irp.c | 0 .../lib/bind/irs/irp_gr.c | 0 .../lib/bind/irs/irp_ho.c | 0 .../lib/bind/irs/irp_ng.c | 0 .../lib/bind/irs/irp_nw.c | 0 .../{bind-9.5.2 => bind}/lib/bind/irs/irp_p.h | 0 .../lib/bind/irs/irp_pr.c | 0 .../lib/bind/irs/irp_pw.c | 0 .../lib/bind/irs/irp_sv.c | 0 .../lib/bind/irs/irpmarshall.c | 0 .../lib/bind/irs/irs_data.c | 0 .../lib/bind/irs/irs_data.h | 0 .../{bind-9.5.2 => bind}/lib/bind/irs/irs_p.h | 0 .../{bind-9.5.2 => bind}/lib/bind/irs/lcl.c | 0 .../lib/bind/irs/lcl_gr.c | 0 .../lib/bind/irs/lcl_ho.c | 0 .../lib/bind/irs/lcl_ng.c | 0 .../lib/bind/irs/lcl_nw.c | 0 .../{bind-9.5.2 => bind}/lib/bind/irs/lcl_p.h | 0 .../lib/bind/irs/lcl_pr.c | 0 .../lib/bind/irs/lcl_pw.c | 0 .../lib/bind/irs/lcl_sv.c | 0 .../{bind-9.5.2 => bind}/lib/bind/irs/nis.c | 0 .../lib/bind/irs/nis_gr.c | 0 .../lib/bind/irs/nis_ho.c | 0 .../lib/bind/irs/nis_ng.c | 0 .../lib/bind/irs/nis_nw.c | 0 .../{bind-9.5.2 => bind}/lib/bind/irs/nis_p.h | 0 .../lib/bind/irs/nis_pr.c | 0 .../lib/bind/irs/nis_pw.c | 0 .../lib/bind/irs/nis_sv.c | 0 .../lib/bind/irs/nul_ng.c | 0 .../lib/bind/irs/pathnames.h | 0 .../{bind-9.5.2 => bind}/lib/bind/irs/util.c | 0 .../lib/bind/isc/assertions.c | 0 .../lib/bind/isc/assertions.mdoc | 0 .../lib/bind/isc/base64.c | 0 .../lib/bind/isc/bitncmp.c | 0 .../lib/bind/isc/bitncmp.mdoc | 0 .../lib/bind/isc/ctl_clnt.c | 0 .../{bind-9.5.2 => bind}/lib/bind/isc/ctl_p.c | 0 .../{bind-9.5.2 => bind}/lib/bind/isc/ctl_p.h | 0 .../lib/bind/isc/ctl_srvr.c | 0 .../lib/bind/isc/ev_connects.c | 0 .../lib/bind/isc/ev_files.c | 0 .../lib/bind/isc/ev_streams.c | 0 .../lib/bind/isc/ev_timers.c | 0 .../lib/bind/isc/ev_waits.c | 0 .../lib/bind/isc/eventlib.c | 0 .../lib/bind/isc/eventlib.mdoc | 0 .../lib/bind/isc/eventlib_p.h | 0 .../{bind-9.5.2 => bind}/lib/bind/isc/heap.c | 0 .../lib/bind/isc/heap.mdoc | 0 .../{bind-9.5.2 => bind}/lib/bind/isc/hex.c | 0 .../lib/bind/isc/logging.c | 0 .../lib/bind/isc/logging.mdoc | 0 .../lib/bind/isc/logging_p.h | 0 .../lib/bind/isc/memcluster.c | 0 .../lib/bind/isc/memcluster.mdoc | 0 .../lib/bind/isc/movefile.c | 0 .../{bind-9.5.2 => bind}/lib/bind/isc/tree.c | 0 .../lib/bind/isc/tree.mdoc | 0 .../lib/bind/make/includes.in | 0 .../lib/bind/make/mkdep.in | 0 .../lib/bind/make/rules.in | 0 .../lib/bind/mkinstalldirs | 0 .../lib/bind/nameser/ns_date.c | 0 .../lib/bind/nameser/ns_name.c | 0 .../lib/bind/nameser/ns_netint.c | 0 .../lib/bind/nameser/ns_parse.c | 0 .../lib/bind/nameser/ns_print.c | 0 .../lib/bind/nameser/ns_samedomain.c | 0 .../lib/bind/nameser/ns_sign.c | 0 .../lib/bind/nameser/ns_ttl.c | 0 .../lib/bind/nameser/ns_verify.c | 0 .../bind/port/freebsd/include/sys/bitypes.h | 0 .../lib/bind/port_after.h.in | 0 .../lib/bind/port_before.h.in | 0 .../lib/bind/resolv/herror.c | 0 .../lib/bind/resolv/mtctxres.c | 0 .../lib/bind/resolv/res_comp.c | 0 .../lib/bind/resolv/res_data.c | 0 .../lib/bind/resolv/res_debug.c | 0 .../lib/bind/resolv/res_debug.h | 0 .../lib/bind/resolv/res_findzonecut.c | 0 .../lib/bind/resolv/res_init.c | 0 .../lib/bind/resolv/res_mkquery.c | 0 .../lib/bind/resolv/res_mkupdate.c | 0 .../lib/bind/resolv/res_mkupdate.h | 0 .../lib/bind/resolv/res_private.h | 0 .../lib/bind/resolv/res_query.c | 0 .../lib/bind/resolv/res_send.c | 0 .../lib/bind/resolv/res_sendsigned.c | 0 .../lib/bind/resolv/res_update.c | 0 contrib/{bind-9.5.2 => bind}/lib/bind9/api | 0 .../{bind-9.5.2 => bind}/lib/bind9/check.c | 0 .../lib/bind9/getaddresses.c | 0 .../lib/bind9/include/bind9/check.h | 0 .../lib/bind9/include/bind9/getaddresses.h | 0 .../lib/bind9/include/bind9/version.h | 0 .../{bind-9.5.2 => bind}/lib/bind9/version.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/acache.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/acl.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/adb.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/api | 0 contrib/{bind-9.5.2 => bind}/lib/dns/byaddr.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/cache.c | 0 .../{bind-9.5.2 => bind}/lib/dns/callbacks.c | 0 .../{bind-9.5.2 => bind}/lib/dns/compress.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/db.c | 0 .../{bind-9.5.2 => bind}/lib/dns/dbiterator.c | 0 .../{bind-9.5.2 => bind}/lib/dns/dbtable.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/diff.c | 0 .../{bind-9.5.2 => bind}/lib/dns/dispatch.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/dlz.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/dnssec.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/ds.c | 0 .../{bind-9.5.2 => bind}/lib/dns/dst_api.c | 0 .../lib/dns/dst_internal.h | 0 .../{bind-9.5.2 => bind}/lib/dns/dst_lib.c | 0 .../lib/dns/dst_openssl.h | 0 .../{bind-9.5.2 => bind}/lib/dns/dst_parse.c | 0 .../{bind-9.5.2 => bind}/lib/dns/dst_parse.h | 0 .../{bind-9.5.2 => bind}/lib/dns/dst_result.c | 0 .../{bind-9.5.2 => bind}/lib/dns/forward.c | 0 .../{bind-9.5.2 => bind}/lib/dns/gen-unix.h | 0 .../{bind-9.5.2 => bind}/lib/dns/gen-win32.h | 0 contrib/{bind-9.5.2 => bind}/lib/dns/gen.c | 0 .../lib/dns/gssapi_link.c | 0 .../{bind-9.5.2 => bind}/lib/dns/gssapictx.c | 0 .../{bind-9.5.2 => bind}/lib/dns/hmac_link.c | 0 .../lib/dns/include/dns/acache.h | 0 .../lib/dns/include/dns/acl.h | 0 .../lib/dns/include/dns/adb.h | 0 .../lib/dns/include/dns/bit.h | 0 .../lib/dns/include/dns/byaddr.h | 0 .../lib/dns/include/dns/cache.h | 0 .../lib/dns/include/dns/callbacks.h | 0 .../lib/dns/include/dns/cert.h | 0 .../lib/dns/include/dns/compress.h | 0 .../lib/dns/include/dns/db.h | 0 .../lib/dns/include/dns/dbiterator.h | 0 .../lib/dns/include/dns/dbtable.h | 0 .../lib/dns/include/dns/diff.h | 0 .../lib/dns/include/dns/dispatch.h | 0 .../lib/dns/include/dns/dlz.h | 0 .../lib/dns/include/dns/dnssec.h | 0 .../lib/dns/include/dns/ds.h | 0 .../lib/dns/include/dns/events.h | 0 .../lib/dns/include/dns/fixedname.h | 0 .../lib/dns/include/dns/forward.h | 0 .../lib/dns/include/dns/iptable.h | 0 .../lib/dns/include/dns/journal.h | 0 .../lib/dns/include/dns/keyflags.h | 0 .../lib/dns/include/dns/keytable.h | 0 .../lib/dns/include/dns/keyvalues.h | 0 .../lib/dns/include/dns/lib.h | 0 .../lib/dns/include/dns/log.h | 0 .../lib/dns/include/dns/lookup.h | 0 .../lib/dns/include/dns/master.h | 0 .../lib/dns/include/dns/masterdump.h | 0 .../lib/dns/include/dns/message.h | 0 .../lib/dns/include/dns/name.h | 0 .../lib/dns/include/dns/ncache.h | 0 .../lib/dns/include/dns/nsec.h | 0 .../lib/dns/include/dns/opcode.h | 0 .../lib/dns/include/dns/order.h | 0 .../lib/dns/include/dns/peer.h | 0 .../lib/dns/include/dns/portlist.h | 0 .../lib/dns/include/dns/rbt.h | 0 .../lib/dns/include/dns/rcode.h | 0 .../lib/dns/include/dns/rdata.h | 0 .../lib/dns/include/dns/rdataclass.h | 0 .../lib/dns/include/dns/rdatalist.h | 0 .../lib/dns/include/dns/rdataset.h | 0 .../lib/dns/include/dns/rdatasetiter.h | 0 .../lib/dns/include/dns/rdataslab.h | 0 .../lib/dns/include/dns/rdatatype.h | 0 .../lib/dns/include/dns/request.h | 0 .../lib/dns/include/dns/resolver.h | 0 .../lib/dns/include/dns/result.h | 0 .../lib/dns/include/dns/rootns.h | 0 .../lib/dns/include/dns/sdb.h | 0 .../lib/dns/include/dns/sdlz.h | 0 .../lib/dns/include/dns/secalg.h | 0 .../lib/dns/include/dns/secproto.h | 0 .../lib/dns/include/dns/soa.h | 0 .../lib/dns/include/dns/ssu.h | 0 .../lib/dns/include/dns/stats.h | 0 .../lib/dns/include/dns/tcpmsg.h | 0 .../lib/dns/include/dns/time.h | 0 .../lib/dns/include/dns/timer.h | 0 .../lib/dns/include/dns/tkey.h | 0 .../lib/dns/include/dns/tsig.h | 0 .../lib/dns/include/dns/ttl.h | 0 .../lib/dns/include/dns/types.h | 0 .../lib/dns/include/dns/validator.h | 0 .../lib/dns/include/dns/version.h | 0 .../lib/dns/include/dns/view.h | 0 .../lib/dns/include/dns/xfrin.h | 0 .../lib/dns/include/dns/zone.h | 0 .../lib/dns/include/dns/zonekey.h | 0 .../lib/dns/include/dns/zt.h | 0 .../lib/dns/include/dst/dst.h | 0 .../lib/dns/include/dst/gssapi.h | 0 .../lib/dns/include/dst/lib.h | 0 .../lib/dns/include/dst/result.h | 0 .../{bind-9.5.2 => bind}/lib/dns/iptable.c | 0 .../{bind-9.5.2 => bind}/lib/dns/journal.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/key.c | 0 .../{bind-9.5.2 => bind}/lib/dns/keytable.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/lib.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/log.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/lookup.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/master.c | 0 .../{bind-9.5.2 => bind}/lib/dns/masterdump.c | 0 .../{bind-9.5.2 => bind}/lib/dns/message.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/name.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/ncache.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/nsec.c | 0 .../lib/dns/openssl_link.c | 0 .../lib/dns/openssldh_link.c | 0 .../lib/dns/openssldsa_link.c | 0 .../lib/dns/opensslrsa_link.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/order.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/peer.c | 0 .../{bind-9.5.2 => bind}/lib/dns/portlist.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/rbt.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/rbtdb.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/rbtdb.h | 0 .../{bind-9.5.2 => bind}/lib/dns/rbtdb64.c | 0 .../{bind-9.5.2 => bind}/lib/dns/rbtdb64.h | 0 contrib/{bind-9.5.2 => bind}/lib/dns/rcode.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/rdata.c | 0 .../lib/dns/rdata/any_255/tsig_250.c | 0 .../lib/dns/rdata/any_255/tsig_250.h | 0 .../lib/dns/rdata/ch_3/a_1.c | 0 .../lib/dns/rdata/ch_3/a_1.h | 0 .../lib/dns/rdata/generic/afsdb_18.c | 0 .../lib/dns/rdata/generic/afsdb_18.h | 0 .../lib/dns/rdata/generic/cert_37.c | 0 .../lib/dns/rdata/generic/cert_37.h | 0 .../lib/dns/rdata/generic/cname_5.c | 0 .../lib/dns/rdata/generic/cname_5.h | 0 .../lib/dns/rdata/generic/dlv_32769.c | 0 .../lib/dns/rdata/generic/dlv_32769.h | 0 .../lib/dns/rdata/generic/dname_39.c | 0 .../lib/dns/rdata/generic/dname_39.h | 0 .../lib/dns/rdata/generic/dnskey_48.c | 0 .../lib/dns/rdata/generic/dnskey_48.h | 0 .../lib/dns/rdata/generic/ds_43.c | 0 .../lib/dns/rdata/generic/ds_43.h | 0 .../lib/dns/rdata/generic/gpos_27.c | 0 .../lib/dns/rdata/generic/gpos_27.h | 0 .../lib/dns/rdata/generic/hinfo_13.c | 0 .../lib/dns/rdata/generic/hinfo_13.h | 0 .../lib/dns/rdata/generic/ipseckey_45.c | 0 .../lib/dns/rdata/generic/ipseckey_45.h | 0 .../lib/dns/rdata/generic/isdn_20.c | 0 .../lib/dns/rdata/generic/isdn_20.h | 0 .../lib/dns/rdata/generic/key_25.c | 0 .../lib/dns/rdata/generic/key_25.h | 0 .../lib/dns/rdata/generic/loc_29.c | 0 .../lib/dns/rdata/generic/loc_29.h | 0 .../lib/dns/rdata/generic/mb_7.c | 0 .../lib/dns/rdata/generic/mb_7.h | 0 .../lib/dns/rdata/generic/md_3.c | 0 .../lib/dns/rdata/generic/md_3.h | 0 .../lib/dns/rdata/generic/mf_4.c | 0 .../lib/dns/rdata/generic/mf_4.h | 0 .../lib/dns/rdata/generic/mg_8.c | 0 .../lib/dns/rdata/generic/mg_8.h | 0 .../lib/dns/rdata/generic/minfo_14.c | 0 .../lib/dns/rdata/generic/minfo_14.h | 0 .../lib/dns/rdata/generic/mr_9.c | 0 .../lib/dns/rdata/generic/mr_9.h | 0 .../lib/dns/rdata/generic/mx_15.c | 0 .../lib/dns/rdata/generic/mx_15.h | 0 .../lib/dns/rdata/generic/ns_2.c | 0 .../lib/dns/rdata/generic/ns_2.h | 0 .../lib/dns/rdata/generic/nsec_47.c | 0 .../lib/dns/rdata/generic/nsec_47.h | 0 .../lib/dns/rdata/generic/null_10.c | 0 .../lib/dns/rdata/generic/null_10.h | 0 .../lib/dns/rdata/generic/nxt_30.c | 0 .../lib/dns/rdata/generic/nxt_30.h | 0 .../lib/dns/rdata/generic/opt_41.c | 0 .../lib/dns/rdata/generic/opt_41.h | 0 .../lib/dns/rdata/generic/proforma.c | 0 .../lib/dns/rdata/generic/proforma.h | 0 .../lib/dns/rdata/generic/ptr_12.c | 0 .../lib/dns/rdata/generic/ptr_12.h | 0 .../lib/dns/rdata/generic/rp_17.c | 0 .../lib/dns/rdata/generic/rp_17.h | 0 .../lib/dns/rdata/generic/rrsig_46.c | 0 .../lib/dns/rdata/generic/rrsig_46.h | 0 .../lib/dns/rdata/generic/rt_21.c | 0 .../lib/dns/rdata/generic/rt_21.h | 0 .../lib/dns/rdata/generic/sig_24.c | 0 .../lib/dns/rdata/generic/sig_24.h | 0 .../lib/dns/rdata/generic/soa_6.c | 0 .../lib/dns/rdata/generic/soa_6.h | 0 .../lib/dns/rdata/generic/spf_99.c | 0 .../lib/dns/rdata/generic/spf_99.h | 0 .../lib/dns/rdata/generic/sshfp_44.c | 0 .../lib/dns/rdata/generic/sshfp_44.h | 0 .../lib/dns/rdata/generic/tkey_249.c | 0 .../lib/dns/rdata/generic/tkey_249.h | 0 .../lib/dns/rdata/generic/txt_16.c | 0 .../lib/dns/rdata/generic/txt_16.h | 0 .../lib/dns/rdata/generic/unspec_103.c | 0 .../lib/dns/rdata/generic/unspec_103.h | 0 .../lib/dns/rdata/generic/x25_19.c | 0 .../lib/dns/rdata/generic/x25_19.h | 0 .../lib/dns/rdata/hs_4/a_1.c | 0 .../lib/dns/rdata/hs_4/a_1.h | 0 .../lib/dns/rdata/in_1/a6_38.c | 0 .../lib/dns/rdata/in_1/a6_38.h | 0 .../lib/dns/rdata/in_1/a_1.c | 0 .../lib/dns/rdata/in_1/a_1.h | 0 .../lib/dns/rdata/in_1/aaaa_28.c | 0 .../lib/dns/rdata/in_1/aaaa_28.h | 0 .../lib/dns/rdata/in_1/apl_42.c | 0 .../lib/dns/rdata/in_1/apl_42.h | 0 .../lib/dns/rdata/in_1/dhcid_49.c | 0 .../lib/dns/rdata/in_1/dhcid_49.h | 0 .../lib/dns/rdata/in_1/kx_36.c | 0 .../lib/dns/rdata/in_1/kx_36.h | 0 .../lib/dns/rdata/in_1/naptr_35.c | 0 .../lib/dns/rdata/in_1/naptr_35.h | 0 .../lib/dns/rdata/in_1/nsap-ptr_23.c | 0 .../lib/dns/rdata/in_1/nsap-ptr_23.h | 0 .../lib/dns/rdata/in_1/nsap_22.c | 0 .../lib/dns/rdata/in_1/nsap_22.h | 0 .../lib/dns/rdata/in_1/px_26.c | 0 .../lib/dns/rdata/in_1/px_26.h | 0 .../lib/dns/rdata/in_1/srv_33.c | 0 .../lib/dns/rdata/in_1/srv_33.h | 0 .../lib/dns/rdata/in_1/wks_11.c | 0 .../lib/dns/rdata/in_1/wks_11.h | 0 .../lib/dns/rdata/rdatastructpre.h | 0 .../lib/dns/rdata/rdatastructsuf.h | 0 .../{bind-9.5.2 => bind}/lib/dns/rdatalist.c | 0 .../lib/dns/rdatalist_p.h | 0 .../{bind-9.5.2 => bind}/lib/dns/rdataset.c | 0 .../lib/dns/rdatasetiter.c | 0 .../{bind-9.5.2 => bind}/lib/dns/rdataslab.c | 0 .../{bind-9.5.2 => bind}/lib/dns/request.c | 0 .../{bind-9.5.2 => bind}/lib/dns/resolver.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/result.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/rootns.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/sdb.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/sdlz.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/soa.c | 0 .../{bind-9.5.2 => bind}/lib/dns/spnego.asn1 | 0 contrib/{bind-9.5.2 => bind}/lib/dns/spnego.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/spnego.h | 0 .../lib/dns/spnego_asn1.c | 0 .../lib/dns/spnego_asn1.pl | 0 contrib/{bind-9.5.2 => bind}/lib/dns/ssu.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/stats.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/tcpmsg.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/time.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/timer.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/tkey.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/tsig.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/ttl.c | 0 .../{bind-9.5.2 => bind}/lib/dns/validator.c | 0 .../{bind-9.5.2 => bind}/lib/dns/version.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/view.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/xfrin.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/zone.c | 0 .../{bind-9.5.2 => bind}/lib/dns/zonekey.c | 0 contrib/{bind-9.5.2 => bind}/lib/dns/zt.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/api | 0 .../{bind-9.5.2 => bind}/lib/isc/assertions.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/base64.c | 0 .../{bind-9.5.2 => bind}/lib/isc/bitstring.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/buffer.c | 0 .../{bind-9.5.2 => bind}/lib/isc/bufferlist.c | 0 .../lib/isc/commandline.c | 0 .../{bind-9.5.2 => bind}/lib/isc/entropy.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/error.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/event.c | 0 .../{bind-9.5.2 => bind}/lib/isc/fsaccess.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/hash.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/heap.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/hex.c | 0 .../{bind-9.5.2 => bind}/lib/isc/hmacmd5.c | 0 .../{bind-9.5.2 => bind}/lib/isc/hmacsha.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/httpd.c | 0 .../lib/isc/include/isc/app.h | 0 .../lib/isc/include/isc/assertions.h | 0 .../lib/isc/include/isc/base64.h | 0 .../lib/isc/include/isc/bitstring.h | 0 .../lib/isc/include/isc/boolean.h | 0 .../lib/isc/include/isc/buffer.h | 0 .../lib/isc/include/isc/bufferlist.h | 0 .../lib/isc/include/isc/commandline.h | 0 .../lib/isc/include/isc/entropy.h | 0 .../lib/isc/include/isc/error.h | 0 .../lib/isc/include/isc/event.h | 0 .../lib/isc/include/isc/eventclass.h | 0 .../lib/isc/include/isc/file.h | 0 .../lib/isc/include/isc/formatcheck.h | 0 .../lib/isc/include/isc/fsaccess.h | 0 .../lib/isc/include/isc/hash.h | 0 .../lib/isc/include/isc/heap.h | 0 .../lib/isc/include/isc/hex.h | 0 .../lib/isc/include/isc/hmacmd5.h | 0 .../lib/isc/include/isc/hmacsha.h | 0 .../lib/isc/include/isc/httpd.h | 0 .../lib/isc/include/isc/interfaceiter.h | 0 .../lib/isc/include/isc/ipv6.h | 0 .../lib/isc/include/isc/lang.h | 0 .../lib/isc/include/isc/lex.h | 0 .../lib/isc/include/isc/lfsr.h | 0 .../lib/isc/include/isc/lib.h | 0 .../lib/isc/include/isc/list.h | 0 .../lib/isc/include/isc/log.h | 0 .../lib/isc/include/isc/magic.h | 0 .../lib/isc/include/isc/md5.h | 0 .../lib/isc/include/isc/mem.h | 0 .../lib/isc/include/isc/msgcat.h | 0 .../lib/isc/include/isc/msgs.h | 0 .../lib/isc/include/isc/mutexblock.h | 0 .../lib/isc/include/isc/netaddr.h | 0 .../lib/isc/include/isc/netscope.h | 0 .../lib/isc/include/isc/ondestroy.h | 0 .../lib/isc/include/isc/os.h | 0 .../lib/isc/include/isc/parseint.h | 0 .../lib/isc/include/isc/platform.h.in | 0 .../lib/isc/include/isc/portset.h | 0 .../lib/isc/include/isc/print.h | 0 .../lib/isc/include/isc/quota.h | 0 .../lib/isc/include/isc/radix.h | 0 .../lib/isc/include/isc/random.h | 0 .../lib/isc/include/isc/ratelimiter.h | 0 .../lib/isc/include/isc/refcount.h | 0 .../lib/isc/include/isc/region.h | 0 .../lib/isc/include/isc/resource.h | 0 .../lib/isc/include/isc/result.h | 0 .../lib/isc/include/isc/resultclass.h | 0 .../lib/isc/include/isc/rwlock.h | 0 .../lib/isc/include/isc/serial.h | 0 .../lib/isc/include/isc/sha1.h | 0 .../lib/isc/include/isc/sha2.h | 0 .../lib/isc/include/isc/sockaddr.h | 0 .../lib/isc/include/isc/socket.h | 0 .../lib/isc/include/isc/stats.h | 0 .../lib/isc/include/isc/stdio.h | 0 .../lib/isc/include/isc/stdlib.h | 0 .../lib/isc/include/isc/string.h | 0 .../lib/isc/include/isc/symtab.h | 0 .../lib/isc/include/isc/task.h | 0 .../lib/isc/include/isc/taskpool.h | 0 .../lib/isc/include/isc/timer.h | 0 .../lib/isc/include/isc/types.h | 0 .../lib/isc/include/isc/util.h | 0 .../lib/isc/include/isc/version.h | 0 .../lib/isc/include/isc/xml.h | 0 .../{bind-9.5.2 => bind}/lib/isc/inet_aton.c | 0 .../{bind-9.5.2 => bind}/lib/isc/inet_ntop.c | 0 .../{bind-9.5.2 => bind}/lib/isc/inet_pton.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/lex.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/lfsr.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/lib.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/log.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/md5.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/mem.c | 0 .../{bind-9.5.2 => bind}/lib/isc/mutexblock.c | 0 .../{bind-9.5.2 => bind}/lib/isc/netaddr.c | 0 .../{bind-9.5.2 => bind}/lib/isc/netscope.c | 0 .../{bind-9.5.2 => bind}/lib/isc/nls/msgcat.c | 0 .../lib/isc/noatomic/include/isc/atomic.h | 0 .../lib/isc/nothreads/condition.c | 0 .../lib/isc/nothreads/include/isc/condition.h | 0 .../lib/isc/nothreads/include/isc/mutex.h | 0 .../lib/isc/nothreads/include/isc/once.h | 0 .../lib/isc/nothreads/include/isc/thread.h | 0 .../lib/isc/nothreads/mutex.c | 0 .../lib/isc/nothreads/thread.c | 0 .../{bind-9.5.2 => bind}/lib/isc/ondestroy.c | 0 .../{bind-9.5.2 => bind}/lib/isc/parseint.c | 0 .../{bind-9.5.2 => bind}/lib/isc/portset.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/print.c | 0 .../lib/isc/pthreads/condition.c | 0 .../lib/isc/pthreads/include/isc/condition.h | 0 .../lib/isc/pthreads/include/isc/mutex.h | 0 .../lib/isc/pthreads/include/isc/once.h | 0 .../lib/isc/pthreads/include/isc/thread.h | 0 .../lib/isc/pthreads/mutex.c | 0 .../lib/isc/pthreads/thread.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/quota.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/radix.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/random.c | 0 .../lib/isc/ratelimiter.c | 0 .../{bind-9.5.2 => bind}/lib/isc/refcount.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/region.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/result.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/rwlock.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/serial.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/sha1.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/sha2.c | 0 .../{bind-9.5.2 => bind}/lib/isc/sockaddr.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/stats.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/string.c | 0 .../{bind-9.5.2 => bind}/lib/isc/strtoul.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/symtab.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/task.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/task_p.h | 0 .../{bind-9.5.2 => bind}/lib/isc/taskpool.c | 0 contrib/{bind-9.5.2 => bind}/lib/isc/timer.c | 0 .../{bind-9.5.2 => bind}/lib/isc/timer_p.h | 0 .../{bind-9.5.2 => bind}/lib/isc/unix/app.c | 0 .../{bind-9.5.2 => bind}/lib/isc/unix/dir.c | 0 .../lib/isc/unix/entropy.c | 0 .../lib/isc/unix/errno2result.c | 0 .../lib/isc/unix/errno2result.h | 0 .../{bind-9.5.2 => bind}/lib/isc/unix/file.c | 0 .../lib/isc/unix/fsaccess.c | 0 .../lib/isc/unix/ifiter_getifaddrs.c | 0 .../lib/isc/unix/ifiter_ioctl.c | 0 .../lib/isc/unix/ifiter_sysctl.c | 0 .../lib/isc/unix/include/isc/dir.h | 0 .../lib/isc/unix/include/isc/int.h | 0 .../lib/isc/unix/include/isc/keyboard.h | 0 .../lib/isc/unix/include/isc/net.h | 0 .../lib/isc/unix/include/isc/netdb.h | 0 .../lib/isc/unix/include/isc/offset.h | 0 .../lib/isc/unix/include/isc/stat.h | 0 .../lib/isc/unix/include/isc/stdtime.h | 0 .../lib/isc/unix/include/isc/strerror.h | 0 .../lib/isc/unix/include/isc/syslog.h | 0 .../lib/isc/unix/include/isc/time.h | 0 .../lib/isc/unix/interfaceiter.c | 0 .../{bind-9.5.2 => bind}/lib/isc/unix/ipv6.c | 0 .../lib/isc/unix/keyboard.c | 0 .../{bind-9.5.2 => bind}/lib/isc/unix/net.c | 0 .../{bind-9.5.2 => bind}/lib/isc/unix/os.c | 0 .../lib/isc/unix/resource.c | 0 .../lib/isc/unix/socket.c | 0 .../lib/isc/unix/socket_p.h | 0 .../{bind-9.5.2 => bind}/lib/isc/unix/stdio.c | 0 .../lib/isc/unix/stdtime.c | 0 .../lib/isc/unix/strerror.c | 0 .../lib/isc/unix/syslog.c | 0 .../{bind-9.5.2 => bind}/lib/isc/unix/time.c | 0 .../{bind-9.5.2 => bind}/lib/isc/version.c | 0 .../lib/isc/x86_32/include/isc/atomic.h | 0 .../lib/isc/x86_64/include/isc/atomic.h | 0 .../{bind-9.5.2 => bind}/lib/isccc/alist.c | 0 contrib/{bind-9.5.2 => bind}/lib/isccc/api | 0 .../{bind-9.5.2 => bind}/lib/isccc/base64.c | 0 contrib/{bind-9.5.2 => bind}/lib/isccc/cc.c | 0 .../{bind-9.5.2 => bind}/lib/isccc/ccmsg.c | 0 .../lib/isccc/include/isccc/alist.h | 0 .../lib/isccc/include/isccc/base64.h | 0 .../lib/isccc/include/isccc/cc.h | 0 .../lib/isccc/include/isccc/ccmsg.h | 0 .../lib/isccc/include/isccc/events.h | 0 .../lib/isccc/include/isccc/lib.h | 0 .../lib/isccc/include/isccc/result.h | 0 .../lib/isccc/include/isccc/sexpr.h | 0 .../lib/isccc/include/isccc/symtab.h | 0 .../lib/isccc/include/isccc/symtype.h | 0 .../lib/isccc/include/isccc/types.h | 0 .../lib/isccc/include/isccc/util.h | 0 .../lib/isccc/include/isccc/version.h | 0 contrib/{bind-9.5.2 => bind}/lib/isccc/lib.c | 0 .../{bind-9.5.2 => bind}/lib/isccc/result.c | 0 .../{bind-9.5.2 => bind}/lib/isccc/sexpr.c | 0 .../{bind-9.5.2 => bind}/lib/isccc/symtab.c | 0 .../{bind-9.5.2 => bind}/lib/isccc/version.c | 0 .../{bind-9.5.2 => bind}/lib/isccfg/aclconf.c | 0 contrib/{bind-9.5.2 => bind}/lib/isccfg/api | 0 .../lib/isccfg/include/isccfg/aclconf.h | 0 .../lib/isccfg/include/isccfg/cfg.h | 0 .../lib/isccfg/include/isccfg/grammar.h | 0 .../lib/isccfg/include/isccfg/log.h | 0 .../lib/isccfg/include/isccfg/namedconf.h | 0 .../lib/isccfg/include/isccfg/version.h | 0 contrib/{bind-9.5.2 => bind}/lib/isccfg/log.c | 0 .../lib/isccfg/namedconf.c | 0 .../{bind-9.5.2 => bind}/lib/isccfg/parser.c | 0 .../{bind-9.5.2 => bind}/lib/isccfg/version.c | 0 contrib/{bind-9.5.2 => bind}/lib/lwres/api | 0 .../{bind-9.5.2 => bind}/lib/lwres/assert_p.h | 0 .../{bind-9.5.2 => bind}/lib/lwres/context.c | 0 .../lib/lwres/context_p.h | 0 .../lib/lwres/gai_strerror.c | 0 .../lib/lwres/getaddrinfo.c | 0 .../{bind-9.5.2 => bind}/lib/lwres/gethost.c | 0 .../lib/lwres/getipnode.c | 0 .../lib/lwres/getnameinfo.c | 0 .../{bind-9.5.2 => bind}/lib/lwres/getrrset.c | 0 .../{bind-9.5.2 => bind}/lib/lwres/herror.c | 0 .../lib/lwres/include/lwres/context.h | 0 .../lib/lwres/include/lwres/int.h | 0 .../lib/lwres/include/lwres/ipv6.h | 0 .../lib/lwres/include/lwres/lang.h | 0 .../lib/lwres/include/lwres/list.h | 0 .../lib/lwres/include/lwres/lwbuffer.h | 0 .../lib/lwres/include/lwres/lwpacket.h | 0 .../lib/lwres/include/lwres/lwres.h | 0 .../lib/lwres/include/lwres/netdb.h.in | 0 .../lib/lwres/include/lwres/platform.h.in | 0 .../lib/lwres/include/lwres/result.h | 0 .../lib/lwres/include/lwres/stdlib.h | 0 .../lib/lwres/include/lwres/version.h | 0 .../{bind-9.5.2 => bind}/lib/lwres/lwbuffer.c | 0 .../{bind-9.5.2 => bind}/lib/lwres/lwconfig.c | 0 .../lib/lwres/lwinetaton.c | 0 .../lib/lwres/lwinetntop.c | 0 .../lib/lwres/lwinetpton.c | 0 .../{bind-9.5.2 => bind}/lib/lwres/lwpacket.c | 0 .../lib/lwres/lwres_gabn.c | 0 .../lib/lwres/lwres_gnba.c | 0 .../lib/lwres/lwres_grbn.c | 0 .../lib/lwres/lwres_noop.c | 0 .../lib/lwres/lwresutil.c | 0 .../lib/lwres/man/lwres.3 | 0 .../lib/lwres/man/lwres.html | 0 .../lib/lwres/man/lwres_buffer.3 | 0 .../lib/lwres/man/lwres_buffer.html | 0 .../lib/lwres/man/lwres_config.3 | 0 .../lib/lwres/man/lwres_config.html | 0 .../lib/lwres/man/lwres_context.3 | 0 .../lib/lwres/man/lwres_context.html | 0 .../lib/lwres/man/lwres_gabn.3 | 0 .../lib/lwres/man/lwres_gabn.html | 0 .../lib/lwres/man/lwres_gai_strerror.3 | 0 .../lib/lwres/man/lwres_gai_strerror.html | 0 .../lib/lwres/man/lwres_getaddrinfo.3 | 0 .../lib/lwres/man/lwres_getaddrinfo.html | 0 .../lib/lwres/man/lwres_gethostent.3 | 0 .../lib/lwres/man/lwres_gethostent.html | 0 .../lib/lwres/man/lwres_getipnode.3 | 0 .../lib/lwres/man/lwres_getipnode.html | 0 .../lib/lwres/man/lwres_getnameinfo.3 | 0 .../lib/lwres/man/lwres_getnameinfo.html | 0 .../lib/lwres/man/lwres_getrrsetbyname.3 | 0 .../lib/lwres/man/lwres_getrrsetbyname.html | 0 .../lib/lwres/man/lwres_gnba.3 | 0 .../lib/lwres/man/lwres_gnba.html | 0 .../lib/lwres/man/lwres_hstrerror.3 | 0 .../lib/lwres/man/lwres_hstrerror.html | 0 .../lib/lwres/man/lwres_inetntop.3 | 0 .../lib/lwres/man/lwres_inetntop.html | 0 .../lib/lwres/man/lwres_noop.3 | 0 .../lib/lwres/man/lwres_noop.html | 0 .../lib/lwres/man/lwres_packet.3 | 0 .../lib/lwres/man/lwres_packet.html | 0 .../lib/lwres/man/lwres_resutil.3 | 0 .../lib/lwres/man/lwres_resutil.html | 0 .../{bind-9.5.2 => bind}/lib/lwres/print.c | 0 .../{bind-9.5.2 => bind}/lib/lwres/print_p.h | 0 .../{bind-9.5.2 => bind}/lib/lwres/strtoul.c | 0 .../lib/lwres/unix/include/lwres/net.h | 0 .../{bind-9.5.2 => bind}/lib/lwres/version.c | 0 contrib/{bind-9.5.2 => bind}/version | 0 880 files changed, 32 insertions(+), 58 deletions(-) delete mode 100644 contrib/bind-9.5.2/README.DRAGONFLY rename contrib/{bind-9.5.2 => bind}/CHANGES (100%) rename contrib/{bind-9.5.2 => bind}/COPYRIGHT (100%) rename contrib/{bind-9.5.2 => bind}/FAQ (100%) rename contrib/{bind-9.5.2 => bind}/README (100%) rename contrib/{bind-9.5.2 => bind}/README.DELETED (100%) create mode 100644 contrib/bind/README.DRAGONFLY rename contrib/{bind-9.5.2 => bind}/README.idnkit (100%) rename contrib/{bind-9.5.2 => bind}/bin/check/check-tool.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/check/check-tool.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/check/named-checkconf.8 (100%) rename contrib/{bind-9.5.2 => bind}/bin/check/named-checkconf.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/check/named-checkconf.html (100%) rename contrib/{bind-9.5.2 => bind}/bin/check/named-checkzone.8 (100%) rename contrib/{bind-9.5.2 => bind}/bin/check/named-checkzone.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/check/named-checkzone.html (100%) rename contrib/{bind-9.5.2 => bind}/bin/dig/dig.1 (100%) rename contrib/{bind-9.5.2 => bind}/bin/dig/dig.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/dig/dig.html (100%) rename contrib/{bind-9.5.2 => bind}/bin/dig/dighost.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/dig/host.1 (100%) rename contrib/{bind-9.5.2 => bind}/bin/dig/host.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/dig/host.html (100%) rename contrib/{bind-9.5.2 => bind}/bin/dig/include/dig/dig.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/dig/nslookup.1 (100%) rename contrib/{bind-9.5.2 => bind}/bin/dig/nslookup.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/dig/nslookup.html (100%) rename contrib/{bind-9.5.2 => bind}/bin/dnssec/dnssec-keygen.8 (100%) rename contrib/{bind-9.5.2 => bind}/bin/dnssec/dnssec-keygen.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/dnssec/dnssec-keygen.html (100%) rename contrib/{bind-9.5.2 => bind}/bin/dnssec/dnssec-signzone.8 (100%) rename contrib/{bind-9.5.2 => bind}/bin/dnssec/dnssec-signzone.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/dnssec/dnssec-signzone.html (100%) rename contrib/{bind-9.5.2 => bind}/bin/dnssec/dnssectool.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/dnssec/dnssectool.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/bind9.xsl (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/bind9.xsl.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/builtin.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/client.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/config.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/control.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/controlconf.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/convertxsl.pl (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/builtin.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/client.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/config.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/control.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/globals.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/interfacemgr.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/listenlist.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/log.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/logconf.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/lwaddr.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/lwdclient.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/lwresd.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/lwsearch.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/main.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/notify.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/ns_smf_globals.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/query.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/server.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/sortlist.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/statschannel.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/tkeyconf.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/tsigconf.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/types.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/update.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/xfrout.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/include/named/zoneconf.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/interfacemgr.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/listenlist.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/log.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/logconf.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/lwaddr.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/lwdclient.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/lwderror.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/lwdgabn.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/lwdgnba.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/lwdgrbn.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/lwdnoop.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/lwresd.8 (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/lwresd.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/lwresd.html (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/lwsearch.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/main.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/named.8 (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/named.conf.5 (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/named.conf.html (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/named.html (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/notify.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/query.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/server.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/sortlist.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/statschannel.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/tkeyconf.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/tsigconf.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/unix/include/named/os.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/unix/os.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/update.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/xfrout.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/named/zoneconf.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/nsupdate/nsupdate.1 (100%) rename contrib/{bind-9.5.2 => bind}/bin/nsupdate/nsupdate.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/nsupdate/nsupdate.html (100%) rename contrib/{bind-9.5.2 => bind}/bin/rndc/include/rndc/os.h (100%) rename contrib/{bind-9.5.2 => bind}/bin/rndc/rndc-confgen.8 (100%) rename contrib/{bind-9.5.2 => bind}/bin/rndc/rndc-confgen.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/rndc/rndc-confgen.html (100%) rename contrib/{bind-9.5.2 => bind}/bin/rndc/rndc.8 (100%) rename contrib/{bind-9.5.2 => bind}/bin/rndc/rndc.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/rndc/rndc.conf (100%) rename contrib/{bind-9.5.2 => bind}/bin/rndc/rndc.conf.5 (100%) rename contrib/{bind-9.5.2 => bind}/bin/rndc/rndc.conf.html (100%) rename contrib/{bind-9.5.2 => bind}/bin/rndc/rndc.html (100%) rename contrib/{bind-9.5.2 => bind}/bin/rndc/unix/os.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/rndc/util.c (100%) rename contrib/{bind-9.5.2 => bind}/bin/rndc/util.h (100%) rename contrib/{bind-9.5.2 => bind}/bind.keys (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/README (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/api (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/bsd/daemon.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/bsd/ftruncate.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/bsd/gettimeofday.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/bsd/mktemp.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/bsd/putenv.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/bsd/readv.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/bsd/setenv.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/bsd/setitimer.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/bsd/strcasecmp.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/bsd/strdup.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/bsd/strerror.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/bsd/strpbrk.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/bsd/strsep.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/bsd/strtoul.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/bsd/utimes.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/bsd/writev.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/config.h.in (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/dst/dst_api.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/dst/dst_internal.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/dst/hmac_link.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/dst/md5.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/dst/md5_dgst.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/dst/md5_locl.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/dst/support.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/arpa/inet.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/arpa/nameser.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/arpa/nameser_compat.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/fd_setsize.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/hesiod.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/irp.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/irs.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/isc/assertions.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/isc/ctl.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/isc/dst.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/isc/eventlib.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/isc/heap.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/isc/irpmarshall.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/isc/list.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/isc/logging.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/isc/memcluster.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/isc/misc.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/isc/platform.h.in (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/isc/tree.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/netdb.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/netgroup.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/res_update.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/resolv.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/include/resolv_mt.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/inet/inet_addr.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/inet/inet_cidr_ntop.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/inet/inet_cidr_pton.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/inet/inet_data.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/inet/inet_lnaof.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/inet/inet_makeaddr.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/inet/inet_net_ntop.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/inet/inet_net_pton.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/inet/inet_neta.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/inet/inet_netof.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/inet/inet_network.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/inet/inet_ntoa.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/inet/inet_ntop.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/inet/inet_pton.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/inet/nsap_addr.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/dns.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/dns_gr.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/dns_ho.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/dns_nw.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/dns_p.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/dns_pr.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/dns_pw.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/dns_sv.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/gai_strerror.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/gen.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/gen_gr.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/gen_ho.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/gen_ng.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/gen_nw.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/gen_p.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/gen_pr.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/gen_pw.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/gen_sv.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/getaddrinfo.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/getgrent.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/getgrent_r.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/gethostent.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/gethostent_r.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/getnameinfo.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/getnetent.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/getnetent_r.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/getnetgrent.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/getnetgrent_r.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/getprotoent.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/getprotoent_r.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/getpwent.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/getpwent_r.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/getservent.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/getservent_r.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/hesiod.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/hesiod_p.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/irp.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/irp_gr.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/irp_ho.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/irp_ng.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/irp_nw.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/irp_p.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/irp_pr.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/irp_pw.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/irp_sv.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/irpmarshall.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/irs_data.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/irs_data.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/irs_p.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/lcl.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/lcl_gr.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/lcl_ho.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/lcl_ng.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/lcl_nw.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/lcl_p.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/lcl_pr.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/lcl_pw.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/lcl_sv.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/nis.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/nis_gr.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/nis_ho.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/nis_ng.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/nis_nw.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/nis_p.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/nis_pr.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/nis_pw.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/nis_sv.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/nul_ng.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/pathnames.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/irs/util.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/assertions.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/assertions.mdoc (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/base64.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/bitncmp.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/bitncmp.mdoc (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/ctl_clnt.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/ctl_p.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/ctl_p.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/ctl_srvr.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/ev_connects.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/ev_files.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/ev_streams.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/ev_timers.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/ev_waits.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/eventlib.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/eventlib.mdoc (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/eventlib_p.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/heap.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/heap.mdoc (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/hex.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/logging.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/logging.mdoc (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/logging_p.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/memcluster.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/memcluster.mdoc (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/movefile.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/tree.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/isc/tree.mdoc (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/make/includes.in (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/make/mkdep.in (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/make/rules.in (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/mkinstalldirs (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/nameser/ns_date.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/nameser/ns_name.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/nameser/ns_netint.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/nameser/ns_parse.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/nameser/ns_print.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/nameser/ns_samedomain.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/nameser/ns_sign.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/nameser/ns_ttl.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/nameser/ns_verify.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/port/freebsd/include/sys/bitypes.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/port_after.h.in (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/port_before.h.in (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/resolv/herror.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/resolv/mtctxres.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/resolv/res_comp.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/resolv/res_data.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/resolv/res_debug.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/resolv/res_debug.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/resolv/res_findzonecut.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/resolv/res_init.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/resolv/res_mkquery.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/resolv/res_mkupdate.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/resolv/res_mkupdate.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/resolv/res_private.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/resolv/res_query.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/resolv/res_send.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/resolv/res_sendsigned.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind/resolv/res_update.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind9/api (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind9/check.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind9/getaddresses.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind9/include/bind9/check.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind9/include/bind9/getaddresses.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind9/include/bind9/version.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/bind9/version.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/acache.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/acl.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/adb.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/api (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/byaddr.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/cache.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/callbacks.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/compress.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/db.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/dbiterator.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/dbtable.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/diff.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/dispatch.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/dlz.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/dnssec.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/ds.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/dst_api.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/dst_internal.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/dst_lib.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/dst_openssl.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/dst_parse.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/dst_parse.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/dst_result.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/forward.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/gen-unix.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/gen-win32.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/gen.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/gssapi_link.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/gssapictx.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/hmac_link.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/acache.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/acl.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/adb.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/bit.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/byaddr.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/cache.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/callbacks.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/cert.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/compress.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/db.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/dbiterator.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/dbtable.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/diff.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/dispatch.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/dlz.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/dnssec.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/ds.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/events.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/fixedname.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/forward.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/iptable.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/journal.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/keyflags.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/keytable.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/keyvalues.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/lib.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/log.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/lookup.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/master.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/masterdump.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/message.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/name.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/ncache.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/nsec.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/opcode.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/order.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/peer.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/portlist.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/rbt.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/rcode.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/rdata.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/rdataclass.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/rdatalist.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/rdataset.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/rdatasetiter.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/rdataslab.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/rdatatype.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/request.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/resolver.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/result.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/rootns.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/sdb.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/sdlz.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/secalg.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/secproto.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/soa.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/ssu.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/stats.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/tcpmsg.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/time.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/timer.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/tkey.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/tsig.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/ttl.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/types.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/validator.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/version.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/view.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/xfrin.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/zone.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/zonekey.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dns/zt.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dst/dst.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dst/gssapi.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dst/lib.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/include/dst/result.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/iptable.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/journal.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/key.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/keytable.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/lib.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/log.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/lookup.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/master.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/masterdump.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/message.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/name.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/ncache.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/nsec.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/openssl_link.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/openssldh_link.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/openssldsa_link.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/opensslrsa_link.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/order.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/peer.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/portlist.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rbt.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rbtdb.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rbtdb.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rbtdb64.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rbtdb64.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rcode.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/any_255/tsig_250.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/any_255/tsig_250.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/ch_3/a_1.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/ch_3/a_1.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/afsdb_18.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/afsdb_18.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/cert_37.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/cert_37.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/cname_5.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/cname_5.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/dlv_32769.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/dlv_32769.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/dname_39.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/dname_39.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/dnskey_48.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/dnskey_48.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/ds_43.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/ds_43.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/gpos_27.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/gpos_27.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/hinfo_13.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/hinfo_13.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/ipseckey_45.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/ipseckey_45.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/isdn_20.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/isdn_20.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/key_25.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/key_25.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/loc_29.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/loc_29.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/mb_7.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/mb_7.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/md_3.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/md_3.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/mf_4.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/mf_4.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/mg_8.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/mg_8.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/minfo_14.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/minfo_14.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/mr_9.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/mr_9.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/mx_15.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/mx_15.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/ns_2.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/ns_2.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/nsec_47.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/nsec_47.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/null_10.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/null_10.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/nxt_30.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/nxt_30.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/opt_41.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/opt_41.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/proforma.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/proforma.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/ptr_12.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/ptr_12.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/rp_17.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/rp_17.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/rrsig_46.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/rrsig_46.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/rt_21.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/rt_21.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/sig_24.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/sig_24.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/soa_6.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/soa_6.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/spf_99.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/spf_99.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/sshfp_44.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/sshfp_44.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/tkey_249.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/tkey_249.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/txt_16.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/txt_16.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/unspec_103.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/unspec_103.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/x25_19.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/generic/x25_19.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/hs_4/a_1.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/hs_4/a_1.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/a6_38.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/a6_38.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/a_1.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/a_1.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/aaaa_28.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/aaaa_28.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/apl_42.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/apl_42.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/dhcid_49.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/dhcid_49.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/kx_36.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/kx_36.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/naptr_35.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/naptr_35.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/nsap-ptr_23.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/nsap-ptr_23.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/nsap_22.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/nsap_22.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/px_26.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/px_26.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/srv_33.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/srv_33.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/wks_11.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/in_1/wks_11.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/rdatastructpre.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdata/rdatastructsuf.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdatalist.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdatalist_p.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdataset.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdatasetiter.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rdataslab.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/request.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/resolver.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/result.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/rootns.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/sdb.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/sdlz.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/soa.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/spnego.asn1 (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/spnego.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/spnego.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/spnego_asn1.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/spnego_asn1.pl (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/ssu.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/stats.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/tcpmsg.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/time.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/timer.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/tkey.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/tsig.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/ttl.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/validator.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/version.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/view.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/xfrin.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/zone.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/zonekey.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/dns/zt.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/api (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/assertions.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/base64.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/bitstring.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/buffer.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/bufferlist.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/commandline.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/entropy.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/error.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/event.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/fsaccess.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/hash.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/heap.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/hex.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/hmacmd5.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/hmacsha.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/httpd.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/app.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/assertions.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/base64.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/bitstring.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/boolean.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/buffer.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/bufferlist.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/commandline.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/entropy.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/error.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/event.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/eventclass.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/file.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/formatcheck.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/fsaccess.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/hash.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/heap.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/hex.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/hmacmd5.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/hmacsha.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/httpd.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/interfaceiter.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/ipv6.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/lang.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/lex.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/lfsr.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/lib.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/list.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/log.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/magic.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/md5.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/mem.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/msgcat.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/msgs.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/mutexblock.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/netaddr.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/netscope.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/ondestroy.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/os.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/parseint.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/platform.h.in (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/portset.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/print.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/quota.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/radix.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/random.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/ratelimiter.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/refcount.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/region.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/resource.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/result.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/resultclass.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/rwlock.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/serial.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/sha1.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/sha2.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/sockaddr.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/socket.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/stats.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/stdio.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/stdlib.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/string.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/symtab.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/task.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/taskpool.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/timer.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/types.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/util.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/version.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/include/isc/xml.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/inet_aton.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/inet_ntop.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/inet_pton.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/lex.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/lfsr.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/lib.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/log.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/md5.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/mem.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/mutexblock.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/netaddr.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/netscope.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/nls/msgcat.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/noatomic/include/isc/atomic.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/nothreads/condition.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/nothreads/include/isc/condition.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/nothreads/include/isc/mutex.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/nothreads/include/isc/once.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/nothreads/include/isc/thread.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/nothreads/mutex.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/nothreads/thread.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/ondestroy.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/parseint.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/portset.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/print.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/pthreads/condition.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/pthreads/include/isc/condition.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/pthreads/include/isc/mutex.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/pthreads/include/isc/once.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/pthreads/include/isc/thread.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/pthreads/mutex.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/pthreads/thread.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/quota.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/radix.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/random.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/ratelimiter.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/refcount.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/region.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/result.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/rwlock.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/serial.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/sha1.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/sha2.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/sockaddr.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/stats.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/string.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/strtoul.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/symtab.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/task.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/task_p.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/taskpool.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/timer.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/timer_p.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/app.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/dir.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/entropy.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/errno2result.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/errno2result.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/file.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/fsaccess.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/ifiter_getifaddrs.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/ifiter_ioctl.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/ifiter_sysctl.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/include/isc/dir.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/include/isc/int.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/include/isc/keyboard.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/include/isc/net.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/include/isc/netdb.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/include/isc/offset.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/include/isc/stat.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/include/isc/stdtime.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/include/isc/strerror.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/include/isc/syslog.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/include/isc/time.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/interfaceiter.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/ipv6.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/keyboard.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/net.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/os.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/resource.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/socket.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/socket_p.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/stdio.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/stdtime.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/strerror.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/syslog.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/unix/time.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/version.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/x86_32/include/isc/atomic.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isc/x86_64/include/isc/atomic.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccc/alist.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccc/api (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccc/base64.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccc/cc.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccc/ccmsg.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccc/include/isccc/alist.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccc/include/isccc/base64.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccc/include/isccc/cc.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccc/include/isccc/ccmsg.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccc/include/isccc/events.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccc/include/isccc/lib.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccc/include/isccc/result.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccc/include/isccc/sexpr.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccc/include/isccc/symtab.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccc/include/isccc/symtype.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccc/include/isccc/types.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccc/include/isccc/util.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccc/include/isccc/version.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccc/lib.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccc/result.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccc/sexpr.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccc/symtab.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccc/version.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccfg/aclconf.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccfg/api (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccfg/include/isccfg/aclconf.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccfg/include/isccfg/cfg.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccfg/include/isccfg/grammar.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccfg/include/isccfg/log.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccfg/include/isccfg/namedconf.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccfg/include/isccfg/version.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccfg/log.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccfg/namedconf.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccfg/parser.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/isccfg/version.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/api (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/assert_p.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/context.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/context_p.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/gai_strerror.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/getaddrinfo.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/gethost.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/getipnode.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/getnameinfo.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/getrrset.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/herror.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/include/lwres/context.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/include/lwres/int.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/include/lwres/ipv6.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/include/lwres/lang.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/include/lwres/list.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/include/lwres/lwbuffer.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/include/lwres/lwpacket.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/include/lwres/lwres.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/include/lwres/netdb.h.in (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/include/lwres/platform.h.in (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/include/lwres/result.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/include/lwres/stdlib.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/include/lwres/version.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/lwbuffer.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/lwconfig.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/lwinetaton.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/lwinetntop.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/lwinetpton.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/lwpacket.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/lwres_gabn.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/lwres_gnba.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/lwres_grbn.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/lwres_noop.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/lwresutil.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres.3 (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres.html (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_buffer.3 (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_buffer.html (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_config.3 (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_config.html (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_context.3 (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_context.html (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_gabn.3 (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_gabn.html (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_gai_strerror.3 (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_gai_strerror.html (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_getaddrinfo.3 (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_getaddrinfo.html (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_gethostent.3 (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_gethostent.html (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_getipnode.3 (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_getipnode.html (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_getnameinfo.3 (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_getnameinfo.html (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_getrrsetbyname.3 (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_getrrsetbyname.html (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_gnba.3 (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_gnba.html (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_hstrerror.3 (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_hstrerror.html (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_inetntop.3 (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_inetntop.html (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_noop.3 (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_noop.html (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_packet.3 (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_packet.html (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_resutil.3 (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/man/lwres_resutil.html (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/print.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/print_p.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/strtoul.c (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/unix/include/lwres/net.h (100%) rename contrib/{bind-9.5.2 => bind}/lib/lwres/version.c (100%) rename contrib/{bind-9.5.2 => bind}/version (100%) diff --git a/contrib/bind-9.5.2/README.DRAGONFLY b/contrib/bind-9.5.2/README.DRAGONFLY deleted file mode 100644 index 1fe245f218..0000000000 --- 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 index 0000000000..8b4718e75f --- /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 diff --git a/contrib/bind-9.5.2/lib/bind/bsd/strsep.c b/contrib/bind/lib/bind/bsd/strsep.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/bsd/strsep.c rename to contrib/bind/lib/bind/bsd/strsep.c diff --git a/contrib/bind-9.5.2/lib/bind/bsd/strtoul.c b/contrib/bind/lib/bind/bsd/strtoul.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/bsd/strtoul.c rename to contrib/bind/lib/bind/bsd/strtoul.c diff --git a/contrib/bind-9.5.2/lib/bind/bsd/utimes.c b/contrib/bind/lib/bind/bsd/utimes.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/bsd/utimes.c rename to contrib/bind/lib/bind/bsd/utimes.c diff --git a/contrib/bind-9.5.2/lib/bind/bsd/writev.c b/contrib/bind/lib/bind/bsd/writev.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/bsd/writev.c rename to contrib/bind/lib/bind/bsd/writev.c diff --git a/contrib/bind-9.5.2/lib/bind/config.h.in b/contrib/bind/lib/bind/config.h.in similarity index 100% rename from contrib/bind-9.5.2/lib/bind/config.h.in rename to contrib/bind/lib/bind/config.h.in diff --git a/contrib/bind-9.5.2/lib/bind/dst/dst_api.c b/contrib/bind/lib/bind/dst/dst_api.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/dst/dst_api.c rename to contrib/bind/lib/bind/dst/dst_api.c diff --git a/contrib/bind-9.5.2/lib/bind/dst/dst_internal.h b/contrib/bind/lib/bind/dst/dst_internal.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/dst/dst_internal.h rename to contrib/bind/lib/bind/dst/dst_internal.h diff --git a/contrib/bind-9.5.2/lib/bind/dst/hmac_link.c b/contrib/bind/lib/bind/dst/hmac_link.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/dst/hmac_link.c rename to contrib/bind/lib/bind/dst/hmac_link.c diff --git a/contrib/bind-9.5.2/lib/bind/dst/md5.h b/contrib/bind/lib/bind/dst/md5.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/dst/md5.h rename to contrib/bind/lib/bind/dst/md5.h diff --git a/contrib/bind-9.5.2/lib/bind/dst/md5_dgst.c b/contrib/bind/lib/bind/dst/md5_dgst.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/dst/md5_dgst.c rename to contrib/bind/lib/bind/dst/md5_dgst.c diff --git a/contrib/bind-9.5.2/lib/bind/dst/md5_locl.h b/contrib/bind/lib/bind/dst/md5_locl.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/dst/md5_locl.h rename to contrib/bind/lib/bind/dst/md5_locl.h diff --git a/contrib/bind-9.5.2/lib/bind/dst/support.c b/contrib/bind/lib/bind/dst/support.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/dst/support.c rename to contrib/bind/lib/bind/dst/support.c diff --git a/contrib/bind-9.5.2/lib/bind/include/arpa/inet.h b/contrib/bind/lib/bind/include/arpa/inet.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/arpa/inet.h rename to contrib/bind/lib/bind/include/arpa/inet.h diff --git a/contrib/bind-9.5.2/lib/bind/include/arpa/nameser.h b/contrib/bind/lib/bind/include/arpa/nameser.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/arpa/nameser.h rename to contrib/bind/lib/bind/include/arpa/nameser.h diff --git a/contrib/bind-9.5.2/lib/bind/include/arpa/nameser_compat.h b/contrib/bind/lib/bind/include/arpa/nameser_compat.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/arpa/nameser_compat.h rename to contrib/bind/lib/bind/include/arpa/nameser_compat.h diff --git a/contrib/bind-9.5.2/lib/bind/include/fd_setsize.h b/contrib/bind/lib/bind/include/fd_setsize.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/fd_setsize.h rename to contrib/bind/lib/bind/include/fd_setsize.h diff --git a/contrib/bind-9.5.2/lib/bind/include/hesiod.h b/contrib/bind/lib/bind/include/hesiod.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/hesiod.h rename to contrib/bind/lib/bind/include/hesiod.h diff --git a/contrib/bind-9.5.2/lib/bind/include/irp.h b/contrib/bind/lib/bind/include/irp.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/irp.h rename to contrib/bind/lib/bind/include/irp.h diff --git a/contrib/bind-9.5.2/lib/bind/include/irs.h b/contrib/bind/lib/bind/include/irs.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/irs.h rename to contrib/bind/lib/bind/include/irs.h diff --git a/contrib/bind-9.5.2/lib/bind/include/isc/assertions.h b/contrib/bind/lib/bind/include/isc/assertions.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/isc/assertions.h rename to contrib/bind/lib/bind/include/isc/assertions.h diff --git a/contrib/bind-9.5.2/lib/bind/include/isc/ctl.h b/contrib/bind/lib/bind/include/isc/ctl.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/isc/ctl.h rename to contrib/bind/lib/bind/include/isc/ctl.h diff --git a/contrib/bind-9.5.2/lib/bind/include/isc/dst.h b/contrib/bind/lib/bind/include/isc/dst.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/isc/dst.h rename to contrib/bind/lib/bind/include/isc/dst.h diff --git a/contrib/bind-9.5.2/lib/bind/include/isc/eventlib.h b/contrib/bind/lib/bind/include/isc/eventlib.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/isc/eventlib.h rename to contrib/bind/lib/bind/include/isc/eventlib.h diff --git a/contrib/bind-9.5.2/lib/bind/include/isc/heap.h b/contrib/bind/lib/bind/include/isc/heap.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/isc/heap.h rename to contrib/bind/lib/bind/include/isc/heap.h diff --git a/contrib/bind-9.5.2/lib/bind/include/isc/irpmarshall.h b/contrib/bind/lib/bind/include/isc/irpmarshall.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/isc/irpmarshall.h rename to contrib/bind/lib/bind/include/isc/irpmarshall.h diff --git a/contrib/bind-9.5.2/lib/bind/include/isc/list.h b/contrib/bind/lib/bind/include/isc/list.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/isc/list.h rename to contrib/bind/lib/bind/include/isc/list.h diff --git a/contrib/bind-9.5.2/lib/bind/include/isc/logging.h b/contrib/bind/lib/bind/include/isc/logging.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/isc/logging.h rename to contrib/bind/lib/bind/include/isc/logging.h diff --git a/contrib/bind-9.5.2/lib/bind/include/isc/memcluster.h b/contrib/bind/lib/bind/include/isc/memcluster.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/isc/memcluster.h rename to contrib/bind/lib/bind/include/isc/memcluster.h diff --git a/contrib/bind-9.5.2/lib/bind/include/isc/misc.h b/contrib/bind/lib/bind/include/isc/misc.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/isc/misc.h rename to contrib/bind/lib/bind/include/isc/misc.h diff --git a/contrib/bind-9.5.2/lib/bind/include/isc/platform.h.in b/contrib/bind/lib/bind/include/isc/platform.h.in similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/isc/platform.h.in rename to contrib/bind/lib/bind/include/isc/platform.h.in diff --git a/contrib/bind-9.5.2/lib/bind/include/isc/tree.h b/contrib/bind/lib/bind/include/isc/tree.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/isc/tree.h rename to contrib/bind/lib/bind/include/isc/tree.h diff --git a/contrib/bind-9.5.2/lib/bind/include/netdb.h b/contrib/bind/lib/bind/include/netdb.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/netdb.h rename to contrib/bind/lib/bind/include/netdb.h diff --git a/contrib/bind-9.5.2/lib/bind/include/netgroup.h b/contrib/bind/lib/bind/include/netgroup.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/netgroup.h rename to contrib/bind/lib/bind/include/netgroup.h diff --git a/contrib/bind-9.5.2/lib/bind/include/res_update.h b/contrib/bind/lib/bind/include/res_update.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/res_update.h rename to contrib/bind/lib/bind/include/res_update.h diff --git a/contrib/bind-9.5.2/lib/bind/include/resolv.h b/contrib/bind/lib/bind/include/resolv.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/resolv.h rename to contrib/bind/lib/bind/include/resolv.h diff --git a/contrib/bind-9.5.2/lib/bind/include/resolv_mt.h b/contrib/bind/lib/bind/include/resolv_mt.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/include/resolv_mt.h rename to contrib/bind/lib/bind/include/resolv_mt.h diff --git a/contrib/bind-9.5.2/lib/bind/inet/inet_addr.c b/contrib/bind/lib/bind/inet/inet_addr.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/inet/inet_addr.c rename to contrib/bind/lib/bind/inet/inet_addr.c diff --git a/contrib/bind-9.5.2/lib/bind/inet/inet_cidr_ntop.c b/contrib/bind/lib/bind/inet/inet_cidr_ntop.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/inet/inet_cidr_ntop.c rename to contrib/bind/lib/bind/inet/inet_cidr_ntop.c diff --git a/contrib/bind-9.5.2/lib/bind/inet/inet_cidr_pton.c b/contrib/bind/lib/bind/inet/inet_cidr_pton.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/inet/inet_cidr_pton.c rename to contrib/bind/lib/bind/inet/inet_cidr_pton.c diff --git a/contrib/bind-9.5.2/lib/bind/inet/inet_data.c b/contrib/bind/lib/bind/inet/inet_data.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/inet/inet_data.c rename to contrib/bind/lib/bind/inet/inet_data.c diff --git a/contrib/bind-9.5.2/lib/bind/inet/inet_lnaof.c b/contrib/bind/lib/bind/inet/inet_lnaof.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/inet/inet_lnaof.c rename to contrib/bind/lib/bind/inet/inet_lnaof.c diff --git a/contrib/bind-9.5.2/lib/bind/inet/inet_makeaddr.c b/contrib/bind/lib/bind/inet/inet_makeaddr.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/inet/inet_makeaddr.c rename to contrib/bind/lib/bind/inet/inet_makeaddr.c diff --git a/contrib/bind-9.5.2/lib/bind/inet/inet_net_ntop.c b/contrib/bind/lib/bind/inet/inet_net_ntop.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/inet/inet_net_ntop.c rename to contrib/bind/lib/bind/inet/inet_net_ntop.c diff --git a/contrib/bind-9.5.2/lib/bind/inet/inet_net_pton.c b/contrib/bind/lib/bind/inet/inet_net_pton.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/inet/inet_net_pton.c rename to contrib/bind/lib/bind/inet/inet_net_pton.c diff --git a/contrib/bind-9.5.2/lib/bind/inet/inet_neta.c b/contrib/bind/lib/bind/inet/inet_neta.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/inet/inet_neta.c rename to contrib/bind/lib/bind/inet/inet_neta.c diff --git a/contrib/bind-9.5.2/lib/bind/inet/inet_netof.c b/contrib/bind/lib/bind/inet/inet_netof.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/inet/inet_netof.c rename to contrib/bind/lib/bind/inet/inet_netof.c diff --git a/contrib/bind-9.5.2/lib/bind/inet/inet_network.c b/contrib/bind/lib/bind/inet/inet_network.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/inet/inet_network.c rename to contrib/bind/lib/bind/inet/inet_network.c diff --git a/contrib/bind-9.5.2/lib/bind/inet/inet_ntoa.c b/contrib/bind/lib/bind/inet/inet_ntoa.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/inet/inet_ntoa.c rename to contrib/bind/lib/bind/inet/inet_ntoa.c diff --git a/contrib/bind-9.5.2/lib/bind/inet/inet_ntop.c b/contrib/bind/lib/bind/inet/inet_ntop.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/inet/inet_ntop.c rename to contrib/bind/lib/bind/inet/inet_ntop.c diff --git a/contrib/bind-9.5.2/lib/bind/inet/inet_pton.c b/contrib/bind/lib/bind/inet/inet_pton.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/inet/inet_pton.c rename to contrib/bind/lib/bind/inet/inet_pton.c diff --git a/contrib/bind-9.5.2/lib/bind/inet/nsap_addr.c b/contrib/bind/lib/bind/inet/nsap_addr.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/inet/nsap_addr.c rename to contrib/bind/lib/bind/inet/nsap_addr.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/dns.c b/contrib/bind/lib/bind/irs/dns.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/dns.c rename to contrib/bind/lib/bind/irs/dns.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/dns_gr.c b/contrib/bind/lib/bind/irs/dns_gr.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/dns_gr.c rename to contrib/bind/lib/bind/irs/dns_gr.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/dns_ho.c b/contrib/bind/lib/bind/irs/dns_ho.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/dns_ho.c rename to contrib/bind/lib/bind/irs/dns_ho.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/dns_nw.c b/contrib/bind/lib/bind/irs/dns_nw.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/dns_nw.c rename to contrib/bind/lib/bind/irs/dns_nw.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/dns_p.h b/contrib/bind/lib/bind/irs/dns_p.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/dns_p.h rename to contrib/bind/lib/bind/irs/dns_p.h diff --git a/contrib/bind-9.5.2/lib/bind/irs/dns_pr.c b/contrib/bind/lib/bind/irs/dns_pr.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/dns_pr.c rename to contrib/bind/lib/bind/irs/dns_pr.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/dns_pw.c b/contrib/bind/lib/bind/irs/dns_pw.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/dns_pw.c rename to contrib/bind/lib/bind/irs/dns_pw.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/dns_sv.c b/contrib/bind/lib/bind/irs/dns_sv.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/dns_sv.c rename to contrib/bind/lib/bind/irs/dns_sv.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/gai_strerror.c b/contrib/bind/lib/bind/irs/gai_strerror.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/gai_strerror.c rename to contrib/bind/lib/bind/irs/gai_strerror.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/gen.c b/contrib/bind/lib/bind/irs/gen.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/gen.c rename to contrib/bind/lib/bind/irs/gen.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/gen_gr.c b/contrib/bind/lib/bind/irs/gen_gr.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/gen_gr.c rename to contrib/bind/lib/bind/irs/gen_gr.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/gen_ho.c b/contrib/bind/lib/bind/irs/gen_ho.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/gen_ho.c rename to contrib/bind/lib/bind/irs/gen_ho.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/gen_ng.c b/contrib/bind/lib/bind/irs/gen_ng.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/gen_ng.c rename to contrib/bind/lib/bind/irs/gen_ng.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/gen_nw.c b/contrib/bind/lib/bind/irs/gen_nw.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/gen_nw.c rename to contrib/bind/lib/bind/irs/gen_nw.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/gen_p.h b/contrib/bind/lib/bind/irs/gen_p.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/gen_p.h rename to contrib/bind/lib/bind/irs/gen_p.h diff --git a/contrib/bind-9.5.2/lib/bind/irs/gen_pr.c b/contrib/bind/lib/bind/irs/gen_pr.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/gen_pr.c rename to contrib/bind/lib/bind/irs/gen_pr.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/gen_pw.c b/contrib/bind/lib/bind/irs/gen_pw.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/gen_pw.c rename to contrib/bind/lib/bind/irs/gen_pw.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/gen_sv.c b/contrib/bind/lib/bind/irs/gen_sv.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/gen_sv.c rename to contrib/bind/lib/bind/irs/gen_sv.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/getaddrinfo.c b/contrib/bind/lib/bind/irs/getaddrinfo.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/getaddrinfo.c rename to contrib/bind/lib/bind/irs/getaddrinfo.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/getgrent.c b/contrib/bind/lib/bind/irs/getgrent.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/getgrent.c rename to contrib/bind/lib/bind/irs/getgrent.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/getgrent_r.c b/contrib/bind/lib/bind/irs/getgrent_r.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/getgrent_r.c rename to contrib/bind/lib/bind/irs/getgrent_r.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/gethostent.c b/contrib/bind/lib/bind/irs/gethostent.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/gethostent.c rename to contrib/bind/lib/bind/irs/gethostent.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/gethostent_r.c b/contrib/bind/lib/bind/irs/gethostent_r.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/gethostent_r.c rename to contrib/bind/lib/bind/irs/gethostent_r.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/getnameinfo.c b/contrib/bind/lib/bind/irs/getnameinfo.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/getnameinfo.c rename to contrib/bind/lib/bind/irs/getnameinfo.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/getnetent.c b/contrib/bind/lib/bind/irs/getnetent.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/getnetent.c rename to contrib/bind/lib/bind/irs/getnetent.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/getnetent_r.c b/contrib/bind/lib/bind/irs/getnetent_r.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/getnetent_r.c rename to contrib/bind/lib/bind/irs/getnetent_r.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/getnetgrent.c b/contrib/bind/lib/bind/irs/getnetgrent.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/getnetgrent.c rename to contrib/bind/lib/bind/irs/getnetgrent.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/getnetgrent_r.c b/contrib/bind/lib/bind/irs/getnetgrent_r.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/getnetgrent_r.c rename to contrib/bind/lib/bind/irs/getnetgrent_r.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/getprotoent.c b/contrib/bind/lib/bind/irs/getprotoent.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/getprotoent.c rename to contrib/bind/lib/bind/irs/getprotoent.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/getprotoent_r.c b/contrib/bind/lib/bind/irs/getprotoent_r.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/getprotoent_r.c rename to contrib/bind/lib/bind/irs/getprotoent_r.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/getpwent.c b/contrib/bind/lib/bind/irs/getpwent.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/getpwent.c rename to contrib/bind/lib/bind/irs/getpwent.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/getpwent_r.c b/contrib/bind/lib/bind/irs/getpwent_r.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/getpwent_r.c rename to contrib/bind/lib/bind/irs/getpwent_r.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/getservent.c b/contrib/bind/lib/bind/irs/getservent.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/getservent.c rename to contrib/bind/lib/bind/irs/getservent.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/getservent_r.c b/contrib/bind/lib/bind/irs/getservent_r.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/getservent_r.c rename to contrib/bind/lib/bind/irs/getservent_r.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/hesiod.c b/contrib/bind/lib/bind/irs/hesiod.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/hesiod.c rename to contrib/bind/lib/bind/irs/hesiod.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/hesiod_p.h b/contrib/bind/lib/bind/irs/hesiod_p.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/hesiod_p.h rename to contrib/bind/lib/bind/irs/hesiod_p.h diff --git a/contrib/bind-9.5.2/lib/bind/irs/irp.c b/contrib/bind/lib/bind/irs/irp.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/irp.c rename to contrib/bind/lib/bind/irs/irp.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/irp_gr.c b/contrib/bind/lib/bind/irs/irp_gr.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/irp_gr.c rename to contrib/bind/lib/bind/irs/irp_gr.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/irp_ho.c b/contrib/bind/lib/bind/irs/irp_ho.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/irp_ho.c rename to contrib/bind/lib/bind/irs/irp_ho.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/irp_ng.c b/contrib/bind/lib/bind/irs/irp_ng.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/irp_ng.c rename to contrib/bind/lib/bind/irs/irp_ng.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/irp_nw.c b/contrib/bind/lib/bind/irs/irp_nw.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/irp_nw.c rename to contrib/bind/lib/bind/irs/irp_nw.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/irp_p.h b/contrib/bind/lib/bind/irs/irp_p.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/irp_p.h rename to contrib/bind/lib/bind/irs/irp_p.h diff --git a/contrib/bind-9.5.2/lib/bind/irs/irp_pr.c b/contrib/bind/lib/bind/irs/irp_pr.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/irp_pr.c rename to contrib/bind/lib/bind/irs/irp_pr.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/irp_pw.c b/contrib/bind/lib/bind/irs/irp_pw.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/irp_pw.c rename to contrib/bind/lib/bind/irs/irp_pw.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/irp_sv.c b/contrib/bind/lib/bind/irs/irp_sv.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/irp_sv.c rename to contrib/bind/lib/bind/irs/irp_sv.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/irpmarshall.c b/contrib/bind/lib/bind/irs/irpmarshall.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/irpmarshall.c rename to contrib/bind/lib/bind/irs/irpmarshall.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/irs_data.c b/contrib/bind/lib/bind/irs/irs_data.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/irs_data.c rename to contrib/bind/lib/bind/irs/irs_data.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/irs_data.h b/contrib/bind/lib/bind/irs/irs_data.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/irs_data.h rename to contrib/bind/lib/bind/irs/irs_data.h diff --git a/contrib/bind-9.5.2/lib/bind/irs/irs_p.h b/contrib/bind/lib/bind/irs/irs_p.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/irs_p.h rename to contrib/bind/lib/bind/irs/irs_p.h diff --git a/contrib/bind-9.5.2/lib/bind/irs/lcl.c b/contrib/bind/lib/bind/irs/lcl.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/lcl.c rename to contrib/bind/lib/bind/irs/lcl.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/lcl_gr.c b/contrib/bind/lib/bind/irs/lcl_gr.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/lcl_gr.c rename to contrib/bind/lib/bind/irs/lcl_gr.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/lcl_ho.c b/contrib/bind/lib/bind/irs/lcl_ho.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/lcl_ho.c rename to contrib/bind/lib/bind/irs/lcl_ho.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/lcl_ng.c b/contrib/bind/lib/bind/irs/lcl_ng.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/lcl_ng.c rename to contrib/bind/lib/bind/irs/lcl_ng.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/lcl_nw.c b/contrib/bind/lib/bind/irs/lcl_nw.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/lcl_nw.c rename to contrib/bind/lib/bind/irs/lcl_nw.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/lcl_p.h b/contrib/bind/lib/bind/irs/lcl_p.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/lcl_p.h rename to contrib/bind/lib/bind/irs/lcl_p.h diff --git a/contrib/bind-9.5.2/lib/bind/irs/lcl_pr.c b/contrib/bind/lib/bind/irs/lcl_pr.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/lcl_pr.c rename to contrib/bind/lib/bind/irs/lcl_pr.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/lcl_pw.c b/contrib/bind/lib/bind/irs/lcl_pw.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/lcl_pw.c rename to contrib/bind/lib/bind/irs/lcl_pw.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/lcl_sv.c b/contrib/bind/lib/bind/irs/lcl_sv.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/lcl_sv.c rename to contrib/bind/lib/bind/irs/lcl_sv.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/nis.c b/contrib/bind/lib/bind/irs/nis.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/nis.c rename to contrib/bind/lib/bind/irs/nis.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/nis_gr.c b/contrib/bind/lib/bind/irs/nis_gr.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/nis_gr.c rename to contrib/bind/lib/bind/irs/nis_gr.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/nis_ho.c b/contrib/bind/lib/bind/irs/nis_ho.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/nis_ho.c rename to contrib/bind/lib/bind/irs/nis_ho.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/nis_ng.c b/contrib/bind/lib/bind/irs/nis_ng.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/nis_ng.c rename to contrib/bind/lib/bind/irs/nis_ng.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/nis_nw.c b/contrib/bind/lib/bind/irs/nis_nw.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/nis_nw.c rename to contrib/bind/lib/bind/irs/nis_nw.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/nis_p.h b/contrib/bind/lib/bind/irs/nis_p.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/nis_p.h rename to contrib/bind/lib/bind/irs/nis_p.h diff --git a/contrib/bind-9.5.2/lib/bind/irs/nis_pr.c b/contrib/bind/lib/bind/irs/nis_pr.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/nis_pr.c rename to contrib/bind/lib/bind/irs/nis_pr.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/nis_pw.c b/contrib/bind/lib/bind/irs/nis_pw.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/nis_pw.c rename to contrib/bind/lib/bind/irs/nis_pw.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/nis_sv.c b/contrib/bind/lib/bind/irs/nis_sv.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/nis_sv.c rename to contrib/bind/lib/bind/irs/nis_sv.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/nul_ng.c b/contrib/bind/lib/bind/irs/nul_ng.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/nul_ng.c rename to contrib/bind/lib/bind/irs/nul_ng.c diff --git a/contrib/bind-9.5.2/lib/bind/irs/pathnames.h b/contrib/bind/lib/bind/irs/pathnames.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/pathnames.h rename to contrib/bind/lib/bind/irs/pathnames.h diff --git a/contrib/bind-9.5.2/lib/bind/irs/util.c b/contrib/bind/lib/bind/irs/util.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/irs/util.c rename to contrib/bind/lib/bind/irs/util.c diff --git a/contrib/bind-9.5.2/lib/bind/isc/assertions.c b/contrib/bind/lib/bind/isc/assertions.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/assertions.c rename to contrib/bind/lib/bind/isc/assertions.c diff --git a/contrib/bind-9.5.2/lib/bind/isc/assertions.mdoc b/contrib/bind/lib/bind/isc/assertions.mdoc similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/assertions.mdoc rename to contrib/bind/lib/bind/isc/assertions.mdoc diff --git a/contrib/bind-9.5.2/lib/bind/isc/base64.c b/contrib/bind/lib/bind/isc/base64.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/base64.c rename to contrib/bind/lib/bind/isc/base64.c diff --git a/contrib/bind-9.5.2/lib/bind/isc/bitncmp.c b/contrib/bind/lib/bind/isc/bitncmp.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/bitncmp.c rename to contrib/bind/lib/bind/isc/bitncmp.c diff --git a/contrib/bind-9.5.2/lib/bind/isc/bitncmp.mdoc b/contrib/bind/lib/bind/isc/bitncmp.mdoc similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/bitncmp.mdoc rename to contrib/bind/lib/bind/isc/bitncmp.mdoc diff --git a/contrib/bind-9.5.2/lib/bind/isc/ctl_clnt.c b/contrib/bind/lib/bind/isc/ctl_clnt.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/ctl_clnt.c rename to contrib/bind/lib/bind/isc/ctl_clnt.c diff --git a/contrib/bind-9.5.2/lib/bind/isc/ctl_p.c b/contrib/bind/lib/bind/isc/ctl_p.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/ctl_p.c rename to contrib/bind/lib/bind/isc/ctl_p.c diff --git a/contrib/bind-9.5.2/lib/bind/isc/ctl_p.h b/contrib/bind/lib/bind/isc/ctl_p.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/ctl_p.h rename to contrib/bind/lib/bind/isc/ctl_p.h diff --git a/contrib/bind-9.5.2/lib/bind/isc/ctl_srvr.c b/contrib/bind/lib/bind/isc/ctl_srvr.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/ctl_srvr.c rename to contrib/bind/lib/bind/isc/ctl_srvr.c diff --git a/contrib/bind-9.5.2/lib/bind/isc/ev_connects.c b/contrib/bind/lib/bind/isc/ev_connects.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/ev_connects.c rename to contrib/bind/lib/bind/isc/ev_connects.c diff --git a/contrib/bind-9.5.2/lib/bind/isc/ev_files.c b/contrib/bind/lib/bind/isc/ev_files.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/ev_files.c rename to contrib/bind/lib/bind/isc/ev_files.c diff --git a/contrib/bind-9.5.2/lib/bind/isc/ev_streams.c b/contrib/bind/lib/bind/isc/ev_streams.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/ev_streams.c rename to contrib/bind/lib/bind/isc/ev_streams.c diff --git a/contrib/bind-9.5.2/lib/bind/isc/ev_timers.c b/contrib/bind/lib/bind/isc/ev_timers.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/ev_timers.c rename to contrib/bind/lib/bind/isc/ev_timers.c diff --git a/contrib/bind-9.5.2/lib/bind/isc/ev_waits.c b/contrib/bind/lib/bind/isc/ev_waits.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/ev_waits.c rename to contrib/bind/lib/bind/isc/ev_waits.c diff --git a/contrib/bind-9.5.2/lib/bind/isc/eventlib.c b/contrib/bind/lib/bind/isc/eventlib.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/eventlib.c rename to contrib/bind/lib/bind/isc/eventlib.c diff --git a/contrib/bind-9.5.2/lib/bind/isc/eventlib.mdoc b/contrib/bind/lib/bind/isc/eventlib.mdoc similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/eventlib.mdoc rename to contrib/bind/lib/bind/isc/eventlib.mdoc diff --git a/contrib/bind-9.5.2/lib/bind/isc/eventlib_p.h b/contrib/bind/lib/bind/isc/eventlib_p.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/eventlib_p.h rename to contrib/bind/lib/bind/isc/eventlib_p.h diff --git a/contrib/bind-9.5.2/lib/bind/isc/heap.c b/contrib/bind/lib/bind/isc/heap.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/heap.c rename to contrib/bind/lib/bind/isc/heap.c diff --git a/contrib/bind-9.5.2/lib/bind/isc/heap.mdoc b/contrib/bind/lib/bind/isc/heap.mdoc similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/heap.mdoc rename to contrib/bind/lib/bind/isc/heap.mdoc diff --git a/contrib/bind-9.5.2/lib/bind/isc/hex.c b/contrib/bind/lib/bind/isc/hex.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/hex.c rename to contrib/bind/lib/bind/isc/hex.c diff --git a/contrib/bind-9.5.2/lib/bind/isc/logging.c b/contrib/bind/lib/bind/isc/logging.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/logging.c rename to contrib/bind/lib/bind/isc/logging.c diff --git a/contrib/bind-9.5.2/lib/bind/isc/logging.mdoc b/contrib/bind/lib/bind/isc/logging.mdoc similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/logging.mdoc rename to contrib/bind/lib/bind/isc/logging.mdoc diff --git a/contrib/bind-9.5.2/lib/bind/isc/logging_p.h b/contrib/bind/lib/bind/isc/logging_p.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/logging_p.h rename to contrib/bind/lib/bind/isc/logging_p.h diff --git a/contrib/bind-9.5.2/lib/bind/isc/memcluster.c b/contrib/bind/lib/bind/isc/memcluster.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/memcluster.c rename to contrib/bind/lib/bind/isc/memcluster.c diff --git a/contrib/bind-9.5.2/lib/bind/isc/memcluster.mdoc b/contrib/bind/lib/bind/isc/memcluster.mdoc similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/memcluster.mdoc rename to contrib/bind/lib/bind/isc/memcluster.mdoc diff --git a/contrib/bind-9.5.2/lib/bind/isc/movefile.c b/contrib/bind/lib/bind/isc/movefile.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/movefile.c rename to contrib/bind/lib/bind/isc/movefile.c diff --git a/contrib/bind-9.5.2/lib/bind/isc/tree.c b/contrib/bind/lib/bind/isc/tree.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/tree.c rename to contrib/bind/lib/bind/isc/tree.c diff --git a/contrib/bind-9.5.2/lib/bind/isc/tree.mdoc b/contrib/bind/lib/bind/isc/tree.mdoc similarity index 100% rename from contrib/bind-9.5.2/lib/bind/isc/tree.mdoc rename to contrib/bind/lib/bind/isc/tree.mdoc diff --git a/contrib/bind-9.5.2/lib/bind/make/includes.in b/contrib/bind/lib/bind/make/includes.in similarity index 100% rename from contrib/bind-9.5.2/lib/bind/make/includes.in rename to contrib/bind/lib/bind/make/includes.in diff --git a/contrib/bind-9.5.2/lib/bind/make/mkdep.in b/contrib/bind/lib/bind/make/mkdep.in similarity index 100% rename from contrib/bind-9.5.2/lib/bind/make/mkdep.in rename to contrib/bind/lib/bind/make/mkdep.in diff --git a/contrib/bind-9.5.2/lib/bind/make/rules.in b/contrib/bind/lib/bind/make/rules.in similarity index 100% rename from contrib/bind-9.5.2/lib/bind/make/rules.in rename to contrib/bind/lib/bind/make/rules.in diff --git a/contrib/bind-9.5.2/lib/bind/mkinstalldirs b/contrib/bind/lib/bind/mkinstalldirs similarity index 100% rename from contrib/bind-9.5.2/lib/bind/mkinstalldirs rename to contrib/bind/lib/bind/mkinstalldirs diff --git a/contrib/bind-9.5.2/lib/bind/nameser/ns_date.c b/contrib/bind/lib/bind/nameser/ns_date.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/nameser/ns_date.c rename to contrib/bind/lib/bind/nameser/ns_date.c diff --git a/contrib/bind-9.5.2/lib/bind/nameser/ns_name.c b/contrib/bind/lib/bind/nameser/ns_name.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/nameser/ns_name.c rename to contrib/bind/lib/bind/nameser/ns_name.c diff --git a/contrib/bind-9.5.2/lib/bind/nameser/ns_netint.c b/contrib/bind/lib/bind/nameser/ns_netint.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/nameser/ns_netint.c rename to contrib/bind/lib/bind/nameser/ns_netint.c diff --git a/contrib/bind-9.5.2/lib/bind/nameser/ns_parse.c b/contrib/bind/lib/bind/nameser/ns_parse.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/nameser/ns_parse.c rename to contrib/bind/lib/bind/nameser/ns_parse.c diff --git a/contrib/bind-9.5.2/lib/bind/nameser/ns_print.c b/contrib/bind/lib/bind/nameser/ns_print.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/nameser/ns_print.c rename to contrib/bind/lib/bind/nameser/ns_print.c diff --git a/contrib/bind-9.5.2/lib/bind/nameser/ns_samedomain.c b/contrib/bind/lib/bind/nameser/ns_samedomain.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/nameser/ns_samedomain.c rename to contrib/bind/lib/bind/nameser/ns_samedomain.c diff --git a/contrib/bind-9.5.2/lib/bind/nameser/ns_sign.c b/contrib/bind/lib/bind/nameser/ns_sign.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/nameser/ns_sign.c rename to contrib/bind/lib/bind/nameser/ns_sign.c diff --git a/contrib/bind-9.5.2/lib/bind/nameser/ns_ttl.c b/contrib/bind/lib/bind/nameser/ns_ttl.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/nameser/ns_ttl.c rename to contrib/bind/lib/bind/nameser/ns_ttl.c diff --git a/contrib/bind-9.5.2/lib/bind/nameser/ns_verify.c b/contrib/bind/lib/bind/nameser/ns_verify.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/nameser/ns_verify.c rename to contrib/bind/lib/bind/nameser/ns_verify.c diff --git a/contrib/bind-9.5.2/lib/bind/port/freebsd/include/sys/bitypes.h b/contrib/bind/lib/bind/port/freebsd/include/sys/bitypes.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/port/freebsd/include/sys/bitypes.h rename to contrib/bind/lib/bind/port/freebsd/include/sys/bitypes.h diff --git a/contrib/bind-9.5.2/lib/bind/port_after.h.in b/contrib/bind/lib/bind/port_after.h.in similarity index 100% rename from contrib/bind-9.5.2/lib/bind/port_after.h.in rename to contrib/bind/lib/bind/port_after.h.in diff --git a/contrib/bind-9.5.2/lib/bind/port_before.h.in b/contrib/bind/lib/bind/port_before.h.in similarity index 100% rename from contrib/bind-9.5.2/lib/bind/port_before.h.in rename to contrib/bind/lib/bind/port_before.h.in diff --git a/contrib/bind-9.5.2/lib/bind/resolv/herror.c b/contrib/bind/lib/bind/resolv/herror.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/resolv/herror.c rename to contrib/bind/lib/bind/resolv/herror.c diff --git a/contrib/bind-9.5.2/lib/bind/resolv/mtctxres.c b/contrib/bind/lib/bind/resolv/mtctxres.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/resolv/mtctxres.c rename to contrib/bind/lib/bind/resolv/mtctxres.c diff --git a/contrib/bind-9.5.2/lib/bind/resolv/res_comp.c b/contrib/bind/lib/bind/resolv/res_comp.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/resolv/res_comp.c rename to contrib/bind/lib/bind/resolv/res_comp.c diff --git a/contrib/bind-9.5.2/lib/bind/resolv/res_data.c b/contrib/bind/lib/bind/resolv/res_data.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/resolv/res_data.c rename to contrib/bind/lib/bind/resolv/res_data.c diff --git a/contrib/bind-9.5.2/lib/bind/resolv/res_debug.c b/contrib/bind/lib/bind/resolv/res_debug.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/resolv/res_debug.c rename to contrib/bind/lib/bind/resolv/res_debug.c diff --git a/contrib/bind-9.5.2/lib/bind/resolv/res_debug.h b/contrib/bind/lib/bind/resolv/res_debug.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/resolv/res_debug.h rename to contrib/bind/lib/bind/resolv/res_debug.h diff --git a/contrib/bind-9.5.2/lib/bind/resolv/res_findzonecut.c b/contrib/bind/lib/bind/resolv/res_findzonecut.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/resolv/res_findzonecut.c rename to contrib/bind/lib/bind/resolv/res_findzonecut.c diff --git a/contrib/bind-9.5.2/lib/bind/resolv/res_init.c b/contrib/bind/lib/bind/resolv/res_init.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/resolv/res_init.c rename to contrib/bind/lib/bind/resolv/res_init.c diff --git a/contrib/bind-9.5.2/lib/bind/resolv/res_mkquery.c b/contrib/bind/lib/bind/resolv/res_mkquery.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/resolv/res_mkquery.c rename to contrib/bind/lib/bind/resolv/res_mkquery.c diff --git a/contrib/bind-9.5.2/lib/bind/resolv/res_mkupdate.c b/contrib/bind/lib/bind/resolv/res_mkupdate.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/resolv/res_mkupdate.c rename to contrib/bind/lib/bind/resolv/res_mkupdate.c diff --git a/contrib/bind-9.5.2/lib/bind/resolv/res_mkupdate.h b/contrib/bind/lib/bind/resolv/res_mkupdate.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/resolv/res_mkupdate.h rename to contrib/bind/lib/bind/resolv/res_mkupdate.h diff --git a/contrib/bind-9.5.2/lib/bind/resolv/res_private.h b/contrib/bind/lib/bind/resolv/res_private.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind/resolv/res_private.h rename to contrib/bind/lib/bind/resolv/res_private.h diff --git a/contrib/bind-9.5.2/lib/bind/resolv/res_query.c b/contrib/bind/lib/bind/resolv/res_query.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/resolv/res_query.c rename to contrib/bind/lib/bind/resolv/res_query.c diff --git a/contrib/bind-9.5.2/lib/bind/resolv/res_send.c b/contrib/bind/lib/bind/resolv/res_send.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/resolv/res_send.c rename to contrib/bind/lib/bind/resolv/res_send.c diff --git a/contrib/bind-9.5.2/lib/bind/resolv/res_sendsigned.c b/contrib/bind/lib/bind/resolv/res_sendsigned.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/resolv/res_sendsigned.c rename to contrib/bind/lib/bind/resolv/res_sendsigned.c diff --git a/contrib/bind-9.5.2/lib/bind/resolv/res_update.c b/contrib/bind/lib/bind/resolv/res_update.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind/resolv/res_update.c rename to contrib/bind/lib/bind/resolv/res_update.c diff --git a/contrib/bind-9.5.2/lib/bind9/api b/contrib/bind/lib/bind9/api similarity index 100% rename from contrib/bind-9.5.2/lib/bind9/api rename to contrib/bind/lib/bind9/api diff --git a/contrib/bind-9.5.2/lib/bind9/check.c b/contrib/bind/lib/bind9/check.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind9/check.c rename to contrib/bind/lib/bind9/check.c diff --git a/contrib/bind-9.5.2/lib/bind9/getaddresses.c b/contrib/bind/lib/bind9/getaddresses.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind9/getaddresses.c rename to contrib/bind/lib/bind9/getaddresses.c diff --git a/contrib/bind-9.5.2/lib/bind9/include/bind9/check.h b/contrib/bind/lib/bind9/include/bind9/check.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind9/include/bind9/check.h rename to contrib/bind/lib/bind9/include/bind9/check.h diff --git a/contrib/bind-9.5.2/lib/bind9/include/bind9/getaddresses.h b/contrib/bind/lib/bind9/include/bind9/getaddresses.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind9/include/bind9/getaddresses.h rename to contrib/bind/lib/bind9/include/bind9/getaddresses.h diff --git a/contrib/bind-9.5.2/lib/bind9/include/bind9/version.h b/contrib/bind/lib/bind9/include/bind9/version.h similarity index 100% rename from contrib/bind-9.5.2/lib/bind9/include/bind9/version.h rename to contrib/bind/lib/bind9/include/bind9/version.h diff --git a/contrib/bind-9.5.2/lib/bind9/version.c b/contrib/bind/lib/bind9/version.c similarity index 100% rename from contrib/bind-9.5.2/lib/bind9/version.c rename to contrib/bind/lib/bind9/version.c diff --git a/contrib/bind-9.5.2/lib/dns/acache.c b/contrib/bind/lib/dns/acache.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/acache.c rename to contrib/bind/lib/dns/acache.c diff --git a/contrib/bind-9.5.2/lib/dns/acl.c b/contrib/bind/lib/dns/acl.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/acl.c rename to contrib/bind/lib/dns/acl.c diff --git a/contrib/bind-9.5.2/lib/dns/adb.c b/contrib/bind/lib/dns/adb.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/adb.c rename to contrib/bind/lib/dns/adb.c diff --git a/contrib/bind-9.5.2/lib/dns/api b/contrib/bind/lib/dns/api similarity index 100% rename from contrib/bind-9.5.2/lib/dns/api rename to contrib/bind/lib/dns/api diff --git a/contrib/bind-9.5.2/lib/dns/byaddr.c b/contrib/bind/lib/dns/byaddr.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/byaddr.c rename to contrib/bind/lib/dns/byaddr.c diff --git a/contrib/bind-9.5.2/lib/dns/cache.c b/contrib/bind/lib/dns/cache.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/cache.c rename to contrib/bind/lib/dns/cache.c diff --git a/contrib/bind-9.5.2/lib/dns/callbacks.c b/contrib/bind/lib/dns/callbacks.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/callbacks.c rename to contrib/bind/lib/dns/callbacks.c diff --git a/contrib/bind-9.5.2/lib/dns/compress.c b/contrib/bind/lib/dns/compress.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/compress.c rename to contrib/bind/lib/dns/compress.c diff --git a/contrib/bind-9.5.2/lib/dns/db.c b/contrib/bind/lib/dns/db.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/db.c rename to contrib/bind/lib/dns/db.c diff --git a/contrib/bind-9.5.2/lib/dns/dbiterator.c b/contrib/bind/lib/dns/dbiterator.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/dbiterator.c rename to contrib/bind/lib/dns/dbiterator.c diff --git a/contrib/bind-9.5.2/lib/dns/dbtable.c b/contrib/bind/lib/dns/dbtable.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/dbtable.c rename to contrib/bind/lib/dns/dbtable.c diff --git a/contrib/bind-9.5.2/lib/dns/diff.c b/contrib/bind/lib/dns/diff.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/diff.c rename to contrib/bind/lib/dns/diff.c diff --git a/contrib/bind-9.5.2/lib/dns/dispatch.c b/contrib/bind/lib/dns/dispatch.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/dispatch.c rename to contrib/bind/lib/dns/dispatch.c diff --git a/contrib/bind-9.5.2/lib/dns/dlz.c b/contrib/bind/lib/dns/dlz.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/dlz.c rename to contrib/bind/lib/dns/dlz.c diff --git a/contrib/bind-9.5.2/lib/dns/dnssec.c b/contrib/bind/lib/dns/dnssec.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/dnssec.c rename to contrib/bind/lib/dns/dnssec.c diff --git a/contrib/bind-9.5.2/lib/dns/ds.c b/contrib/bind/lib/dns/ds.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/ds.c rename to contrib/bind/lib/dns/ds.c diff --git a/contrib/bind-9.5.2/lib/dns/dst_api.c b/contrib/bind/lib/dns/dst_api.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/dst_api.c rename to contrib/bind/lib/dns/dst_api.c diff --git a/contrib/bind-9.5.2/lib/dns/dst_internal.h b/contrib/bind/lib/dns/dst_internal.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/dst_internal.h rename to contrib/bind/lib/dns/dst_internal.h diff --git a/contrib/bind-9.5.2/lib/dns/dst_lib.c b/contrib/bind/lib/dns/dst_lib.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/dst_lib.c rename to contrib/bind/lib/dns/dst_lib.c diff --git a/contrib/bind-9.5.2/lib/dns/dst_openssl.h b/contrib/bind/lib/dns/dst_openssl.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/dst_openssl.h rename to contrib/bind/lib/dns/dst_openssl.h diff --git a/contrib/bind-9.5.2/lib/dns/dst_parse.c b/contrib/bind/lib/dns/dst_parse.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/dst_parse.c rename to contrib/bind/lib/dns/dst_parse.c diff --git a/contrib/bind-9.5.2/lib/dns/dst_parse.h b/contrib/bind/lib/dns/dst_parse.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/dst_parse.h rename to contrib/bind/lib/dns/dst_parse.h diff --git a/contrib/bind-9.5.2/lib/dns/dst_result.c b/contrib/bind/lib/dns/dst_result.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/dst_result.c rename to contrib/bind/lib/dns/dst_result.c diff --git a/contrib/bind-9.5.2/lib/dns/forward.c b/contrib/bind/lib/dns/forward.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/forward.c rename to contrib/bind/lib/dns/forward.c diff --git a/contrib/bind-9.5.2/lib/dns/gen-unix.h b/contrib/bind/lib/dns/gen-unix.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/gen-unix.h rename to contrib/bind/lib/dns/gen-unix.h diff --git a/contrib/bind-9.5.2/lib/dns/gen-win32.h b/contrib/bind/lib/dns/gen-win32.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/gen-win32.h rename to contrib/bind/lib/dns/gen-win32.h diff --git a/contrib/bind-9.5.2/lib/dns/gen.c b/contrib/bind/lib/dns/gen.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/gen.c rename to contrib/bind/lib/dns/gen.c diff --git a/contrib/bind-9.5.2/lib/dns/gssapi_link.c b/contrib/bind/lib/dns/gssapi_link.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/gssapi_link.c rename to contrib/bind/lib/dns/gssapi_link.c diff --git a/contrib/bind-9.5.2/lib/dns/gssapictx.c b/contrib/bind/lib/dns/gssapictx.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/gssapictx.c rename to contrib/bind/lib/dns/gssapictx.c diff --git a/contrib/bind-9.5.2/lib/dns/hmac_link.c b/contrib/bind/lib/dns/hmac_link.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/hmac_link.c rename to contrib/bind/lib/dns/hmac_link.c diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/acache.h b/contrib/bind/lib/dns/include/dns/acache.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/acache.h rename to contrib/bind/lib/dns/include/dns/acache.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/acl.h b/contrib/bind/lib/dns/include/dns/acl.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/acl.h rename to contrib/bind/lib/dns/include/dns/acl.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/adb.h b/contrib/bind/lib/dns/include/dns/adb.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/adb.h rename to contrib/bind/lib/dns/include/dns/adb.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/bit.h b/contrib/bind/lib/dns/include/dns/bit.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/bit.h rename to contrib/bind/lib/dns/include/dns/bit.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/byaddr.h b/contrib/bind/lib/dns/include/dns/byaddr.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/byaddr.h rename to contrib/bind/lib/dns/include/dns/byaddr.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/cache.h b/contrib/bind/lib/dns/include/dns/cache.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/cache.h rename to contrib/bind/lib/dns/include/dns/cache.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/callbacks.h b/contrib/bind/lib/dns/include/dns/callbacks.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/callbacks.h rename to contrib/bind/lib/dns/include/dns/callbacks.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/cert.h b/contrib/bind/lib/dns/include/dns/cert.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/cert.h rename to contrib/bind/lib/dns/include/dns/cert.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/compress.h b/contrib/bind/lib/dns/include/dns/compress.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/compress.h rename to contrib/bind/lib/dns/include/dns/compress.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/db.h b/contrib/bind/lib/dns/include/dns/db.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/db.h rename to contrib/bind/lib/dns/include/dns/db.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/dbiterator.h b/contrib/bind/lib/dns/include/dns/dbiterator.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/dbiterator.h rename to contrib/bind/lib/dns/include/dns/dbiterator.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/dbtable.h b/contrib/bind/lib/dns/include/dns/dbtable.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/dbtable.h rename to contrib/bind/lib/dns/include/dns/dbtable.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/diff.h b/contrib/bind/lib/dns/include/dns/diff.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/diff.h rename to contrib/bind/lib/dns/include/dns/diff.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/dispatch.h b/contrib/bind/lib/dns/include/dns/dispatch.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/dispatch.h rename to contrib/bind/lib/dns/include/dns/dispatch.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/dlz.h b/contrib/bind/lib/dns/include/dns/dlz.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/dlz.h rename to contrib/bind/lib/dns/include/dns/dlz.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/dnssec.h b/contrib/bind/lib/dns/include/dns/dnssec.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/dnssec.h rename to contrib/bind/lib/dns/include/dns/dnssec.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/ds.h b/contrib/bind/lib/dns/include/dns/ds.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/ds.h rename to contrib/bind/lib/dns/include/dns/ds.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/events.h b/contrib/bind/lib/dns/include/dns/events.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/events.h rename to contrib/bind/lib/dns/include/dns/events.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/fixedname.h b/contrib/bind/lib/dns/include/dns/fixedname.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/fixedname.h rename to contrib/bind/lib/dns/include/dns/fixedname.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/forward.h b/contrib/bind/lib/dns/include/dns/forward.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/forward.h rename to contrib/bind/lib/dns/include/dns/forward.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/iptable.h b/contrib/bind/lib/dns/include/dns/iptable.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/iptable.h rename to contrib/bind/lib/dns/include/dns/iptable.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/journal.h b/contrib/bind/lib/dns/include/dns/journal.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/journal.h rename to contrib/bind/lib/dns/include/dns/journal.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/keyflags.h b/contrib/bind/lib/dns/include/dns/keyflags.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/keyflags.h rename to contrib/bind/lib/dns/include/dns/keyflags.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/keytable.h b/contrib/bind/lib/dns/include/dns/keytable.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/keytable.h rename to contrib/bind/lib/dns/include/dns/keytable.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/keyvalues.h b/contrib/bind/lib/dns/include/dns/keyvalues.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/keyvalues.h rename to contrib/bind/lib/dns/include/dns/keyvalues.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/lib.h b/contrib/bind/lib/dns/include/dns/lib.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/lib.h rename to contrib/bind/lib/dns/include/dns/lib.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/log.h b/contrib/bind/lib/dns/include/dns/log.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/log.h rename to contrib/bind/lib/dns/include/dns/log.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/lookup.h b/contrib/bind/lib/dns/include/dns/lookup.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/lookup.h rename to contrib/bind/lib/dns/include/dns/lookup.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/master.h b/contrib/bind/lib/dns/include/dns/master.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/master.h rename to contrib/bind/lib/dns/include/dns/master.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/masterdump.h b/contrib/bind/lib/dns/include/dns/masterdump.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/masterdump.h rename to contrib/bind/lib/dns/include/dns/masterdump.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/message.h b/contrib/bind/lib/dns/include/dns/message.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/message.h rename to contrib/bind/lib/dns/include/dns/message.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/name.h b/contrib/bind/lib/dns/include/dns/name.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/name.h rename to contrib/bind/lib/dns/include/dns/name.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/ncache.h b/contrib/bind/lib/dns/include/dns/ncache.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/ncache.h rename to contrib/bind/lib/dns/include/dns/ncache.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/nsec.h b/contrib/bind/lib/dns/include/dns/nsec.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/nsec.h rename to contrib/bind/lib/dns/include/dns/nsec.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/opcode.h b/contrib/bind/lib/dns/include/dns/opcode.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/opcode.h rename to contrib/bind/lib/dns/include/dns/opcode.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/order.h b/contrib/bind/lib/dns/include/dns/order.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/order.h rename to contrib/bind/lib/dns/include/dns/order.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/peer.h b/contrib/bind/lib/dns/include/dns/peer.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/peer.h rename to contrib/bind/lib/dns/include/dns/peer.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/portlist.h b/contrib/bind/lib/dns/include/dns/portlist.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/portlist.h rename to contrib/bind/lib/dns/include/dns/portlist.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/rbt.h b/contrib/bind/lib/dns/include/dns/rbt.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/rbt.h rename to contrib/bind/lib/dns/include/dns/rbt.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/rcode.h b/contrib/bind/lib/dns/include/dns/rcode.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/rcode.h rename to contrib/bind/lib/dns/include/dns/rcode.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/rdata.h b/contrib/bind/lib/dns/include/dns/rdata.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/rdata.h rename to contrib/bind/lib/dns/include/dns/rdata.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/rdataclass.h b/contrib/bind/lib/dns/include/dns/rdataclass.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/rdataclass.h rename to contrib/bind/lib/dns/include/dns/rdataclass.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/rdatalist.h b/contrib/bind/lib/dns/include/dns/rdatalist.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/rdatalist.h rename to contrib/bind/lib/dns/include/dns/rdatalist.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/rdataset.h b/contrib/bind/lib/dns/include/dns/rdataset.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/rdataset.h rename to contrib/bind/lib/dns/include/dns/rdataset.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/rdatasetiter.h b/contrib/bind/lib/dns/include/dns/rdatasetiter.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/rdatasetiter.h rename to contrib/bind/lib/dns/include/dns/rdatasetiter.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/rdataslab.h b/contrib/bind/lib/dns/include/dns/rdataslab.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/rdataslab.h rename to contrib/bind/lib/dns/include/dns/rdataslab.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/rdatatype.h b/contrib/bind/lib/dns/include/dns/rdatatype.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/rdatatype.h rename to contrib/bind/lib/dns/include/dns/rdatatype.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/request.h b/contrib/bind/lib/dns/include/dns/request.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/request.h rename to contrib/bind/lib/dns/include/dns/request.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/resolver.h b/contrib/bind/lib/dns/include/dns/resolver.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/resolver.h rename to contrib/bind/lib/dns/include/dns/resolver.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/result.h b/contrib/bind/lib/dns/include/dns/result.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/result.h rename to contrib/bind/lib/dns/include/dns/result.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/rootns.h b/contrib/bind/lib/dns/include/dns/rootns.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/rootns.h rename to contrib/bind/lib/dns/include/dns/rootns.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/sdb.h b/contrib/bind/lib/dns/include/dns/sdb.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/sdb.h rename to contrib/bind/lib/dns/include/dns/sdb.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/sdlz.h b/contrib/bind/lib/dns/include/dns/sdlz.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/sdlz.h rename to contrib/bind/lib/dns/include/dns/sdlz.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/secalg.h b/contrib/bind/lib/dns/include/dns/secalg.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/secalg.h rename to contrib/bind/lib/dns/include/dns/secalg.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/secproto.h b/contrib/bind/lib/dns/include/dns/secproto.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/secproto.h rename to contrib/bind/lib/dns/include/dns/secproto.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/soa.h b/contrib/bind/lib/dns/include/dns/soa.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/soa.h rename to contrib/bind/lib/dns/include/dns/soa.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/ssu.h b/contrib/bind/lib/dns/include/dns/ssu.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/ssu.h rename to contrib/bind/lib/dns/include/dns/ssu.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/stats.h b/contrib/bind/lib/dns/include/dns/stats.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/stats.h rename to contrib/bind/lib/dns/include/dns/stats.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/tcpmsg.h b/contrib/bind/lib/dns/include/dns/tcpmsg.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/tcpmsg.h rename to contrib/bind/lib/dns/include/dns/tcpmsg.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/time.h b/contrib/bind/lib/dns/include/dns/time.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/time.h rename to contrib/bind/lib/dns/include/dns/time.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/timer.h b/contrib/bind/lib/dns/include/dns/timer.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/timer.h rename to contrib/bind/lib/dns/include/dns/timer.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/tkey.h b/contrib/bind/lib/dns/include/dns/tkey.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/tkey.h rename to contrib/bind/lib/dns/include/dns/tkey.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/tsig.h b/contrib/bind/lib/dns/include/dns/tsig.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/tsig.h rename to contrib/bind/lib/dns/include/dns/tsig.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/ttl.h b/contrib/bind/lib/dns/include/dns/ttl.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/ttl.h rename to contrib/bind/lib/dns/include/dns/ttl.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/types.h b/contrib/bind/lib/dns/include/dns/types.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/types.h rename to contrib/bind/lib/dns/include/dns/types.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/validator.h b/contrib/bind/lib/dns/include/dns/validator.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/validator.h rename to contrib/bind/lib/dns/include/dns/validator.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/version.h b/contrib/bind/lib/dns/include/dns/version.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/version.h rename to contrib/bind/lib/dns/include/dns/version.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/view.h b/contrib/bind/lib/dns/include/dns/view.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/view.h rename to contrib/bind/lib/dns/include/dns/view.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/xfrin.h b/contrib/bind/lib/dns/include/dns/xfrin.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/xfrin.h rename to contrib/bind/lib/dns/include/dns/xfrin.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/zone.h b/contrib/bind/lib/dns/include/dns/zone.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/zone.h rename to contrib/bind/lib/dns/include/dns/zone.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/zonekey.h b/contrib/bind/lib/dns/include/dns/zonekey.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/zonekey.h rename to contrib/bind/lib/dns/include/dns/zonekey.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dns/zt.h b/contrib/bind/lib/dns/include/dns/zt.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dns/zt.h rename to contrib/bind/lib/dns/include/dns/zt.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dst/dst.h b/contrib/bind/lib/dns/include/dst/dst.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dst/dst.h rename to contrib/bind/lib/dns/include/dst/dst.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dst/gssapi.h b/contrib/bind/lib/dns/include/dst/gssapi.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dst/gssapi.h rename to contrib/bind/lib/dns/include/dst/gssapi.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dst/lib.h b/contrib/bind/lib/dns/include/dst/lib.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dst/lib.h rename to contrib/bind/lib/dns/include/dst/lib.h diff --git a/contrib/bind-9.5.2/lib/dns/include/dst/result.h b/contrib/bind/lib/dns/include/dst/result.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/include/dst/result.h rename to contrib/bind/lib/dns/include/dst/result.h diff --git a/contrib/bind-9.5.2/lib/dns/iptable.c b/contrib/bind/lib/dns/iptable.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/iptable.c rename to contrib/bind/lib/dns/iptable.c diff --git a/contrib/bind-9.5.2/lib/dns/journal.c b/contrib/bind/lib/dns/journal.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/journal.c rename to contrib/bind/lib/dns/journal.c diff --git a/contrib/bind-9.5.2/lib/dns/key.c b/contrib/bind/lib/dns/key.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/key.c rename to contrib/bind/lib/dns/key.c diff --git a/contrib/bind-9.5.2/lib/dns/keytable.c b/contrib/bind/lib/dns/keytable.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/keytable.c rename to contrib/bind/lib/dns/keytable.c diff --git a/contrib/bind-9.5.2/lib/dns/lib.c b/contrib/bind/lib/dns/lib.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/lib.c rename to contrib/bind/lib/dns/lib.c diff --git a/contrib/bind-9.5.2/lib/dns/log.c b/contrib/bind/lib/dns/log.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/log.c rename to contrib/bind/lib/dns/log.c diff --git a/contrib/bind-9.5.2/lib/dns/lookup.c b/contrib/bind/lib/dns/lookup.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/lookup.c rename to contrib/bind/lib/dns/lookup.c diff --git a/contrib/bind-9.5.2/lib/dns/master.c b/contrib/bind/lib/dns/master.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/master.c rename to contrib/bind/lib/dns/master.c diff --git a/contrib/bind-9.5.2/lib/dns/masterdump.c b/contrib/bind/lib/dns/masterdump.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/masterdump.c rename to contrib/bind/lib/dns/masterdump.c diff --git a/contrib/bind-9.5.2/lib/dns/message.c b/contrib/bind/lib/dns/message.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/message.c rename to contrib/bind/lib/dns/message.c diff --git a/contrib/bind-9.5.2/lib/dns/name.c b/contrib/bind/lib/dns/name.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/name.c rename to contrib/bind/lib/dns/name.c diff --git a/contrib/bind-9.5.2/lib/dns/ncache.c b/contrib/bind/lib/dns/ncache.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/ncache.c rename to contrib/bind/lib/dns/ncache.c diff --git a/contrib/bind-9.5.2/lib/dns/nsec.c b/contrib/bind/lib/dns/nsec.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/nsec.c rename to contrib/bind/lib/dns/nsec.c diff --git a/contrib/bind-9.5.2/lib/dns/openssl_link.c b/contrib/bind/lib/dns/openssl_link.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/openssl_link.c rename to contrib/bind/lib/dns/openssl_link.c diff --git a/contrib/bind-9.5.2/lib/dns/openssldh_link.c b/contrib/bind/lib/dns/openssldh_link.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/openssldh_link.c rename to contrib/bind/lib/dns/openssldh_link.c diff --git a/contrib/bind-9.5.2/lib/dns/openssldsa_link.c b/contrib/bind/lib/dns/openssldsa_link.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/openssldsa_link.c rename to contrib/bind/lib/dns/openssldsa_link.c diff --git a/contrib/bind-9.5.2/lib/dns/opensslrsa_link.c b/contrib/bind/lib/dns/opensslrsa_link.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/opensslrsa_link.c rename to contrib/bind/lib/dns/opensslrsa_link.c diff --git a/contrib/bind-9.5.2/lib/dns/order.c b/contrib/bind/lib/dns/order.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/order.c rename to contrib/bind/lib/dns/order.c diff --git a/contrib/bind-9.5.2/lib/dns/peer.c b/contrib/bind/lib/dns/peer.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/peer.c rename to contrib/bind/lib/dns/peer.c diff --git a/contrib/bind-9.5.2/lib/dns/portlist.c b/contrib/bind/lib/dns/portlist.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/portlist.c rename to contrib/bind/lib/dns/portlist.c diff --git a/contrib/bind-9.5.2/lib/dns/rbt.c b/contrib/bind/lib/dns/rbt.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rbt.c rename to contrib/bind/lib/dns/rbt.c diff --git a/contrib/bind-9.5.2/lib/dns/rbtdb.c b/contrib/bind/lib/dns/rbtdb.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rbtdb.c rename to contrib/bind/lib/dns/rbtdb.c diff --git a/contrib/bind-9.5.2/lib/dns/rbtdb.h b/contrib/bind/lib/dns/rbtdb.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rbtdb.h rename to contrib/bind/lib/dns/rbtdb.h diff --git a/contrib/bind-9.5.2/lib/dns/rbtdb64.c b/contrib/bind/lib/dns/rbtdb64.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rbtdb64.c rename to contrib/bind/lib/dns/rbtdb64.c diff --git a/contrib/bind-9.5.2/lib/dns/rbtdb64.h b/contrib/bind/lib/dns/rbtdb64.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rbtdb64.h rename to contrib/bind/lib/dns/rbtdb64.h diff --git a/contrib/bind-9.5.2/lib/dns/rcode.c b/contrib/bind/lib/dns/rcode.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rcode.c rename to contrib/bind/lib/dns/rcode.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata.c b/contrib/bind/lib/dns/rdata.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata.c rename to contrib/bind/lib/dns/rdata.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/any_255/tsig_250.c b/contrib/bind/lib/dns/rdata/any_255/tsig_250.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/any_255/tsig_250.c rename to contrib/bind/lib/dns/rdata/any_255/tsig_250.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/any_255/tsig_250.h b/contrib/bind/lib/dns/rdata/any_255/tsig_250.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/any_255/tsig_250.h rename to contrib/bind/lib/dns/rdata/any_255/tsig_250.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/ch_3/a_1.c b/contrib/bind/lib/dns/rdata/ch_3/a_1.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/ch_3/a_1.c rename to contrib/bind/lib/dns/rdata/ch_3/a_1.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/ch_3/a_1.h b/contrib/bind/lib/dns/rdata/ch_3/a_1.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/ch_3/a_1.h rename to contrib/bind/lib/dns/rdata/ch_3/a_1.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/afsdb_18.c b/contrib/bind/lib/dns/rdata/generic/afsdb_18.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/afsdb_18.c rename to contrib/bind/lib/dns/rdata/generic/afsdb_18.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/afsdb_18.h b/contrib/bind/lib/dns/rdata/generic/afsdb_18.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/afsdb_18.h rename to contrib/bind/lib/dns/rdata/generic/afsdb_18.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/cert_37.c b/contrib/bind/lib/dns/rdata/generic/cert_37.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/cert_37.c rename to contrib/bind/lib/dns/rdata/generic/cert_37.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/cert_37.h b/contrib/bind/lib/dns/rdata/generic/cert_37.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/cert_37.h rename to contrib/bind/lib/dns/rdata/generic/cert_37.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/cname_5.c b/contrib/bind/lib/dns/rdata/generic/cname_5.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/cname_5.c rename to contrib/bind/lib/dns/rdata/generic/cname_5.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/cname_5.h b/contrib/bind/lib/dns/rdata/generic/cname_5.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/cname_5.h rename to contrib/bind/lib/dns/rdata/generic/cname_5.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/dlv_32769.c b/contrib/bind/lib/dns/rdata/generic/dlv_32769.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/dlv_32769.c rename to contrib/bind/lib/dns/rdata/generic/dlv_32769.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/dlv_32769.h b/contrib/bind/lib/dns/rdata/generic/dlv_32769.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/dlv_32769.h rename to contrib/bind/lib/dns/rdata/generic/dlv_32769.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/dname_39.c b/contrib/bind/lib/dns/rdata/generic/dname_39.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/dname_39.c rename to contrib/bind/lib/dns/rdata/generic/dname_39.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/dname_39.h b/contrib/bind/lib/dns/rdata/generic/dname_39.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/dname_39.h rename to contrib/bind/lib/dns/rdata/generic/dname_39.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/dnskey_48.c b/contrib/bind/lib/dns/rdata/generic/dnskey_48.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/dnskey_48.c rename to contrib/bind/lib/dns/rdata/generic/dnskey_48.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/dnskey_48.h b/contrib/bind/lib/dns/rdata/generic/dnskey_48.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/dnskey_48.h rename to contrib/bind/lib/dns/rdata/generic/dnskey_48.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/ds_43.c b/contrib/bind/lib/dns/rdata/generic/ds_43.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/ds_43.c rename to contrib/bind/lib/dns/rdata/generic/ds_43.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/ds_43.h b/contrib/bind/lib/dns/rdata/generic/ds_43.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/ds_43.h rename to contrib/bind/lib/dns/rdata/generic/ds_43.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/gpos_27.c b/contrib/bind/lib/dns/rdata/generic/gpos_27.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/gpos_27.c rename to contrib/bind/lib/dns/rdata/generic/gpos_27.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/gpos_27.h b/contrib/bind/lib/dns/rdata/generic/gpos_27.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/gpos_27.h rename to contrib/bind/lib/dns/rdata/generic/gpos_27.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/hinfo_13.c b/contrib/bind/lib/dns/rdata/generic/hinfo_13.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/hinfo_13.c rename to contrib/bind/lib/dns/rdata/generic/hinfo_13.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/hinfo_13.h b/contrib/bind/lib/dns/rdata/generic/hinfo_13.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/hinfo_13.h rename to contrib/bind/lib/dns/rdata/generic/hinfo_13.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/ipseckey_45.c b/contrib/bind/lib/dns/rdata/generic/ipseckey_45.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/ipseckey_45.c rename to contrib/bind/lib/dns/rdata/generic/ipseckey_45.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/ipseckey_45.h b/contrib/bind/lib/dns/rdata/generic/ipseckey_45.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/ipseckey_45.h rename to contrib/bind/lib/dns/rdata/generic/ipseckey_45.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/isdn_20.c b/contrib/bind/lib/dns/rdata/generic/isdn_20.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/isdn_20.c rename to contrib/bind/lib/dns/rdata/generic/isdn_20.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/isdn_20.h b/contrib/bind/lib/dns/rdata/generic/isdn_20.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/isdn_20.h rename to contrib/bind/lib/dns/rdata/generic/isdn_20.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/key_25.c b/contrib/bind/lib/dns/rdata/generic/key_25.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/key_25.c rename to contrib/bind/lib/dns/rdata/generic/key_25.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/key_25.h b/contrib/bind/lib/dns/rdata/generic/key_25.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/key_25.h rename to contrib/bind/lib/dns/rdata/generic/key_25.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/loc_29.c b/contrib/bind/lib/dns/rdata/generic/loc_29.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/loc_29.c rename to contrib/bind/lib/dns/rdata/generic/loc_29.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/loc_29.h b/contrib/bind/lib/dns/rdata/generic/loc_29.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/loc_29.h rename to contrib/bind/lib/dns/rdata/generic/loc_29.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/mb_7.c b/contrib/bind/lib/dns/rdata/generic/mb_7.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/mb_7.c rename to contrib/bind/lib/dns/rdata/generic/mb_7.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/mb_7.h b/contrib/bind/lib/dns/rdata/generic/mb_7.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/mb_7.h rename to contrib/bind/lib/dns/rdata/generic/mb_7.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/md_3.c b/contrib/bind/lib/dns/rdata/generic/md_3.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/md_3.c rename to contrib/bind/lib/dns/rdata/generic/md_3.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/md_3.h b/contrib/bind/lib/dns/rdata/generic/md_3.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/md_3.h rename to contrib/bind/lib/dns/rdata/generic/md_3.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/mf_4.c b/contrib/bind/lib/dns/rdata/generic/mf_4.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/mf_4.c rename to contrib/bind/lib/dns/rdata/generic/mf_4.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/mf_4.h b/contrib/bind/lib/dns/rdata/generic/mf_4.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/mf_4.h rename to contrib/bind/lib/dns/rdata/generic/mf_4.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/mg_8.c b/contrib/bind/lib/dns/rdata/generic/mg_8.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/mg_8.c rename to contrib/bind/lib/dns/rdata/generic/mg_8.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/mg_8.h b/contrib/bind/lib/dns/rdata/generic/mg_8.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/mg_8.h rename to contrib/bind/lib/dns/rdata/generic/mg_8.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/minfo_14.c b/contrib/bind/lib/dns/rdata/generic/minfo_14.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/minfo_14.c rename to contrib/bind/lib/dns/rdata/generic/minfo_14.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/minfo_14.h b/contrib/bind/lib/dns/rdata/generic/minfo_14.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/minfo_14.h rename to contrib/bind/lib/dns/rdata/generic/minfo_14.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/mr_9.c b/contrib/bind/lib/dns/rdata/generic/mr_9.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/mr_9.c rename to contrib/bind/lib/dns/rdata/generic/mr_9.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/mr_9.h b/contrib/bind/lib/dns/rdata/generic/mr_9.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/mr_9.h rename to contrib/bind/lib/dns/rdata/generic/mr_9.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/mx_15.c b/contrib/bind/lib/dns/rdata/generic/mx_15.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/mx_15.c rename to contrib/bind/lib/dns/rdata/generic/mx_15.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/mx_15.h b/contrib/bind/lib/dns/rdata/generic/mx_15.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/mx_15.h rename to contrib/bind/lib/dns/rdata/generic/mx_15.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/ns_2.c b/contrib/bind/lib/dns/rdata/generic/ns_2.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/ns_2.c rename to contrib/bind/lib/dns/rdata/generic/ns_2.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/ns_2.h b/contrib/bind/lib/dns/rdata/generic/ns_2.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/ns_2.h rename to contrib/bind/lib/dns/rdata/generic/ns_2.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/nsec_47.c b/contrib/bind/lib/dns/rdata/generic/nsec_47.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/nsec_47.c rename to contrib/bind/lib/dns/rdata/generic/nsec_47.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/nsec_47.h b/contrib/bind/lib/dns/rdata/generic/nsec_47.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/nsec_47.h rename to contrib/bind/lib/dns/rdata/generic/nsec_47.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/null_10.c b/contrib/bind/lib/dns/rdata/generic/null_10.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/null_10.c rename to contrib/bind/lib/dns/rdata/generic/null_10.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/null_10.h b/contrib/bind/lib/dns/rdata/generic/null_10.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/null_10.h rename to contrib/bind/lib/dns/rdata/generic/null_10.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/nxt_30.c b/contrib/bind/lib/dns/rdata/generic/nxt_30.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/nxt_30.c rename to contrib/bind/lib/dns/rdata/generic/nxt_30.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/nxt_30.h b/contrib/bind/lib/dns/rdata/generic/nxt_30.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/nxt_30.h rename to contrib/bind/lib/dns/rdata/generic/nxt_30.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/opt_41.c b/contrib/bind/lib/dns/rdata/generic/opt_41.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/opt_41.c rename to contrib/bind/lib/dns/rdata/generic/opt_41.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/opt_41.h b/contrib/bind/lib/dns/rdata/generic/opt_41.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/opt_41.h rename to contrib/bind/lib/dns/rdata/generic/opt_41.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/proforma.c b/contrib/bind/lib/dns/rdata/generic/proforma.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/proforma.c rename to contrib/bind/lib/dns/rdata/generic/proforma.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/proforma.h b/contrib/bind/lib/dns/rdata/generic/proforma.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/proforma.h rename to contrib/bind/lib/dns/rdata/generic/proforma.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/ptr_12.c b/contrib/bind/lib/dns/rdata/generic/ptr_12.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/ptr_12.c rename to contrib/bind/lib/dns/rdata/generic/ptr_12.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/ptr_12.h b/contrib/bind/lib/dns/rdata/generic/ptr_12.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/ptr_12.h rename to contrib/bind/lib/dns/rdata/generic/ptr_12.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/rp_17.c b/contrib/bind/lib/dns/rdata/generic/rp_17.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/rp_17.c rename to contrib/bind/lib/dns/rdata/generic/rp_17.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/rp_17.h b/contrib/bind/lib/dns/rdata/generic/rp_17.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/rp_17.h rename to contrib/bind/lib/dns/rdata/generic/rp_17.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/rrsig_46.c b/contrib/bind/lib/dns/rdata/generic/rrsig_46.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/rrsig_46.c rename to contrib/bind/lib/dns/rdata/generic/rrsig_46.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/rrsig_46.h b/contrib/bind/lib/dns/rdata/generic/rrsig_46.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/rrsig_46.h rename to contrib/bind/lib/dns/rdata/generic/rrsig_46.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/rt_21.c b/contrib/bind/lib/dns/rdata/generic/rt_21.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/rt_21.c rename to contrib/bind/lib/dns/rdata/generic/rt_21.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/rt_21.h b/contrib/bind/lib/dns/rdata/generic/rt_21.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/rt_21.h rename to contrib/bind/lib/dns/rdata/generic/rt_21.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/sig_24.c b/contrib/bind/lib/dns/rdata/generic/sig_24.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/sig_24.c rename to contrib/bind/lib/dns/rdata/generic/sig_24.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/sig_24.h b/contrib/bind/lib/dns/rdata/generic/sig_24.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/sig_24.h rename to contrib/bind/lib/dns/rdata/generic/sig_24.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/soa_6.c b/contrib/bind/lib/dns/rdata/generic/soa_6.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/soa_6.c rename to contrib/bind/lib/dns/rdata/generic/soa_6.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/soa_6.h b/contrib/bind/lib/dns/rdata/generic/soa_6.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/soa_6.h rename to contrib/bind/lib/dns/rdata/generic/soa_6.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/spf_99.c b/contrib/bind/lib/dns/rdata/generic/spf_99.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/spf_99.c rename to contrib/bind/lib/dns/rdata/generic/spf_99.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/spf_99.h b/contrib/bind/lib/dns/rdata/generic/spf_99.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/spf_99.h rename to contrib/bind/lib/dns/rdata/generic/spf_99.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/sshfp_44.c b/contrib/bind/lib/dns/rdata/generic/sshfp_44.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/sshfp_44.c rename to contrib/bind/lib/dns/rdata/generic/sshfp_44.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/sshfp_44.h b/contrib/bind/lib/dns/rdata/generic/sshfp_44.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/sshfp_44.h rename to contrib/bind/lib/dns/rdata/generic/sshfp_44.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/tkey_249.c b/contrib/bind/lib/dns/rdata/generic/tkey_249.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/tkey_249.c rename to contrib/bind/lib/dns/rdata/generic/tkey_249.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/tkey_249.h b/contrib/bind/lib/dns/rdata/generic/tkey_249.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/tkey_249.h rename to contrib/bind/lib/dns/rdata/generic/tkey_249.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/txt_16.c b/contrib/bind/lib/dns/rdata/generic/txt_16.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/txt_16.c rename to contrib/bind/lib/dns/rdata/generic/txt_16.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/txt_16.h b/contrib/bind/lib/dns/rdata/generic/txt_16.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/txt_16.h rename to contrib/bind/lib/dns/rdata/generic/txt_16.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/unspec_103.c b/contrib/bind/lib/dns/rdata/generic/unspec_103.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/unspec_103.c rename to contrib/bind/lib/dns/rdata/generic/unspec_103.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/unspec_103.h b/contrib/bind/lib/dns/rdata/generic/unspec_103.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/unspec_103.h rename to contrib/bind/lib/dns/rdata/generic/unspec_103.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/x25_19.c b/contrib/bind/lib/dns/rdata/generic/x25_19.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/x25_19.c rename to contrib/bind/lib/dns/rdata/generic/x25_19.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/generic/x25_19.h b/contrib/bind/lib/dns/rdata/generic/x25_19.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/generic/x25_19.h rename to contrib/bind/lib/dns/rdata/generic/x25_19.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/hs_4/a_1.c b/contrib/bind/lib/dns/rdata/hs_4/a_1.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/hs_4/a_1.c rename to contrib/bind/lib/dns/rdata/hs_4/a_1.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/hs_4/a_1.h b/contrib/bind/lib/dns/rdata/hs_4/a_1.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/hs_4/a_1.h rename to contrib/bind/lib/dns/rdata/hs_4/a_1.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/a6_38.c b/contrib/bind/lib/dns/rdata/in_1/a6_38.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/a6_38.c rename to contrib/bind/lib/dns/rdata/in_1/a6_38.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/a6_38.h b/contrib/bind/lib/dns/rdata/in_1/a6_38.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/a6_38.h rename to contrib/bind/lib/dns/rdata/in_1/a6_38.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/a_1.c b/contrib/bind/lib/dns/rdata/in_1/a_1.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/a_1.c rename to contrib/bind/lib/dns/rdata/in_1/a_1.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/a_1.h b/contrib/bind/lib/dns/rdata/in_1/a_1.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/a_1.h rename to contrib/bind/lib/dns/rdata/in_1/a_1.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/aaaa_28.c b/contrib/bind/lib/dns/rdata/in_1/aaaa_28.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/aaaa_28.c rename to contrib/bind/lib/dns/rdata/in_1/aaaa_28.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/aaaa_28.h b/contrib/bind/lib/dns/rdata/in_1/aaaa_28.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/aaaa_28.h rename to contrib/bind/lib/dns/rdata/in_1/aaaa_28.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/apl_42.c b/contrib/bind/lib/dns/rdata/in_1/apl_42.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/apl_42.c rename to contrib/bind/lib/dns/rdata/in_1/apl_42.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/apl_42.h b/contrib/bind/lib/dns/rdata/in_1/apl_42.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/apl_42.h rename to contrib/bind/lib/dns/rdata/in_1/apl_42.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/dhcid_49.c b/contrib/bind/lib/dns/rdata/in_1/dhcid_49.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/dhcid_49.c rename to contrib/bind/lib/dns/rdata/in_1/dhcid_49.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/dhcid_49.h b/contrib/bind/lib/dns/rdata/in_1/dhcid_49.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/dhcid_49.h rename to contrib/bind/lib/dns/rdata/in_1/dhcid_49.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/kx_36.c b/contrib/bind/lib/dns/rdata/in_1/kx_36.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/kx_36.c rename to contrib/bind/lib/dns/rdata/in_1/kx_36.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/kx_36.h b/contrib/bind/lib/dns/rdata/in_1/kx_36.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/kx_36.h rename to contrib/bind/lib/dns/rdata/in_1/kx_36.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/naptr_35.c b/contrib/bind/lib/dns/rdata/in_1/naptr_35.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/naptr_35.c rename to contrib/bind/lib/dns/rdata/in_1/naptr_35.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/naptr_35.h b/contrib/bind/lib/dns/rdata/in_1/naptr_35.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/naptr_35.h rename to contrib/bind/lib/dns/rdata/in_1/naptr_35.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/nsap-ptr_23.c b/contrib/bind/lib/dns/rdata/in_1/nsap-ptr_23.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/nsap-ptr_23.c rename to contrib/bind/lib/dns/rdata/in_1/nsap-ptr_23.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/nsap-ptr_23.h b/contrib/bind/lib/dns/rdata/in_1/nsap-ptr_23.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/nsap-ptr_23.h rename to contrib/bind/lib/dns/rdata/in_1/nsap-ptr_23.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/nsap_22.c b/contrib/bind/lib/dns/rdata/in_1/nsap_22.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/nsap_22.c rename to contrib/bind/lib/dns/rdata/in_1/nsap_22.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/nsap_22.h b/contrib/bind/lib/dns/rdata/in_1/nsap_22.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/nsap_22.h rename to contrib/bind/lib/dns/rdata/in_1/nsap_22.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/px_26.c b/contrib/bind/lib/dns/rdata/in_1/px_26.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/px_26.c rename to contrib/bind/lib/dns/rdata/in_1/px_26.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/px_26.h b/contrib/bind/lib/dns/rdata/in_1/px_26.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/px_26.h rename to contrib/bind/lib/dns/rdata/in_1/px_26.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/srv_33.c b/contrib/bind/lib/dns/rdata/in_1/srv_33.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/srv_33.c rename to contrib/bind/lib/dns/rdata/in_1/srv_33.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/srv_33.h b/contrib/bind/lib/dns/rdata/in_1/srv_33.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/srv_33.h rename to contrib/bind/lib/dns/rdata/in_1/srv_33.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/wks_11.c b/contrib/bind/lib/dns/rdata/in_1/wks_11.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/wks_11.c rename to contrib/bind/lib/dns/rdata/in_1/wks_11.c diff --git a/contrib/bind-9.5.2/lib/dns/rdata/in_1/wks_11.h b/contrib/bind/lib/dns/rdata/in_1/wks_11.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/in_1/wks_11.h rename to contrib/bind/lib/dns/rdata/in_1/wks_11.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/rdatastructpre.h b/contrib/bind/lib/dns/rdata/rdatastructpre.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/rdatastructpre.h rename to contrib/bind/lib/dns/rdata/rdatastructpre.h diff --git a/contrib/bind-9.5.2/lib/dns/rdata/rdatastructsuf.h b/contrib/bind/lib/dns/rdata/rdatastructsuf.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdata/rdatastructsuf.h rename to contrib/bind/lib/dns/rdata/rdatastructsuf.h diff --git a/contrib/bind-9.5.2/lib/dns/rdatalist.c b/contrib/bind/lib/dns/rdatalist.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdatalist.c rename to contrib/bind/lib/dns/rdatalist.c diff --git a/contrib/bind-9.5.2/lib/dns/rdatalist_p.h b/contrib/bind/lib/dns/rdatalist_p.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdatalist_p.h rename to contrib/bind/lib/dns/rdatalist_p.h diff --git a/contrib/bind-9.5.2/lib/dns/rdataset.c b/contrib/bind/lib/dns/rdataset.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdataset.c rename to contrib/bind/lib/dns/rdataset.c diff --git a/contrib/bind-9.5.2/lib/dns/rdatasetiter.c b/contrib/bind/lib/dns/rdatasetiter.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdatasetiter.c rename to contrib/bind/lib/dns/rdatasetiter.c diff --git a/contrib/bind-9.5.2/lib/dns/rdataslab.c b/contrib/bind/lib/dns/rdataslab.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rdataslab.c rename to contrib/bind/lib/dns/rdataslab.c diff --git a/contrib/bind-9.5.2/lib/dns/request.c b/contrib/bind/lib/dns/request.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/request.c rename to contrib/bind/lib/dns/request.c diff --git a/contrib/bind-9.5.2/lib/dns/resolver.c b/contrib/bind/lib/dns/resolver.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/resolver.c rename to contrib/bind/lib/dns/resolver.c diff --git a/contrib/bind-9.5.2/lib/dns/result.c b/contrib/bind/lib/dns/result.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/result.c rename to contrib/bind/lib/dns/result.c diff --git a/contrib/bind-9.5.2/lib/dns/rootns.c b/contrib/bind/lib/dns/rootns.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/rootns.c rename to contrib/bind/lib/dns/rootns.c diff --git a/contrib/bind-9.5.2/lib/dns/sdb.c b/contrib/bind/lib/dns/sdb.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/sdb.c rename to contrib/bind/lib/dns/sdb.c diff --git a/contrib/bind-9.5.2/lib/dns/sdlz.c b/contrib/bind/lib/dns/sdlz.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/sdlz.c rename to contrib/bind/lib/dns/sdlz.c diff --git a/contrib/bind-9.5.2/lib/dns/soa.c b/contrib/bind/lib/dns/soa.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/soa.c rename to contrib/bind/lib/dns/soa.c diff --git a/contrib/bind-9.5.2/lib/dns/spnego.asn1 b/contrib/bind/lib/dns/spnego.asn1 similarity index 100% rename from contrib/bind-9.5.2/lib/dns/spnego.asn1 rename to contrib/bind/lib/dns/spnego.asn1 diff --git a/contrib/bind-9.5.2/lib/dns/spnego.c b/contrib/bind/lib/dns/spnego.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/spnego.c rename to contrib/bind/lib/dns/spnego.c diff --git a/contrib/bind-9.5.2/lib/dns/spnego.h b/contrib/bind/lib/dns/spnego.h similarity index 100% rename from contrib/bind-9.5.2/lib/dns/spnego.h rename to contrib/bind/lib/dns/spnego.h diff --git a/contrib/bind-9.5.2/lib/dns/spnego_asn1.c b/contrib/bind/lib/dns/spnego_asn1.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/spnego_asn1.c rename to contrib/bind/lib/dns/spnego_asn1.c diff --git a/contrib/bind-9.5.2/lib/dns/spnego_asn1.pl b/contrib/bind/lib/dns/spnego_asn1.pl similarity index 100% rename from contrib/bind-9.5.2/lib/dns/spnego_asn1.pl rename to contrib/bind/lib/dns/spnego_asn1.pl diff --git a/contrib/bind-9.5.2/lib/dns/ssu.c b/contrib/bind/lib/dns/ssu.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/ssu.c rename to contrib/bind/lib/dns/ssu.c diff --git a/contrib/bind-9.5.2/lib/dns/stats.c b/contrib/bind/lib/dns/stats.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/stats.c rename to contrib/bind/lib/dns/stats.c diff --git a/contrib/bind-9.5.2/lib/dns/tcpmsg.c b/contrib/bind/lib/dns/tcpmsg.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/tcpmsg.c rename to contrib/bind/lib/dns/tcpmsg.c diff --git a/contrib/bind-9.5.2/lib/dns/time.c b/contrib/bind/lib/dns/time.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/time.c rename to contrib/bind/lib/dns/time.c diff --git a/contrib/bind-9.5.2/lib/dns/timer.c b/contrib/bind/lib/dns/timer.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/timer.c rename to contrib/bind/lib/dns/timer.c diff --git a/contrib/bind-9.5.2/lib/dns/tkey.c b/contrib/bind/lib/dns/tkey.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/tkey.c rename to contrib/bind/lib/dns/tkey.c diff --git a/contrib/bind-9.5.2/lib/dns/tsig.c b/contrib/bind/lib/dns/tsig.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/tsig.c rename to contrib/bind/lib/dns/tsig.c diff --git a/contrib/bind-9.5.2/lib/dns/ttl.c b/contrib/bind/lib/dns/ttl.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/ttl.c rename to contrib/bind/lib/dns/ttl.c diff --git a/contrib/bind-9.5.2/lib/dns/validator.c b/contrib/bind/lib/dns/validator.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/validator.c rename to contrib/bind/lib/dns/validator.c diff --git a/contrib/bind-9.5.2/lib/dns/version.c b/contrib/bind/lib/dns/version.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/version.c rename to contrib/bind/lib/dns/version.c diff --git a/contrib/bind-9.5.2/lib/dns/view.c b/contrib/bind/lib/dns/view.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/view.c rename to contrib/bind/lib/dns/view.c diff --git a/contrib/bind-9.5.2/lib/dns/xfrin.c b/contrib/bind/lib/dns/xfrin.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/xfrin.c rename to contrib/bind/lib/dns/xfrin.c diff --git a/contrib/bind-9.5.2/lib/dns/zone.c b/contrib/bind/lib/dns/zone.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/zone.c rename to contrib/bind/lib/dns/zone.c diff --git a/contrib/bind-9.5.2/lib/dns/zonekey.c b/contrib/bind/lib/dns/zonekey.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/zonekey.c rename to contrib/bind/lib/dns/zonekey.c diff --git a/contrib/bind-9.5.2/lib/dns/zt.c b/contrib/bind/lib/dns/zt.c similarity index 100% rename from contrib/bind-9.5.2/lib/dns/zt.c rename to contrib/bind/lib/dns/zt.c diff --git a/contrib/bind-9.5.2/lib/isc/api b/contrib/bind/lib/isc/api similarity index 100% rename from contrib/bind-9.5.2/lib/isc/api rename to contrib/bind/lib/isc/api diff --git a/contrib/bind-9.5.2/lib/isc/assertions.c b/contrib/bind/lib/isc/assertions.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/assertions.c rename to contrib/bind/lib/isc/assertions.c diff --git a/contrib/bind-9.5.2/lib/isc/base64.c b/contrib/bind/lib/isc/base64.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/base64.c rename to contrib/bind/lib/isc/base64.c diff --git a/contrib/bind-9.5.2/lib/isc/bitstring.c b/contrib/bind/lib/isc/bitstring.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/bitstring.c rename to contrib/bind/lib/isc/bitstring.c diff --git a/contrib/bind-9.5.2/lib/isc/buffer.c b/contrib/bind/lib/isc/buffer.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/buffer.c rename to contrib/bind/lib/isc/buffer.c diff --git a/contrib/bind-9.5.2/lib/isc/bufferlist.c b/contrib/bind/lib/isc/bufferlist.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/bufferlist.c rename to contrib/bind/lib/isc/bufferlist.c diff --git a/contrib/bind-9.5.2/lib/isc/commandline.c b/contrib/bind/lib/isc/commandline.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/commandline.c rename to contrib/bind/lib/isc/commandline.c diff --git a/contrib/bind-9.5.2/lib/isc/entropy.c b/contrib/bind/lib/isc/entropy.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/entropy.c rename to contrib/bind/lib/isc/entropy.c diff --git a/contrib/bind-9.5.2/lib/isc/error.c b/contrib/bind/lib/isc/error.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/error.c rename to contrib/bind/lib/isc/error.c diff --git a/contrib/bind-9.5.2/lib/isc/event.c b/contrib/bind/lib/isc/event.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/event.c rename to contrib/bind/lib/isc/event.c diff --git a/contrib/bind-9.5.2/lib/isc/fsaccess.c b/contrib/bind/lib/isc/fsaccess.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/fsaccess.c rename to contrib/bind/lib/isc/fsaccess.c diff --git a/contrib/bind-9.5.2/lib/isc/hash.c b/contrib/bind/lib/isc/hash.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/hash.c rename to contrib/bind/lib/isc/hash.c diff --git a/contrib/bind-9.5.2/lib/isc/heap.c b/contrib/bind/lib/isc/heap.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/heap.c rename to contrib/bind/lib/isc/heap.c diff --git a/contrib/bind-9.5.2/lib/isc/hex.c b/contrib/bind/lib/isc/hex.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/hex.c rename to contrib/bind/lib/isc/hex.c diff --git a/contrib/bind-9.5.2/lib/isc/hmacmd5.c b/contrib/bind/lib/isc/hmacmd5.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/hmacmd5.c rename to contrib/bind/lib/isc/hmacmd5.c diff --git a/contrib/bind-9.5.2/lib/isc/hmacsha.c b/contrib/bind/lib/isc/hmacsha.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/hmacsha.c rename to contrib/bind/lib/isc/hmacsha.c diff --git a/contrib/bind-9.5.2/lib/isc/httpd.c b/contrib/bind/lib/isc/httpd.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/httpd.c rename to contrib/bind/lib/isc/httpd.c diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/app.h b/contrib/bind/lib/isc/include/isc/app.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/app.h rename to contrib/bind/lib/isc/include/isc/app.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/assertions.h b/contrib/bind/lib/isc/include/isc/assertions.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/assertions.h rename to contrib/bind/lib/isc/include/isc/assertions.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/base64.h b/contrib/bind/lib/isc/include/isc/base64.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/base64.h rename to contrib/bind/lib/isc/include/isc/base64.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/bitstring.h b/contrib/bind/lib/isc/include/isc/bitstring.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/bitstring.h rename to contrib/bind/lib/isc/include/isc/bitstring.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/boolean.h b/contrib/bind/lib/isc/include/isc/boolean.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/boolean.h rename to contrib/bind/lib/isc/include/isc/boolean.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/buffer.h b/contrib/bind/lib/isc/include/isc/buffer.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/buffer.h rename to contrib/bind/lib/isc/include/isc/buffer.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/bufferlist.h b/contrib/bind/lib/isc/include/isc/bufferlist.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/bufferlist.h rename to contrib/bind/lib/isc/include/isc/bufferlist.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/commandline.h b/contrib/bind/lib/isc/include/isc/commandline.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/commandline.h rename to contrib/bind/lib/isc/include/isc/commandline.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/entropy.h b/contrib/bind/lib/isc/include/isc/entropy.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/entropy.h rename to contrib/bind/lib/isc/include/isc/entropy.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/error.h b/contrib/bind/lib/isc/include/isc/error.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/error.h rename to contrib/bind/lib/isc/include/isc/error.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/event.h b/contrib/bind/lib/isc/include/isc/event.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/event.h rename to contrib/bind/lib/isc/include/isc/event.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/eventclass.h b/contrib/bind/lib/isc/include/isc/eventclass.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/eventclass.h rename to contrib/bind/lib/isc/include/isc/eventclass.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/file.h b/contrib/bind/lib/isc/include/isc/file.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/file.h rename to contrib/bind/lib/isc/include/isc/file.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/formatcheck.h b/contrib/bind/lib/isc/include/isc/formatcheck.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/formatcheck.h rename to contrib/bind/lib/isc/include/isc/formatcheck.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/fsaccess.h b/contrib/bind/lib/isc/include/isc/fsaccess.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/fsaccess.h rename to contrib/bind/lib/isc/include/isc/fsaccess.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/hash.h b/contrib/bind/lib/isc/include/isc/hash.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/hash.h rename to contrib/bind/lib/isc/include/isc/hash.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/heap.h b/contrib/bind/lib/isc/include/isc/heap.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/heap.h rename to contrib/bind/lib/isc/include/isc/heap.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/hex.h b/contrib/bind/lib/isc/include/isc/hex.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/hex.h rename to contrib/bind/lib/isc/include/isc/hex.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/hmacmd5.h b/contrib/bind/lib/isc/include/isc/hmacmd5.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/hmacmd5.h rename to contrib/bind/lib/isc/include/isc/hmacmd5.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/hmacsha.h b/contrib/bind/lib/isc/include/isc/hmacsha.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/hmacsha.h rename to contrib/bind/lib/isc/include/isc/hmacsha.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/httpd.h b/contrib/bind/lib/isc/include/isc/httpd.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/httpd.h rename to contrib/bind/lib/isc/include/isc/httpd.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/interfaceiter.h b/contrib/bind/lib/isc/include/isc/interfaceiter.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/interfaceiter.h rename to contrib/bind/lib/isc/include/isc/interfaceiter.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/ipv6.h b/contrib/bind/lib/isc/include/isc/ipv6.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/ipv6.h rename to contrib/bind/lib/isc/include/isc/ipv6.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/lang.h b/contrib/bind/lib/isc/include/isc/lang.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/lang.h rename to contrib/bind/lib/isc/include/isc/lang.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/lex.h b/contrib/bind/lib/isc/include/isc/lex.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/lex.h rename to contrib/bind/lib/isc/include/isc/lex.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/lfsr.h b/contrib/bind/lib/isc/include/isc/lfsr.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/lfsr.h rename to contrib/bind/lib/isc/include/isc/lfsr.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/lib.h b/contrib/bind/lib/isc/include/isc/lib.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/lib.h rename to contrib/bind/lib/isc/include/isc/lib.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/list.h b/contrib/bind/lib/isc/include/isc/list.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/list.h rename to contrib/bind/lib/isc/include/isc/list.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/log.h b/contrib/bind/lib/isc/include/isc/log.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/log.h rename to contrib/bind/lib/isc/include/isc/log.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/magic.h b/contrib/bind/lib/isc/include/isc/magic.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/magic.h rename to contrib/bind/lib/isc/include/isc/magic.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/md5.h b/contrib/bind/lib/isc/include/isc/md5.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/md5.h rename to contrib/bind/lib/isc/include/isc/md5.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/mem.h b/contrib/bind/lib/isc/include/isc/mem.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/mem.h rename to contrib/bind/lib/isc/include/isc/mem.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/msgcat.h b/contrib/bind/lib/isc/include/isc/msgcat.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/msgcat.h rename to contrib/bind/lib/isc/include/isc/msgcat.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/msgs.h b/contrib/bind/lib/isc/include/isc/msgs.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/msgs.h rename to contrib/bind/lib/isc/include/isc/msgs.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/mutexblock.h b/contrib/bind/lib/isc/include/isc/mutexblock.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/mutexblock.h rename to contrib/bind/lib/isc/include/isc/mutexblock.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/netaddr.h b/contrib/bind/lib/isc/include/isc/netaddr.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/netaddr.h rename to contrib/bind/lib/isc/include/isc/netaddr.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/netscope.h b/contrib/bind/lib/isc/include/isc/netscope.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/netscope.h rename to contrib/bind/lib/isc/include/isc/netscope.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/ondestroy.h b/contrib/bind/lib/isc/include/isc/ondestroy.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/ondestroy.h rename to contrib/bind/lib/isc/include/isc/ondestroy.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/os.h b/contrib/bind/lib/isc/include/isc/os.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/os.h rename to contrib/bind/lib/isc/include/isc/os.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/parseint.h b/contrib/bind/lib/isc/include/isc/parseint.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/parseint.h rename to contrib/bind/lib/isc/include/isc/parseint.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/platform.h.in b/contrib/bind/lib/isc/include/isc/platform.h.in similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/platform.h.in rename to contrib/bind/lib/isc/include/isc/platform.h.in diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/portset.h b/contrib/bind/lib/isc/include/isc/portset.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/portset.h rename to contrib/bind/lib/isc/include/isc/portset.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/print.h b/contrib/bind/lib/isc/include/isc/print.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/print.h rename to contrib/bind/lib/isc/include/isc/print.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/quota.h b/contrib/bind/lib/isc/include/isc/quota.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/quota.h rename to contrib/bind/lib/isc/include/isc/quota.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/radix.h b/contrib/bind/lib/isc/include/isc/radix.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/radix.h rename to contrib/bind/lib/isc/include/isc/radix.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/random.h b/contrib/bind/lib/isc/include/isc/random.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/random.h rename to contrib/bind/lib/isc/include/isc/random.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/ratelimiter.h b/contrib/bind/lib/isc/include/isc/ratelimiter.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/ratelimiter.h rename to contrib/bind/lib/isc/include/isc/ratelimiter.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/refcount.h b/contrib/bind/lib/isc/include/isc/refcount.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/refcount.h rename to contrib/bind/lib/isc/include/isc/refcount.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/region.h b/contrib/bind/lib/isc/include/isc/region.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/region.h rename to contrib/bind/lib/isc/include/isc/region.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/resource.h b/contrib/bind/lib/isc/include/isc/resource.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/resource.h rename to contrib/bind/lib/isc/include/isc/resource.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/result.h b/contrib/bind/lib/isc/include/isc/result.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/result.h rename to contrib/bind/lib/isc/include/isc/result.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/resultclass.h b/contrib/bind/lib/isc/include/isc/resultclass.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/resultclass.h rename to contrib/bind/lib/isc/include/isc/resultclass.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/rwlock.h b/contrib/bind/lib/isc/include/isc/rwlock.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/rwlock.h rename to contrib/bind/lib/isc/include/isc/rwlock.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/serial.h b/contrib/bind/lib/isc/include/isc/serial.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/serial.h rename to contrib/bind/lib/isc/include/isc/serial.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/sha1.h b/contrib/bind/lib/isc/include/isc/sha1.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/sha1.h rename to contrib/bind/lib/isc/include/isc/sha1.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/sha2.h b/contrib/bind/lib/isc/include/isc/sha2.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/sha2.h rename to contrib/bind/lib/isc/include/isc/sha2.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/sockaddr.h b/contrib/bind/lib/isc/include/isc/sockaddr.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/sockaddr.h rename to contrib/bind/lib/isc/include/isc/sockaddr.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/socket.h b/contrib/bind/lib/isc/include/isc/socket.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/socket.h rename to contrib/bind/lib/isc/include/isc/socket.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/stats.h b/contrib/bind/lib/isc/include/isc/stats.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/stats.h rename to contrib/bind/lib/isc/include/isc/stats.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/stdio.h b/contrib/bind/lib/isc/include/isc/stdio.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/stdio.h rename to contrib/bind/lib/isc/include/isc/stdio.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/stdlib.h b/contrib/bind/lib/isc/include/isc/stdlib.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/stdlib.h rename to contrib/bind/lib/isc/include/isc/stdlib.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/string.h b/contrib/bind/lib/isc/include/isc/string.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/string.h rename to contrib/bind/lib/isc/include/isc/string.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/symtab.h b/contrib/bind/lib/isc/include/isc/symtab.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/symtab.h rename to contrib/bind/lib/isc/include/isc/symtab.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/task.h b/contrib/bind/lib/isc/include/isc/task.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/task.h rename to contrib/bind/lib/isc/include/isc/task.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/taskpool.h b/contrib/bind/lib/isc/include/isc/taskpool.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/taskpool.h rename to contrib/bind/lib/isc/include/isc/taskpool.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/timer.h b/contrib/bind/lib/isc/include/isc/timer.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/timer.h rename to contrib/bind/lib/isc/include/isc/timer.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/types.h b/contrib/bind/lib/isc/include/isc/types.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/types.h rename to contrib/bind/lib/isc/include/isc/types.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/util.h b/contrib/bind/lib/isc/include/isc/util.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/util.h rename to contrib/bind/lib/isc/include/isc/util.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/version.h b/contrib/bind/lib/isc/include/isc/version.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/version.h rename to contrib/bind/lib/isc/include/isc/version.h diff --git a/contrib/bind-9.5.2/lib/isc/include/isc/xml.h b/contrib/bind/lib/isc/include/isc/xml.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/include/isc/xml.h rename to contrib/bind/lib/isc/include/isc/xml.h diff --git a/contrib/bind-9.5.2/lib/isc/inet_aton.c b/contrib/bind/lib/isc/inet_aton.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/inet_aton.c rename to contrib/bind/lib/isc/inet_aton.c diff --git a/contrib/bind-9.5.2/lib/isc/inet_ntop.c b/contrib/bind/lib/isc/inet_ntop.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/inet_ntop.c rename to contrib/bind/lib/isc/inet_ntop.c diff --git a/contrib/bind-9.5.2/lib/isc/inet_pton.c b/contrib/bind/lib/isc/inet_pton.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/inet_pton.c rename to contrib/bind/lib/isc/inet_pton.c diff --git a/contrib/bind-9.5.2/lib/isc/lex.c b/contrib/bind/lib/isc/lex.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/lex.c rename to contrib/bind/lib/isc/lex.c diff --git a/contrib/bind-9.5.2/lib/isc/lfsr.c b/contrib/bind/lib/isc/lfsr.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/lfsr.c rename to contrib/bind/lib/isc/lfsr.c diff --git a/contrib/bind-9.5.2/lib/isc/lib.c b/contrib/bind/lib/isc/lib.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/lib.c rename to contrib/bind/lib/isc/lib.c diff --git a/contrib/bind-9.5.2/lib/isc/log.c b/contrib/bind/lib/isc/log.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/log.c rename to contrib/bind/lib/isc/log.c diff --git a/contrib/bind-9.5.2/lib/isc/md5.c b/contrib/bind/lib/isc/md5.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/md5.c rename to contrib/bind/lib/isc/md5.c diff --git a/contrib/bind-9.5.2/lib/isc/mem.c b/contrib/bind/lib/isc/mem.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/mem.c rename to contrib/bind/lib/isc/mem.c diff --git a/contrib/bind-9.5.2/lib/isc/mutexblock.c b/contrib/bind/lib/isc/mutexblock.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/mutexblock.c rename to contrib/bind/lib/isc/mutexblock.c diff --git a/contrib/bind-9.5.2/lib/isc/netaddr.c b/contrib/bind/lib/isc/netaddr.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/netaddr.c rename to contrib/bind/lib/isc/netaddr.c diff --git a/contrib/bind-9.5.2/lib/isc/netscope.c b/contrib/bind/lib/isc/netscope.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/netscope.c rename to contrib/bind/lib/isc/netscope.c diff --git a/contrib/bind-9.5.2/lib/isc/nls/msgcat.c b/contrib/bind/lib/isc/nls/msgcat.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/nls/msgcat.c rename to contrib/bind/lib/isc/nls/msgcat.c diff --git a/contrib/bind-9.5.2/lib/isc/noatomic/include/isc/atomic.h b/contrib/bind/lib/isc/noatomic/include/isc/atomic.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/noatomic/include/isc/atomic.h rename to contrib/bind/lib/isc/noatomic/include/isc/atomic.h diff --git a/contrib/bind-9.5.2/lib/isc/nothreads/condition.c b/contrib/bind/lib/isc/nothreads/condition.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/nothreads/condition.c rename to contrib/bind/lib/isc/nothreads/condition.c diff --git a/contrib/bind-9.5.2/lib/isc/nothreads/include/isc/condition.h b/contrib/bind/lib/isc/nothreads/include/isc/condition.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/nothreads/include/isc/condition.h rename to contrib/bind/lib/isc/nothreads/include/isc/condition.h diff --git a/contrib/bind-9.5.2/lib/isc/nothreads/include/isc/mutex.h b/contrib/bind/lib/isc/nothreads/include/isc/mutex.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/nothreads/include/isc/mutex.h rename to contrib/bind/lib/isc/nothreads/include/isc/mutex.h diff --git a/contrib/bind-9.5.2/lib/isc/nothreads/include/isc/once.h b/contrib/bind/lib/isc/nothreads/include/isc/once.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/nothreads/include/isc/once.h rename to contrib/bind/lib/isc/nothreads/include/isc/once.h diff --git a/contrib/bind-9.5.2/lib/isc/nothreads/include/isc/thread.h b/contrib/bind/lib/isc/nothreads/include/isc/thread.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/nothreads/include/isc/thread.h rename to contrib/bind/lib/isc/nothreads/include/isc/thread.h diff --git a/contrib/bind-9.5.2/lib/isc/nothreads/mutex.c b/contrib/bind/lib/isc/nothreads/mutex.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/nothreads/mutex.c rename to contrib/bind/lib/isc/nothreads/mutex.c diff --git a/contrib/bind-9.5.2/lib/isc/nothreads/thread.c b/contrib/bind/lib/isc/nothreads/thread.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/nothreads/thread.c rename to contrib/bind/lib/isc/nothreads/thread.c diff --git a/contrib/bind-9.5.2/lib/isc/ondestroy.c b/contrib/bind/lib/isc/ondestroy.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/ondestroy.c rename to contrib/bind/lib/isc/ondestroy.c diff --git a/contrib/bind-9.5.2/lib/isc/parseint.c b/contrib/bind/lib/isc/parseint.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/parseint.c rename to contrib/bind/lib/isc/parseint.c diff --git a/contrib/bind-9.5.2/lib/isc/portset.c b/contrib/bind/lib/isc/portset.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/portset.c rename to contrib/bind/lib/isc/portset.c diff --git a/contrib/bind-9.5.2/lib/isc/print.c b/contrib/bind/lib/isc/print.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/print.c rename to contrib/bind/lib/isc/print.c diff --git a/contrib/bind-9.5.2/lib/isc/pthreads/condition.c b/contrib/bind/lib/isc/pthreads/condition.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/pthreads/condition.c rename to contrib/bind/lib/isc/pthreads/condition.c diff --git a/contrib/bind-9.5.2/lib/isc/pthreads/include/isc/condition.h b/contrib/bind/lib/isc/pthreads/include/isc/condition.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/pthreads/include/isc/condition.h rename to contrib/bind/lib/isc/pthreads/include/isc/condition.h diff --git a/contrib/bind-9.5.2/lib/isc/pthreads/include/isc/mutex.h b/contrib/bind/lib/isc/pthreads/include/isc/mutex.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/pthreads/include/isc/mutex.h rename to contrib/bind/lib/isc/pthreads/include/isc/mutex.h diff --git a/contrib/bind-9.5.2/lib/isc/pthreads/include/isc/once.h b/contrib/bind/lib/isc/pthreads/include/isc/once.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/pthreads/include/isc/once.h rename to contrib/bind/lib/isc/pthreads/include/isc/once.h diff --git a/contrib/bind-9.5.2/lib/isc/pthreads/include/isc/thread.h b/contrib/bind/lib/isc/pthreads/include/isc/thread.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/pthreads/include/isc/thread.h rename to contrib/bind/lib/isc/pthreads/include/isc/thread.h diff --git a/contrib/bind-9.5.2/lib/isc/pthreads/mutex.c b/contrib/bind/lib/isc/pthreads/mutex.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/pthreads/mutex.c rename to contrib/bind/lib/isc/pthreads/mutex.c diff --git a/contrib/bind-9.5.2/lib/isc/pthreads/thread.c b/contrib/bind/lib/isc/pthreads/thread.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/pthreads/thread.c rename to contrib/bind/lib/isc/pthreads/thread.c diff --git a/contrib/bind-9.5.2/lib/isc/quota.c b/contrib/bind/lib/isc/quota.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/quota.c rename to contrib/bind/lib/isc/quota.c diff --git a/contrib/bind-9.5.2/lib/isc/radix.c b/contrib/bind/lib/isc/radix.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/radix.c rename to contrib/bind/lib/isc/radix.c diff --git a/contrib/bind-9.5.2/lib/isc/random.c b/contrib/bind/lib/isc/random.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/random.c rename to contrib/bind/lib/isc/random.c diff --git a/contrib/bind-9.5.2/lib/isc/ratelimiter.c b/contrib/bind/lib/isc/ratelimiter.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/ratelimiter.c rename to contrib/bind/lib/isc/ratelimiter.c diff --git a/contrib/bind-9.5.2/lib/isc/refcount.c b/contrib/bind/lib/isc/refcount.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/refcount.c rename to contrib/bind/lib/isc/refcount.c diff --git a/contrib/bind-9.5.2/lib/isc/region.c b/contrib/bind/lib/isc/region.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/region.c rename to contrib/bind/lib/isc/region.c diff --git a/contrib/bind-9.5.2/lib/isc/result.c b/contrib/bind/lib/isc/result.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/result.c rename to contrib/bind/lib/isc/result.c diff --git a/contrib/bind-9.5.2/lib/isc/rwlock.c b/contrib/bind/lib/isc/rwlock.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/rwlock.c rename to contrib/bind/lib/isc/rwlock.c diff --git a/contrib/bind-9.5.2/lib/isc/serial.c b/contrib/bind/lib/isc/serial.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/serial.c rename to contrib/bind/lib/isc/serial.c diff --git a/contrib/bind-9.5.2/lib/isc/sha1.c b/contrib/bind/lib/isc/sha1.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/sha1.c rename to contrib/bind/lib/isc/sha1.c diff --git a/contrib/bind-9.5.2/lib/isc/sha2.c b/contrib/bind/lib/isc/sha2.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/sha2.c rename to contrib/bind/lib/isc/sha2.c diff --git a/contrib/bind-9.5.2/lib/isc/sockaddr.c b/contrib/bind/lib/isc/sockaddr.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/sockaddr.c rename to contrib/bind/lib/isc/sockaddr.c diff --git a/contrib/bind-9.5.2/lib/isc/stats.c b/contrib/bind/lib/isc/stats.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/stats.c rename to contrib/bind/lib/isc/stats.c diff --git a/contrib/bind-9.5.2/lib/isc/string.c b/contrib/bind/lib/isc/string.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/string.c rename to contrib/bind/lib/isc/string.c diff --git a/contrib/bind-9.5.2/lib/isc/strtoul.c b/contrib/bind/lib/isc/strtoul.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/strtoul.c rename to contrib/bind/lib/isc/strtoul.c diff --git a/contrib/bind-9.5.2/lib/isc/symtab.c b/contrib/bind/lib/isc/symtab.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/symtab.c rename to contrib/bind/lib/isc/symtab.c diff --git a/contrib/bind-9.5.2/lib/isc/task.c b/contrib/bind/lib/isc/task.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/task.c rename to contrib/bind/lib/isc/task.c diff --git a/contrib/bind-9.5.2/lib/isc/task_p.h b/contrib/bind/lib/isc/task_p.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/task_p.h rename to contrib/bind/lib/isc/task_p.h diff --git a/contrib/bind-9.5.2/lib/isc/taskpool.c b/contrib/bind/lib/isc/taskpool.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/taskpool.c rename to contrib/bind/lib/isc/taskpool.c diff --git a/contrib/bind-9.5.2/lib/isc/timer.c b/contrib/bind/lib/isc/timer.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/timer.c rename to contrib/bind/lib/isc/timer.c diff --git a/contrib/bind-9.5.2/lib/isc/timer_p.h b/contrib/bind/lib/isc/timer_p.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/timer_p.h rename to contrib/bind/lib/isc/timer_p.h diff --git a/contrib/bind-9.5.2/lib/isc/unix/app.c b/contrib/bind/lib/isc/unix/app.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/app.c rename to contrib/bind/lib/isc/unix/app.c diff --git a/contrib/bind-9.5.2/lib/isc/unix/dir.c b/contrib/bind/lib/isc/unix/dir.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/dir.c rename to contrib/bind/lib/isc/unix/dir.c diff --git a/contrib/bind-9.5.2/lib/isc/unix/entropy.c b/contrib/bind/lib/isc/unix/entropy.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/entropy.c rename to contrib/bind/lib/isc/unix/entropy.c diff --git a/contrib/bind-9.5.2/lib/isc/unix/errno2result.c b/contrib/bind/lib/isc/unix/errno2result.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/errno2result.c rename to contrib/bind/lib/isc/unix/errno2result.c diff --git a/contrib/bind-9.5.2/lib/isc/unix/errno2result.h b/contrib/bind/lib/isc/unix/errno2result.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/errno2result.h rename to contrib/bind/lib/isc/unix/errno2result.h diff --git a/contrib/bind-9.5.2/lib/isc/unix/file.c b/contrib/bind/lib/isc/unix/file.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/file.c rename to contrib/bind/lib/isc/unix/file.c diff --git a/contrib/bind-9.5.2/lib/isc/unix/fsaccess.c b/contrib/bind/lib/isc/unix/fsaccess.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/fsaccess.c rename to contrib/bind/lib/isc/unix/fsaccess.c diff --git a/contrib/bind-9.5.2/lib/isc/unix/ifiter_getifaddrs.c b/contrib/bind/lib/isc/unix/ifiter_getifaddrs.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/ifiter_getifaddrs.c rename to contrib/bind/lib/isc/unix/ifiter_getifaddrs.c diff --git a/contrib/bind-9.5.2/lib/isc/unix/ifiter_ioctl.c b/contrib/bind/lib/isc/unix/ifiter_ioctl.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/ifiter_ioctl.c rename to contrib/bind/lib/isc/unix/ifiter_ioctl.c diff --git a/contrib/bind-9.5.2/lib/isc/unix/ifiter_sysctl.c b/contrib/bind/lib/isc/unix/ifiter_sysctl.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/ifiter_sysctl.c rename to contrib/bind/lib/isc/unix/ifiter_sysctl.c diff --git a/contrib/bind-9.5.2/lib/isc/unix/include/isc/dir.h b/contrib/bind/lib/isc/unix/include/isc/dir.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/include/isc/dir.h rename to contrib/bind/lib/isc/unix/include/isc/dir.h diff --git a/contrib/bind-9.5.2/lib/isc/unix/include/isc/int.h b/contrib/bind/lib/isc/unix/include/isc/int.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/include/isc/int.h rename to contrib/bind/lib/isc/unix/include/isc/int.h diff --git a/contrib/bind-9.5.2/lib/isc/unix/include/isc/keyboard.h b/contrib/bind/lib/isc/unix/include/isc/keyboard.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/include/isc/keyboard.h rename to contrib/bind/lib/isc/unix/include/isc/keyboard.h diff --git a/contrib/bind-9.5.2/lib/isc/unix/include/isc/net.h b/contrib/bind/lib/isc/unix/include/isc/net.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/include/isc/net.h rename to contrib/bind/lib/isc/unix/include/isc/net.h diff --git a/contrib/bind-9.5.2/lib/isc/unix/include/isc/netdb.h b/contrib/bind/lib/isc/unix/include/isc/netdb.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/include/isc/netdb.h rename to contrib/bind/lib/isc/unix/include/isc/netdb.h diff --git a/contrib/bind-9.5.2/lib/isc/unix/include/isc/offset.h b/contrib/bind/lib/isc/unix/include/isc/offset.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/include/isc/offset.h rename to contrib/bind/lib/isc/unix/include/isc/offset.h diff --git a/contrib/bind-9.5.2/lib/isc/unix/include/isc/stat.h b/contrib/bind/lib/isc/unix/include/isc/stat.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/include/isc/stat.h rename to contrib/bind/lib/isc/unix/include/isc/stat.h diff --git a/contrib/bind-9.5.2/lib/isc/unix/include/isc/stdtime.h b/contrib/bind/lib/isc/unix/include/isc/stdtime.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/include/isc/stdtime.h rename to contrib/bind/lib/isc/unix/include/isc/stdtime.h diff --git a/contrib/bind-9.5.2/lib/isc/unix/include/isc/strerror.h b/contrib/bind/lib/isc/unix/include/isc/strerror.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/include/isc/strerror.h rename to contrib/bind/lib/isc/unix/include/isc/strerror.h diff --git a/contrib/bind-9.5.2/lib/isc/unix/include/isc/syslog.h b/contrib/bind/lib/isc/unix/include/isc/syslog.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/include/isc/syslog.h rename to contrib/bind/lib/isc/unix/include/isc/syslog.h diff --git a/contrib/bind-9.5.2/lib/isc/unix/include/isc/time.h b/contrib/bind/lib/isc/unix/include/isc/time.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/include/isc/time.h rename to contrib/bind/lib/isc/unix/include/isc/time.h diff --git a/contrib/bind-9.5.2/lib/isc/unix/interfaceiter.c b/contrib/bind/lib/isc/unix/interfaceiter.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/interfaceiter.c rename to contrib/bind/lib/isc/unix/interfaceiter.c diff --git a/contrib/bind-9.5.2/lib/isc/unix/ipv6.c b/contrib/bind/lib/isc/unix/ipv6.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/ipv6.c rename to contrib/bind/lib/isc/unix/ipv6.c diff --git a/contrib/bind-9.5.2/lib/isc/unix/keyboard.c b/contrib/bind/lib/isc/unix/keyboard.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/keyboard.c rename to contrib/bind/lib/isc/unix/keyboard.c diff --git a/contrib/bind-9.5.2/lib/isc/unix/net.c b/contrib/bind/lib/isc/unix/net.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/net.c rename to contrib/bind/lib/isc/unix/net.c diff --git a/contrib/bind-9.5.2/lib/isc/unix/os.c b/contrib/bind/lib/isc/unix/os.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/os.c rename to contrib/bind/lib/isc/unix/os.c diff --git a/contrib/bind-9.5.2/lib/isc/unix/resource.c b/contrib/bind/lib/isc/unix/resource.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/resource.c rename to contrib/bind/lib/isc/unix/resource.c diff --git a/contrib/bind-9.5.2/lib/isc/unix/socket.c b/contrib/bind/lib/isc/unix/socket.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/socket.c rename to contrib/bind/lib/isc/unix/socket.c diff --git a/contrib/bind-9.5.2/lib/isc/unix/socket_p.h b/contrib/bind/lib/isc/unix/socket_p.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/socket_p.h rename to contrib/bind/lib/isc/unix/socket_p.h diff --git a/contrib/bind-9.5.2/lib/isc/unix/stdio.c b/contrib/bind/lib/isc/unix/stdio.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/stdio.c rename to contrib/bind/lib/isc/unix/stdio.c diff --git a/contrib/bind-9.5.2/lib/isc/unix/stdtime.c b/contrib/bind/lib/isc/unix/stdtime.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/stdtime.c rename to contrib/bind/lib/isc/unix/stdtime.c diff --git a/contrib/bind-9.5.2/lib/isc/unix/strerror.c b/contrib/bind/lib/isc/unix/strerror.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/strerror.c rename to contrib/bind/lib/isc/unix/strerror.c diff --git a/contrib/bind-9.5.2/lib/isc/unix/syslog.c b/contrib/bind/lib/isc/unix/syslog.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/syslog.c rename to contrib/bind/lib/isc/unix/syslog.c diff --git a/contrib/bind-9.5.2/lib/isc/unix/time.c b/contrib/bind/lib/isc/unix/time.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/unix/time.c rename to contrib/bind/lib/isc/unix/time.c diff --git a/contrib/bind-9.5.2/lib/isc/version.c b/contrib/bind/lib/isc/version.c similarity index 100% rename from contrib/bind-9.5.2/lib/isc/version.c rename to contrib/bind/lib/isc/version.c diff --git a/contrib/bind-9.5.2/lib/isc/x86_32/include/isc/atomic.h b/contrib/bind/lib/isc/x86_32/include/isc/atomic.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/x86_32/include/isc/atomic.h rename to contrib/bind/lib/isc/x86_32/include/isc/atomic.h diff --git a/contrib/bind-9.5.2/lib/isc/x86_64/include/isc/atomic.h b/contrib/bind/lib/isc/x86_64/include/isc/atomic.h similarity index 100% rename from contrib/bind-9.5.2/lib/isc/x86_64/include/isc/atomic.h rename to contrib/bind/lib/isc/x86_64/include/isc/atomic.h diff --git a/contrib/bind-9.5.2/lib/isccc/alist.c b/contrib/bind/lib/isccc/alist.c similarity index 100% rename from contrib/bind-9.5.2/lib/isccc/alist.c rename to contrib/bind/lib/isccc/alist.c diff --git a/contrib/bind-9.5.2/lib/isccc/api b/contrib/bind/lib/isccc/api similarity index 100% rename from contrib/bind-9.5.2/lib/isccc/api rename to contrib/bind/lib/isccc/api diff --git a/contrib/bind-9.5.2/lib/isccc/base64.c b/contrib/bind/lib/isccc/base64.c similarity index 100% rename from contrib/bind-9.5.2/lib/isccc/base64.c rename to contrib/bind/lib/isccc/base64.c diff --git a/contrib/bind-9.5.2/lib/isccc/cc.c b/contrib/bind/lib/isccc/cc.c similarity index 100% rename from contrib/bind-9.5.2/lib/isccc/cc.c rename to contrib/bind/lib/isccc/cc.c diff --git a/contrib/bind-9.5.2/lib/isccc/ccmsg.c b/contrib/bind/lib/isccc/ccmsg.c similarity index 100% rename from contrib/bind-9.5.2/lib/isccc/ccmsg.c rename to contrib/bind/lib/isccc/ccmsg.c diff --git a/contrib/bind-9.5.2/lib/isccc/include/isccc/alist.h b/contrib/bind/lib/isccc/include/isccc/alist.h similarity index 100% rename from contrib/bind-9.5.2/lib/isccc/include/isccc/alist.h rename to contrib/bind/lib/isccc/include/isccc/alist.h diff --git a/contrib/bind-9.5.2/lib/isccc/include/isccc/base64.h b/contrib/bind/lib/isccc/include/isccc/base64.h similarity index 100% rename from contrib/bind-9.5.2/lib/isccc/include/isccc/base64.h rename to contrib/bind/lib/isccc/include/isccc/base64.h diff --git a/contrib/bind-9.5.2/lib/isccc/include/isccc/cc.h b/contrib/bind/lib/isccc/include/isccc/cc.h similarity index 100% rename from contrib/bind-9.5.2/lib/isccc/include/isccc/cc.h rename to contrib/bind/lib/isccc/include/isccc/cc.h diff --git a/contrib/bind-9.5.2/lib/isccc/include/isccc/ccmsg.h b/contrib/bind/lib/isccc/include/isccc/ccmsg.h similarity index 100% rename from contrib/bind-9.5.2/lib/isccc/include/isccc/ccmsg.h rename to contrib/bind/lib/isccc/include/isccc/ccmsg.h diff --git a/contrib/bind-9.5.2/lib/isccc/include/isccc/events.h b/contrib/bind/lib/isccc/include/isccc/events.h similarity index 100% rename from contrib/bind-9.5.2/lib/isccc/include/isccc/events.h rename to contrib/bind/lib/isccc/include/isccc/events.h diff --git a/contrib/bind-9.5.2/lib/isccc/include/isccc/lib.h b/contrib/bind/lib/isccc/include/isccc/lib.h similarity index 100% rename from contrib/bind-9.5.2/lib/isccc/include/isccc/lib.h rename to contrib/bind/lib/isccc/include/isccc/lib.h diff --git a/contrib/bind-9.5.2/lib/isccc/include/isccc/result.h b/contrib/bind/lib/isccc/include/isccc/result.h similarity index 100% rename from contrib/bind-9.5.2/lib/isccc/include/isccc/result.h rename to contrib/bind/lib/isccc/include/isccc/result.h diff --git a/contrib/bind-9.5.2/lib/isccc/include/isccc/sexpr.h b/contrib/bind/lib/isccc/include/isccc/sexpr.h similarity index 100% rename from contrib/bind-9.5.2/lib/isccc/include/isccc/sexpr.h rename to contrib/bind/lib/isccc/include/isccc/sexpr.h diff --git a/contrib/bind-9.5.2/lib/isccc/include/isccc/symtab.h b/contrib/bind/lib/isccc/include/isccc/symtab.h similarity index 100% rename from contrib/bind-9.5.2/lib/isccc/include/isccc/symtab.h rename to contrib/bind/lib/isccc/include/isccc/symtab.h diff --git a/contrib/bind-9.5.2/lib/isccc/include/isccc/symtype.h b/contrib/bind/lib/isccc/include/isccc/symtype.h similarity index 100% rename from contrib/bind-9.5.2/lib/isccc/include/isccc/symtype.h rename to contrib/bind/lib/isccc/include/isccc/symtype.h diff --git a/contrib/bind-9.5.2/lib/isccc/include/isccc/types.h b/contrib/bind/lib/isccc/include/isccc/types.h similarity index 100% rename from contrib/bind-9.5.2/lib/isccc/include/isccc/types.h rename to contrib/bind/lib/isccc/include/isccc/types.h diff --git a/contrib/bind-9.5.2/lib/isccc/include/isccc/util.h b/contrib/bind/lib/isccc/include/isccc/util.h similarity index 100% rename from contrib/bind-9.5.2/lib/isccc/include/isccc/util.h rename to contrib/bind/lib/isccc/include/isccc/util.h diff --git a/contrib/bind-9.5.2/lib/isccc/include/isccc/version.h b/contrib/bind/lib/isccc/include/isccc/version.h similarity index 100% rename from contrib/bind-9.5.2/lib/isccc/include/isccc/version.h rename to contrib/bind/lib/isccc/include/isccc/version.h diff --git a/contrib/bind-9.5.2/lib/isccc/lib.c b/contrib/bind/lib/isccc/lib.c similarity index 100% rename from contrib/bind-9.5.2/lib/isccc/lib.c rename to contrib/bind/lib/isccc/lib.c diff --git a/contrib/bind-9.5.2/lib/isccc/result.c b/contrib/bind/lib/isccc/result.c similarity index 100% rename from contrib/bind-9.5.2/lib/isccc/result.c rename to contrib/bind/lib/isccc/result.c diff --git a/contrib/bind-9.5.2/lib/isccc/sexpr.c b/contrib/bind/lib/isccc/sexpr.c similarity index 100% rename from contrib/bind-9.5.2/lib/isccc/sexpr.c rename to contrib/bind/lib/isccc/sexpr.c diff --git a/contrib/bind-9.5.2/lib/isccc/symtab.c b/contrib/bind/lib/isccc/symtab.c similarity index 100% rename from contrib/bind-9.5.2/lib/isccc/symtab.c rename to contrib/bind/lib/isccc/symtab.c diff --git a/contrib/bind-9.5.2/lib/isccc/version.c b/contrib/bind/lib/isccc/version.c similarity index 100% rename from contrib/bind-9.5.2/lib/isccc/version.c rename to contrib/bind/lib/isccc/version.c diff --git a/contrib/bind-9.5.2/lib/isccfg/aclconf.c b/contrib/bind/lib/isccfg/aclconf.c similarity index 100% rename from contrib/bind-9.5.2/lib/isccfg/aclconf.c rename to contrib/bind/lib/isccfg/aclconf.c diff --git a/contrib/bind-9.5.2/lib/isccfg/api b/contrib/bind/lib/isccfg/api similarity index 100% rename from contrib/bind-9.5.2/lib/isccfg/api rename to contrib/bind/lib/isccfg/api diff --git a/contrib/bind-9.5.2/lib/isccfg/include/isccfg/aclconf.h b/contrib/bind/lib/isccfg/include/isccfg/aclconf.h similarity index 100% rename from contrib/bind-9.5.2/lib/isccfg/include/isccfg/aclconf.h rename to contrib/bind/lib/isccfg/include/isccfg/aclconf.h diff --git a/contrib/bind-9.5.2/lib/isccfg/include/isccfg/cfg.h b/contrib/bind/lib/isccfg/include/isccfg/cfg.h similarity index 100% rename from contrib/bind-9.5.2/lib/isccfg/include/isccfg/cfg.h rename to contrib/bind/lib/isccfg/include/isccfg/cfg.h diff --git a/contrib/bind-9.5.2/lib/isccfg/include/isccfg/grammar.h b/contrib/bind/lib/isccfg/include/isccfg/grammar.h similarity index 100% rename from contrib/bind-9.5.2/lib/isccfg/include/isccfg/grammar.h rename to contrib/bind/lib/isccfg/include/isccfg/grammar.h diff --git a/contrib/bind-9.5.2/lib/isccfg/include/isccfg/log.h b/contrib/bind/lib/isccfg/include/isccfg/log.h similarity index 100% rename from contrib/bind-9.5.2/lib/isccfg/include/isccfg/log.h rename to contrib/bind/lib/isccfg/include/isccfg/log.h diff --git a/contrib/bind-9.5.2/lib/isccfg/include/isccfg/namedconf.h b/contrib/bind/lib/isccfg/include/isccfg/namedconf.h similarity index 100% rename from contrib/bind-9.5.2/lib/isccfg/include/isccfg/namedconf.h rename to contrib/bind/lib/isccfg/include/isccfg/namedconf.h diff --git a/contrib/bind-9.5.2/lib/isccfg/include/isccfg/version.h b/contrib/bind/lib/isccfg/include/isccfg/version.h similarity index 100% rename from contrib/bind-9.5.2/lib/isccfg/include/isccfg/version.h rename to contrib/bind/lib/isccfg/include/isccfg/version.h diff --git a/contrib/bind-9.5.2/lib/isccfg/log.c b/contrib/bind/lib/isccfg/log.c similarity index 100% rename from contrib/bind-9.5.2/lib/isccfg/log.c rename to contrib/bind/lib/isccfg/log.c diff --git a/contrib/bind-9.5.2/lib/isccfg/namedconf.c b/contrib/bind/lib/isccfg/namedconf.c similarity index 100% rename from contrib/bind-9.5.2/lib/isccfg/namedconf.c rename to contrib/bind/lib/isccfg/namedconf.c diff --git a/contrib/bind-9.5.2/lib/isccfg/parser.c b/contrib/bind/lib/isccfg/parser.c similarity index 100% rename from contrib/bind-9.5.2/lib/isccfg/parser.c rename to contrib/bind/lib/isccfg/parser.c diff --git a/contrib/bind-9.5.2/lib/isccfg/version.c b/contrib/bind/lib/isccfg/version.c similarity index 100% rename from contrib/bind-9.5.2/lib/isccfg/version.c rename to contrib/bind/lib/isccfg/version.c diff --git a/contrib/bind-9.5.2/lib/lwres/api b/contrib/bind/lib/lwres/api similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/api rename to contrib/bind/lib/lwres/api diff --git a/contrib/bind-9.5.2/lib/lwres/assert_p.h b/contrib/bind/lib/lwres/assert_p.h similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/assert_p.h rename to contrib/bind/lib/lwres/assert_p.h diff --git a/contrib/bind-9.5.2/lib/lwres/context.c b/contrib/bind/lib/lwres/context.c similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/context.c rename to contrib/bind/lib/lwres/context.c diff --git a/contrib/bind-9.5.2/lib/lwres/context_p.h b/contrib/bind/lib/lwres/context_p.h similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/context_p.h rename to contrib/bind/lib/lwres/context_p.h diff --git a/contrib/bind-9.5.2/lib/lwres/gai_strerror.c b/contrib/bind/lib/lwres/gai_strerror.c similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/gai_strerror.c rename to contrib/bind/lib/lwres/gai_strerror.c diff --git a/contrib/bind-9.5.2/lib/lwres/getaddrinfo.c b/contrib/bind/lib/lwres/getaddrinfo.c similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/getaddrinfo.c rename to contrib/bind/lib/lwres/getaddrinfo.c diff --git a/contrib/bind-9.5.2/lib/lwres/gethost.c b/contrib/bind/lib/lwres/gethost.c similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/gethost.c rename to contrib/bind/lib/lwres/gethost.c diff --git a/contrib/bind-9.5.2/lib/lwres/getipnode.c b/contrib/bind/lib/lwres/getipnode.c similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/getipnode.c rename to contrib/bind/lib/lwres/getipnode.c diff --git a/contrib/bind-9.5.2/lib/lwres/getnameinfo.c b/contrib/bind/lib/lwres/getnameinfo.c similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/getnameinfo.c rename to contrib/bind/lib/lwres/getnameinfo.c diff --git a/contrib/bind-9.5.2/lib/lwres/getrrset.c b/contrib/bind/lib/lwres/getrrset.c similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/getrrset.c rename to contrib/bind/lib/lwres/getrrset.c diff --git a/contrib/bind-9.5.2/lib/lwres/herror.c b/contrib/bind/lib/lwres/herror.c similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/herror.c rename to contrib/bind/lib/lwres/herror.c diff --git a/contrib/bind-9.5.2/lib/lwres/include/lwres/context.h b/contrib/bind/lib/lwres/include/lwres/context.h similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/include/lwres/context.h rename to contrib/bind/lib/lwres/include/lwres/context.h diff --git a/contrib/bind-9.5.2/lib/lwres/include/lwres/int.h b/contrib/bind/lib/lwres/include/lwres/int.h similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/include/lwres/int.h rename to contrib/bind/lib/lwres/include/lwres/int.h diff --git a/contrib/bind-9.5.2/lib/lwres/include/lwres/ipv6.h b/contrib/bind/lib/lwres/include/lwres/ipv6.h similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/include/lwres/ipv6.h rename to contrib/bind/lib/lwres/include/lwres/ipv6.h diff --git a/contrib/bind-9.5.2/lib/lwres/include/lwres/lang.h b/contrib/bind/lib/lwres/include/lwres/lang.h similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/include/lwres/lang.h rename to contrib/bind/lib/lwres/include/lwres/lang.h diff --git a/contrib/bind-9.5.2/lib/lwres/include/lwres/list.h b/contrib/bind/lib/lwres/include/lwres/list.h similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/include/lwres/list.h rename to contrib/bind/lib/lwres/include/lwres/list.h diff --git a/contrib/bind-9.5.2/lib/lwres/include/lwres/lwbuffer.h b/contrib/bind/lib/lwres/include/lwres/lwbuffer.h similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/include/lwres/lwbuffer.h rename to contrib/bind/lib/lwres/include/lwres/lwbuffer.h diff --git a/contrib/bind-9.5.2/lib/lwres/include/lwres/lwpacket.h b/contrib/bind/lib/lwres/include/lwres/lwpacket.h similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/include/lwres/lwpacket.h rename to contrib/bind/lib/lwres/include/lwres/lwpacket.h diff --git a/contrib/bind-9.5.2/lib/lwres/include/lwres/lwres.h b/contrib/bind/lib/lwres/include/lwres/lwres.h similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/include/lwres/lwres.h rename to contrib/bind/lib/lwres/include/lwres/lwres.h diff --git a/contrib/bind-9.5.2/lib/lwres/include/lwres/netdb.h.in b/contrib/bind/lib/lwres/include/lwres/netdb.h.in similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/include/lwres/netdb.h.in rename to contrib/bind/lib/lwres/include/lwres/netdb.h.in diff --git a/contrib/bind-9.5.2/lib/lwres/include/lwres/platform.h.in b/contrib/bind/lib/lwres/include/lwres/platform.h.in similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/include/lwres/platform.h.in rename to contrib/bind/lib/lwres/include/lwres/platform.h.in diff --git a/contrib/bind-9.5.2/lib/lwres/include/lwres/result.h b/contrib/bind/lib/lwres/include/lwres/result.h similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/include/lwres/result.h rename to contrib/bind/lib/lwres/include/lwres/result.h diff --git a/contrib/bind-9.5.2/lib/lwres/include/lwres/stdlib.h b/contrib/bind/lib/lwres/include/lwres/stdlib.h similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/include/lwres/stdlib.h rename to contrib/bind/lib/lwres/include/lwres/stdlib.h diff --git a/contrib/bind-9.5.2/lib/lwres/include/lwres/version.h b/contrib/bind/lib/lwres/include/lwres/version.h similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/include/lwres/version.h rename to contrib/bind/lib/lwres/include/lwres/version.h diff --git a/contrib/bind-9.5.2/lib/lwres/lwbuffer.c b/contrib/bind/lib/lwres/lwbuffer.c similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/lwbuffer.c rename to contrib/bind/lib/lwres/lwbuffer.c diff --git a/contrib/bind-9.5.2/lib/lwres/lwconfig.c b/contrib/bind/lib/lwres/lwconfig.c similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/lwconfig.c rename to contrib/bind/lib/lwres/lwconfig.c diff --git a/contrib/bind-9.5.2/lib/lwres/lwinetaton.c b/contrib/bind/lib/lwres/lwinetaton.c similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/lwinetaton.c rename to contrib/bind/lib/lwres/lwinetaton.c diff --git a/contrib/bind-9.5.2/lib/lwres/lwinetntop.c b/contrib/bind/lib/lwres/lwinetntop.c similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/lwinetntop.c rename to contrib/bind/lib/lwres/lwinetntop.c diff --git a/contrib/bind-9.5.2/lib/lwres/lwinetpton.c b/contrib/bind/lib/lwres/lwinetpton.c similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/lwinetpton.c rename to contrib/bind/lib/lwres/lwinetpton.c diff --git a/contrib/bind-9.5.2/lib/lwres/lwpacket.c b/contrib/bind/lib/lwres/lwpacket.c similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/lwpacket.c rename to contrib/bind/lib/lwres/lwpacket.c diff --git a/contrib/bind-9.5.2/lib/lwres/lwres_gabn.c b/contrib/bind/lib/lwres/lwres_gabn.c similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/lwres_gabn.c rename to contrib/bind/lib/lwres/lwres_gabn.c diff --git a/contrib/bind-9.5.2/lib/lwres/lwres_gnba.c b/contrib/bind/lib/lwres/lwres_gnba.c similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/lwres_gnba.c rename to contrib/bind/lib/lwres/lwres_gnba.c diff --git a/contrib/bind-9.5.2/lib/lwres/lwres_grbn.c b/contrib/bind/lib/lwres/lwres_grbn.c similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/lwres_grbn.c rename to contrib/bind/lib/lwres/lwres_grbn.c diff --git a/contrib/bind-9.5.2/lib/lwres/lwres_noop.c b/contrib/bind/lib/lwres/lwres_noop.c similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/lwres_noop.c rename to contrib/bind/lib/lwres/lwres_noop.c diff --git a/contrib/bind-9.5.2/lib/lwres/lwresutil.c b/contrib/bind/lib/lwres/lwresutil.c similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/lwresutil.c rename to contrib/bind/lib/lwres/lwresutil.c diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres.3 b/contrib/bind/lib/lwres/man/lwres.3 similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres.3 rename to contrib/bind/lib/lwres/man/lwres.3 diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres.html b/contrib/bind/lib/lwres/man/lwres.html similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres.html rename to contrib/bind/lib/lwres/man/lwres.html diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_buffer.3 b/contrib/bind/lib/lwres/man/lwres_buffer.3 similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_buffer.3 rename to contrib/bind/lib/lwres/man/lwres_buffer.3 diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_buffer.html b/contrib/bind/lib/lwres/man/lwres_buffer.html similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_buffer.html rename to contrib/bind/lib/lwres/man/lwres_buffer.html diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_config.3 b/contrib/bind/lib/lwres/man/lwres_config.3 similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_config.3 rename to contrib/bind/lib/lwres/man/lwres_config.3 diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_config.html b/contrib/bind/lib/lwres/man/lwres_config.html similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_config.html rename to contrib/bind/lib/lwres/man/lwres_config.html diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_context.3 b/contrib/bind/lib/lwres/man/lwres_context.3 similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_context.3 rename to contrib/bind/lib/lwres/man/lwres_context.3 diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_context.html b/contrib/bind/lib/lwres/man/lwres_context.html similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_context.html rename to contrib/bind/lib/lwres/man/lwres_context.html diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_gabn.3 b/contrib/bind/lib/lwres/man/lwres_gabn.3 similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_gabn.3 rename to contrib/bind/lib/lwres/man/lwres_gabn.3 diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_gabn.html b/contrib/bind/lib/lwres/man/lwres_gabn.html similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_gabn.html rename to contrib/bind/lib/lwres/man/lwres_gabn.html diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_gai_strerror.3 b/contrib/bind/lib/lwres/man/lwres_gai_strerror.3 similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_gai_strerror.3 rename to contrib/bind/lib/lwres/man/lwres_gai_strerror.3 diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_gai_strerror.html b/contrib/bind/lib/lwres/man/lwres_gai_strerror.html similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_gai_strerror.html rename to contrib/bind/lib/lwres/man/lwres_gai_strerror.html diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_getaddrinfo.3 b/contrib/bind/lib/lwres/man/lwres_getaddrinfo.3 similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_getaddrinfo.3 rename to contrib/bind/lib/lwres/man/lwres_getaddrinfo.3 diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_getaddrinfo.html b/contrib/bind/lib/lwres/man/lwres_getaddrinfo.html similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_getaddrinfo.html rename to contrib/bind/lib/lwres/man/lwres_getaddrinfo.html diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_gethostent.3 b/contrib/bind/lib/lwres/man/lwres_gethostent.3 similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_gethostent.3 rename to contrib/bind/lib/lwres/man/lwres_gethostent.3 diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_gethostent.html b/contrib/bind/lib/lwres/man/lwres_gethostent.html similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_gethostent.html rename to contrib/bind/lib/lwres/man/lwres_gethostent.html diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_getipnode.3 b/contrib/bind/lib/lwres/man/lwres_getipnode.3 similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_getipnode.3 rename to contrib/bind/lib/lwres/man/lwres_getipnode.3 diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_getipnode.html b/contrib/bind/lib/lwres/man/lwres_getipnode.html similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_getipnode.html rename to contrib/bind/lib/lwres/man/lwres_getipnode.html diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_getnameinfo.3 b/contrib/bind/lib/lwres/man/lwres_getnameinfo.3 similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_getnameinfo.3 rename to contrib/bind/lib/lwres/man/lwres_getnameinfo.3 diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_getnameinfo.html b/contrib/bind/lib/lwres/man/lwres_getnameinfo.html similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_getnameinfo.html rename to contrib/bind/lib/lwres/man/lwres_getnameinfo.html diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_getrrsetbyname.3 b/contrib/bind/lib/lwres/man/lwres_getrrsetbyname.3 similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_getrrsetbyname.3 rename to contrib/bind/lib/lwres/man/lwres_getrrsetbyname.3 diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_getrrsetbyname.html b/contrib/bind/lib/lwres/man/lwres_getrrsetbyname.html similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_getrrsetbyname.html rename to contrib/bind/lib/lwres/man/lwres_getrrsetbyname.html diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_gnba.3 b/contrib/bind/lib/lwres/man/lwres_gnba.3 similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_gnba.3 rename to contrib/bind/lib/lwres/man/lwres_gnba.3 diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_gnba.html b/contrib/bind/lib/lwres/man/lwres_gnba.html similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_gnba.html rename to contrib/bind/lib/lwres/man/lwres_gnba.html diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_hstrerror.3 b/contrib/bind/lib/lwres/man/lwres_hstrerror.3 similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_hstrerror.3 rename to contrib/bind/lib/lwres/man/lwres_hstrerror.3 diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_hstrerror.html b/contrib/bind/lib/lwres/man/lwres_hstrerror.html similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_hstrerror.html rename to contrib/bind/lib/lwres/man/lwres_hstrerror.html diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_inetntop.3 b/contrib/bind/lib/lwres/man/lwres_inetntop.3 similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_inetntop.3 rename to contrib/bind/lib/lwres/man/lwres_inetntop.3 diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_inetntop.html b/contrib/bind/lib/lwres/man/lwres_inetntop.html similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_inetntop.html rename to contrib/bind/lib/lwres/man/lwres_inetntop.html diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_noop.3 b/contrib/bind/lib/lwres/man/lwres_noop.3 similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_noop.3 rename to contrib/bind/lib/lwres/man/lwres_noop.3 diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_noop.html b/contrib/bind/lib/lwres/man/lwres_noop.html similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_noop.html rename to contrib/bind/lib/lwres/man/lwres_noop.html diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_packet.3 b/contrib/bind/lib/lwres/man/lwres_packet.3 similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_packet.3 rename to contrib/bind/lib/lwres/man/lwres_packet.3 diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_packet.html b/contrib/bind/lib/lwres/man/lwres_packet.html similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_packet.html rename to contrib/bind/lib/lwres/man/lwres_packet.html diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_resutil.3 b/contrib/bind/lib/lwres/man/lwres_resutil.3 similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_resutil.3 rename to contrib/bind/lib/lwres/man/lwres_resutil.3 diff --git a/contrib/bind-9.5.2/lib/lwres/man/lwres_resutil.html b/contrib/bind/lib/lwres/man/lwres_resutil.html similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/man/lwres_resutil.html rename to contrib/bind/lib/lwres/man/lwres_resutil.html diff --git a/contrib/bind-9.5.2/lib/lwres/print.c b/contrib/bind/lib/lwres/print.c similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/print.c rename to contrib/bind/lib/lwres/print.c diff --git a/contrib/bind-9.5.2/lib/lwres/print_p.h b/contrib/bind/lib/lwres/print_p.h similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/print_p.h rename to contrib/bind/lib/lwres/print_p.h diff --git a/contrib/bind-9.5.2/lib/lwres/strtoul.c b/contrib/bind/lib/lwres/strtoul.c similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/strtoul.c rename to contrib/bind/lib/lwres/strtoul.c diff --git a/contrib/bind-9.5.2/lib/lwres/unix/include/lwres/net.h b/contrib/bind/lib/lwres/unix/include/lwres/net.h similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/unix/include/lwres/net.h rename to contrib/bind/lib/lwres/unix/include/lwres/net.h diff --git a/contrib/bind-9.5.2/lib/lwres/version.c b/contrib/bind/lib/lwres/version.c similarity index 100% rename from contrib/bind-9.5.2/lib/lwres/version.c rename to contrib/bind/lib/lwres/version.c diff --git a/contrib/bind-9.5.2/version b/contrib/bind/version similarity index 100% rename from contrib/bind-9.5.2/version rename to contrib/bind/version -- 2.41.0