[pkgsrc/trunk]: pkgsrc/sysutils/bup sysutils/bup: Deal with sha1-named distfi...

[gdt <gdt%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a8afa01cec6c
branches:  trunk
changeset: 405127:a8afa01cec6c
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Sat Nov 23 21:25:12 2019 +0000

description:
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.

diffstat:

 sysutils/bup/Makefile |  10 +++-------
 sysutils/bup/distinfo |  18 +++++++++---------
 2 files changed, 12 insertions(+), 16 deletions(-)

diffs (52 lines):

diff -r d1cf06ddd291 -r a8afa01cec6c sysutils/bup/Makefile
--- a/sysutils/bup/Makefile     Sat Nov 23 21:06:46 2019 +0000
+++ b/sysutils/bup/Makefile     Sat Nov 23 21:25:12 2019 +0000
@@ -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 @@
 # (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}
 
diff -r d1cf06ddd291 -r a8afa01cec6c sysutils/bup/distinfo
--- a/sysutils/bup/distinfo     Sat Nov 23 21:06:46 2019 +0000
+++ b/sysutils/bup/distinfo     Sat Nov 23 21:25:12 2019 +0000
@@ -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