Index: lang/python-doc-html/Makefile
===================================================================
--- lang/python-doc-html/Makefile
+++ lang/python-doc-html/Makefile
@@ -22,16 +22,57 @@
 DOCSDIR=	${PREFIX}/share/doc/${PYTHON_VERSION}
 PLIST=		${WRKDIR}/pkg-plist.${DOCFORMAT}
 
+DOCFORMATS=	html pdf-a4 pdf-letter text
 DOCFORMAT?=	html
 
-.if ${DOCFORMAT} != "html" && ${DOCFORMAT} != "pdf-a4" && ${DOCFORMAT} != "pdf-letter" && ${DOCFORMAT} != "text"
-IGNORE=		invalid value for DOCFORMAT: "${DOCFORMAT}", possible values are: text, html, pdf-a4, pdf-letter
+.if empty(DOCFORMATS:M${DOCFORMAT})
+IGNORE=		invalid value for DOCFORMAT: "${DOCFORMAT}", possible values are: ${DOCFORMATS:ts,:S/,/, /g}
 .endif
 
 .if ${DOCFORMAT} != "html" && ${DOCFORMAT} != "text"
 WRKSRC=		${WRKDIR}/docs-pdf
 .endif
 
+.if make(all_python_versions) || make(all_master_sites1)
+_VERS!=		${MAKE} -V _PYTHON_VERSIONS
+.endif
+
+.if make(all_python_versions)
+all_python_versions:
+.for v in ${_VERS}
+	@${MAKE} -V PYTHON_PORTVERSION DEFAULT_VERSIONS=python=${v}
+.endfor
+.endif
+
+.if make(all_distfiles)
+ALL_PYTHON_VERSIONS!=	${MAKE} all_python_versions
+.endif
+
+all_distfiles:
+	@n=1; for v in ${ALL_PYTHON_VERSIONS}; do \
+	    for f in ${DOCFORMATS}; do \
+		echo "python-$${v}-docs-$${f}${EXTRACT_SUFX}:$${n},DEFAULT" ; \
+	    done; \
+	    n=`expr $${n} + 1` ; \
+	done
+
+.if make(all_master_sites1)
+all_master_sites1:
+.for v in ${_VERS}
+	@${MAKE} -V MASTER_SITES DEFAULT_VERSIONS=python=${v}
+.endfor
+.endif
+
+all_master_sites:
+	# We just want the first one
+	@${MAKE} all_master_sites1 | ${AWK} '{print $$1 ":" NR}'
+	@${ECHO} ${MASTER_SITES:[-1]}:DEFAULT
+
+.if make(makesum)
+DISTFILES!=	${MAKE} all_distfiles
+MASTER_SITES!=	${MAKE} all_master_sites
+.endif
+
 pre-install:
 	@${FIND} ${WRKSRC} -type f | ${SED} -e 's|^${WRKSRC}|%%DOCSDIR%%|' | ${SORT} > ${PLIST}
 
Index: lang/python-doc-html/distinfo
===================================================================
--- lang/python-doc-html/distinfo
+++ lang/python-doc-html/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1548414749
+TIMESTAMP = 1549843710
 SHA256 (python/python-2.7.15-docs-html.tar.bz2) = 5582aa8f59c2d5457ae87e266000f9ef75ed041a02fa72bd988a5169aae8ebde
 SIZE (python/python-2.7.15-docs-html.tar.bz2) = 4627519
 SHA256 (python/python-2.7.15-docs-pdf-a4.tar.bz2) = f747ca034cae426876017c37dfac0648ae535ad0b95d1e3a27385feee602d956
@@ -7,14 +7,6 @@
 SIZE (python/python-2.7.15-docs-pdf-letter.tar.bz2) = 9429554
 SHA256 (python/python-2.7.15-docs-text.tar.bz2) = 92b32e57182b1b7110f71db43a8c49aaaf9833186d7ea1021fe3b166e7164535
 SIZE (python/python-2.7.15-docs-text.tar.bz2) = 1617467
