MFH: r449128

Update to r50775 from the FreeBSD docset (a.k.a. 10.4-R version)

Approved by:	portmgr (blanket), doceng (implicit)

11 files changed, 27 insertions, 7 deletions

diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index d8d8358470ef..53925b3361c6 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	50402
+PORTVERSION=	50775
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index 4c8d2519372a..e421e51541e1 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	50402
+PORTVERSION=	50775
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index 34ddaef5f6ca..7a141fdf545f 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498297052
-SHA256 (freebsd-doc-50402.tar.gz) = 5c7df6eac72878750a9500acd7a85ff59660b390948de337176a2156385ae476
-SIZE (freebsd-doc-50402.tar.gz) = 54132026
+TIMESTAMP = 1504183447
+SHA256 (freebsd-doc-50775.tar.gz) = 4b9e602d4dfc6aa247b07c3e941705f4aa07390cb06eba44e4043fc16cb8a664
+SIZE (freebsd-doc-50775.tar.gz) = 54231421
diff --git a/misc/freebsd-doc-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split
index fdce8d34597b..bc18b35549fa 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-split
+++ b/misc/freebsd-doc-en/pkg-plist.html-split
@@ -107,6 +107,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/releng-prep.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/releng-stable.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/releng-terms.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/releng-website.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/releng-wrapup.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-releng/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/freebsd-update-server/Configuration.html
@@ -950,6 +951,17 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-checksum.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-dads.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-desc.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-order-broken.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-order-depends.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-order-license.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-order-maintainer.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-order-options.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-order-patch.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-order-rest.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-order-targets.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-order-uses.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-order-variables.html
+%%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-order.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-portlint.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-prefix.html
 %%DOCSDIR%%/%%DOCLANG%%/books/porters-handbook/porting-restrictions.html
diff --git a/misc/freebsd-doc-ja/pkg-plist.html-split b/misc/freebsd-doc-ja/pkg-plist.html-split
index 5b8c29f4e823..d7eda55e65d5 100644
--- a/misc/freebsd-doc-ja/pkg-plist.html-split
+++ b/misc/freebsd-doc-ja/pkg-plist.html-split
@@ -154,7 +154,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-news.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-web.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/floppies.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/freebsd-glossary.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/fs-acl.html
@@ -251,7 +250,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-mp3.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-setup.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/svn.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/synching.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/system-administration.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/tcpwrappers.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/term.html
diff --git a/misc/freebsd-doc-zh_cn/pkg-plist.html b/misc/freebsd-doc-zh_cn/pkg-plist.html
index 1b00f83ec7b0..facbbaafd446 100644
--- a/misc/freebsd-doc-zh_cn/pkg-plist.html
+++ b/misc/freebsd-doc-zh_cn/pkg-plist.html
@@ -1,4 +1,5 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/article.html
diff --git a/misc/freebsd-doc-zh_cn/pkg-plist.html-common b/misc/freebsd-doc-zh_cn/pkg-plist.html-common
index 4e62ee9b9dcb..a194d35d97c6 100644
--- a/misc/freebsd-doc-zh_cn/pkg-plist.html-common
+++ b/misc/freebsd-doc-zh_cn/pkg-plist.html-common
@@ -1,4 +1,5 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/imagelib/callouts/1.png
diff --git a/misc/freebsd-doc-zh_cn/pkg-plist.html-split b/misc/freebsd-doc-zh_cn/pkg-plist.html-split
index 61d6237e8891..0362cc7037ee 100644
--- a/misc/freebsd-doc-zh_cn/pkg-plist.html-split
+++ b/misc/freebsd-doc-zh_cn/pkg-plist.html-split
@@ -2,6 +2,11 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/ix01.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/trademarks.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leapseconds-cautions.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leapseconds-conclusion.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leapseconds-posix.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leapseconds-testing.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/commands.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/conclusion.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/firewall.html
diff --git a/misc/freebsd-doc-zh_cn/pkg-plist.pdf b/misc/freebsd-doc-zh_cn/pkg-plist.pdf
index fc126abb32a0..e630f7bda375 100644
--- a/misc/freebsd-doc-zh_cn/pkg-plist.pdf
+++ b/misc/freebsd-doc-zh_cn/pkg-plist.pdf
@@ -1,4 +1,5 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/article.pdf
diff --git a/misc/freebsd-doc-zh_cn/pkg-plist.ps b/misc/freebsd-doc-zh_cn/pkg-plist.ps
index 8d0f328b8366..bca4aec5918b 100644
--- a/misc/freebsd-doc-zh_cn/pkg-plist.ps
+++ b/misc/freebsd-doc-zh_cn/pkg-plist.ps
@@ -1,4 +1,5 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/article.ps
diff --git a/misc/freebsd-doc-zh_cn/pkg-plist.txt b/misc/freebsd-doc-zh_cn/pkg-plist.txt
index b1e7b6783881..3202f100e51d 100644
--- a/misc/freebsd-doc-zh_cn/pkg-plist.txt
+++ b/misc/freebsd-doc-zh_cn/pkg-plist.txt
@@ -1,4 +1,5 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/rc-scripting/article.txt