svn commit: r492965 - head/lang/python-doc-html

[Craig Leres]

Author: leres
Date: Fri Feb 15 02:54:52 2019
New Revision: 492965
URL: https://svnweb.freebsd.org/changeset/ports/492965

Log:
  When doing makesum set MASTER_SITES and DISTFILES that generate a
  distinfo containing all supported Python versions vs. all document
  formats.
  
  While we're here update distfiles to match the new order (i.e.
  _PYTHON_VERSIONS from Uses/python.mk).
  
  PR:		235169
  Reviewed by:	koobs (python, ports), matthew (mentor)
  Approved by:	koobs (python, ports), matthew (mentor)
  Differential Revision:	D19064

Modified:
  head/lang/python-doc-html/Makefile
  head/lang/python-doc-html/distinfo

Modified: head/lang/python-doc-html/Makefile
==============================================================================
--- head/lang/python-doc-html/Makefile	Fri Feb 15 00:49:18 2019	(r492964)
+++ head/lang/python-doc-html/Makefile	Fri Feb 15 02:54:52 2019	(r492965)
@@ -22,14 +22,39 @@ NO_BUILD=	yes
 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)
+_VERS!=		${MAKE} -V _PYTHON_VERSIONS
+.endif
+
+all_python_versions:
+.for v in ${_VERS}
+	@${MAKE} -V PYTHON_PORTVERSION DEFAULT_VERSIONS=python=${v}
+.endfor
+
+.if make(makesum)
+ALL_PYTHON_VERSIONS!=	${MAKE} all_python_versions
+.endif
+
+.if make(makesum)
+MASTER_SITES=
+.for v in ${ALL_PYTHON_VERSIONS}
+MASTER_SITES+=	PYTHON/ftp/python/doc/${v}:${v:S/./x/g}
+.for f in ${DOCFORMATS}
+DISTFILES+=	python-${v}-docs-${f}${EXTRACT_SUFX}:${v:S/./x/g},DEFAULT
+.endfor
+.endfor
+MASTER_SITES+=	PYTHON/ftp/python/doc/current:DEFAULT
 .endif
 
 pre-install:

Modified: head/lang/python-doc-html/distinfo
==============================================================================
--- head/lang/python-doc-html/distinfo	Fri Feb 15 00:49:18 2019	(r492964)
+++ head/lang/python-doc-html/distinfo	Fri Feb 15 02:54:52 2019	(r492965)
@@ -1,4 +1,4 @@
-TIMESTAMP = 1548414749
+TIMESTAMP = 1549906249
 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 @@ SHA256 (python/python-2.7.15-docs-pdf-letter.tar.bz2) 
 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
@@ -31,3 +23,11 @@ SHA256 (python/python-3.7.2-docs-pdf-letter.tar.bz2) =
 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