- Update to doc/ tree version 20090525;

- Add Options menu;
- Add MAKE_JOBS_SAFE knob.

Approved by:	doceng (implicit)

15 files changed, 47 insertions, 24 deletions

diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index a5f912eac475..f6324b997623 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	20090417
+PORTVERSION=	20090525
 CATEGORIES=	misc docs
 MASTER_SITES=	#empty
 DISTFILES=	#empty
diff --git a/misc/freebsd-doc-de/pkg-plist.html-split b/misc/freebsd-doc-de/pkg-plist.html-split
index ce6c4c7d2b78..362a01cde469 100644
--- a/misc/freebsd-doc-de/pkg-plist.html-split
+++ b/misc/freebsd-doc-de/pkg-plist.html-split
@@ -116,6 +116,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/commercial.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-drives.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-kbd-mice.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-memory.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-networking.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-other.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-processors.html
@@ -263,7 +264,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/editors.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-email.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-news.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-shell.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-web.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/filesystems.html
@@ -276,6 +276,12 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/floppies.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/freebsd-glossary.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/fs-acl.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-ggate.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-gjournal.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-glabel.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-intro.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-mirror.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom-striping.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/geom.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/getting-started.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/history.html
diff --git a/misc/freebsd-doc-el/pkg-plist.common b/misc/freebsd-doc-el/pkg-plist.common
index f074a4c75a17..faf04eb0d9ac 100644
--- a/misc/freebsd-doc-el/pkg-plist.common
+++ b/misc/freebsd-doc-el/pkg-plist.common
@@ -28,6 +28,7 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
diff --git a/misc/freebsd-doc-el/pkg-plist.html b/misc/freebsd-doc-el/pkg-plist.html
index 13e70d42bea7..e8a6a5c09096 100644
--- a/misc/freebsd-doc-el/pkg-plist.html
+++ b/misc/freebsd-doc-el/pkg-plist.html
@@ -1,6 +1,7 @@
 @comment $FreeBSD$
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
diff --git a/misc/freebsd-doc-el/pkg-plist.html-common b/misc/freebsd-doc-el/pkg-plist.html-common
index 935dddadff7c..941d9b37cd71 100644
--- a/misc/freebsd-doc-el/pkg-plist.html-common
+++ b/misc/freebsd-doc-el/pkg-plist.html-common
@@ -1,6 +1,7 @@
 @comment $FreeBSD$
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
diff --git a/misc/freebsd-doc-el/pkg-plist.html-split b/misc/freebsd-doc-el/pkg-plist.html-split
index 47a1b09f4772..1b7df4b9c756 100644
--- a/misc/freebsd-doc-el/pkg-plist.html-split
+++ b/misc/freebsd-doc-el/pkg-plist.html-split
@@ -19,6 +19,9 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/nvidia-setup.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/xorg-configuration.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contrib-how.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/first-setup.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/freebsdspecific.html
@@ -91,17 +94,17 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/howto.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/adding-a-user.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/comments-welcome.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/editing-text.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/getting-help.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x131.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x226.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x344.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x484.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x550.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x619.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x699.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x71.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x773.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x786.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/looking-around.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/next-steps.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/other-useful-commands.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/other.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/printing-files-from-dos.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/your-working-environment.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-followup.html
diff --git a/misc/freebsd-doc-el/pkg-plist.pdf b/misc/freebsd-doc-el/pkg-plist.pdf
index f1c3b023202c..f8a84c82c8c8 100644
--- a/misc/freebsd-doc-el/pkg-plist.pdf
+++ b/misc/freebsd-doc-el/pkg-plist.pdf
@@ -1,6 +1,7 @@
 @comment $FreeBSD$
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
diff --git a/misc/freebsd-doc-el/pkg-plist.ps b/misc/freebsd-doc-el/pkg-plist.ps
index 93d4d89e16fb..8e76fb3eac84 100644
--- a/misc/freebsd-doc-el/pkg-plist.ps
+++ b/misc/freebsd-doc-el/pkg-plist.ps
@@ -1,6 +1,7 @@
 @comment $FreeBSD$
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps
diff --git a/misc/freebsd-doc-el/pkg-plist.txt b/misc/freebsd-doc-el/pkg-plist.txt
index 72a243299c57..6a47853dbfa7 100644
--- a/misc/freebsd-doc-el/pkg-plist.txt
+++ b/misc/freebsd-doc-el/pkg-plist.txt
@@ -1,6 +1,7 @@
 @comment $FreeBSD$
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index 157a562875f1..72f9c0291de1 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -28,7 +28,7 @@
 #
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	20090417
+PORTVERSION=	20090525
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
 PKGNAMEPREFIX?=	en-
