 @@ -1,39 +1,32 @@
-$NetBSD: README.MacOSX,v 1.38 2019/07/26 15:41:43 prlw1 Exp $
+$NetBSD: README.MacOSX,v 1.39 2020/08/14 07:24:16 schmonz Exp $
 This file describes the use of current versions of pkgsrc with
 multiple versions of Darwin and macOS, omitting information about
 previous pkgsrc versions.
 * Darwin vs macOS
 macOS consists of Darwin (kernel/userland) plus Mac stuff on top.
 pkgsrc used to target Darwin, but given the tools issued discussed
 below it is not clear that it works on Darwin without macOS.  Darwin
 from Apple is no longer open source.
 Users of non-macOS Darwin are invited to submit patches to this file.
 The only known project is:
   http://www.puredarwin.org/
 Until then, this file remains macOS-centric.
 * macOS specific bootstrap arguments
 Providing the --binary-macpkg flag to the bootstrap script causes it
 to prepare a bootstrap kit as a native macOS package instead of using
 the conventional .tar.bz2 format.  This requires the package-maker
 application to be installed.
 * system tools issues
 ** native headers vs SDK
 macOS used to include system headers in /usr/include, so that one
 could treat it like a relatively normal POSIX system.  Starting at
 approximately 10.9, headers were no longer available at the standard
 location, and one has to use an SDK that puts headers someplace else.
 pkgsrc supports this, but there has been some confusion where a 10.9
 system produced binaries for 10.10, which only mostly works.  The
 confusion is believed to be resolved.
 *** SDK version issues

 @@ -1,16 +1,16 @@
 #! /bin/sh
-# $NetBSD: bootstrap,v 1.289 2020/07/21 15:53:10 sjmulder Exp $
+# $NetBSD: bootstrap,v 1.290 2020/08/14 07:24:16 schmonz Exp $
+#
 # Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
 # All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
+#
 @@ -49,72 +49,49 @@ export NO_PKGTOOLS_REQD_CHECK
 unprivileged=no
 preserve_path=no
 # where the building takes place
 bootstrapdir=`dirname "$0"`
 bootstrapdir=`cd "${bootstrapdir}" && pwd`
 pkgsrcdir=`dirname "${bootstrapdir}"`
 wrkdir="`pwd`/work"
 usage="Usage: $0 "'
     [ --abi [32|64] ]
     [ --binary-kit <tarball> ]
     [ --binary-macpkg <pkg> ]
     [ --compiler <compiler> ]
     [ --cwrappers <auto|yes|no> ]
     [ --full ]
     [ --gzip-binary-kit <tarball> ]
     [ --help ]
     [ --make-jobs <num> ]
     [ --mk-fragment <mk.conf> ]
     [ --pkgdbdir <pkgdbdir> ]
     [ --pkginfodir <pkginfodir> ]
     [ --pkgmandir <pkgmandir> ]
     [ --prefer-pkgsrc <list|yes|no> ]
     [ --prefix <prefix> ]
     [ --preserve-path ]
     [ --quiet ]
     [ --sysconfdir <sysconfdir> ]
     [ --unprivileged | --ignore-user-check ]
     [ --varbase <varbase> ]
     [ --workdir <workdir> ]
