Wed Apr 30 03:14:55 2008 UTC ()
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.


(minskim)
diff -r1.122 -r1.123 pkgsrc/bootstrap/bootstrap
cvs diff -r1.122 -r1.123 pkgsrc/bootstrap/bootstrap (expand / switch to unified diff)

--- pkgsrc/bootstrap/bootstrap 2008/04/29 22:03:19 1.122
+++ pkgsrc/bootstrap/bootstrap 2008/04/30 03:14:55 1.123
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#! /bin/sh 1#! /bin/sh
2 2
3# $NetBSD: bootstrap,v 1.122 2008/04/29 22:03:19 minskim Exp $ 3# $NetBSD: bootstrap,v 1.123 2008/04/30 03:14:55 minskim Exp $
4# 4#
5# 5#
6# Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved. 6# Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved.
7# 7#
8# Redistribution and use in source and binary forms, with or without 8# Redistribution and use in source and binary forms, with or without
9# modification, are permitted provided that the following conditions 9# modification, are permitted provided that the following conditions
10# are met: 10# are met:
11# 1. Redistributions of source code must retain the above copyright 11# 1. Redistributions of source code must retain the above copyright
12# notice, this list of conditions and the following disclaimer. 12# notice, this list of conditions and the following disclaimer.
13# 2. Redistributions in binary form must reproduce the above copyright 13# 2. Redistributions in binary form must reproduce the above copyright
14# notice, this list of conditions and the following disclaimer in the 14# notice, this list of conditions and the following disclaimer in the
15# documentation and/or other materials provided with the distribution. 15# documentation and/or other materials provided with the distribution.
16# 3. All advertising materials mentioning features or use of this software 16# 3. All advertising materials mentioning features or use of this software
@@ -435,26 +435,37 @@ bmakexenv= @@ -435,26 +435,37 @@ bmakexenv=
435bmakexargs= 435bmakexargs=
436tnftpxflags= 436tnftpxflags=
437need_extras=no 437need_extras=no
438case "$opsys" in 438case "$opsys" in
439Darwin) 439Darwin)
440 root_group=wheel 440 root_group=wheel
441 need_pax=yes 441 need_pax=yes
442 need_bsd_install=no 442 need_bsd_install=no
443 need_awk=no 443 need_awk=no
444 need_sed=no 444 need_sed=no
445 set_opsys=no 445 set_opsys=no
446 machine_arch=`uname -p` 446 machine_arch=`uname -p`
447 CC="gcc -isystem /usr/include"; export CC 447 CC="gcc -isystem /usr/include"; export CC
 448 osrev=`uname -r`
 449 macosx_version=`echo $osrev | awk -F . '{ print "10."$1-4; }'`
 450 case "$macosx_version" in
 451 10.[0-4])
 452 packagemaker=/Developer/Tools/packagemaker
 453 ;;
 454 *)
 455 packagemaker=/Developer/usr/bin/packagemaker
 456 ;;
 457 esac
 458 unset osrev macosx_version
448 ;; 459 ;;
449DragonFly) 460DragonFly)
450 root_group=wheel 461 root_group=wheel
451 need_pax=yes 462 need_pax=yes
452 need_bsd_install=no 463 need_bsd_install=no
453 need_awk=no 464 need_awk=no
454 need_sed=no 465 need_sed=no
455 set_opsys=no 466 set_opsys=no
456 check_prog tarprog tar 467 check_prog tarprog tar
457 machine_arch=`uname -p` 468 machine_arch=`uname -p`
458 case `uname -r` in 469 case `uname -r` in
459 1.1[0-9]*) 470 1.1[0-9]*)
460 [ -z "$fetch_cmd" ] && fetch_cmd="/usr/bin/ftp" 471 [ -z "$fetch_cmd" ] && fetch_cmd="/usr/bin/ftp"