diff options
-rwxr-xr-x | bootstrap/bootstrap | 6 | ||||
-rw-r--r-- | pkgtools/bootstrap-mk-files/Makefile | 3 | ||||
-rw-r--r-- | pkgtools/mtree/Makefile | 3 | ||||
-rw-r--r-- | pkgtools/pax/Makefile | 3 | ||||
-rw-r--r-- | pkgtools/tnftp/Makefile | 3 |
5 files changed, 7 insertions, 11 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index ca2b7f46bd5..262fa96d489 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.92 2007/03/02 16:48:48 wiz Exp $ +# $NetBSD: bootstrap,v 1.93 2007/04/12 14:36:40 joerg Exp $ # # # Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved. @@ -889,11 +889,11 @@ echo ".endif # end pkgsrc settings" >> ${MKCONF_EXAMPLE} # register packages # usage: register_package <packagedirectory> [additional arguments] register_package() { - run_cmd "(cd $pkgsrcdir/$1 && $bmake MAKECONF=${MKCONF_EXAMPLE} WRKOBJDIR=${wrkobjdir} ${2-} bootstrap-register)" + run_cmd "(cd $pkgsrcdir/$1 && $bmake -DPKG_PRESERVE MAKECONF=${MKCONF_EXAMPLE} WRKOBJDIR=${wrkobjdir} ${2-} bootstrap-register)" } echo_msg "Registering installed packages" -run_cmd "(cd $pkgsrcdir/pkgtools/bootstrap-mk-files && $bmake MAKECONF=${MKCONF_EXAMPLE} WRKOBJDIR=$wrkobjdir bootstrap-register)" +register_package "pkgtools/bootstrap-mk-files" case "$need_awk" in yes) register_package "lang/nawk";; esac diff --git a/pkgtools/bootstrap-mk-files/Makefile b/pkgtools/bootstrap-mk-files/Makefile index a339b66d191..8e88624b9ce 100644 --- a/pkgtools/bootstrap-mk-files/Makefile +++ b/pkgtools/bootstrap-mk-files/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2006/11/11 18:24:52 jschauma Exp $ +# $NetBSD: Makefile,v 1.4 2007/04/12 14:36:40 joerg Exp $ DISTNAME= bootstrap-mk-files-20061111 CATEGORIES= pkgtools @@ -12,7 +12,6 @@ HOMEPAGE= http://www.pkgsrc.org/ COMMENT= *.mk files for the bootstrap bmake utility NO_PKGTOOLS_REQD_CHECK= # defined -PKG_PRESERVE= # defined NO_CHECKSUM= yes NO_MTREE= yes diff --git a/pkgtools/mtree/Makefile b/pkgtools/mtree/Makefile index 2a9939ee02a..f5c578b8947 100644 --- a/pkgtools/mtree/Makefile +++ b/pkgtools/mtree/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2006/07/14 20:11:10 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2007/04/12 14:36:40 joerg Exp $ # # This version of mtree installs into ${PKG_TOOLS_BIN}. # @@ -8,7 +8,6 @@ CATEGORIES= pkgtools NO_PKGTOOLS_REQD_CHECK= # defined -PKG_PRESERVE= # defined PKG_TOOLS_PREFIX= ${PKG_TOOLS_BIN:C|/[^/]?bin$||} diff --git a/pkgtools/pax/Makefile b/pkgtools/pax/Makefile index 3d780b96921..282cb11ca8e 100644 --- a/pkgtools/pax/Makefile +++ b/pkgtools/pax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/07/14 20:11:10 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2007/04/12 14:36:40 joerg Exp $ # # This version of pax installs into ${PKG_TOOLS_BIN}. # @@ -8,7 +8,6 @@ CATEGORIES= pkgtools NO_PKGTOOLS_REQD_CHECK= yes -PKG_PRESERVE= yes PKG_TOOLS_PREFIX= ${PKG_TOOLS_BIN:C|/[^/]?bin$||} diff --git a/pkgtools/tnftp/Makefile b/pkgtools/tnftp/Makefile index 8ab0fceddbf..800ebee9827 100644 --- a/pkgtools/tnftp/Makefile +++ b/pkgtools/tnftp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2006/07/14 21:41:42 jlam Exp $ +# $NetBSD: Makefile,v 1.2 2007/04/12 14:36:41 joerg Exp $ # # This version of tnftp installs into ${PKG_TOOLS_BIN}. # @@ -8,7 +8,6 @@ CATEGORIES= pkgtools NO_PKGTOOLS_REQD_CHECK= yes -PKG_PRESERVE= yes PKG_TOOLS_PREFIX= ${PKG_TOOLS_BIN:C|/[^/]?bin$||} |