summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2005-12-29 04:41:09 +0000
committerDoug Barton <dougb@FreeBSD.org>2005-12-29 04:41:09 +0000
commit15fe416f9d13e8a30899ed8ab928c1ffd3d50f6a (patch)
treeebb34888b8e06182ebdd0b4b1644e71965b69152
parent8a2e2a8ecd1b1d09b5f00ab42944f3711e277e84 (diff)
Notes
-rw-r--r--contrib/bind9/FREEBSD-Upgrade4
-rw-r--r--contrib/bind9/FREEBSD-Xlist4
2 files changed, 6 insertions, 2 deletions
diff --git a/contrib/bind9/FREEBSD-Upgrade b/contrib/bind9/FREEBSD-Upgrade
index 456df7f3dfaf..55f27c0c9b1d 100644
--- a/contrib/bind9/FREEBSD-Upgrade
+++ b/contrib/bind9/FREEBSD-Upgrade
@@ -28,13 +28,13 @@
5) Resolve conflicts.
- As of 17 March 2005, we have no local patches against BIND 9; thus
+ As of 28 December 2005, we have no local patches against BIND 9; thus
there are no conflicts to merge. This may change at a later date.
6) Remove any references to the {bin,lib}/tests and docutil
directories from the configure and Makefile templates:
- $ sed -i.orig -e '/\/tests/d; /docutil/d;' \
+ $ sed -i.orig -e '/\/tests/d; /docutil/d; /\/xsl/d;' \
configure.in Makefile.in */Makefile.in
Please do not commit this change, as it would unnecessarily take
diff --git a/contrib/bind9/FREEBSD-Xlist b/contrib/bind9/FREEBSD-Xlist
index e6c1b832a132..f4239557b3ae 100644
--- a/contrib/bind9/FREEBSD-Xlist
+++ b/contrib/bind9/FREEBSD-Xlist
@@ -12,6 +12,10 @@ docutil
bin/tests
lib/tests
+# Doc stuff
+doc/arm/latex-fixup.pl
+doc/xsl
+
# Windows directories
bin/check/win32
bin/dig/win32