Index: trunk/src/VBox/Installer/darwin/Makefile.kmk
===================================================================
--- trunk/src/VBox/Installer/darwin/Makefile.kmk	(revision 42794)
+++ trunk/src/VBox/Installer/darwin/Makefile.kmk	(revision 42940)
@@ -59,10 +59,4 @@
 # Unset this to speed up things during makefile hacking.
 VBOX_DARWIN_INST_DEP_ON_MAKEFILE := $(MAKEFILE_CURRENT)
-
-# The location of the PackageMaker program.
-ifndef VBOX_PACKAGEMAKER
- VBOX_PACKAGEMAKER := $(firstword $(rsort $(wildcard $(PATH_DEVTOOLS)/darwin.x86/packagemaker/v*/PackageMaker.app/Contents/MacOS/PackageMaker)) \
-                                  /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker)
-endif
 
 # The location of the pkgbuild program.
@@ -213,5 +207,5 @@
 			$(VBOX_BRAND_$(f)_REGISTRATIONPANE_LOCALIZABLE_STRINGS)) \
 		$(VBOX_DARWIN_INST_DEP_ON_MAKEFILE)
-	$(call MSG_TOOL,PackageMaker,,,$@)
+	$(call MSG_TOOL,productbuild,,,$@)
 	@# Cleanup any previously failed attempts.
 	sudo rm -Rf \
