Wed Feb 1 10:14:09 2017 UTC ()
Simplify and optimise previous.


(jperkin)
diff -r1.238 -r1.239 pkgsrc/bootstrap/bootstrap
cvs diff -r1.238 -r1.239 pkgsrc/bootstrap/bootstrap (expand / switch to unified diff)

--- pkgsrc/bootstrap/bootstrap 2017/02/01 09:54:21 1.238
+++ pkgsrc/bootstrap/bootstrap 2017/02/01 10:14:09 1.239
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#! /bin/sh 1#! /bin/sh
2 2
3# $NetBSD: bootstrap,v 1.238 2017/02/01 09:54:21 sevan Exp $ 3# $NetBSD: bootstrap,v 1.239 2017/02/01 10:14:09 jperkin Exp $
4# 4#
5# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org> 5# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
6# All rights reserved. 6# 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# 16#
@@ -704,33 +704,31 @@ Linux) @@ -704,33 +704,31 @@ Linux)
704 else 704 else
705 root_group=root 705 root_group=root
706 fi 706 fi
707 need_bsd_install=no 707 need_bsd_install=no
708 # Debian/Ubuntu's awk is mawk, and mawk does not understand 708 # Debian/Ubuntu's awk is mawk, and mawk does not understand
709 # some regexp used in pkgsrc/mk. 709 # some regexp used in pkgsrc/mk.
710 if [ -f /etc/debian_version ]; then 710 if [ -f /etc/debian_version ]; then
711 need_awk=yes 711 need_awk=yes
712 else 712 else
713 need_awk=no 713 need_awk=no
714 fi 714 fi
715 need_sed=no 715 need_sed=no
716 set_opsys=no 716 set_opsys=no
717 case `uname -m` in 717 machine_arch=`uname -m`
718 ppc64le) 718 # Override machine_arch where required.
719 machine_arch=powerpc64le 719 case "$machine_arch" in
720 ;; 720 i?86) machine_arch=i386 ;;
721 *) 721 ppc64le) machine_arch=powerpc64le ;;
722 machine_arch=`uname -m | sed -e 's/i.86/i386/'` 
723 ;; 
724 esac 722 esac
725 ;; 723 ;;
726Minix) 724Minix)
727 root_group=operator 725 root_group=operator
728 need_bsd_install=yes 726 need_bsd_install=yes
729 need_awk=no 727 need_awk=no
730 need_sed=no 728 need_sed=no
731 set_opsys=no 729 set_opsys=no
732 machine_arch=`uname -p` 730 machine_arch=`uname -p`
733 LDFLAGS="-lcompat_minix -lminlib" 731 LDFLAGS="-lcompat_minix -lminlib"
734 ;;  732 ;;
735MirBSD) 733MirBSD)
736 root_group=wheel 734 root_group=wheel