Tue Jun 17 14:58:14 2008 UTC ()

Pullup ticket #2421 - requested by he
Fix old-style bulk builds

Revisions pulled up:
- mk/bulk/build			1.104
- pkgtools/pkg_install/Makefile	1.154
---
    Module Name:	pkgsrc
    Committed By:	he
    Date:		Sun Jun  8 21:04:30 UTC 2008

    Modified Files:
    	pkgsrc/mk/bulk: build
    	pkgsrc/pkgtools/pkg_install: Makefile

    Log Message:
    Commit two fixes which at least for me appear to be required when
    doing an old-style bulk build on 4.0 or older systems:

     - in mk/bulk/build, do "make update" instead of "make install + clean"
       when installing a new pkg_install
     - in pkgtools/pkg_install/Makefile, don't try to use our own
       executables (${WORKDIR}/pkg_add/pkg_add etc.) if they don't exist

    Discussed with joerg, and even though he's not entirely happy
    with the latter change, he didn't appear to have a better suggestion.

    This, and putting /usr/pkg/sbin earlier than /usr/sbin in the $PATH
    appears to be required to get an old-style bulk build going.


(tron)

diff -r1.103 -r1.103.2.1 pkgsrc/mk/bulk/build
diff -r1.149 -r1.149.2.1 pkgsrc/pkgtools/pkg_install/Makefile

--- pkgsrc/mk/bulk/Attic/build 2008/01/04 15:49:07 1.103
+++ pkgsrc/mk/bulk/Attic/build 2008/06/17 14:58:14 1.103.2.1

 @@ -1,15 +1,15 @@
 #!/bin/sh
-# $NetBSD: build,v 1.103 2008/01/04 15:49:07 rillig Exp $
+# $NetBSD: build,v 1.103.2.1 2008/06/17 14:58:14 tron Exp $
+#
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org>
 # All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 @@ -222,28 +222,27 @@ do_common_setup () {
 				# confuses the printindex script.
 	unset DISPLAY || true	# allow sane failure for gimp, xlispstat
+}
 # Check that the package tools are up to date.
 check_tools () {
 	echo "build> Checking if the pkgtools are up-to-date"
 	( cd "${lintpkgsrc_dir}"				\
   	  && ${BMAKE} fetch >/dev/null 2>&1
 	) || {
 	  echo "build> Updating pkgtools"
 	  ( cd "${pkgsrc_dir}/pkgtools/pkg_install"	\
 	    && ${BMAKE} clean 				\
-	    && ${BMAKE} install 			\
+	    && ${BMAKE} update
 	    && ${BMAKE} clean
 	  ) || die "Could not update the package tools."
+	}
+}
 # Run the pre-build script if necessary.
 run_pre_build () {
 	case $resume in
 		yes)	echo "build> Resuming -- skipping pre-build script";;
 		*)	# make veryveryclean :)
 			( cd "${pkgsrc_dir}"		\
 	  		  && /bin/sh mk/bulk/pre-build
 			) || die "Error during bulk-build preparations, aborting.";;
 	esac

--- pkgsrc/pkgtools/pkg_install/Makefile 2008/04/03 14:22:26 1.149
+++ pkgsrc/pkgtools/pkg_install/Makefile 2008/06/17 14:58:14 1.149.2.1

 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.149 2008/04/03 14:22:26 jlam Exp $
+# $NetBSD: Makefile,v 1.149.2.1 2008/06/17 14:58:14 tron Exp $
 # Notes to package maintainers:
+#
 # Updating this package does not automatically necessitate bumping
 # PKGTOOLS_REQD in bsd.pkg.mk. Do so if and only if there is a critical
 # change in the pkg_* tools that pkgsrc relies on for proper operation.
 DISTNAME=		pkg_install-${VERSION}
 CATEGORIES=		pkgtools
 MASTER_SITES=		# empty
 DISTFILES=		# empty
 MAINTAINER=		joerg@NetBSD.org
 @@ -43,30 +43,32 @@ NO_MTREE=		yes
 PKG_PRESERVE=		yes
 CHECK_PERMS=		no
 # These are needed to solve a chicken-and-egg problem where pkgsrc uses
 # newer features of pkg_install, but older NetBSD installations won't
 # support them.  In this case, we explicitly use the native GCC
 # compiler to avoid problems with depending on pkgsrc GCC for building
 # pkg_install.
+#
 # We also use the newly built pkg_{add,create,delete} since upgrading
 # from an older pkg_install might required features of the new program.
+#
 USE_NATIVE_GCC=		yes
 .if exists(${WRKSRC}/add/pkg_add)
 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
 CPPFLAGS+=		-DDEF_UMASK=${DEF_UMASK}
 MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
 MAKE_ENV+=		OPSYS=${OPSYS:Q}
 PKG_DBDIR?=		/var/db/pkg
 EGDIR=			${PREFIX}/share/examples/pkg_install
 PLIST_SUBST+=		PKG_DBDIR=${PKG_DBDIR:Q}