Update to r51730 from the FreeBSD docset (a.k.a. 11.2-R version)

Approved by:	doceng (implicit)

8 files changed, 7 insertions, 28 deletions

diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index 25715f795728..368a85360aa9 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	51585
+PORTVERSION=	51730
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index 9bc56d80e944..ec08159ebe25 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524494929
-SHA256 (freebsd-doc-51585.tar.gz) = 80085d785f408ada750e7fe4061b3d8241dd5969d3dbb6b7bb61566177bc8908
-SIZE (freebsd-doc-51585.tar.gz) = 56500910
+TIMESTAMP = 1527351263
+SHA256 (freebsd-doc-51730.tar.gz) = 798d47285ee3377d58cd51e57276cc9b8456c13f310b66a196b52225713c5d68
+SIZE (freebsd-doc-51730.tar.gz) = 56540577
diff --git a/misc/freebsd-doc-en/pkg-plist.html b/misc/freebsd-doc-en/pkg-plist.html
index 0493619092f9..e30a02e9d6bb 100644
--- a/misc/freebsd-doc-en/pkg-plist.html
+++ b/misc/freebsd-doc-en/pkg-plist.html
@@ -21,7 +21,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pgpkeys/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.html
diff --git a/misc/freebsd-doc-en/pkg-plist.html-common b/misc/freebsd-doc-en/pkg-plist.html-common
index 8f0b71e3fdb2..812d957198d4 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-common
+++ b/misc/freebsd-doc-en/pkg-plist.html-common
@@ -40,7 +40,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/3.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/4.png
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/docbook.css
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/pgpkeys/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/docbook.css
diff --git a/misc/freebsd-doc-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split
index 449cd3ce9f78..602554ee2096 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-split
+++ b/misc/freebsd-doc-en/pkg-plist.html-split
@@ -197,23 +197,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/other.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/your-working-environment.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/Integrations.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/add-rm-files.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/branches.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/changes.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/clients.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/diffs.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/editing.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/freebsd-cvs-and-p4.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/offline-ops.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/renaming-files.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/soc.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/start.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/submit.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/syncing.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/trademarks.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/working-with-diffs.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-appl-prog.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/pam-config.html
@@ -435,7 +418,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/dev-model/sub-project-documentation.html
 %%DOCSDIR%%/%%DOCLANG%%/books/dev-model/sub-projects.html
 %%DOCSDIR%%/%%DOCLANG%%/books/dev-model/tool-bugzilla.html
-%%DOCSDIR%%/%%DOCLANG%%/books/dev-model/tool-perforce.html
 %%DOCSDIR%%/%%DOCLANG%%/books/dev-model/tool-pgp.html
 %%DOCSDIR%%/%%DOCLANG%%/books/dev-model/tool-ssh2.html
 %%DOCSDIR%%/%%DOCLANG%%/books/dev-model/tools.html
@@ -918,7 +900,8 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-use-posix-standards.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/dads-verbose-logs.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/distfile-survey.html
-%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/flavors-auto.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/flavors-auto-php.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/flavors-auto-python.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/flavors-using.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/flavors.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/gnome-components.html
@@ -1010,6 +993,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-bdb.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-bison.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-blaslapack.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-cargo.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-charsetfix.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-cmake.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/uses-compiler.html
diff --git a/misc/freebsd-doc-en/pkg-plist.pdf b/misc/freebsd-doc-en/pkg-plist.pdf
index f5619b78a8c2..318d309031b2 100644
--- a/misc/freebsd-doc-en/pkg-plist.pdf
+++ b/misc/freebsd-doc-en/pkg-plist.pdf
@@ -21,7 +21,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.pdf
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/pgpkeys/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.pdf
diff --git a/misc/freebsd-doc-en/pkg-plist.ps b/misc/freebsd-doc-en/pkg-plist.ps
index 30f3d5d900a4..8b2d467ca5af 100644
--- a/misc/freebsd-doc-en/pkg-plist.ps
+++ b/misc/freebsd-doc-en/pkg-plist.ps
@@ -21,7 +21,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.ps
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/pgpkeys/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.ps
diff --git a/misc/freebsd-doc-en/pkg-plist.txt b/misc/freebsd-doc-en/pkg-plist.txt
index 30dd356d26ba..ef43ac2d96f2 100644
--- a/misc/freebsd-doc-en/pkg-plist.txt
+++ b/misc/freebsd-doc-en/pkg-plist.txt
@@ -21,7 +21,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/article.txt
-%%DOCSDIR%%/%%DOCLANG%%/articles/p4-primer/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/pgpkeys/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/port-mentor-guidelines/article.txt