Re: rfc: fix make distinfo/makesum/mirror-distfiles for conditional distfiles

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

[resending patch as inline]

Index: mk/bsd.pkg.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/bsd.pkg.mk,v
retrieving revision 1.2009
diff -u -r1.2009 bsd.pkg.mk
--- mk/bsd.pkg.mk	1 Jan 2015 07:51:47 -0000	1.2009
+++ mk/bsd.pkg.mk	6 Mar 2015 15:46:09 -0000
@@ -65,7 +65,6 @@
 .include "check/bsd.check-vars.mk"
 .include "depends/bsd.depends-vars.mk"
 .include "fetch/bsd.fetch-vars.mk"
-.include "checksum/bsd.checksum-vars.mk"
 .include "extract/bsd.extract-vars.mk"
 .include "patch/bsd.patch-vars.mk"
 .include "configure/bsd.configure-vars.mk"
Index: mk/bsd.prefs.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/bsd.prefs.mk,v
retrieving revision 1.360
diff -u -r1.360 bsd.prefs.mk
--- mk/bsd.prefs.mk	24 Feb 2015 13:26:34 -0000	1.360
+++ mk/bsd.prefs.mk	6 Mar 2015 15:46:09 -0000
@@ -803,6 +803,9 @@
 # Package system format definitions
 .include "pkgformat/bsd.pkgformat-vars.mk"
 
+# Checksum variable definitions
+.include "checksum/bsd.checksum-vars.mk"
+
 # Make variable definitions cache
 .include "bsd.makevars.mk"
 
Index: mk/checksum/bsd.checksum-vars.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/checksum/bsd.checksum-vars.mk,v
retrieving revision 1.2
diff -u -r1.2 bsd.checksum-vars.mk
--- mk/checksum/bsd.checksum-vars.mk	22 May 2008 16:27:22 -0000	1.2
+++ mk/checksum/bsd.checksum-vars.mk	6 Mar 2015 15:46:10 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: bsd.checksum-vars.mk,v 1.2 2008/05/22 16:27:22 joerg Exp $
 #
-# This Makefile fragment is included separately by bsd.pkg.mk and
+# This Makefile fragment is included separately by bsd.prefs.mk and
 # defines some variables which must be defined earlier than where
 # bsd.checksum.mk is included.
 #
@@ -14,3 +14,7 @@
 .if !empty(_CKSUMFILES)
 USE_TOOLS+=	digest:bootstrap
 .endif
+
+.if make(makedistinfo) || make(mdi) || make(distinfo) || make(makesum) || make(mirror-distfiles)
+CHECKSUM_ALL_DISTFILES?=	yes
+.endif
Index: emulators/suse131_linux/Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/suse131_linux/Makefile.common,v
retrieving revision 1.11
diff -u -r1.11 Makefile.common
--- emulators/suse131_linux/Makefile.common	2 Mar 2015 19:40:08 -0000	1.11
+++ emulators/suse131_linux/Makefile.common	6 Mar 2015 15:46:10 -0000
@@ -121,6 +121,15 @@
 #
 .sinclude "${SUSE_PKGSRCDIR}/suse.${EMUL_ARCH}.mk"
 
+.if !empty(CHECKSUM_ALL_DISTFILES:M[Yy][Ee][Ss])
+.  if defined(RPMPKGS) && !empty(RPMPKGS)
+RPMPKGS:=	${RPMPKGS:S/${EMUL_ARCH}/i586/} ${RPMPKGS:S/${EMUL_ARCH}/x86_64/}
+.  endif
+.  if defined(RPMUPDPKGS) && !empty(RPMUPDPKGS)
+RPMUPDPKGS:=	${RPMUPDPKGS:S/${EMUL_ARCH}/i586/} ${RPMUPDPKGS:S/${EMUL_ARCH}/x86_64/}
+.  endif
+.endif
+
 .if defined(RPMPKGS) && !empty(RPMPKGS)
 .  for distfile in ${RPMPKGS}
 DISTFILES+=	${distfile}.rpm