Received: by mail.netbsd.org (Postfix, from userid 605) id 655EF84D43; Sat, 23 Nov 2019 21:25:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E25F684D37 for ; Sat, 23 Nov 2019 21:25:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id gZ9d_gR1BVuA for ; Sat, 23 Nov 2019 21:25:12 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 5501784CDB for ; Sat, 23 Nov 2019 21:25:12 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 48941FA97; Sat, 23 Nov 2019 21:25:12 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_157454431262430" MIME-Version: 1.0 Date: Sat, 23 Nov 2019 21:25:12 +0000 From: "Greg Troxel" Subject: CVS commit: pkgsrc/sysutils/bup To: pkgsrc-changes@NetBSD.org Reply-To: gdt@netbsd.org X-Mailer: log_accum Message-Id: <20191123212512.48941FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_157454431262430 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gdt Date: Sat Nov 23 21:25:12 UTC 2019 Modified Files: pkgsrc/sysutils/bup: Makefile distinfo Log Message: sysutils/bup: Deal with sha1-named distfile better Use a reasonable local name to deal with ${sha1}.tar.gz, instead of DISTDIR. Thanks to rillig@ for the hint. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 pkgsrc/sysutils/bup/Makefile cvs rdiff -u -r1.14 -r1.15 pkgsrc/sysutils/bup/distinfo Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_157454431262430 Content-Disposition: inline Content-Length: 3433 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/bup/Makefile diff -u pkgsrc/sysutils/bup/Makefile:1.40 pkgsrc/sysutils/bup/Makefile:1.41 --- pkgsrc/sysutils/bup/Makefile:1.40 Thu Nov 21 17:34:06 2019 +++ pkgsrc/sysutils/bup/Makefile Sat Nov 23 21:25:12 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2019/11/21 17:34:06 gdt Exp $ +# $NetBSD: Makefile,v 1.41 2019/11/23 21:25:12 gdt Exp $ DISTNAME= bup-0.30 CATEGORIES= sysutils @@ -13,17 +13,13 @@ MASTER_SITES= ${MASTER_SITE_GITHUB:=bup/ # (Note to future updating self) We would like to fetch the following files: # https://github.com/bup/bup/archive/0.30.tar.gz # https://github.com/bup/bup/archive/28876cde4a3dac518e773860aa7969c106f5390d.tar.gz -# We use a subdir to isolate the man distfile that is named with a -# SHA1, so that one can readily understand to which package the file -# belongs (and the main file, which is not necessary but not harmful). -DIST_SUBDIR= bup # EXTRACT_SUFX is set too late, so using it in SITES.* fails. EXTRACT_SUFX= .tar.gz MAN_TAG= 28876cde4a3dac518e773860aa7969c106f5390d MAN_UNPACK= bup-${MAN_TAG} -MAN_DISTFILE= ${MAN_TAG}${EXTRACT_SUFX} -SITES.${MAN_DISTFILE}= -${MASTER_SITE_GITHUB:=bup/bup/archive/}${MAN_DISTFILE} +MAN_DISTFILE= bup-man-${MAN_TAG}${EXTRACT_SUFX} +SITES.${MAN_DISTFILE}= -${MASTER_SITE_GITHUB:=bup/bup/archive/}${MAN_TAG}${EXTRACT_SUFX} DISTFILES= ${DEFAULT_DISTFILES} ${MAN_DISTFILE} Index: pkgsrc/sysutils/bup/distinfo diff -u pkgsrc/sysutils/bup/distinfo:1.14 pkgsrc/sysutils/bup/distinfo:1.15 --- pkgsrc/sysutils/bup/distinfo:1.14 Thu Nov 21 16:19:05 2019 +++ pkgsrc/sysutils/bup/distinfo Sat Nov 23 21:25:12 2019 @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.14 2019/11/21 16:19:05 gdt Exp $ +$NetBSD: distinfo,v 1.15 2019/11/23 21:25:12 gdt Exp $ -SHA1 (bup/28876cde4a3dac518e773860aa7969c106f5390d.tar.gz) = 7621c8db2a6dc58ab3cc38e92f360f6de50b3eca -RMD160 (bup/28876cde4a3dac518e773860aa7969c106f5390d.tar.gz) = 463b18875c27b70ad0777456797f647eda7712a9 -SHA512 (bup/28876cde4a3dac518e773860aa7969c106f5390d.tar.gz) = 56d424c11992c9e46d059e617b8979fe7f73bbe2496604524e52d2ab9c9af9f0d305ef99df3fa1b826f091ef78f4f938020c8f7b11080c3060a5c004ed421960 -Size (bup/28876cde4a3dac518e773860aa7969c106f5390d.tar.gz) = 32954 bytes -SHA1 (bup/bup-0.30.tar.gz) = 1ac664d49844d8a11a4b3ab01d581f57e163dc80 -RMD160 (bup/bup-0.30.tar.gz) = b716d4972990c0b2cda82b2cc2866123a8b6ef04 -SHA512 (bup/bup-0.30.tar.gz) = 8c500568ca2609e6b437b3a67c08976bbdb6fbad39c77eb7e74e503b5ffdc1cbe1e51b5e834e7db0481a3cfc38a55aeae49a8e53657994524b612e54136e7af1 -Size (bup/bup-0.30.tar.gz) = 431253 bytes +SHA1 (bup-0.30.tar.gz) = 1ac664d49844d8a11a4b3ab01d581f57e163dc80 +RMD160 (bup-0.30.tar.gz) = b716d4972990c0b2cda82b2cc2866123a8b6ef04 +SHA512 (bup-0.30.tar.gz) = 8c500568ca2609e6b437b3a67c08976bbdb6fbad39c77eb7e74e503b5ffdc1cbe1e51b5e834e7db0481a3cfc38a55aeae49a8e53657994524b612e54136e7af1 +Size (bup-0.30.tar.gz) = 431253 bytes +SHA1 (bup-man-28876cde4a3dac518e773860aa7969c106f5390d.tar.gz) = 7621c8db2a6dc58ab3cc38e92f360f6de50b3eca +RMD160 (bup-man-28876cde4a3dac518e773860aa7969c106f5390d.tar.gz) = 463b18875c27b70ad0777456797f647eda7712a9 +SHA512 (bup-man-28876cde4a3dac518e773860aa7969c106f5390d.tar.gz) = 56d424c11992c9e46d059e617b8979fe7f73bbe2496604524e52d2ab9c9af9f0d305ef99df3fa1b826f091ef78f4f938020c8f7b11080c3060a5c004ed421960 +Size (bup-man-28876cde4a3dac518e773860aa7969c106f5390d.tar.gz) = 32954 bytes --_----------=_157454431262430--