Re: Preserving binary packages

[David Holland <dholland-pkgtech%netbsd.org@localhost>]

On Wed, Nov 12, 2014 at 11:50:29PM +0000, Jonathan Perkin wrote:
 > > The problem with the two suggestions above is that, as a naive user,
 > > I'm going to be surprised to find packages still accumulating into
 > > $PACKAGES via depends even though I set PKGSRC_ACCUMULATE_PACKAGES=no.
 > 
 > Sorry, ignore this.  Something was bugging me that I may have been
 > wrong about the behaviour and indeed I was.  I've set
 > DEPENDS_TARGET=bin-install for a long time, and that defaults to
 > calling package-install if no binary exists, which will produce the
 > behaviour I've been talking about ('bmake install' will package all
 > dependencies into $PACKAGES except for the current package itself).

Yeah, I was about to say, it shouldn't do that by default...

Here's the alternative change for doing it that I mentioned a couple
days back. I'm not sure if it's better to do it at this level or not,
but this way setting the flag changes exactly one thing instead of
rearranging targets and I think that has at least some virtues.

Index: mk/pkgformat/pkg/package.mk
===================================================================
RCS file: /cvsroot/pkgsrc/mk/pkgformat/pkg/package.mk,v
retrieving revision 1.5
diff -u -r1.5 package.mk
--- mk/pkgformat/pkg/package.mk	7 Apr 2014 05:25:03 -0000	1.5
+++ mk/pkgformat/pkg/package.mk	13 Nov 2014 08:24:20 -0000
@@ -22,7 +22,11 @@
 STAGE_PKGFILE?=		${PKGFILE}
 . endif
 .else
+. if !empty(PKGSRC_ACCUMULATE_PACKAGES:M[Yy][Ee][Ss])
+STAGE_PKGFILE?=		${PKGFILE}
+. else
 STAGE_PKGFILE?=		${WRKDIR}/.packages/${FILEBASE}-${PKGVERSION}${PKG_SUFX}
+. endif
 .endif
 PKGREPOSITORY?=		${PACKAGES}/${PKGREPOSITORYSUBDIR}
 PKGREPOSITORYSUBDIR?=	All


-- 
David A. Holland
dholland%netbsd.org@localhost