diff options
| author | des <des@FreeBSD.org> | 2013-09-24 14:33:31 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2013-09-24 14:33:31 +0000 |
| commit | 044043195e064e5fe04e76fcf6ad9d4665bea3b4 (patch) | |
| tree | abb7fda2a47f201285461a17a5c0e27b9c7608f3 | |
| parent | 8e50b328e4ddad34b88719c05a56867515ac46c0 (diff) | |
| download | FreeBSD-src-044043195e064e5fe04e76fcf6ad9d4665bea3b4.zip FreeBSD-src-044043195e064e5fe04e76fcf6ad9d4665bea3b4.tar.gz | |
Flip the switch: disable BIND and enable LDNS_UTILS.
Approved by: re (blanket)
| -rw-r--r-- | share/mk/bsd.own.mk | 4 | ||||
| -rw-r--r-- | tools/build/options/WITHOUT_BIND | 2 | ||||
| -rw-r--r-- | tools/build/options/WITHOUT_LDNS_UTILS | 5 | ||||
| -rw-r--r-- | tools/build/options/WITH_BIND | 2 | ||||
| -rw-r--r-- | tools/build/options/WITH_LDNS_UTILS | 5 |
5 files changed, 9 insertions, 9 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index b319824..74764c7 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -255,7 +255,6 @@ __DEFAULT_YES_OPTIONS = \ ATM \ AUDIT \ AUTHPF \ - BIND \ BIND_DNSSEC \ BIND_ETC \ BIND_LIBS_LWRES \ @@ -308,6 +307,7 @@ __DEFAULT_YES_OPTIONS = \ KERNEL_SYMBOLS \ KVM \ LDNS \ + LDNS_UTILS \ LEGACY_CONSOLE \ LIB32 \ LIBPTHREAD \ @@ -367,6 +367,7 @@ __DEFAULT_YES_OPTIONS = \ ZONEINFO __DEFAULT_NO_OPTIONS = \ + BIND \ BIND_IDN \ BIND_LARGE_FILE \ BIND_LIBS \ @@ -380,7 +381,6 @@ __DEFAULT_NO_OPTIONS = \ HESIOD \ LIBICONV_COMPAT \ INSTALL_AS_USER \ - LDNS_UTILS \ LLDB \ NMTREE \ NAND \ diff --git a/tools/build/options/WITHOUT_BIND b/tools/build/options/WITHOUT_BIND deleted file mode 100644 index c61a4c7..0000000 --- a/tools/build/options/WITHOUT_BIND +++ /dev/null @@ -1,2 +0,0 @@ -.\" $FreeBSD$ -Setting this variable will prevent any part of BIND from being built. diff --git a/tools/build/options/WITHOUT_LDNS_UTILS b/tools/build/options/WITHOUT_LDNS_UTILS new file mode 100644 index 0000000..f061f01 --- /dev/null +++ b/tools/build/options/WITHOUT_LDNS_UTILS @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Setting this variable will prevent building the LDNS utilities +.Xr drill 1 +and +.Xr host 1 . diff --git a/tools/build/options/WITH_BIND b/tools/build/options/WITH_BIND new file mode 100644 index 0000000..e3f70e1 --- /dev/null +++ b/tools/build/options/WITH_BIND @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Setting this variable will enable BIND. diff --git a/tools/build/options/WITH_LDNS_UTILS b/tools/build/options/WITH_LDNS_UTILS deleted file mode 100644 index e54d554..0000000 --- a/tools/build/options/WITH_LDNS_UTILS +++ /dev/null @@ -1,5 +0,0 @@ -.\" $FreeBSD$ -Setting this variable will enable the LDNS-based versions of -.Xr dig 1 -and -.Xr host 1 . |
