From 70d6ddd08fb64fbd65d9b8e7e808a3b3dad86463 Mon Sep 17 00:00:00 2001
From: unknown <lenz@mysql.com>
Date: Mon, 10 May 2004 20:32:44 +0200
Subject: [PATCH]  - Renamed the Mac OS X StartupItem directory from   
 /Library/StartupItems/MySQL to /Library/StartupItems/MySQLCOM    to avoid a
 name space collision with the MySQL Startup Item shipped    with Mac OS X
 Server, updated the MySQLStartupItem PKG version    number to reflect the
 change.

Build-tools/Do-pkg:
   - Renamed the StartupItem directory from /Library/StartupItems/MySQL
     to /Library/StartupItems/MySQLCOM to avoid a name space collision
     with the MySQL Startup Item in Mac OS X Server
support-files/MacOSX/StartupItem.Description.plist:
   - Bumped up the StartupItem Package version to 1.1 to indicate the
     change in directory naming
---
 Build-tools/Do-pkg                                | 15 +++++++++------
 .../MacOSX/StartupItem.Description.plist          |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Build-tools/Do-pkg b/Build-tools/Do-pkg
index 2fd1946ed0e..286e33f6dd4 100755
--- a/Build-tools/Do-pkg
+++ b/Build-tools/Do-pkg
@@ -95,6 +95,7 @@ $SI_DESC= <$SUPFILEDIR/StartupItem.Description.plist>;
 $SI_PARAMS= <$SUPFILEDIR/StartupParameters.plist>;
 $SI_POST= <$SUPFILEDIR/StartupItem.postinstall>;
 $SI_NAME= "MySQLStartupItem";
+$SI_DIR_NAME= "MySQLCOM";
 $SI_SCRIPT= <$SUPFILEDIR/MySQL>;
 @RESOURCES= qw/ ReadMe.txt postinstall preinstall /;
 @LICENSES= ("$SRCBASEDIR/COPYING","$SRCBASEDIR/MySQLEULA.txt");
@@ -195,16 +196,18 @@ unless ($opt_skip_si)
 	&logger("Cleaning up $RESOURCE_DIR");
 	&run_command("rm -rf $RESOURCE_DIR/*", "Unable to clean up $RESOURCE_DIR!");
 
-	&logger("Installing MySQL StartupItem files into $PKGROOT/MySQL");
+	my $SI_DIR= $PKGROOT . "/" . $SI_DIR_NAME;
+	&logger("Installing MySQL StartupItem files into $SI_DIR");
 	unless($opt_dry_run)
 	{
-		mkdir("$PKGROOT/MySQL") or &abort("Error creating $PKGROOT/MySQL");
-		copy("$SI_SCRIPT", "$PKGROOT/MySQL/")
+		mkdir("$SI_DIR")
+			or &abort("Error creating $SI_DIR");
+		copy("$SI_SCRIPT", "$SI_DIR/")
 			or &abort("Error copying $SI_SCRIPT!");
-		chmod(0755, "$PKGROOT/MySQL/" . basename("$SI_SCRIPT"));
-		copy("$SI_PARAMS", "$PKGROOT/MySQL/")
+		chmod(0755, "$SI_DIR/" . basename("$SI_SCRIPT"));
+		copy("$SI_PARAMS", "$SI_DIR/")
 			or &abort("Error copying $SI_PARAMS!");
-		chmod(0644, "$PKGROOT/MySQL/" . basename("$SI_PARAMS"));
+		chmod(0644, "$SI_DIR/" . basename("$SI_PARAMS"));
 		&run_command("chown -R root:wheel $PKGROOT/*", "Cannot chown $PKGROOT!");
 		copy("$SI_POST", "$RESOURCE_DIR/postinstall")
 			or &abort("Error copying $SI_POST!");
diff --git a/support-files/MacOSX/StartupItem.Description.plist b/support-files/MacOSX/StartupItem.Description.plist
index 1f0023bde0d..e8ceb1ee062 100644
--- a/support-files/MacOSX/StartupItem.Description.plist
+++ b/support-files/MacOSX/StartupItem.Description.plist
@@ -10,6 +10,6 @@
 	<key>IFPkgDescriptionTitle</key>
 	<string>MySQL Startup Item</string>
 	<key>IFPkgDescriptionVersion</key>
-	<string>1.0</string>
+	<string>1.1</string>
 </dict>
 </plist>
-- 
2.30.9