Re: CVS commit: pkgsrc/sysutils/bup

[Greg Troxel <gdt%lexort.com@localhost>]

Tobias Nygren <tnn%NetBSD.org@localhost> writes:

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

Thanks very much for explaining this.  I have more or less applied your
patch.

> -# 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             

I left this, because it seems bad to have ${SHA1}.tar.gz in
/usr/pkgsrc/distfiles.

> -SITES.${MAN_DISTFILE}=       ${MASTER_SITES:=${GITHUB_PROJECT}/archive/${MAN_DISTFILE}}
> +SITES.${MAN_DISTFILE}=       -${MASTER_SITE_GITHUB:=bup/bup/archive/}${MAN_DISTFILE}

I realize it doesn't change the value, but that is not parallel
structure with what's in github.mk:

  SITES.${_GITHUB_DEFAULT_DISTFILES}=     -${MASTER_SITES:=${GITHUB_PROJECT}/archive/${GITHUB_TAG}${EXTRACT_SUFX}}

so I wonder if we should move the trailing } before back to just after
'TAG}'.

(I also don't understand the -, even after reading fetch/fetch.mk, but I
don't doubt that you are right to put it in!)