Re: OpenSolaris bootstrap problems

[Joerg Sonnenberger <joerg%britannica.bec.de@localhost>]

On Fri, Jun 06, 2008 at 12:40:18PM -0500, Jeremy C. Reed wrote:
> Also see for my workaround:
> http://mail-index.netbsd.org/tech-pkg/2008/06/03/msg001053.html

It won't be able to fetch from FTP that way though.
I think the attached patch fixes this and related issues, but it needs
very careful testing that it doesn't break the update path on older
NetBSD. Johnny, what do you think?

Joerg

Index: Makefile
===================================================================
RCS file: /data/repo/netbsd/pkgsrc/pkgtools/pkg_install/Makefile,v
retrieving revision 1.153
diff -u -p -r1.153 Makefile
--- Makefile    2 Jun 2008 16:40:25 -0000       1.153
+++ Makefile    6 Jun 2008 16:08:48 -0000
@@ -51,12 +51,19 @@ CHECK_PERMS=                no
 #
 # We also use the newly built pkg_{add,create,delete} since upgrading
 # from an older pkg_install might required features of the new program. 
+# Note that the definitions are only overriden for the phases that are
+# supposed to use them.  pkg_admin pmatch might be used when looking for
+# dependencies. If that is ever changed in a incompatible way, this has to
+# be rethought.
 #
 USE_NATIVE_GCC=                yes
+
+.if defined(_PKGSRC_BARRIER)
 PKG_ADD_CMD=           ${WRKSRC}/add/pkg_add
 PKG_CREATE_CMD=                ${WRKSRC}/create/pkg_create
 PKG_DELETE_CMD=                ${WRKSRC}/delete/pkg_delete
 PKG_INFO_CMD=          ${WRKSRC}/info/pkg_info
+.endif
 
 CPPFLAGS+=             -D_LARGEFILE_SOURCE -D_LARGE_FILES
 CPPFLAGS+=             -D_FILE_OFFSET_BITS=64