From b534579dd6ead3fa866d50a4a58e944179a26e01 Mon Sep 17 00:00:00 2001 From: schmonz Date: Fri, 14 Aug 2020 07:24:16 +0000 Subject: Retire --binary-macpkg option, which would generate a binary pkgsrc bootstrap kit for macOS in the form of a double-clickable .pkg. --- bootstrap/README.MacOSX | 9 +- bootstrap/bootstrap | 30 +-- bootstrap/macpkg.pmproj.in | 652 --------------------------------------------- 3 files changed, 2 insertions(+), 689 deletions(-) delete mode 100644 bootstrap/macpkg.pmproj.in 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 # All rights reserved. @@ -59,7 +59,6 @@ wrkdir="`pwd`/work" usage="Usage: $0 "' [ --abi [32|64] ] [ --binary-kit ] - [ --binary-macpkg ] [ --compiler ] [ --cwrappers ] [ --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 @@ - - - - - - $archiver - NSKeyedArchiver - $objects - - $null - - $class - - CF$UID - 61 - - buildPath - - CF$UID - 54 - - desc - - CF$UID - 49 - - documentFormat - 11 - fileFilterPatterns - - CF$UID - 55 - - info - - CF$UID - 16 - - locatorDefinitions - - CF$UID - 2 - - pathMappings - - CF$UID - 4 - - requirementsInstallCheckScript - - CF$UID - 0 - - requirementsPlist - - CF$UID - 0 - - requirementsVolumeCheckScript - - CF$UID - 0 - - resources - - CF$UID - 6 - - - - $class - - CF$UID - 3 - - NS.keys - - NS.objects - - - - $classes - - NSDictionary - NSObject - - $classname - NSDictionary - - - $class - - CF$UID - 5 - - NS.keys - - NS.objects - - - - $classes - - NSMutableDictionary - NSDictionary - NSObject - - $classname - NSMutableDictionary - - - $class - - CF$UID - 15 - - alignment - 2 - background - - CF$UID - 12 - - conclusion - - CF$UID - 11 - - extras - - CF$UID - 13 - - license - - CF$UID - 10 - - localizedMimeResources - - CF$UID - 14 - - model - - CF$UID - 1 - - readme - - CF$UID - 9 - - scaling - 2 - welcome - - CF$UID - 7 - - - - $class - - CF$UID - 8 - - model - - CF$UID - 1 - - path - - CF$UID - 0 - - type - 0 - - - $classes - - LocalPath - NSObject - - $classname - LocalPath - - - $class - - CF$UID - 8 - - model - - CF$UID - 1 - - path - - CF$UID - 0 - - type - 0 - - - $class - - CF$UID - 8 - - model - - CF$UID - 1 - - path - - CF$UID - 0 - - type - 0 - - - $class - - CF$UID - 8 - - model - - CF$UID - 1 - - path - - CF$UID - 0 - - type - 0 - - - $class - - CF$UID - 8 - - model - - CF$UID - 1 - - path - - CF$UID - 0 - - type - 0 - - - $class - - CF$UID - 8 - - model - - CF$UID - 1 - - path - - CF$UID - 0 - - type - 0 - - - $class - - CF$UID - 5 - - NS.keys - - NS.objects - - - - $classes - - Resources - NSObject - - $classname - Resources - - - $class - - CF$UID - 5 - - NS.keys - - - CF$UID - 17 - - - CF$UID - 18 - - - CF$UID - 19 - - - CF$UID - 20 - - - CF$UID - 21 - - - CF$UID - 22 - - - CF$UID - 23 - - - CF$UID - 24 - - - CF$UID - 25 - - - CF$UID - 26 - - - CF$UID - 27 - - - CF$UID - 28 - - - CF$UID - 29 - - - CF$UID - 30 - - - CF$UID - 31 - - - CF$UID - 32 - - - CF$UID - 33 - - - CF$UID - 34 - - - CF$UID - 35 - - - NS.objects - - - CF$UID - 36 - - - CF$UID - 37 - - - CF$UID - 37 - - - CF$UID - 36 - - - CF$UID - 38 - - - CF$UID - 40 - - - CF$UID - 36 - - - CF$UID - 36 - - - CF$UID - 36 - - - CF$UID - 42 - - - CF$UID - 44 - - - CF$UID - 45 - - - CF$UID - 37 - - - CF$UID - 46 - - - CF$UID - 36 - - - CF$UID - 47 - - - CF$UID - 36 - - - CF$UID - 36 - - - CF$UID - 48 - - - - preserveForks - followLinks - removeDSStore - allowBackRev - contents - tempBuild - installFat - rootVolumeOnly - updateInstalledLanguages - installLocation - getInfo - authorization - compress - identifier - overwritePermissions - onFinished - relocatable - required - shortVersion - - - - $class - - CF$UID - 8 - - model - - CF$UID - 1 - - path - - CF$UID - 39 - - type - 0 - - %WRKDIR%/macpkg-destdir - - $class - - CF$UID - 8 - - model - - CF$UID - 1 - - path - - CF$UID - 41 - - type - 0 - - /private/tmp - - $class - - CF$UID - 8 - - model - - CF$UID - 1 - - path - - CF$UID - 43 - - type - 0 - - / - %DATE%, The NetBSD Foundation - 1 - org.pkgsrc.bootstrap - 0 - %DATE% - - $class - - CF$UID - 5 - - NS.keys - - - CF$UID - 50 - - - CF$UID - 51 - - - NS.objects - - - CF$UID - 52 - - - CF$UID - 53 - - - - description - title - 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. - pkgsrc bootstrap tools - %TARGETDIR%/bootstrap-macpkg.pkg - - $class - - CF$UID - 60 - - NS.objects - - - CF$UID - 56 - - - CF$UID - 57 - - - CF$UID - 58 - - - CF$UID - 59 - - - - /CVS$ - /\.svn$ - /\.cvsignore$ - /\.cvspass - - $classes - - NSMutableArray - NSArray - NSObject - - $classname - NSMutableArray - - - $classes - - SPModel - PModel - NSObject - - $classname - SPModel - - - $top - - root - - CF$UID - 1 - - - $version - 100000 - - -- cgit v1.2.3