Re: CVS commit: pkgsrc/sysutils/bup

[Tobias Nygren <tnn%NetBSD.org@localhost>]

On Thu, 21 Nov 2019 16:19:05 +0000
Greg Troxel <gdt%netbsd.org@localhost> wrote:

> Module Name:  pkgsrc
> Committed By: gdt
> Date:         Thu Nov 21 16:19:05 UTC 2019
> 
> Modified Files:
>       pkgsrc/sysutils/bup: Makefile distinfo
> 
> Log Message:
> 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.

The problem is that the default for EXTRACT_SUFX is set too late.
This should fix the problem without using MASTER_SITE_BACKUP.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/bup/Makefile,v
retrieving revision 1.39
diff -p -u -r1.39 Makefile
--- Makefile    21 Nov 2019 16:19:05 -0000      1.39
+++ Makefile    21 Nov 2019 17:23:57 -0000
@@ -10,27 +10,12 @@ MASTER_SITES=       ${MASTER_SITE_GITHUB:=bup/
 # 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}
+EXTRACT_SUFX=  .tar.gz
+SITES.${MAN_DISTFILE}= -${MASTER_SITE_GITHUB:=bup/bup/archive/}${MAN_DISTFILE}
+DISTFILES=     ${DEFAULT_DISTFILES} ${MAN_DISTFILE}
 
 # Upstream provides html, but we choose not to include it in the package.
 #HTML_TARBALL= 66eccb7eb49575d006d193276018d9551ac5b4d4