[pkgsrc/pkgsrc-2008Q1]: pkgsrc/bootstrap pullup ticket #2399 - requested by m...

[rtr <rtr%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/26c0c463f4f5
branches:  pkgsrc-2008Q1
changeset: 540402:26c0c463f4f5
user:      rtr <rtr%pkgsrc.org@localhost>
date:      Thu Jun 05 11:57:46 2008 +0000

description:
pullup ticket #2399 - requested by minskim
bootstrap script: --binary-macpkg option fix

revisions pulled up:
- pkgsrc/bootstrap/bootstrap 1.122,1.123

   Module Name:    pkgsrc
   Committed By:   minskim
   Date:           Tue Apr 29 22:03:19 UTC 2008

   Modified Files:
          pkgsrc/bootstrap: bootstrap

   Log Message:
   Make the --binary-macpkg option compatible with the other binary-kit options.
   ------------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   minskim
   Date:           Wed Apr 30 03:14:55 UTC 2008

   Modified Files:
          pkgsrc/bootstrap: bootstrap

   Log Message:
   Set packagemaker so that the .pkg is built on Darwin.

   This functionality disappeared when mkbinarykit was merged into bootstrap.
   Still need to revive support for universal binary.

diffstat:

 bootstrap/bootstrap |  17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diffs (41 lines):

diff -r f60928afbd71 -r 26c0c463f4f5 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Thu Jun 05 11:51:00 2008 +0000
+++ b/bootstrap/bootstrap       Thu Jun 05 11:57:46 2008 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.121 2008/03/06 04:45:58 jlam Exp $
+# $NetBSD: bootstrap,v 1.121.2.1 2008/06/05 11:57:46 rtr Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -385,8 +385,10 @@
                        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=`get_optarg "$1"` ;;
+                       binary_macpkg="$2"; shift ;;
        --full)         full=yes ;;
        --quiet)        quiet=yes ;;
        --help)         echo "$usage"; exit ;;
@@ -443,6 +445,17 @@
        set_opsys=no
        machine_arch=`uname -p`
        CC="gcc -isystem /usr/include"; export CC
+       osrev=`uname -r`
+       macosx_version=`echo $osrev | awk -F . '{ print "10."$1-4; }'`
+       case "$macosx_version" in
+       10.[0-4])
+               packagemaker=/Developer/Tools/packagemaker
+               ;;
+       *)
+               packagemaker=/Developer/usr/bin/packagemaker
+               ;;
+       esac
+       unset osrev macosx_version
        ;;
 DragonFly)
        root_group=wheel