Wed Nov 19 16:35:23 2008 UTC ()
/usr/ucb/install cannot handle a Solaris zone with a read-only /usr but
writeable /usr/pkg, so use install-sh on Solaris instead.


(sketch)
diff -r1.136 -r1.137 pkgsrc/bootstrap/bootstrap
cvs diff -r1.136 -r1.137 pkgsrc/bootstrap/bootstrap (expand / switch to unified diff)

--- pkgsrc/bootstrap/bootstrap 2008/10/14 22:50:54 1.136
+++ pkgsrc/bootstrap/bootstrap 2008/11/19 16:35:23 1.137
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#! /bin/sh 1#! /bin/sh
2 2
3# $NetBSD: bootstrap,v 1.136 2008/10/14 22:50:54 joerg Exp $ 3# $NetBSD: bootstrap,v 1.137 2008/11/19 16:35:23 sketch 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
@@ -561,27 +561,27 @@ OpenBSD) @@ -561,27 +561,27 @@ OpenBSD)
561 need_pax=yes 561 need_pax=yes
562 need_bsd_install=no 562 need_bsd_install=no
563 need_awk=no 563 need_awk=no
564 need_sed=no 564 need_sed=no
565 set_opsys=no 565 set_opsys=no
566 machine_arch=`uname -m` 566 machine_arch=`uname -m`
567 ;; 567 ;;
568SunOS) 568SunOS)
569 if [ -d "/usr/xpg4/bin" ]; then 569 if [ -d "/usr/xpg4/bin" ]; then
570 overpath="/usr/xpg4/bin:$overpath" 570 overpath="/usr/xpg4/bin:$overpath"
571 fi 571 fi
572 root_group=root 572 root_group=root
573 need_pax=yes 573 need_pax=yes
574 need_bsd_install=no 574 need_bsd_install=yes
575 need_awk=yes 575 need_awk=yes
576 need_sed=yes 576 need_sed=yes
577 need_ksh=yes 577 need_ksh=yes
578 set_opsys=no 578 set_opsys=no
579 groupsprog="/usr/xpg4/bin/id -gn" 579 groupsprog="/usr/xpg4/bin/id -gn"
580 whoamiprog="/usr/xpg4/bin/id -un" 580 whoamiprog="/usr/xpg4/bin/id -un"
581 machine_arch=`uname -p | sed -e 's/i86pc/i386/'` 581 machine_arch=`uname -p | sed -e 's/i86pc/i386/'`
582 check_compiler=yes 582 check_compiler=yes
583 ;; 583 ;;
584AIX) 584AIX)
585 root_group=system 585 root_group=system
586 need_pax=yes 586 need_pax=yes
587 need_bsd_install=yes 587 need_bsd_install=yes