CVS commit: pkgsrc/sysutils/bup

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Nov 21 17:34:06 UTC 2019

Modified Files:
        pkgsrc/sysutils/bup: Makefile

Log Message:
sysutils/bup: Resolve man tarball fetching

Define EXTRACT_SUFX explicitly, so that it is set when setting
SITES.*.

Thanks to tnn@ for explaining this and rillig@ for other hints.


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 pkgsrc/sysutils/bup/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/bup/Makefile
diff -u pkgsrc/sysutils/bup/Makefile:1.39 pkgsrc/sysutils/bup/Makefile:1.40
--- pkgsrc/sysutils/bup/Makefile:1.39   Thu Nov 21 16:19:05 2019
+++ pkgsrc/sysutils/bup/Makefile        Thu Nov 21 17:34:06 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2019/11/21 16:19:05 gdt Exp $
+# $NetBSD: Makefile,v 1.40 2019/11/21 17:34:06 gdt Exp $
 
 DISTNAME=      bup-0.30
 CATEGORIES=    sysutils
@@ -10,27 +10,22 @@ 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:
+# (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.
+# belongs (and the main file, which is not necessary but not harmful).
 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.
+# 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_SITES:=${GITHUB_PROJECT}/archive/${MAN_DISTFILE}}
-DISTFILES+=    ${MAN_DISTFILE}
+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