-SHA256 (python/python-3.5.6-docs-html.tar.bz2) = 1a81b6640d0000db802e2c2deaf6584851c09d0a9afc238e41edcb2895f471b9
-SIZE (python/python-3.5.6-docs-html.tar.bz2) = 5779040
-SHA256 (python/python-3.5.6-docs-pdf-a4.tar.bz2) = f4803bba5d2fe5c96a7682729ccd45fc06b6f62acef957bc9b9588e4995b94e8
-SIZE (python/python-3.5.6-docs-pdf-a4.tar.bz2) = 10843211
-SHA256 (python/python-3.5.6-docs-pdf-letter.tar.bz2) = c94faa1c74e5babbe15b19607c5f0f936a402471a1c70b751751f08795c6aa8e
-SIZE (python/python-3.5.6-docs-pdf-letter.tar.bz2) = 10886386
-SHA256 (python/python-3.5.6-docs-text.tar.bz2) = 304e8e78ffcdab0d50803759e7087dca2a8f02626afc79025295951264e570d4
-SIZE (python/python-3.5.6-docs-text.tar.bz2) = 2070883
 SHA256 (python/python-3.6.8-docs-html.tar.bz2) = d17ebdc57a6590b7c86c98047c4f90723c5a1846343a4640e0596161922cf9eb
 SIZE (python/python-3.6.8-docs-html.tar.bz2) = 6010329
 SHA256 (python/python-3.6.8-docs-pdf-a4.tar.bz2) = 4734db2cea99bbd2d3b6523cc3aa969c88cebfce7c705e8918677fce96cdd1c8
@@ -25,9 +17,17 @@
 SIZE (python/python-3.6.8-docs-text.tar.bz2) = 2163182
 SHA256 (python/python-3.7.2-docs-html.tar.bz2) = 4210e0fe861809d09dc66e4ab447a23958deb548dedde8ab4ba0aa76b9ca8ba7
 SIZE (python/python-3.7.2-docs-html.tar.bz2) = 6213366
-SHA256 (python/python-3.7.2-docs-pdf-a4.tar.bz2) = 6a399aca2ca3555579b23f956f16f8eb6221195708716397521282518539bd6d
-SIZE (python/python-3.7.2-docs-pdf-a4.tar.bz2) = 14010184
+SHA256 (python/python-3.7.2-docs-pdf-a4.tar.bz2) = 7fd6d2946ebd2ce16dbef0dbc6d3e41c32cf28b7ebf3e4cb6bfce9225f2a4d86
+SIZE (python/python-3.7.2-docs-pdf-a4.tar.bz2) = 3276800
 SHA256 (python/python-3.7.2-docs-pdf-letter.tar.bz2) = fd0cc4c048f00238d3db2ea9e600f715f9d3d91598206c429aa0e3ede93ee59d
 SIZE (python/python-3.7.2-docs-pdf-letter.tar.bz2) = 14010009
 SHA256 (python/python-3.7.2-docs-text.tar.bz2) = e2057fd6a8c516f371f1fa139682b8d60bbb051664191054779c328932cda040
 SIZE (python/python-3.7.2-docs-text.tar.bz2) = 2258890
+SHA256 (python/python-3.5.6-docs-html.tar.bz2) = 1a81b6640d0000db802e2c2deaf6584851c09d0a9afc238e41edcb2895f471b9
+SIZE (python/python-3.5.6-docs-html.tar.bz2) = 5779040
+SHA256 (python/python-3.5.6-docs-pdf-a4.tar.bz2) = f4803bba5d2fe5c96a7682729ccd45fc06b6f62acef957bc9b9588e4995b94e8
+SIZE (python/python-3.5.6-docs-pdf-a4.tar.bz2) = 10843211
+SHA256 (python/python-3.5.6-docs-pdf-letter.tar.bz2) = c94faa1c74e5babbe15b19607c5f0f936a402471a1c70b751751f08795c6aa8e
+SIZE (python/python-3.5.6-docs-pdf-letter.tar.bz2) = 10886386
+SHA256 (python/python-3.5.6-docs-text.tar.bz2) = 304e8e78ffcdab0d50803759e7087dca2a8f02626afc79025295951264e570d4
+SIZE (python/python-3.5.6-docs-text.tar.bz2) = 2070883