Fri Aug 14 08:45:30 2020 UTC ()
bootstrap: No need to find packagemaker any longer.


(jperkin)
diff -r1.290 -r1.291 pkgsrc/bootstrap/bootstrap
cvs diff -r1.290 -r1.291 pkgsrc/bootstrap/bootstrap (expand / switch to unified diff)

--- pkgsrc/bootstrap/bootstrap 2020/08/14 07:24:16 1.290
+++ pkgsrc/bootstrap/bootstrap 2020/08/14 08:45:30 1.291
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#! /bin/sh 1#! /bin/sh
2 2
3# $NetBSD: bootstrap,v 1.290 2020/08/14 07:24:16 schmonz Exp $ 3# $NetBSD: bootstrap,v 1.291 2020/08/14 08:45:30 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#
@@ -564,38 +564,26 @@ Darwin) @@ -564,38 +564,26 @@ Darwin)
564 need_awk=yes 564 need_awk=yes
565 need_sed=yes 565 need_sed=yes
566 fi 566 fi
567 567
568 # Avoid system shells on macOS versions that enable System Integrity 568 # Avoid system shells on macOS versions that enable System Integrity
569 # Protection (SIP) as it affects packages that rely on variables such 569 # Protection (SIP) as it affects packages that rely on variables such
570 # as LD_LIBRARY_PATH. SIP unsets any variables that may affect 570 # as LD_LIBRARY_PATH. SIP unsets any variables that may affect
571 # security when using system binaries, i.e. /bin/*sh, but using a 571 # security when using system binaries, i.e. /bin/*sh, but using a
572 # non-system shell is unaffected, at least for now. 572 # non-system shell is unaffected, at least for now.
573 if [ $macos_version -ge 1011 ]; then 573 if [ $macos_version -ge 1011 ]; then
574 need_mksh=yes 574 need_mksh=yes
575 fi 575 fi
576 576
577 case "$macos_version" in 
578 100[7-9]) 
579 packagemaker=/Applications/PackageMaker.app/Contents/MacOS/PackageMaker 
580 ;; 
581 100[0-4]) 
582 packagemaker=/Developer/Tools/packagemaker 
583 ;; 
584 *) 
585 packagemaker=/Developer/usr/bin/packagemaker 
586 ;; 
587 esac 
588 
589 unset osrev macos_version 577 unset osrev macos_version
590 ;; 578 ;;
591DragonFly) 579DragonFly)
592 root_group=wheel 580 root_group=wheel
593 check_prog tarprog tar 581 check_prog tarprog tar
594 machine_arch=`uname -p` 582 machine_arch=`uname -p`
595 ;; 583 ;;
596FreeBSD) 584FreeBSD)
597 root_group=wheel 585 root_group=wheel
598 machine_arch=`uname -p` 586 machine_arch=`uname -p`
599 check_compiler=yes 587 check_compiler=yes
600 ;; 588 ;;
601FreeMiNT) 589FreeMiNT)