build: fix .pkg creation tooling

PR-URL: #2687
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>

Author: rvagg

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

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"/>

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"/>

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">