Date: Tue, 11 May 2021 08:21:28 +0900 (JST) From: Yasuhiro Kimura <yasu@utahime.org> To: freebsd-ports@freebsd.org, python@freebsd.org Subject: Re: `make makesum` fails with lang/pyton-doc-html Message-ID: <20210511.082128.1757835026435507959.yasu@utahime.org> In-Reply-To: <20210511.030351.1410990710249735355.yasu@utahime.org> References: <20210510.164118.1586560961016858874.yasu@utahime.org> <20210510142523.tcgbikqeoqelypyk@t480.local> <20210511.030351.1410990710249735355.yasu@utahime.org>
next in thread | previous in thread | raw e-mail | index | archive | help
From: Yasuhiro Kimura <yasu@utahime.org>
Subject: Re: `make makesum` fails with lang/pyton-doc-html
Date: Tue, 11 May 2021 03:03:51 +0900 (JST)
> Thank you for patch. I applied it to 61daf777c5d6 of main and now
> `make makesum` works fine.
Bad news. The problem is found when I tried to update
lang/python-doc-html/distinfo for Python 3.8.10 and 3.9.5.
----------------------------------------------------------------------
yasu@rolling-vm-freebsd2[1443]% git status
On branch main
Your branch is up to date with 'origin/main'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: lang/python-doc-html/Makefile
modified: lang/python38/Makefile.version
no changes added to commit (use "git add" and/or "git commit -a")
yasu@rolling-vm-freebsd2[1444]% git diff
diff --git a/lang/python-doc-html/Makefile b/lang/python-doc-html/Makefile
index 48c696c08995..b4c675e1729d 100644
--- a/lang/python-doc-html/Makefile
+++ b/lang/python-doc-html/Makefile
@@ -3,7 +3,7 @@
PORTNAME= python-doc-${DOCFORMAT}
PORTVERSION= ${PYTHON_PORTVERSION}
CATEGORIES= lang python
-MASTER_SITES= PYTHON/ftp/python/doc/${PORTVERSION} \
+MASTER_SITES?= PYTHON/ftp/python/doc/${PORTVERSION} \
PYTHON/ftp/python/doc/current
DISTNAME= python-${PORTVERSION}-docs-${DOCFORMAT}
DIST_SUBDIR= python
@@ -54,6 +54,7 @@ DISTFILES+= python-${v}-docs-${f}${EXTRACT_SUFX}:${v:S/./x/g},DEFAULT
.endfor
.endfor
MASTER_SITES+= PYTHON/ftp/python/doc/current
+.export MASTER_SITES
.endif
pre-install:
diff --git a/lang/python38/Makefile.version b/lang/python38/Makefile.version
index 5587d0177cf9..12ed93354d24 100644
--- a/lang/python38/Makefile.version
+++ b/lang/python38/Makefile.version
@@ -2,4 +2,4 @@
# Do not forget to update python documentation (lang/python-doc-*)
# Run "make -C lang/python-doc-html makesum"
-PYTHON_PORTVERSION= 3.8.9
+PYTHON_PORTVERSION= 3.8.10
yasu@rolling-vm-freebsd2[1445]% make -C lang/python-doc-html makesum
===> python-doc-html-3.9.4 depends on file: /usr/local/sbin/pkg - found
===> Fetching all distfiles required by python-doc-html-3.9.4 for building
yasu@rolling-vm-freebsd2[1446]% git diff -- lang/python-doc-html/distinfo
diff --git a/lang/python-doc-html/distinfo b/lang/python-doc-html/distinfo
index ba5ecf5b1a03..6d35d0eb6a52 100644
--- a/lang/python-doc-html/distinfo
+++ b/lang/python-doc-html/distinfo
@@ -1,12 +1,12 @@
-TIMESTAMP = 1618020033
-SHA256 (python/python-2.7.18-docs-html.tar.bz2) = 3d05142817615e77cec99f686dca58289bbfe008af22f94a93262e8663db81c7
-SIZE (python/python-2.7.18-docs-html.tar.bz2) = 4732851
-SHA256 (python/python-2.7.18-docs-pdf-a4.tar.bz2) = ead357695e43c824ae1a83dd6cd3b4a47215658f3fa20111726ff7ef16a16dd2
-SIZE (python/python-2.7.18-docs-pdf-a4.tar.bz2) = 11455585
-SHA256 (python/python-2.7.18-docs-pdf-letter.tar.bz2) = 0e1259b379982ceb623f25af9a15ab3d9fcd054b5efcb9d5c173404f7b80048a
-SIZE (python/python-2.7.18-docs-pdf-letter.tar.bz2) = 11455989
-SHA256 (python/python-2.7.18-docs-text.tar.bz2) = c2396b36632ecdefa3fbf9f73c80641c315e8d4a515da5e6616f4450e0ca74ff
-SIZE (python/python-2.7.18-docs-text.tar.bz2) = 1633624
+TIMESTAMP = 1620688048
+SHA256 (python/python-3.8.10-docs-html.tar.bz2) = 5a24209934220c13e9ed531c50ae4ba80d7179fbbee383949873be785fe5b27d
+SIZE (python/python-3.8.10-docs-html.tar.bz2) = 6604538
+SHA256 (python/python-3.8.10-docs-pdf-a4.tar.bz2) = a8e3e50608f7c99525040eee88d3dfea8d85ad6f6962a1d96d5e1d6e434ec60b
+SIZE (python/python-3.8.10-docs-pdf-a4.tar.bz2) = 14748468
+SHA256 (python/python-3.8.10-docs-pdf-letter.tar.bz2) = dd463cd678e3d1e911dd9cc06fdc7967cf7c8754d76959a2a3075dcaa04ff8ca
+SIZE (python/python-3.8.10-docs-pdf-letter.tar.bz2) = 14858809
+SHA256 (python/python-3.8.10-docs-text.tar.bz2) = b5e2151e5cfb41bce2a71b5a8c97e0315740656e4d5aeb9dbbf72cc21a4eb99b
+SIZE (python/python-3.8.10-docs-text.tar.bz2) = 2422201
SHA256 (python/python-3.6.13-docs-html.tar.bz2) = 13e36aea543d2ab55d116a2c150684214c0be37992d71aba126cdf58d342adac
SIZE (python/python-3.6.13-docs-html.tar.bz2) = 6016532
SHA256 (python/python-3.6.13-docs-pdf-a4.tar.bz2) = eb278d548bf1646c85373dde006e42c68d7849c16db2d2a2fbcae9086c4279b5
@@ -23,14 +23,14 @@ SHA256 (python/python-3.7.10-docs-pdf-letter.tar.bz2) = 96de9c6e92754e8f0ab27cb7
SIZE (python/python-3.7.10-docs-pdf-letter.tar.bz2) = 14359866
SHA256 (python/python-3.7.10-docs-text.tar.bz2) = cf6e58134550e92b6e25d365010834c8abdbed1479edf7a566fa841fcec6b960
SIZE (python/python-3.7.10-docs-text.tar.bz2) = 2293462
-SHA256 (python/python-3.8.9-docs-html.tar.bz2) = 0bece0235bdbddea03bfb855ee192ae9889745585dc47bfcae2e29856d212c09
-SIZE (python/python-3.8.9-docs-html.tar.bz2) = 6593775
-SHA256 (python/python-3.8.9-docs-pdf-a4.tar.bz2) = b018e3ad4253207929d622401d9db76ea0d8782d516c431309294d9b3a8c2f8f
-SIZE (python/python-3.8.9-docs-pdf-a4.tar.bz2) = 14737815
-SHA256 (python/python-3.8.9-docs-pdf-letter.tar.bz2) = fa9486d866cd97c41ff5b97799a01285dbba7b8e976e28a8d2de83ce22b17395
-SIZE (python/python-3.8.9-docs-pdf-letter.tar.bz2) = 14852518
-SHA256 (python/python-3.8.9-docs-text.tar.bz2) = ae788a774188bb39c9d28522d01c1522772d1191bb4424bbe703875dcdcc6d06
-SIZE (python/python-3.8.9-docs-text.tar.bz2) = 2419398
+SHA256 (python/python-3.8.10-docs-html.tar.bz2) = 5a24209934220c13e9ed531c50ae4ba80d7179fbbee383949873be785fe5b27d
+SIZE (python/python-3.8.10-docs-html.tar.bz2) = 6604538
+SHA256 (python/python-3.8.10-docs-pdf-a4.tar.bz2) = a8e3e50608f7c99525040eee88d3dfea8d85ad6f6962a1d96d5e1d6e434ec60b
+SIZE (python/python-3.8.10-docs-pdf-a4.tar.bz2) = 14748468
+SHA256 (python/python-3.8.10-docs-pdf-letter.tar.bz2) = dd463cd678e3d1e911dd9cc06fdc7967cf7c8754d76959a2a3075dcaa04ff8ca
+SIZE (python/python-3.8.10-docs-pdf-letter.tar.bz2) = 14858809
+SHA256 (python/python-3.8.10-docs-text.tar.bz2) = b5e2151e5cfb41bce2a71b5a8c97e0315740656e4d5aeb9dbbf72cc21a4eb99b
+SIZE (python/python-3.8.10-docs-text.tar.bz2) = 2422201
SHA256 (python/python-3.9.4-docs-html.tar.bz2) = e80e096db83180a74bfa7ae924e1e4aaea5e641a45e1919d526cfd1502161ad0
SIZE (python/python-3.9.4-docs-html.tar.bz2) = 6831159
SHA256 (python/python-3.9.4-docs-pdf-a4.tar.bz2) = cf3b8859949b6dc101390bba9857cb355a0af97a0a5e647d7deb80a13e4afc14
yasu@rolling-vm-freebsd2[1047]%
----------------------------------------------------------------------
Since lang/python-doc-html/Makefile and lang/python38/Makefile.version
are modified in this case, information of files related to
lang/python38 should be updated in lang/python-doc-html/distinfo. But
as you can see information of files related to lang/python27 is also
updated.
---
Yasuhiro Kimura
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210511.082128.1757835026435507959.yasu>