- Do-pkg: PGK and DMG names now include the full arch name (e.g.

   "-apple-darwin7.3.0-powerpc") - this is needed as we now will provide
   Mac OS X 10.2.x and Mac OS X 10.3.x PGKs (and it's more in line of
   how we name all other packages)

Build-tools/Do-pkg

@@ -61,6 +61,12 @@ else
 }
 
 $PM= "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker";
+# Try another location on 10.3.3
+unless (-e "$PM")
+{
+	$PM= "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker";
+}
+
 $TMP= $ENV{TMPDIR};
 $TMP eq "" ?  $TMP= $TMP . "/PKGBUILD.$$": $TMP= "/tmp/PKGBUILD.$$";
 $PKGROOT= "$TMP/PMROOT";
@@ -79,6 +85,9 @@ $BUILDDIR= "$PWD/$HOST";
 $SRCBASEDIR= <$BUILDDIR/mysql*-$VERSION>;
 $SUPFILEDIR= <$SRCBASEDIR/support-files/MacOSX>;
 $TAR= <$BUILDDIR/$NAME-apple-darwin*-powerpc.tar.gz>;
+$TAR =~ /.*\/$NAME(.*)\.tar\.gz$/;
+$ARCH= $1;
+$NAME= $NAME . $ARCH;
 $INFO= <$SUPFILEDIR/Info.plist>;
 $DESC= <$SUPFILEDIR/Description.plist>;
 $SI_INFO= <$SUPFILEDIR/StartupItem.Info.plist>;
@@ -167,7 +176,7 @@ unless (-f "$RESOURCE_DIR/License.txt");
 &logger("Extracting $TAR to $PKGROOT");
 &run_command("gnutar zxf $TAR -C $PKGROOT", "Unable to extract $TAR!");
 &run_command("cd $PKGROOT ; ln -s mysql* ./mysql", "Unable to create symlink!");
-&run_command("chown -R root.wheel $PKGROOT/*", "Cannot chown $PKGROOT!");
+&run_command("chown -R root:wheel $PKGROOT/*", "Cannot chown $PKGROOT!");
 
 # Now build the PGK using PackageMaker
 # The "|| true" is a nasty hack to work around a problem with Package Maker
@@ -196,7 +205,7 @@ unless ($opt_skip_si)
 		copy("$SI_PARAMS", "$PKGROOT/MySQL/")
 			or &abort("Error copying $SI_PARAMS!");
 		chmod(0644, "$PKGROOT/MySQL/" . basename("$SI_PARAMS"));
-		&run_command("chown -R root.wheel $PKGROOT/*", "Cannot chown $PKGROOT!");
+		&run_command("chown -R root:wheel $PKGROOT/*", "Cannot chown $PKGROOT!");
 		copy("$SI_POST", "$RESOURCE_DIR/postinstall")
 			or &abort("Error copying $SI_POST!");
 		chmod(0644, "$RESOURCE_DIR/postinstall");