sysutils/bup: Workarounds for dealing with haskell, github, github.mk

github.mk presumes that there is one distfile, but bup has two because
it uses pandoc which uses haskell.  Set variables that should result
in fetching both of them.  Because this does not work, I have put a
copy of the man tarball at MASTER_SITE_BACKUP.

(No PKGREVISION++ because if you had the distfiles before you'll get
the same binary package now.)

2 files changed, 34 insertions, 17 deletions

diff --git a/sysutils/bup/Makefile b/sysutils/bup/Makefile
index 4597750f312..4408f3cf7dc 100644
--- a/sysutils/bup/Makefile
+++ b/sysutils/bup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2019/11/19 15:01:25 gdt Exp $
+# $NetBSD: Makefile,v 1.39 2019/11/21 16:19:05 gdt Exp $
 
 DISTNAME=	bup-0.30
 CATEGORIES=	sysutils
@@ -7,13 +7,30 @@ MASTER_SITES=	${MASTER_SITE_GITHUB:=bup/}
 # building man pages requires non-portable tools (pandoc).  The other
 # is that it is hosted on github, which makes hosting tarballs
 # difficult.  The combination of this leads to having a branch "man"
-# in bup's git which has autogenerated man pages.
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-
-# Upstream's 0.30 docs do not have a tag.
-MAN_TARBALL=	28876cde4a3dac518e773860aa7969c106f5390d
-MAN_UNPACK=	bup-${MAN_TARBALL}
-DISTFILES+=	${MAN_TARBALL}${EXTRACT_SUFX}
+# in bup's git which has autogenerated man pages.  The third problem
+# is that github.mk assumes that there is one distfile.
+
+# 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.
+DIST_SUBDIR=	bup		
+
+# This should not be necessary, as it is defaulted by github.mk, but
+# that only works if DISTFILES is empty.
+DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
+
+# The SITES assignment does not work, perhaps because it is overridden
+# elsewhere.  As a workaround, the distfile is at
+# ${MASTER_SITE_BACKUP}.
+# \todo Fix fetching.
+MAN_TAG=	28876cde4a3dac518e773860aa7969c106f5390d
+MAN_UNPACK=	bup-${MAN_TAG}
+MAN_DISTFILE=	${MAN_TAG}${EXTRACT_SUFX}
+SITES.${MAN_DISTFILE}=	${MASTER_SITES:=${GITHUB_PROJECT}/archive/${MAN_DISTFILE}}
+DISTFILES+=	${MAN_DISTFILE}
 
 # Upstream provides html, but we choose not to include it in the package.
 #HTML_TARBALL=	66eccb7eb49575d006d193276018d9551ac5b4d4
diff --git a/sysutils/bup/distinfo b/sysutils/bup/distinfo
index 6f37a5fbf20..45a60bf21b5 100644
--- a/sysutils/bup/distinfo
+++ b/sysutils/bup/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2019/11/19 15:01:25 gdt Exp $
+$NetBSD: distinfo,v 1.14 2019/11/21 16:19:05 gdt Exp $
 
-SHA1 (28876cde4a3dac518e773860aa7969c106f5390d.tar.gz) = 7621c8db2a6dc58ab3cc38e92f360f6de50b3eca
-RMD160 (28876cde4a3dac518e773860aa7969c106f5390d.tar.gz) = 463b18875c27b70ad0777456797f647eda7712a9
-SHA512 (28876cde4a3dac518e773860aa7969c106f5390d.tar.gz) = 56d424c11992c9e46d059e617b8979fe7f73bbe2496604524e52d2ab9c9af9f0d305ef99df3fa1b826f091ef78f4f938020c8f7b11080c3060a5c004ed421960
-Size (28876cde4a3dac518e773860aa7969c106f5390d.tar.gz) = 32954 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/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