+'
 # strip / for BSD/OS, strip - for HP-UX
 opsys=`uname -s | tr -d /-`
 mkbinarykit_macpkg()
 	local macdestdir
 	macdestdir=${wrkdir}/macpkg-destdir
 	rm -rf ${macdestdir} || die "cleanup destdir"
 	mkdir -p ${macdestdir}${prefix} || die "mkdir destprefix"
 	rmdir ${macdestdir}${prefix} || die "rmdir destprefix"
 	cp -Rp ${prefix} ${macdestdir}${prefix} || die "copy prefix"
 	if [ ! -d ${macdestdir}${pkgdbdir} ]; then
 		mkdir -p ${macdestdir}${pkgdbdir} || die "mkdir destdbdir"
 		rmdir ${macdestdir}${pkgdbdir} || die "rmdir destdbdir"
 		cp -Rp ${pkgdbdir} ${macdestdir}${pkgdbdir} || die "copy dbdir"
 	fi
 	${sedprog} -e "s|%WRKDIR%|${wrkdir}|g" \
 		-e "s|%TARGETDIR%|${targetdir}|g" -e "s|%DATE%|${date}|g" \
 		< macpkg.pmproj.in > ${wrkdir}/macpkg.pmproj
 	${packagemaker} -build -proj ${wrkdir}/macpkg.pmproj -p "${binary_macpkg}"
 mkbinarykit_tar()
+{
 	# in case tar was built by bootstrap
 	PATH="$prefix/bin:$PATH"; export PATH
 	cd / && tar -hcf "${binary_kit}" .$prefix .$pkgdbdir .$etc_mk_conf
+}
 mkbinarykit_tgz()
+{
 	# in case tar was built by bootstrap
 	PATH="$prefix/bin:$PATH"; export PATH
 	cd / && tar -hcf - .$prefix .$pkgdbdir .$etc_mk_conf | gzip > "${binary_gzip_kit}"
+}
 @@ -474,30 +451,26 @@ while [ $# -gt 0 ]; do
 	--preserve-path) preserve_path=yes ;;
 	--mk-fragment=*)
 			mk_fragment=`get_optarg "$1"` ;;
 	--mk-fragment)
 			mk_fragment="$2"; shift ;;
 	--binary-kit=*)
 			binary_kit=`get_optarg "$1"` ;;
 	--binary-kit)
 			binary_kit="$2"; shift ;;
 	--gzip-binary-kit=*)
 			binary_gzip_kit=`get_optarg "$1"` ;;
 	--gzip-binary-kit)
 			binary_gzip_kit="$2"; shift ;;
 	--binary-macpkg=*)
 			binary_macpkg=`get_optarg "$1"` ;;
 	--binary-macpkg)
 			binary_macpkg="$2"; shift ;;
 	--make-jobs=*)	make_jobs=`get_optarg "$1"` ;;
 	--make-jobs)	make_jobs="$2"; shift ;;
 	--full)		full=yes ;;
 	--quiet)	quiet=yes ;;
 	--help)		echo "$usage"; exit ;;
 	-h)		echo "$usage"; exit ;;
 	-*)		echo "${0##*/}: unknown option \"$1\"" 1>&2
 			echo "$usage" 1>&2; exit 1 ;;
 	esac
 	shift
 done
 checkarg_sane_absolute_path "$pkgdbdir" "--pkgdbdir"
 @@ -1405,27 +1378,26 @@ build_package "pkgtools/pkg_install"
 etc_mk_conf="$sysconfdir/mk.conf"
 # Install the example mk.conf so that it is used, but only if it doesn't
 # exist yet. This can happen with non-default sysconfdir settings.
 mkdir_p "$sysconfdir"
 if [ ! -f "$etc_mk_conf" ]; then
 	cp "$TARGET_MKCONF" "$etc_mk_conf"
 	TARGET_MKCONF="$etc_mk_conf"
 fi
 [ -n "${binary_kit}" ] && mkbinarykit_tar
 [ -n "${binary_gzip_kit}" ] && mkbinarykit_tgz
 [ -n "${binary_macpkg}" ] && mkbinarykit_macpkg
 hline="==========================================================================="
 echo ""
 echo "$hline"
 echo ""
 echo "Please remember to add $prefix/bin to your PATH environment variable"
 echo "and $mandir to your MANPATH environment variable, if necessary."
 echo ""
 echo "An example mk.conf file with the settings you provided to \"bootstrap\""
 echo "has been created for you. It can be found in:"
 echo ""
 echo "      ${TARGET_MKCONF}"
 echo ""