From: Yasuhiro Kimura <y...@utahime.org>
Subject: Re: `make makesum` fails with lang/pyton-doc-html
Date: Tue, 11 May 2021 11:34:47 +0900 (JST)
> I modified Danilo' patch as following and confirmed `make makesum`
> works as is expected with it.
>
> ----------------------------------------------------------------------
> diff --git a/lang/python-doc-html/Makefile b/lang/python-doc-html/Makefile
> index 48c696c08995..6b0e9d5fadc5 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
> @@ -38,7 +38,7 @@ _VERS!= ${MAKE} -V _PYTHON_VERSIONS:O
>
> all_python_versions:
> .for v in ${_VERS}
> - @${MAKE} -V PYTHON_PORTVERSION DEFAULT_VERSIONS=python=${v}
> + @${MAKE} -C ${PORTSDIR}/lang/python${v:S/.//} -V PYTHON_PORTVERSION
> .endfor
>
> .if make(makesum)
> @@ -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:
> ----------------------------------------------------------------------
>
> But I found another issue. If I execute `make makesum`, distinfo of
> python 2.7 document archive files changes.
>
> ----------------------------------------------------------------------
> yasu@rolling-vm-freebsd2[1511]% pwd
> /usr/ports/lang/python-doc-html
> yasu@rolling-vm-freebsd2[1512]% make 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[1513]% git diff
> diff --git a/lang/python-doc-html/distinfo b/lang/python-doc-html/distinfo
> index ba5ecf5b1a03..4f5ebc4b4501 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 = 1620699906
> +SHA256 (python/python-2.7.18-docs-html.tar.bz2) =
> 20445e9a571cacdd350f702f0980e4dc559b6ff81f1d69affe9b0a862fef2f0e
> +SIZE (python/python-2.7.18-docs-html.tar.bz2) = 4634932
> +SHA256 (python/python-2.7.18-docs-pdf-a4.tar.bz2) =
> dbac6953e48aac341351067ba0938393e415b10bf48ac8cbbc7247deaf13ab67
> +SIZE (python/python-2.7.18-docs-pdf-a4.tar.bz2) = 11486967
> +SHA256 (python/python-2.7.18-docs-pdf-letter.tar.bz2) =
> 565971040db8994630fd5c2447e45c38428cfb22a7845cd2620160daf2c60b1e
> +SIZE (python/python-2.7.18-docs-pdf-letter.tar.bz2) = 11486126
> +SHA256 (python/python-2.7.18-docs-text.tar.bz2) =
> c86f5b5a2bd8f90158523efd350198d6cde7353965ef5a6ca5e54e5174af47f2
> +SIZE (python/python-2.7.18-docs-text.tar.bz2) = 1631043
> 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
> yasu@rolling-vm-freebsd2[1514]%
> ----------------------------------------------------------------------
>
> Does this mean documetn archive files of Python 2.7.18 are rerolled?
I submitted following bug reports on Bugzilla.
Bug 255767 lang/python-doc-html: Fix `make makesum`
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255767
Bug 255782 lang/python-doc-html: Fix distinfo of 2.7.18 document archive files
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255782
---
Yasuhiro Kimura
_______________________________________________
freebsd-ports@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-ports
To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org"
