diff options
| author | jlam <jlam> | 2006-07-14 21:41:42 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-07-14 21:41:42 +0000 |
| commit | 13ad8df80d4fc9ed0a52e2eb9bf6f850a3b501ca (patch) | |
| tree | a119297d73e40b71606780428a0069dd545aaa3e /bootstrap | |
| parent | 667f13dc9e9c0edcbc9bfd56a7c226a6f9b49e8e (diff) | |
| download | pkgsrc-13ad8df80d4fc9ed0a52e2eb9bf6f850a3b501ca.tar.gz | |
Create a separate pkgtools/tnftp package that is installed as part of
the bootstrap process and which may be needed by pkg_install. This
is distinct from the net/tnftp package that is now a "normal" package.
Modify the bootstrap script to use pkgtools/tnftp instead, and clean up
some of the registration code.
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap/bootstrap | 10 | ||||
| -rwxr-xr-x | bootstrap/mkbootstrapkit | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index d133f0b4088..e8159e279cc 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.63 2006/07/14 19:40:26 jlam Exp $ +# $NetBSD: bootstrap,v 1.64 2006/07/14 21:41:42 jlam Exp $ # # # Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved. @@ -836,15 +836,15 @@ case "$need_sed" in yes) run_cmd "(cd ../textproc/nbsed && $bmake MAKECONF=${MKCONF_EXAMPLE} LIBNBCOMPAT_STYLE=inplace bootstrap-register)" ;; esac case "$need_ftp" in -yes) run_cmd "(cd ../net/tnftp&& $bmake MAKECONF=${MKCONF_EXAMPLE} LIBNBCOMPAT_STYLE=inplace PKG_OPTIONS= bootstrap-register)" ;; +yes) run_cmd "(cd ../pkgtools/tnftp && $bmake MAKECONF=${MKCONF_EXAMPLE} bootstrap-register)" ;; esac case "$need_mtree" in -yes) run_cmd "(cd ../pkgtools/mtree && $bmake MAKECONF=${MKCONF_EXAMPLE} LIBNBCOMPAT_STYLE=inplace bootstrap-register)" ;; +yes) run_cmd "(cd ../pkgtools/mtree && $bmake MAKECONF=${MKCONF_EXAMPLE} bootstrap-register)" ;; esac case "$need_pax" in -yes) run_cmd "(cd ../pkgtools/pax && $bmake MAKECONF=${MKCONF_EXAMPLE} LIBNBCOMPAT_STYLE=inplace bootstrap-register)" ;; +yes) run_cmd "(cd ../pkgtools/pax && $bmake MAKECONF=${MKCONF_EXAMPLE} bootstrap-register)" ;; esac -run_cmd "(cd ../pkgtools/pkg_install && $bmake MAKECONF=${MKCONF_EXAMPLE} LIBNBCOMPAT_STYLE=inplace bootstrap-register)" +run_cmd "(cd ../pkgtools/pkg_install && $bmake MAKECONF=${MKCONF_EXAMPLE} bootstrap-register)" echo "" echo "Please remember to add $prefix/bin to your PATH environment variable" diff --git a/bootstrap/mkbootstrapkit b/bootstrap/mkbootstrapkit index 054bc2b717a..7b05b7292d4 100755 --- a/bootstrap/mkbootstrapkit +++ b/bootstrap/mkbootstrapkit @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: mkbootstrapkit,v 1.4 2006/07/14 19:40:26 jlam Exp $ +# $NetBSD: mkbootstrapkit,v 1.5 2006/07/14 21:41:42 jlam Exp $ # # Usage: mkbootstrapkit [kitdir] # @@ -31,6 +31,7 @@ for dir in \ pkgtools/mtree \ pkgtools/pax \ pkgtools/pkg_install \ + pkgtools/tnftp \ textproc/nbsed do echo "Copying $dir." |