@@ -53,6 +53,12 @@ DOCBASE?=		share/doc/freebsd
 
 PLIST=		${WRKDIR}/pkg-plist
 
+OPTIONS=	HTML		"Single HTML file per document" Off \
+		HTML_SPLIT	"The default HTML format used on www.FreeBSD.org" On \
+		PDF		"PDF format" On \
+		PS		"PostScript format" Off \
+		TXT		"Plain text" Off
+
 .include <bsd.port.pre.mk>
 
 AVAILABLEFORMATS=	HTML HTML_SPLIT PDF PS TXT
@@ -83,6 +89,8 @@ BUILD_DEPENDS=	docproj-jadetex>=1.17:${PORTSDIR}/textproc/docproj-jadetex
 BUILD_DEPENDS=	docproj-nojadetex>=1.17:${PORTSDIR}/textproc/docproj-nojadetex
 .endif
 
+MAKE_JOBS_SAFE=	yes
+
 .for F in ${DOCFORMAT:L}
 PLIST_FORMATS+=	${F:L}
 .endfor
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index 32d2014d6ee0..191117b9e264 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,3 +1,3 @@
-MD5 (freebsd-doc-20090417.tar.gz) = 9870cd8ca9d2cd93558df8021bba92a2
-SHA256 (freebsd-doc-20090417.tar.gz) = 4c63daf6fddd65386605b2520bcf253e57fed94edb1b76a88a90f53725db8df3
-SIZE (freebsd-doc-20090417.tar.gz) = 26893433
+MD5 (freebsd-doc-20090525.tar.gz) = 84d72ff28fdfa690781513e76263cc23
+SHA256 (freebsd-doc-20090525.tar.gz) = 71ece4f0202e872c181e2fac99203a090688eee3a9eb0e3961dbe687d1e65ddf
+SIZE (freebsd-doc-20090525.tar.gz) = 26910015
diff --git a/misc/freebsd-doc-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split
index dd4f460b496c..a8f0c5ac242c 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-split
+++ b/misc/freebsd-doc-en/pkg-plist.html-split
@@ -378,7 +378,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/kernel.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/ro-fs.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/strategies.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/x113.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/x93.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/storage-devices/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/storage-devices/hw-storage-controllers.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/storage-devices/index.html
diff --git a/misc/freebsd-doc-hu/pkg-plist.html-split b/misc/freebsd-doc-hu/pkg-plist.html-split
index 84146e95fe0f..233dd14a1a92 100644
--- a/misc/freebsd-doc-hu/pkg-plist.html-split
+++ b/misc/freebsd-doc-hu/pkg-plist.html-split
@@ -443,4 +443,4 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x45069.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x45276.html
diff --git a/misc/freebsd-doc-ja/pkg-plist.html-split b/misc/freebsd-doc-ja/pkg-plist.html-split
index eae29338732b..77be4722b9e3 100644
--- a/misc/freebsd-doc-ja/pkg-plist.html-split
+++ b/misc/freebsd-doc-ja/pkg-plist.html-split
@@ -279,16 +279,16 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-install.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-understanding.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x-xdm.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x10610.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x10696.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11-wm.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x11.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x2351.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26433.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26477.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26521.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26520.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26564.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x26608.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x2704.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/x2864.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x6732.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/x6818.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/LEGALNOTICE.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/c1059.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/c1209.html
diff --git a/misc/freebsd-doc-nl/pkg-plist.html-split b/misc/freebsd-doc-nl/pkg-plist.html-split
index 732b9ac8ea4a..7927274ec7a1 100644
--- a/misc/freebsd-doc-nl/pkg-plist.html-split
+++ b/misc/freebsd-doc-nl/pkg-plist.html-split
@@ -29,7 +29,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/kernel.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/ro-fs.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/strategies.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/x114.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/solid-state/x94.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/LEGALNOTICE.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-debug.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/acpi-overview.html