Retire --binary-macpkg option, which would generate a binary pkgsrc

bootstrap kit for macOS in the form of a double-clickable .pkg.

3 files changed, 2 insertions, 689 deletions

diff --git a/bootstrap/README.MacOSX b/bootstrap/README.MacOSX
index 7661d2f029c..27a414a7d0f 100644
--- a/bootstrap/README.MacOSX
+++ b/bootstrap/README.MacOSX
@@ -1,4 +1,4 @@
-$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
@@ -17,13 +17,6 @@ The only known project is:
 
 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
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap
index 682899f6be5..05234bbc28a 100755
--- a/bootstrap/bootstrap
+++ b/bootstrap/bootstrap
@@ -1,6 +1,6 @@
 #! /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.
@@ -59,7 +59,6 @@ wrkdir="`pwd`/work"
 usage="Usage: $0 "'
     [ --abi [32|64] ]
     [ --binary-kit <tarball> ]
-    [ --binary-macpkg <pkg> ]
     [ --compiler <compiler> ]
     [ --cwrappers <auto|yes|no> ]
     [ --full ]
@@ -83,28 +82,6 @@ usage="Usage: $0 "'
 # 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
@@ -484,10 +461,6 @@ while [ $# -gt 0 ]; do
 			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 ;;
@@ -1415,7 +1388,6 @@ fi
 
 [ -n "${binary_kit}" ] && mkbinarykit_tar
 [ -n "${binary_gzip_kit}" ] && mkbinarykit_tgz
-[ -n "${binary_macpkg}" ] && mkbinarykit_macpkg
 
 hline="==========================================================================="
 echo ""
diff --git a/bootstrap/macpkg.pmproj.in b/bootstrap/macpkg.pmproj.in
deleted file mode 100644
index 9010533f718..00000000000
--- a/bootstrap/macpkg.pmproj.in
+++ /dev/null
@@ -1,652 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- $NetBSD: macpkg.pmproj.in,v 1.2 2007/05/23 05:00:40 schmonz Exp $ -->
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>$archiver</key>
-	<string>NSKeyedArchiver</string>
-	<key>$objects</key>
-	<array>
-		<string>$null</string>
-		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>61</integer>
-			</dict>
-			<key>buildPath</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>54</integer>
-			</dict>
-			<key>desc</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>49</integer>
-			</dict>
-			<key>documentFormat</key>
-			<integer>11</integer>
-			<key>fileFilterPatterns</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>55</integer>
-			</dict>
-			<key>info</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>16</integer>
-			</dict>
-			<key>locatorDefinitions</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>2</integer>
-			</dict>
-			<key>pathMappings</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>4</integer>
-			</dict>
-			<key>requirementsInstallCheckScript</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>0</integer>
-			</dict>
-			<key>requirementsPlist</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>0</integer>
-			</dict>
-			<key>requirementsVolumeCheckScript</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>0</integer>
-			</dict>
-			<key>resources</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>6</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>3</integer>
-			</dict>
-			<key>NS.keys</key>
-			<array/>
-			<key>NS.objects</key>
-			<array/>
-		</dict>
-		<dict>
-			<key>$classes</key>
-			<array>
-				<string>NSDictionary</string>
-				<string>NSObject</string>
-			</array>
-			<key>$classname</key>
-			<string>NSDictionary</string>
-		</dict>
-		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>5</integer>
-			</dict>
-			<key>NS.keys</key>
-			<array/>
-			<key>NS.objects</key>
-			<array/>
-		</dict>
-		<dict>
-			<key>$classes</key>
-			<array>
-				<string>NSMutableDictionary</string>
-				<string>NSDictionary</string>
-				<string>NSObject</string>
-			</array>
-			<key>$classname</key>
-			<string>NSMutableDictionary</string>
-		</dict>
-		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>15</integer>
-			</dict>
-			<key>alignment</key>
-			<integer>2</integer>
-			<key>background</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>12</integer>
-			</dict>
-			<key>conclusion</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>11</integer>
-			</dict>
-			<key>extras</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>13</integer>
-			</dict>
-			<key>license</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>10</integer>
-			</dict>
-			<key>localizedMimeResources</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>14</integer>
-			</dict>
-			<key>model</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>1</integer>
-			</dict>
-			<key>readme</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>9</integer>
-			</dict>
-			<key>scaling</key>
-			<integer>2</integer>
-			<key>welcome</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>7</integer>
-			</dict>
-		</dict>
-		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>8</integer>
-			</dict>
-			<key>model</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>1</integer>
-			</dict>
-			<key>path</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>0</integer>
-			</dict>
-			<key>type</key>
-			<integer>0</integer>
-		</dict>
-		<dict>
-			<key>$classes</key>
-			<array>
-				<string>LocalPath</string>
-				<string>NSObject</string>
-			</array>
-			<key>$classname</key>
-			<string>LocalPath</string>
-		</dict>
-		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>8</integer>
-			</dict>
-			<key>model</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>1</integer>
-			</dict>
-			<key>path</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>0</integer>
-			</dict>
-			<key>type</key>
-			<integer>0</integer>
-		</dict>
-		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>8</integer>
-			</dict>
-			<key>model</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>1</integer>
-			</dict>
-			<key>path</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>0</integer>
-			</dict>
-			<key>type</key>
-			<integer>0</integer>
-		</dict>
-		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>8</integer>
-			</dict>
-			<key>model</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>1</integer>
-			</dict>
-			<key>path</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>0</integer>
-			</dict>
-			<key>type</key>
-			<integer>0</integer>
-		</dict>
-		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>8</integer>
-			</dict>
-			<key>model</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>1</integer>
-			</dict>
-			<key>path</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>0</integer>
-			</dict>
-			<key>type</key>
-			<integer>0</integer>
-		</dict>
-		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>8</integer>
-			</dict>
-			<key>model</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>1</integer>
-			</dict>
-			<key>path</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>0</integer>
-			</dict>
-			<key>type</key>
-			<integer>0</integer>
-		</dict>
-		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>5</integer>
-			</dict>
-			<key>NS.keys</key>
-			<array/>
-			<key>NS.objects</key>
-			<array/>
-		</dict>
-		<dict>
-			<key>$classes</key>
-			<array>
-				<string>Resources</string>
-				<string>NSObject</string>
-			</array>
-			<key>$classname</key>
-			<string>Resources</string>
-		</dict>
-		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>5</integer>
-			</dict>
-			<key>NS.keys</key>
-			<array>
-				<dict>
-					<key>CF$UID</key>
-					<integer>17</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>18</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>19</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>20</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>21</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>22</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>23</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>24</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>25</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>26</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>27</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>28</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>29</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>30</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>31</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>32</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>33</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>34</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>35</integer>
-				</dict>
-			</array>
-			<key>NS.objects</key>
-			<array>
-				<dict>
-					<key>CF$UID</key>
-					<integer>36</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>37</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>37</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>36</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>38</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>40</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>36</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>36</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>36</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>42</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>44</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>45</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>37</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>46</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>36</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>47</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>36</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>36</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>48</integer>
-				</dict>
-			</array>
-		</dict>
-		<string>preserveForks</string>
-		<string>followLinks</string>
-		<string>removeDSStore</string>
-		<string>allowBackRev</string>
-		<string>contents</string>
-		<string>tempBuild</string>
-		<string>installFat</string>
-		<string>rootVolumeOnly</string>
-		<string>updateInstalledLanguages</string>
-		<string>installLocation</string>
-		<string>getInfo</string>
-		<string>authorization</string>
-		<string>compress</string>
-		<string>identifier</string>
-		<string>overwritePermissions</string>
-		<string>onFinished</string>
-		<string>relocatable</string>
-		<string>required</string>
-		<string>shortVersion</string>
-		<false/>
-		<true/>
-		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>8</integer>
-			</dict>
-			<key>model</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>1</integer>
-			</dict>
-			<key>path</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>39</integer>
-			</dict>
-			<key>type</key>
-			<integer>0</integer>
-		</dict>
-		<string>%WRKDIR%/macpkg-destdir</string>
-		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>8</integer>
-			</dict>
-			<key>model</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>1</integer>
-			</dict>
-			<key>path</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>41</integer>
-			</dict>
-			<key>type</key>
-			<integer>0</integer>
-		</dict>
-		<string>/private/tmp</string>
-		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>8</integer>
-			</dict>
-			<key>model</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>1</integer>
-			</dict>
-			<key>path</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>43</integer>
-			</dict>
-			<key>type</key>
-			<integer>0</integer>
-		</dict>
-		<string>/</string>
-		<string>%DATE%, The NetBSD Foundation</string>
-		<integer>1</integer>
-		<string>org.pkgsrc.bootstrap</string>
-		<integer>0</integer>
-		<string>%DATE%</string>
-		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>5</integer>
-			</dict>
-			<key>NS.keys</key>
-			<array>
-				<dict>
-					<key>CF$UID</key>
-					<integer>50</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>51</integer>
-				</dict>
-			</array>
-			<key>NS.objects</key>
-			<array>
-				<dict>
-					<key>CF$UID</key>
-					<integer>52</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>53</integer>
-				</dict>
-			</array>
-		</dict>
-		<string>description</string>
-		<string>title</string>
-		<string>The NetBSD Packages Collection (pkgsrc) is a framework for building third-party software on NetBSD and other UNIX-like systems, currently containing over 6400 packages. It is used to enable freely available software to be configured and built easily on supported platforms.</string>
-		<string>pkgsrc bootstrap tools</string>
-		<string>%TARGETDIR%/bootstrap-macpkg.pkg</string>
-		<dict>
-			<key>$class</key>
-			<dict>
-				<key>CF$UID</key>
-				<integer>60</integer>
-			</dict>
-			<key>NS.objects</key>
-			<array>
-				<dict>
-					<key>CF$UID</key>
-					<integer>56</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>57</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>58</integer>
-				</dict>
-				<dict>
-					<key>CF$UID</key>
-					<integer>59</integer>
-				</dict>
-			</array>
-		</dict>
-		<string>/CVS$</string>
-		<string>/\.svn$</string>
-		<string>/\.cvsignore$</string>
-		<string>/\.cvspass</string>
-		<dict>
-			<key>$classes</key>
-			<array>
-				<string>NSMutableArray</string>
-				<string>NSArray</string>
-				<string>NSObject</string>
-			</array>
-			<key>$classname</key>
-			<string>NSMutableArray</string>
-		</dict>
-		<dict>
-			<key>$classes</key>
-			<array>
-				<string>SPModel</string>
-				<string>PModel</string>
-				<string>NSObject</string>
-			</array>
-			<key>$classname</key>
-			<string>SPModel</string>
-		</dict>
-	</array>
-	<key>$top</key>
-	<dict>
-		<key>root</key>
-		<dict>
-			<key>CF$UID</key>
-			<integer>1</integer>
-		</dict>
-	</dict>
-	<key>$version</key>
-	<integer>100000</integer>
-</dict>
-</plist>