From 4ba7b7c953c857e982ff536df8f74f81057bb82e Mon Sep 17 00:00:00 2001
From: Rod Vagg <rod@vagg.org>
Date: Fri, 4 Sep 2015 15:41:21 +1000
Subject: [PATCH] build: fix .pkg creation tooling

---
 Makefile                           | 2 +-
 tools/osx-pkg.pmdoc/01local.xml    | 2 +-
 tools/osx-pkg.pmdoc/02npm.xml      | 2 +-
 tools/osx-pkg.pmdoc/index.xml.tmpl | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 8e9c62155c59ca..3d6d6f7686679a 100644
--- a/Makefile
+++ b/Makefile
@@ -338,7 +338,7 @@ $(PKG): release-only
 		| sed -E "s/\\{npmversion\\}/$(NPMVERSION)/g" \
 		> tools/osx-pkg.pmdoc/index.xml
 	$(PACKAGEMAKER) \
-		--id "org.node.pkg" \
+		--id "org.nodejs.pkg" \
 		--doc tools/osx-pkg.pmdoc \
 		--out $(PKG)
 	SIGN="$(PRODUCTSIGN_CERT)" PKG="$(PKG)" bash tools/osx-productsign.sh
diff --git a/tools/osx-pkg.pmdoc/01local.xml b/tools/osx-pkg.pmdoc/01local.xml
index 4b093106591fe6..537b35508bb714 100644
--- a/tools/osx-pkg.pmdoc/01local.xml
+++ b/tools/osx-pkg.pmdoc/01local.xml
@@ -1,6 +1,6 @@
 <pkgref spec="1.12" uuid="053587FE-BDF3-4EF5-815D-281427431048">
   <config>
-    <identifier>org.iojs.iojs.pkg</identifier>
+    <identifier>org.nodejs.node.pkg</identifier>
     <version>1.0</version>
     <description></description>
     <post-install type="none"/>
diff --git a/tools/osx-pkg.pmdoc/02npm.xml b/tools/osx-pkg.pmdoc/02npm.xml
index 9db49fb7d7cd0d..fca97e5c27dd11 100644
--- a/tools/osx-pkg.pmdoc/02npm.xml
+++ b/tools/osx-pkg.pmdoc/02npm.xml
@@ -1,6 +1,6 @@
 <pkgref spec="1.12" uuid="DF0233A3-6B5D-4FBF-8048-8FC57F42278F">
   <config>
-    <identifier>org.node.npm.pkg</identifier>
+    <identifier>org.nodejs.npm.pkg</identifier>
     <version>1.0</version>
     <description></description>
     <post-install type="none"/>
diff --git a/tools/osx-pkg.pmdoc/index.xml.tmpl b/tools/osx-pkg.pmdoc/index.xml.tmpl
index 884a86fcedea30..e3b14b2112d694 100644
--- a/tools/osx-pkg.pmdoc/index.xml.tmpl
+++ b/tools/osx-pkg.pmdoc/index.xml.tmpl
@@ -13,10 +13,10 @@
   </distribution>
   <contents>
     <choice title="Node.js" id="choice1" starts_selected="true" starts_enabled="true" starts_hidden="false">
-      <pkgref id="org.nodejs.pkg"/>
+      <pkgref id="org.nodejs.node.pkg"/>
     </choice>
     <choice title="npm" id="choice2" starts_selected="true" starts_enabled="true" starts_hidden="false">
-      <pkgref id="org.nodejs.node.npm.pkg"/>
+      <pkgref id="org.nodejs.npm.pkg"/>
     </choice>
   </contents>
   <resources bg-scale="none" bg-align="topleft">