@@ -227,26 +221,4 @@
 		$(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.res/English.lproj
 	@# Do keyword replacement in the package info and description files.
-ifdef VBOX_USE_PACKAGEMAKER
-	$(SED) \
-		-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
-		-e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/g' \
-		-e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
-		-e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
-		-e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
-		-e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \
-		-e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \
-		--output $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.desc/Info.plist \
-		$(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/Info.plist
-	$(SED) \
-		-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
-		-e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/g' \
-		-e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
-		-e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
-		-e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
-		-e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \
-		-e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \
-		--output $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.desc/Description.plist \
-		$(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/Description.plist
-endif # !VBOX_USE_PACKAGEMAKER
 	$(SED) \
 		-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
@@ -288,38 +260,4 @@
 	)
 	@# Build the package.
-ifdef VBOX_USE_PACKAGEMAKER
-	$(VBOX_PACKAGEMAKER) -build -v \
-		-p $@ \
-		-r $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.res \
-		-i $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.desc/Info.plist \
-		-d $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.desc/Description.plist \
-		-mi $(VBOX_PATH_PACK_TMP)/Packages
-	@# Copy the plugins.
-	$(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/distribution.dist                $@/Contents/
-ifndef VBOX_OSE
-	$(MKDIR) -p $@/Contents/Plugins/
-ifdef VBOX_WITH_SERIALNUMBER_INSTALL
-	$(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/InstallerPlugins/InstallerSections.plist         $@/Contents/Plugins/InstallerSections.plist
-else
-	$(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/InstallerPlugins/InstallerSections.plist         $@/Contents/Plugins/InstallerSections.plist.off
-endif
-	@# Copy the Registration Pane plugin.
-	$(MKDIR) -p $@/Contents/Plugins/RegistrationPane.bundle/Contents/MacOS/
-	$(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/InstallerPlugins/RegistrationPane/Info.plist                                                     $@/Contents/Plugins/RegistrationPane.bundle/Contents/
-	$(INSTALL) -m 0644 $(RegistrationPane_1_TARGET)                                                                                           $@/Contents/Plugins/RegistrationPane.bundle/Contents/MacOS/
-	$(MKDIR) -p $@/Contents/Plugins/RegistrationPane.bundle/Contents/Resources/English.lproj/RegistrationPane.nib
-	$(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/InstallerPlugins/RegistrationPane/Resources/English.lproj/InfoPlist.strings                      $@/Contents/Plugins/RegistrationPane.bundle/Contents/Resources/English.lproj/
-	$(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/InstallerPlugins/RegistrationPane/Resources/English.lproj/Localizable.strings                    $@/Contents/Plugins/RegistrationPane.bundle/Contents/Resources/English.lproj/
-	$(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/InstallerPlugins/RegistrationPane/Resources/English.lproj/RegistrationPane.nib/classes.nib       $@/Contents/Plugins/RegistrationPane.bundle/Contents/Resources/English.lproj/RegistrationPane.nib/
-	$(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/InstallerPlugins/RegistrationPane/Resources/English.lproj/RegistrationPane.nib/info.nib          $@/Contents/Plugins/RegistrationPane.bundle/Contents/Resources/English.lproj/RegistrationPane.nib/
-	$(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/InstallerPlugins/RegistrationPane/Resources/English.lproj/RegistrationPane.nib/keyedobjects.nib  $@/Contents/Plugins/RegistrationPane.bundle/Contents/Resources/English.lproj/RegistrationPane.nib/
-	$(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES), \
-		$(MKDIR) -p \
-			$@/Contents/Plugins/RegistrationPane.bundle/Contents/Resources/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj$(NLTAB) \
-		$(INSTALL) -m 0644 $(VBOX_BRAND_$(f)_REGISTRATIONPANE_INFOPLIST_STRINGS)                  $@/Contents/Plugins/RegistrationPane.bundle/Contents/Resources/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj/InfoPlist.strings$(NLTAB) \
-		$(INSTALL) -m 0644 $(VBOX_BRAND_$(f)_REGISTRATIONPANE_LOCALIZABLE_STRINGS)                $@/Contents/Plugins/RegistrationPane.bundle/Contents/Resources/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj/Localizable.strings$(NLTAB) \
-	)
-endif
-else  # !VBOX_USE_PACKAGEMAKER
 	$(VBOX_PRODUCTBUILD) \
 		--distribution $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/distribution.dist \
@@ -330,5 +268,4 @@
                $(if $(VBOX_MACOSX_INSTALLER_SIGN),--sign "$(VBOX_MACOSX_INSTALLER_SIGN)",) \
 		$@ 
-endif # !VBOX_USE_PACKAGEMAKER
 	@# Cleanup.
 	sudo rm -Rf \
@@ -355,5 +292,5 @@
 			$(VBOX_BRAND_$(f)_VBOXKEXTS_INSTALLATIONCHECK_STRINGS)) \
 		$(VBOX_DARWIN_INST_DEP_ON_MAKEFILE)
-	$(call MSG_TOOL,PackageMaker,,,$@)
+	$(call MSG_TOOL,pkgbuild,,,$@)
 	@# Cleanup any previously failed attempts.
 	sudo rm -Rf \
@@ -393,32 +330,4 @@
 	sudo chown -R root:wheel $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/Library/Extensions
 	@# Do keyword replacement in the package info and description files.
-ifdef VBOX_USE_PACKAGEMAKER
-	$(SED) \
-		-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
-		-e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/g' \
-		-e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
-		-e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
-		-e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
-		-e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \
-		-e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \
-		--output $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.desc/Info.plist \
-		$(VBOX_PATH_DI_SRC)/VBoxKEXTs/Info.plist
-	$(SED) \
-		-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
-		-e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/g' \
-		-e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
-		-e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
-		-e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
-		-e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \
-		-e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \
-		--output $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.desc/Description.plist \
-		$(VBOX_PATH_DI_SRC)/VBoxKEXTs/Description.plist
-	$(SED) \
-		-e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
-		-e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \
-		-e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \
-		--output $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.res/English.lproj/ReadMe.html \
-		$(VBOX_PATH_DI_SRC)/VBoxKEXTs/ReadMe.html
-else
 	$(SED) \
 		-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
@@ -431,41 +340,8 @@
 		--output $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.desc/PkgBuildComponent.plist \
 		$(VBOX_PATH_DI_SRC)/VBoxKEXTs/PkgBuildComponent.plist
-endif
 	@# Copy the resources.
 	$(INSTALL) -m 0755 $(VBOX_PATH_DI_SRC)/VBoxKEXTs/InstallationCheck                     $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.res/
 	$(INSTALL) -m 0755 $(VBOX_PATH_DI_SRC)/VBoxKEXTs/postflight                            $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.res/
-ifdef VBOX_USE_PACKAGEMAKER
-	$(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES), \
-		$(MKDIR) -p \
-			$(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj$(NLTAB) \
-		$(SED) \
-			-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
-			-e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/g' \
-			-e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
-			-e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
-			-e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
-			-e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \
-			-e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \
-			--output $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj/Description.plist \
-			$(VBOX_BRAND_$(f)_VBOXKEXTS_DESCRIPTION_PLIST)$(NLTAB) \
-		$(SED) \
-			-e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
-			-e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \
-			-e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \
-			--output $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj/ReadMe.html \
-			$(VBOX_BRAND_$(f)_VBOXKEXTS_README_HTML)$(NLTAB) \
-		$(INSTALL) -m 0644 $(VBOX_BRAND_$(f)_VBOXKEXTS_INSTALLATIONCHECK_STRINGS)            $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj/InstallationCheck.strings$(NLTAB) \
-	)
-	$(INSTALL) -m 0644 $(VBOX_PATH_DI_SRC)/VBoxKEXTs/English.lproj/InstallationCheck.strings $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.res/English.lproj/
-endif
 	@# Build the package.
-ifdef VBOX_USE_PACKAGEMAKER
-	$(VBOX_PACKAGEMAKER) -build -v \
-		-p $@ \
-		-f $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root \
-		-r $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.res \
-		-i $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.desc/Info.plist \
-		-d $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.desc/Description.plist
-else
 	$(VBOX_PKGBUILD) \
 		--root   $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.root/Library/Extensions/ \
@@ -478,5 +354,4 @@
                $(if $(VBOX_MACOSX_INSTALLER_SIGN),--sign "$(VBOX_MACOSX_INSTALLER_SIGN)",) \
 		$@
-endif
 	@# Cleanup
 	sudo rm -Rf \
@@ -497,5 +372,5 @@
 			$(VBOX_BRAND_$(f)_VBOXSTARTUPITEMS_DESCRIPTION_PLIST)) \
 		$(VBOX_DARWIN_INST_DEP_ON_MAKEFILE)
-	$(call MSG_TOOL,PackageMaker,,,$@)
+	$(call MSG_TOOL,pkgbuild,,,$@)
 	@# Cleanup any previously failed attempts.
 	sudo rm -Rf \
@@ -523,53 +398,5 @@
 	sudo chown    root:admin $(VBOX_PATH_PACK_TMP)/VBoxStartupItems.pkg.root/Library
 	sudo chown -R root:wheel $(VBOX_PATH_PACK_TMP)/VBoxStartupItems.pkg.root/Library/StartupItems
-	@# Do keyword replacement in the package info and description files.
-ifdef VBOX_USE_PACKAGEMAKER
-	$(SED) \
-		-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
-		-e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/g' \
-		-e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
-		-e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
-		-e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
-		-e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \
-		-e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \
-		--output $(VBOX_PATH_PACK_TMP)/VBoxStartupItems.pkg.desc/Info.plist \
-		$(VBOX_PATH_DI_SRC)/VBoxStartupItems/Info.plist
-	$(SED) \
-		-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
-		-e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/g' \
-		-e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
-		-e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
-		-e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
-		-e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \
-		-e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \
-		--output $(VBOX_PATH_PACK_TMP)/VBoxStartupItems.pkg.desc/Description.plist \
-		$(VBOX_PATH_DI_SRC)/VBoxStartupItems/Description.plist
-endif
-	@# Copy the resources.
-ifdef VBOX_USE_PACKAGEMAKER
-	$(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES), \
-		$(MKDIR) -p \
-			$(VBOX_PATH_PACK_TMP)/VBoxStartupItems.pkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj$(NLTAB) \
-		$(SED) \
-			-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
-			-e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/g' \
-			-e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
-			-e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
-			-e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
-			-e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \
-			-e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \
-			--output $(VBOX_PATH_PACK_TMP)/VBoxStartupItems.pkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj/Description.plist \
-			$(VBOX_BRAND_$(f)_VBOXSTARTUPITEMS_DESCRIPTION_PLIST)$(NLTAB) \
-	)
-endif
 	@# Build the package.
-ifdef VBOX_USE_PACKAGEMAKER
-	$(VBOX_PACKAGEMAKER) -build -v \
-		-p $@ \
-		-f $(VBOX_PATH_PACK_TMP)/VBoxStartupItems.pkg.root \
-		-r $(VBOX_PATH_PACK_TMP)/VBoxStartupItems.pkg.res \
-		-i $(VBOX_PATH_PACK_TMP)/VBoxStartupItems.pkg.desc/Info.plist \
-		-d $(VBOX_PATH_PACK_TMP)/VBoxStartupItems.pkg.desc/Description.plist
-else
 	$(VBOX_PKGBUILD) \
 		--root   $(VBOX_PATH_PACK_TMP)/VBoxStartupItems.pkg.root/Library/StartupItems/ \
@@ -580,5 +407,4 @@
                $(if $(VBOX_MACOSX_INSTALLER_SIGN),--sign "$(VBOX_MACOSX_INSTALLER_SIGN)",) \
 		$@
-endif
 	@# Cleanup
 	sudo rm -Rf \
@@ -829,5 +655,5 @@
 		$(VBOX_PATH_DI_SRC)/VirtualBox/VBoxAutostartDarwin.sh \
 		$(VBOX_DARWIN_INST_DEP_ON_MAKEFILE)
-	$(call MSG_TOOL,PackageMaker,,,$@)
+	$(call MSG_TOOL,pkgbuild,,,$@)
 	@# Cleanup any previously failed attempts.
 	sudo rm -Rf \
@@ -1017,26 +843,4 @@
 endif
 	@# Do keyword replacement in the package info and description files.
-ifdef VBOX_USE_PACKAGEMAKER
-	$(SED) \
-		-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
-		-e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/g' \
-		-e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
-		-e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
-		-e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
-		-e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \
-		-e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \
-		--output $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.desc/Info.plist \
-		$(VBOX_PATH_DI_SRC)/VirtualBox/Info.plist
-	$(SED) \
-		-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
-		-e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/g' \
-		-e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
-		-e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
-		-e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
-		-e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \
-		-e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \
-		--output $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.desc/Description.plist \
-		$(VBOX_PATH_DI_SRC)/VirtualBox/Description.plist
-else
 	$(SED) \
 		-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
@@ -1049,32 +853,7 @@
 		--output $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.desc/PkgBuildComponent.plist \
 		$(VBOX_PATH_DI_SRC)/VirtualBox/PkgBuildComponent.plist
-endif
 	@# Copy the resources.
-ifdef VBOX_USE_PACKAGEMAKER
-	$(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES) \
-		,$(MKDIR) -p \
-			$(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj$(NLTAB) \
-		$(SED) \
-			-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
-			-e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/g' \
-			-e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
-			-e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
-			-e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
-			-e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \
-			-e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \
-			--output $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj/Description.plist \
-			$(VBOX_BRAND_$(f)_VIRTUALBOX_DESCRIPTION_PLIST)$(NLTAB) \
-	)
-endif
 	$(INSTALL) -m 0755 $(VBOX_PATH_DI_SRC)/VirtualBox/postflight                        $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.res/
 	@# Build the package.
-ifdef VBOX_USE_PACKAGEMAKER
-	$(VBOX_PACKAGEMAKER) -build -v \
-		-p $@ \
-		-f $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root \
-		-r $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.res \
-		-i $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.desc/Info.plist \
-		-d $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.desc/Description.plist
-else
 	$(VBOX_PKGBUILD) \
        	--root   $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/ \
@@ -1087,5 +866,4 @@
                $(if $(VBOX_MACOSX_INSTALLER_SIGN),--sign "$(VBOX_MACOSX_INSTALLER_SIGN)",) \
 		$@
-endif
 	@# Cleanup
 	sudo rm -Rf \
@@ -1103,5 +881,5 @@
 			,$(VBOX_BRAND_$(f)_VIRTUALBOXCLI_DESCRIPTION_PLIST)) \
 		$(VBOX_DARWIN_INST_DEP_ON_MAKEFILE)
-	$(call MSG_TOOL,PackageMaker,,,$@)
+	$(call MSG_TOOL,pkgbuild,,,$@)
 	@# Cleanup any previously failed attempts.
 	sudo rm -Rf \
@@ -1140,53 +918,5 @@
 	sudo chown    root:admin $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root
 	sudo chown -R root:wheel $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr
-	@# Do keyword replacement in the package info and description files.
-ifdef VBOX_USE_PACKAGEMAKER
-	$(SED) \
-		-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
-		-e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/g' \
-		-e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
-		-e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
-		-e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
-		-e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \
-		-e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \
-		--output $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.desc/Info.plist \
-		$(VBOX_PATH_DI_SRC)/VirtualBoxCLI/Info.plist
-	$(SED) \
-		-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
-		-e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/g' \
-		-e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
-		-e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
-		-e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
-		-e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \
-		-e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \
-		--output $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.desc/Description.plist \
-		$(VBOX_PATH_DI_SRC)/VirtualBoxCLI/Description.plist
-endif
-	@# Copy the resources.
-ifdef VBOX_USE_PACKAGEMAKER
-	$(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES) \
-		,$(MKDIR) -p \
-			$(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj$(NLTAB) \
-		$(SED) \
-			-e 's/@VBOX_VERSION_STRING@/$(VBOX_VERSION_STRING)/g' \
-			-e 's/@VBOX_VERSION_MAJOR@/$(VBOX_VERSION_MAJOR)/g' \
-			-e 's/@VBOX_VERSION_MINOR@/$(VBOX_VERSION_MINOR)/g' \
-			-e 's/@VBOX_VERSION_BUILD@/$(VBOX_VERSION_BUILD)/g' \
-			-e 's/@VBOX_VENDOR@/$(VBOX_VENDOR)/g' \
-			-e 's/@VBOX_PRODUCT@/$(VBOX_PRODUCT)/g' \
-			-e 's/@VBOX_C_YEAR@/$(VBOX_C_YEAR)/g' \
-			--output $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.res/$(VBOX_INSTALLER_$(f)_DARWIN_TARGET).lproj/Description.plist \
-			$(VBOX_BRAND_$(f)_VIRTUALBOXCLI_DESCRIPTION_PLIST)$(NLTAB) \
-	)
-endif
 	@# Build the package.
-ifdef VBOX_USE_PACKAGEMAKER
-	$(VBOX_PACKAGEMAKER) -build -v \
-		-p $@ \
-		-f $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root \
-		-r $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.res \
-		-i $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.desc/Info.plist \
-		-d $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.desc/Description.plist
-else
 	$(VBOX_PKGBUILD) \
        	--root   $(VBOX_PATH_PACK_TMP)/VirtualBoxCLI.pkg.root/usr/bin \
@@ -1197,5 +927,4 @@
                $(if $(VBOX_MACOSX_INSTALLER_SIGN),--sign "$(VBOX_MACOSX_INSTALLER_SIGN)",) \
 		$@
-endif
 	@# Cleanup
 	sudo rm -Rf \
Index: trunk/src/VBox/Installer/darwin/VBoxKEXTs/Description.plist
===================================================================
--- trunk/src/VBox/Installer/darwin/VBoxKEXTs/Description.plist	(revision 42794)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-        <key>IFPkgDescriptionTitle</key>                <string>@VBOX_PRODUCT@ Kernel Extensions</string>
-        <key>IFPkgDescriptionDescription</key>          <string>Installs the @VBOX_PRODUCT@ Kernel Extensions into /Library/Extensions.</string>
-        <key>IFPkgDescriptionVersion</key>              <string>@VBOX_VERSION_STRING@</string>
-        <key>IFPkgDescriptionDeleteWarning</key>        <string></string>
-</dict>
-</plist>
-
Index: trunk/src/VBox/Installer/darwin/VBoxKEXTs/Info.plist
===================================================================
--- trunk/src/VBox/Installer/darwin/VBoxKEXTs/Info.plist	(revision 42794)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-        <key>CFBundleIdentifier</key>                   <string>org.virtualbox.pkg.vboxkexts</string>
-        <key>CFBundleName</key>                         <string>The @VBOX_PRODUCT@ Kernel Extensions Package</string>
-        <key>CFBundleGetInfoString</key>                <string>@VBOX_PRODUCT@ @VBOX_VERSION_STRING@, © 2009-@VBOX_C_YEAR@ @VBOX_VENDOR@</string>
-        <key>CFBundleShortVersionString</key>           <string>@VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@</string>
-        <key>IFMajorVersion</key>                       <integer>@VBOX_VERSION_MAJOR@</integer>
-        <key>IFMinorVersion</key>                       <integer>@VBOX_VERSION_MINOR@</integer>
-        <key>IFPkgFlagAllowBackRev</key>                <false/>
-        <key>IFPkgFlagAuthorizationAction</key>         <string>RootAuthorization</string>
-        <key>IFPkgFlagDefaultLocation</key>             <string>/</string>
-        <key>IFPkgFlagInstallFat</key>                  <false/>
-        <key>IFPkgFlagIsRequired</key>                  <true/>
-        <key>IFPkgFlagRelocatable</key>                 <false/>
-        <key>IFPkgFlagRestartAction</key>               <string>NoRestart</string>
-        <key>IFPkgFlagRootVolumeOnly</key>              <true/>
-        <key>IFPkgFlagUpdateInstalledLanguages</key>    <false/>
-        <key>IFPkgFormatVersion</key>                   <real>0.10000000149011612</real>
-        <key>IFPkgFlagOverwritePermissions</key>        <false/>
-</dict>
-</plist>
-
Index: trunk/src/VBox/Installer/darwin/VBoxKEXTs/ReadMe.html
===================================================================
--- trunk/src/VBox/Installer/darwin/VBoxKEXTs/ReadMe.html	(revision 42794)
+++ 	(revision )
@@ -1,6 +1,0 @@
-<font face="sans-serif">
-<p>This package installs VBoxDrv.kext, VBoxUSB.kext, VBoxNetFlt.kext and
-VBoxNetAdp.kext into /Library/Extensions. At the end of the installation it
-will load the extensions. Note that the extensions will not be loaded
-automatically at boot time unless you also install the @VBOX_PRODUCT@ startup
-item.</p> </font>
Index: trunk/src/VBox/Installer/darwin/VBoxStartupItems/Description.plist
===================================================================
--- trunk/src/VBox/Installer/darwin/VBoxStartupItems/Description.plist	(revision 42794)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-        <key>IFPkgDescriptionTitle</key>                <string>@VBOX_PRODUCT@ Startup Items</string>
-        <key>IFPkgDescriptionDescription</key>          <string>Installs the @VBOX_PRODUCT@ Startup Items to /Library/StartupItems/VirtualBox.</string>
-        <key>IFPkgDescriptionVersion</key>              <string>@VBOX_VERSION_STRING@</string>
-        <key>IFPkgDescriptionDeleteWarning</key>        <string></string>
-</dict>
-</plist>
Index: trunk/src/VBox/Installer/darwin/VBoxStartupItems/Info.plist
===================================================================
--- trunk/src/VBox/Installer/darwin/VBoxStartupItems/Info.plist	(revision 42794)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-        <key>CFBundleIdentifier</key>                   <string>org.virtualbox.pkg.vboxstartupitems</string>
-        <key>CFBundleName</key>                         <string>The @VBOX_PRODUCT@ Startup Items Package</string>
-        <key>CFBundleGetInfoString</key>                <string>@VBOX_PRODUCT@ @VBOX_VERSION_STRING@, © 2009-@VBOX_C_YEAR@ @VBOX_VENDOR@</string>
-        <key>CFBundleShortVersionString</key>           <string>@VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@</string>
-        <key>IFMajorVersion</key>                       <integer>@VBOX_VERSION_MAJOR@</integer>
-        <key>IFMinorVersion</key>                       <integer>@VBOX_VERSION_MINOR@</integer>
-        <key>IFPkgFlagAllowBackRev</key>                <false/>
-        <key>IFPkgFlagAuthorizationAction</key>         <string>RootAuthorization</string>
-        <key>IFPkgFlagDefaultLocation</key>             <string>/</string>
-        <key>IFPkgFlagInstallFat</key>                  <false/>
-        <key>IFPkgFlagIsRequired</key>                  <true/>
-        <key>IFPkgFlagRelocatable</key>                 <false/>
-        <key>IFPkgFlagRestartAction</key>               <string>NoRestart</string>
-        <key>IFPkgFlagRootVolumeOnly</key>              <true/>
-        <key>IFPkgFlagUpdateInstalledLanguages</key>    <false/>
-        <key>IFPkgFormatVersion</key>                   <real>0.10000000149011612</real>
-        <key>IFPkgFlagOverwritePermissions</key>        <false/>
-</dict>
-</plist>
Index: trunk/src/VBox/Installer/darwin/VirtualBox/Description.plist
===================================================================
--- trunk/src/VBox/Installer/darwin/VirtualBox/Description.plist	(revision 42794)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-        <key>IFPkgDescriptionTitle</key>                <string>@VBOX_PRODUCT@</string>
-        <key>IFPkgDescriptionDescription</key>          <string>Installs the @VBOX_PRODUCT@ application into /Applications.</string>
-        <key>IFPkgDescriptionVersion</key>              <string>@VBOX_VERSION_STRING@</string>
-        <key>IFPkgDescriptionDeleteWarning</key>        <string></string>
-</dict>
-</plist>
Index: trunk/src/VBox/Installer/darwin/VirtualBox/Info.plist
===================================================================
--- trunk/src/VBox/Installer/darwin/VirtualBox/Info.plist	(revision 42794)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-        <key>CFBundleIdentifier</key>                   <string>org.virtualbox.pkg.virtualbox</string>
-        <key>CFBundleName</key>                         <string>The @VBOX_PRODUCT@ Application Package</string>
-        <key>CFBundleGetInfoString</key>                <string>@VBOX_PRODUCT@ @VBOX_VERSION_STRING@, © 2009-@VBOX_C_YEAR@ @VBOX_VENDOR@</string>
-        <key>CFBundleShortVersionString</key>           <string>@VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@</string>
-        <key>IFMajorVersion</key>                       <integer>@VBOX_VERSION_MAJOR@</integer>
-        <key>IFMinorVersion</key>                       <integer>@VBOX_VERSION_MINOR@</integer>
-        <key>IFPkgFlagAllowBackRev</key>                <false/>
-        <key>IFPkgFlagAuthorizationAction</key>         <string>RootAuthorization</string>
-        <key>IFPkgFlagDefaultLocation</key>             <string>/</string>
-        <key>IFPkgFlagInstallFat</key>                  <false/>
-        <key>IFPkgFlagIsRequired</key>                  <true/>
-        <key>IFPkgFlagRelocatable</key>                 <false/>
-        <key>IFPkgFlagRestartAction</key>               <string>NoRestart</string>
-        <key>IFPkgFlagRootVolumeOnly</key>              <true/>
-        <key>IFPkgFlagUpdateInstalledLanguages</key>    <false/>
-        <key>IFPkgFormatVersion</key>                   <real>0.10000000149011612</real>
-        <key>IFPkgFlagOverwritePermissions</key>        <false/>
-        <key>IFPkgFlagFollowLinks</key>                 <false/>
-</dict>
-</plist>
Index: trunk/src/VBox/Installer/darwin/VirtualBoxCLI/Description.plist
===================================================================
--- trunk/src/VBox/Installer/darwin/VirtualBoxCLI/Description.plist	(revision 42794)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-        <key>IFPkgDescriptionTitle</key>                <string>@VBOX_PRODUCT@ Command Line Utilities</string>
-        <key>IFPkgDescriptionDescription</key>          <string>Installs the @VBOX_PRODUCT@ command line utilities into /usr/bin.</string>
-        <key>IFPkgDescriptionVersion</key>              <string>@VBOX_VERSION_STRING@</string>
-        <key>IFPkgDescriptionDeleteWarning</key>        <string></string>
-</dict>
-</plist>
Index: trunk/src/VBox/Installer/darwin/VirtualBoxCLI/Info.plist
===================================================================
--- trunk/src/VBox/Installer/darwin/VirtualBoxCLI/Info.plist	(revision 42794)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-        <key>CFBundleIdentifier</key>                   <string>org.virtualbox.pkg.virtualboxcli</string>
-        <key>CFBundleName</key>                         <string>The @VBOX_PRODUCT@ Command Line Utilities Package</string>
-        <key>CFBundleGetInfoString</key>                <string>@VBOX_PRODUCT@ @VBOX_VERSION_STRING@, © 2009-@VBOX_C_YEAR@ @VBOX_VENDOR@</string>
-        <key>CFBundleShortVersionString</key>           <string>@VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@</string>
-        <key>IFMajorVersion</key>                       <integer>@VBOX_VERSION_MAJOR@</integer>
-        <key>IFMinorVersion</key>                       <integer>@VBOX_VERSION_MINOR@</integer>
-        <key>IFPkgFlagAllowBackRev</key>                <false/>
-        <key>IFPkgFlagAuthorizationAction</key>         <string>RootAuthorization</string>
-        <key>IFPkgFlagDefaultLocation</key>             <string>/</string>
-        <key>IFPkgFlagInstallFat</key>                  <false/>
-        <key>IFPkgFlagIsRequired</key>                  <false/>
-        <key>IFPkgFlagRelocatable</key>                 <false/>
-        <key>IFPkgFlagRestartAction</key>               <string>NoRestart</string>
-        <key>IFPkgFlagRootVolumeOnly</key>              <true/>
-        <key>IFPkgFlagUpdateInstalledLanguages</key>    <false/>
-        <key>IFPkgFormatVersion</key>                   <real>0.10000000149011612</real>
-        <key>IFPkgFlagOverwritePermissions</key>        <false/>
-</dict>
-</plist>
Index: trunk/src/VBox/Installer/darwin/VirtualBox_mpkg/Description.plist
===================================================================
--- trunk/src/VBox/Installer/darwin/VirtualBox_mpkg/Description.plist	(revision 42794)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IFPkgDescriptionTitle</key>                <string>@VBOX_PRODUCT@</string>
-	<key>IFPkgDescriptionDescription</key>          <string>The @VBOX_PRODUCT@ Package.</string>
-	<key>IFPkgDescriptionVersion</key>              <string>@VBOX_VERSION_STRING@</string>
-	<key>IFPkgDescriptionDeleteWarning</key>        <string></string>
-</dict>
-</plist>
-
Index: trunk/src/VBox/Installer/darwin/VirtualBox_mpkg/Info.plist
===================================================================
--- trunk/src/VBox/Installer/darwin/VirtualBox_mpkg/Info.plist	(revision 42794)
+++ 	(revision )
@@ -1,35 +1,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-        <key>CFBundleIdentifier</key>                   <string>org.virtualbox.mpkg.virtualbox</string>
-        <key>CFBundleName</key>                         <string>The @VBOX_PRODUCT@ Package</string>
-        <key>CFBundleGetInfoString</key>                <string>@VBOX_PRODUCT@ @VBOX_VERSION_STRING@, © 2009-@VBOX_C_YEAR@ @VBOX_VENDOR@</string>
-        <key>CFBundleShortVersionString</key>           <string>@VBOX_VERSION_MAJOR@.@VBOX_VERSION_MINOR@.@VBOX_VERSION_BUILD@</string>
-        <key>IFMajorVersion</key>                       <integer>@VBOX_VERSION_MAJOR@</integer>
-        <key>IFMinorVersion</key>                       <integer>@VBOX_VERSION_MINOR@</integer>
-        <key>IFPkgFormatVersion</key>                   <real>0.10000000149011612</real>
-        <key>IFPkgFlagComponentDirectory</key>          <string>./Contents/Packages/</string>
-        <key>IFPkgFlagRootVolumeOnly</key>              <true/>
-        <key>IFPkgFlagFollowLinks</key>                 <false/>
-        <key>IFPkgFlagPackageList</key>
-	<array>
-		<dict>
-			<key>IFPkgFlagPackageLocation</key>             <string>VBoxKEXTs.pkg</string>
-			<key>IFPkgFlagPackageSelection</key>            <string>required</string>
-		</dict>
-		<dict>
-			<key>IFPkgFlagPackageLocation</key>             <string>VBoxStartupItems.pkg</string>
-			<key>IFPkgFlagPackageSelection</key>            <string>required</string>
-		</dict>
-		<dict>
-			<key>IFPkgFlagPackageLocation</key>             <string>VirtualBox.pkg</string>
-			<key>IFPkgFlagPackageSelection</key>            <string>required</string>
-		</dict>
-		<dict>
-			<key>IFPkgFlagPackageLocation</key>             <string>VirtualBoxCLI.pkg</string>
-			<key>IFPkgFlagPackageSelection</key>            <string>selected</string>
-		</dict>
-	</array>
-</dict>
-</plist>
