From owner-freebsd-ports@freebsd.org Tue May 11 02:35:34 2021 Return-Path: Delivered-To: freebsd-ports@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 890AF64C639; Tue, 11 May 2021 02:35:34 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from maybe.home.utahime.org (gate.home.utahime.org [183.180.29.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FfMTx0TRBz4p0H; Tue, 11 May 2021 02:35:32 +0000 (UTC) (envelope-from yasu@utahime.org) Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by maybe.home.utahime.org (Postfix) with ESMTPS id 554152C02B; Tue, 11 May 2021 11:35:29 +0900 (JST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=utahime.org; s=maybe2019112701; t=1620700529; bh=0zXLwFSMW8EgfDEhI41nYgsmdWB+/RPmT0SWBa44Zwo=; h=Date:To:Subject:From:In-Reply-To:References; b=X1YrN+QV7aImYwFEi7hOFgeu0nHCpcLqPAfglMIyrp6tT/UreT6XHNXy0P6PXGDQC bgO36xcK5ye3mBwzLnsMZZzn4sYJtmLtDxV92f8MnmuqXcc+E39AYO95yc2Qcs3IQN Ya95kBg1kGucKFxKeCHsxC0mw12soL1DFQ5IOehInGpcXCTvUUOZJ6YwQqIXh54DJU Q584oyeq/urTeWppYMpEA4l+5zeKabniM14nw7fbiXuky8SMbXoqREb6YD1BPOxcIt 8I0N6Uux2DLcBfyDbZdO3/MgMiGl3gnWzOc4fBXxZteyY0tY1WB8Q0ued+xUTSKM/2 X4Tr22CVvL5bQ== Received: from localhost (rolling-vm-freebsd2.home.utahime.org [192.168.174.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by eastasia.home.utahime.org (Postfix) with ESMTPSA id 1950338266; Tue, 11 May 2021 11:35:28 +0900 (JST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.2 at eastasia.home.utahime.org Date: Tue, 11 May 2021 11:34:47 +0900 (JST) Message-Id: <20210511.113447.67440704132479148.yasu@utahime.org> To: freebsd-ports@freebsd.org, python@freebsd.org Subject: Re: `make makesum` fails with lang/pyton-doc-html From: Yasuhiro Kimura In-Reply-To: <20210511.082128.1757835026435507959.yasu@utahime.org> References: <20210510142523.tcgbikqeoqelypyk@t480.local> <20210511.030351.1410990710249735355.yasu@utahime.org> <20210511.082128.1757835026435507959.yasu@utahime.org> X-Mailer: Mew version 6.8 on Emacs 27.2 Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4FfMTx0TRBz4p0H X-Spamd-Bar: + Authentication-Results: mx1.freebsd.org; dkim=pass header.d=utahime.org header.s=maybe2019112701 header.b=X1YrN+QV; dmarc=none; spf=pass (mx1.freebsd.org: domain of yasu@utahime.org designates 183.180.29.210 as permitted sender) smtp.mailfrom=yasu@utahime.org X-Spamd-Result: default: False [1.30 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+a:spf-authorized.utahime.org]; TO_DN_NONE(0.00)[]; HFILTER_HELO_IP_A(1.00)[maybe.home.utahime.org]; HFILTER_HELO_NORES_A_OR_MX(0.30)[maybe.home.utahime.org]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[utahime.org:+]; RCPT_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[183.180.29.210:from]; ASN(0.00)[asn:2519, ipnet:183.180.0.0/16, country:JP]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[utahime.org:s=maybe2019112701]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[utahime.org]; NEURAL_SPAM_SHORT(1.00)[0.997]; SPAMHAUS_ZRD(0.00)[183.180.29.210:from:127.0.2.255]; MID_CONTAINS_FROM(1.00)[]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-ports,python] X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 May 2021 02:35:34 -0000 From: Yasuhiro Kimura Subject: Re: `make makesum` fails with lang/pyton-doc-html Date: Tue, 11 May 2021 08:21:28 +0900 (JST) > 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. > (snip) > > 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. 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? --- Yasuhiro Kimura