Mon Apr 6 14:21:05 2009 UTC ()
Don't install ftp -- it is no longer a dependency of bootstrap
components, so it doesn't need the special threatment.


(joerg)
diff -r1.141 -r1.142 pkgsrc/bootstrap/bootstrap
cvs diff -r1.141 -r1.142 pkgsrc/bootstrap/bootstrap (expand / switch to unified diff)

--- pkgsrc/bootstrap/bootstrap 2009/02/05 18:53:03 1.141
+++ pkgsrc/bootstrap/bootstrap 2009/04/06 14:21:05 1.142
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#! /bin/sh 1#! /bin/sh
2 2
3# $NetBSD: bootstrap,v 1.141 2009/02/05 18:53:03 joerg Exp $ 3# $NetBSD: bootstrap,v 1.142 2009/04/06 14:21:05 joerg Exp $
4# 4#
5# 5#
6# Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved. 6# Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved.
7# 7#
8# Redistribution and use in source and binary forms, with or without 8# Redistribution and use in source and binary forms, with or without
9# modification, are permitted provided that the following conditions 9# modification, are permitted provided that the following conditions
10# are met: 10# are met:
11# 1. Redistributions of source code must retain the above copyright 11# 1. Redistributions of source code must retain the above copyright
12# notice, this list of conditions and the following disclaimer. 12# notice, this list of conditions and the following disclaimer.
13# 2. Redistributions in binary form must reproduce the above copyright 13# 2. Redistributions in binary form must reproduce the above copyright
14# notice, this list of conditions and the following disclaimer in the 14# notice, this list of conditions and the following disclaimer in the
15# documentation and/or other materials provided with the distribution. 15# documentation and/or other materials provided with the distribution.
16# 3. All advertising materials mentioning features or use of this software 16# 3. All advertising materials mentioning features or use of this software
@@ -627,41 +627,34 @@ QNX) @@ -627,41 +627,34 @@ QNX)
627 fetch_cmd="/usr/bin/ftp" 627 fetch_cmd="/usr/bin/ftp"
628 machine_arch=`uname -p | sed -e 's/x86/i386/'` 628 machine_arch=`uname -p | sed -e 's/x86/i386/'`
629 ;; 629 ;;
630*) 630*)
631 echo "This platform ($opsys) is untried - good luck, and thanks for using pkgsrc" 631 echo "This platform ($opsys) is untried - good luck, and thanks for using pkgsrc"
632 root_group=wheel 632 root_group=wheel
633 need_bsd_install=yes 633 need_bsd_install=yes
634 need_awk=yes 634 need_awk=yes
635 need_sed=yes 635 need_sed=yes
636 set_opsys=no 636 set_opsys=no
637 ;; 637 ;;
638esac 638esac
639 639
640if [ -z "$fetch_cmd" ]; then 
641 need_ftp=yes 
642else 
643 need_ftp=no 
644fi 
645 
646# If "--full" is specified, then install all of the platform-independent 640# If "--full" is specified, then install all of the platform-independent
647# bootstrap software. 641# bootstrap software.
648# 642#
649case "$full" in 643case "$full" in
650yes) 644yes)
651 need_bsd_install=yes 645 need_bsd_install=yes
652 need_awk=yes 646 need_awk=yes
653 need_sed=yes 647 need_sed=yes
654 need_ftp=yes 
655 need_ksh=yes 648 need_ksh=yes
656 ;; 649 ;;
657esac 650esac
658 651
659case "$quiet" in 652case "$quiet" in
660yes) 653yes)
661 configure_quiet_flags="--quiet" 654 configure_quiet_flags="--quiet"
662 make_quiet_flags="-s" 655 make_quiet_flags="-s"
663 ;; 656 ;;
664no) 657no)
665 configure_quiet_flags="" 658 configure_quiet_flags=""
666 make_quiet_flags="" 659 make_quiet_flags=""
667esac 660esac