summaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorminskim <minskim>2007-11-03 17:51:08 +0000
committerminskim <minskim>2007-11-03 17:51:08 +0000
commit2f47d9f94d216c5d57105dac3a657bb2cea0715f (patch)
tree7c46f249c3424397953f169018357ba5b3aab625 /bootstrap
parent4aa9c8d30eddbc77c582ec6752b6f4f075e72888 (diff)
downloadpkgsrc-2f47d9f94d216c5d57105dac3a657bb2cea0715f.tar.gz
Make mkbinarykit work on Mac OS X 10.5.
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap/mkbinarykit15
1 files changed, 12 insertions, 3 deletions
diff --git a/bootstrap/mkbinarykit b/bootstrap/mkbinarykit
index 2e4567dbb84..d5626e6afba 100755
--- a/bootstrap/mkbinarykit
+++ b/bootstrap/mkbinarykit
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: mkbinarykit,v 1.26 2007/10/09 19:19:08 martti Exp $
+# $NetBSD: mkbinarykit,v 1.27 2007/11/03 17:51:08 minskim Exp $
#
# Make a binary bootstrap kit and place it in targetdir (or current
# working directory if not specified). The mk.conf.example file is
@@ -27,7 +27,7 @@ mkbinarykit_macpkg()
${sedprog} -e "s|%WRKDIR%|${wrkdir}|g" \
-e "s|%TARGETDIR%|${targetdir}|g" -e "s|%DATE%|${date}|g" \
< macpkg.pmproj.in > ${wrkdir}/macpkg.pmproj
- /Developer/Tools/packagemaker -build -proj ${wrkdir}/macpkg.pmproj -p "$targetdir/bootstrap-pkgsrc-$opsys-$osrev-$ospro-$date.pkg"
+ ${packagemaker} -build -proj ${wrkdir}/macpkg.pmproj -p "$targetdir/bootstrap-pkgsrc-$opsys-$osrev-$ospro-$date.pkg"
ls -dl "$targetdir/bootstrap-pkgsrc-$opsys-$osrev-$ospro-$date.pkg"
}
@@ -81,7 +81,16 @@ AIX)
;;
Darwin)
macosx_version=`echo $osrev | awk -F . '{ print "10."$1-4; }'`
- universal_sdk="/Developer/SDKs/MacOSX${macosx_version}u.sdk"
+ case "$macosx_version" in
+ 10.[0-4])
+ universal_sdk="/Developer/SDKs/MacOSX${macosx_version}u.sdk"
+ packagemaker=/Developer/Tools/packagemaker
+ ;;
+ *)
+ universal_sdk="/Developer/SDKs/MacOSX${macosx_version}.sdk"
+ packagemaker=/Developer/usr/bin/packagemaker
+ ;;
+ esac
if [ -d "${universal_sdk}" ]; then
echo "===> Building Universal binaries."
ospro=universal