Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/bootstrap Retire --binary-macpkg option, which would g...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e30936b8c40a
branches: trunk
changeset: 437000:e30936b8c40a
user: schmonz <schmonz%pkgsrc.org@localhost>
date: Fri Aug 14 07:24:16 2020 +0000
description:
Retire --binary-macpkg option, which would generate a binary pkgsrc
bootstrap kit for macOS in the form of a double-clickable .pkg.
diffstat:
bootstrap/README.MacOSX | 9 +-
bootstrap/bootstrap | 30 +--
bootstrap/macpkg.pmproj.in | 652 ---------------------------------------------
3 files changed, 2 insertions(+), 689 deletions(-)
diffs (truncated from 746 to 300 lines):
diff -r 82cfb32d04a2 -r e30936b8c40a bootstrap/README.MacOSX
--- a/bootstrap/README.MacOSX Fri Aug 14 06:58:00 2020 +0000
+++ b/bootstrap/README.MacOSX Fri Aug 14 07:24:16 2020 +0000
@@ -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 @@
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 -r 82cfb32d04a2 -r e30936b8c40a bootstrap/bootstrap
--- a/bootstrap/bootstrap Fri Aug 14 06:58:00 2020 +0000
+++ b/bootstrap/bootstrap Fri Aug 14 07:24:16 2020 +0000
@@ -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 @@
usage="Usage: $0 "'
[ --abi [32|64] ]
[ --binary-kit <tarball> ]
- [ --binary-macpkg <pkg> ]
[ --compiler <compiler> ]
[ --cwrappers <auto|yes|no> ]
[ --full ]
@@ -83,28 +82,6 @@
# 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 @@
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 @@
[ -n "${binary_kit}" ] && mkbinarykit_tar
[ -n "${binary_gzip_kit}" ] && mkbinarykit_tgz
-[ -n "${binary_macpkg}" ] && mkbinarykit_macpkg
hline="==========================================================================="
echo ""
diff -r 82cfb32d04a2 -r e30936b8c40a bootstrap/macpkg.pmproj.in
--- a/bootstrap/macpkg.pmproj.in Fri Aug 14 06:58:00 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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>
Home |
Main Index |
Thread Index |
Old Index