CVS commit: pkgsrc/bootstrap

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Aug 14 07:24:16 UTC 2020

Modified Files:
        pkgsrc/bootstrap: README.MacOSX bootstrap
Removed Files:
        pkgsrc/bootstrap: macpkg.pmproj.in

Log Message:
Retire --binary-macpkg option, which would generate a binary pkgsrc
bootstrap kit for macOS in the form of a double-clickable .pkg.


To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 pkgsrc/bootstrap/README.MacOSX
cvs rdiff -u -r1.289 -r1.290 pkgsrc/bootstrap/bootstrap
cvs rdiff -u -r1.2 -r0 pkgsrc/bootstrap/macpkg.pmproj.in

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/bootstrap/README.MacOSX
diff -u pkgsrc/bootstrap/README.MacOSX:1.38 pkgsrc/bootstrap/README.MacOSX:1.39
--- pkgsrc/bootstrap/README.MacOSX:1.38 Fri Jul 26 15:41:43 2019
+++ pkgsrc/bootstrap/README.MacOSX      Fri Aug 14 07:24:16 2020
@@ -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

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.289 pkgsrc/bootstrap/bootstrap:1.290
--- pkgsrc/bootstrap/bootstrap:1.289    Tue Jul 21 15:53:10 2020
+++ pkgsrc/bootstrap/bootstrap  Fri Aug 14 07:24:16 2020
@@ -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@localhost>
 # 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 ""