From 7f34f8ad3dfbcb9890181ca74cf28e22d79e5cb1 Mon Sep 17 00:00:00 2001
From: Lorenz Schori <lo@znerol.ch>
Date: Wed, 18 Nov 2009 21:22:00 +0100
Subject: [PATCH] OSX installer: fix for a bug in 10.5 packagemaker, --id
 argument required

---
 bacula/platforms/osx/Makefile.in                            | 6 ++++--
 bacula/platforms/osx/files/installer.pmdoc.in/01destdir.xml | 2 +-
 bacula/platforms/osx/files/installer.pmdoc.in/index.xml     | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bacula/platforms/osx/Makefile.in b/bacula/platforms/osx/Makefile.in
index 5a7da4ae18..4a2c037da3 100644
--- a/bacula/platforms/osx/Makefile.in
+++ b/bacula/platforms/osx/Makefile.in
@@ -50,6 +50,7 @@ ifneq ($(CURDIR),$(CURSUB))
 endif
 
 PACKAGE_TITLE:=Bacula File Daemon ${BACULA_VERSION}
+PACKAGE_ID:=org.bacula.bacula-fd.pkg
 PACKAGE_DIR:=${PRODUCTS_DIR}/${PACKAGE_TITLE}
 PACKAGE_BUNDLE:=${PACKAGE_DIR}/${PACKAGE_TITLE}.pkg
 PACKAGE_DMG:=${PRODUCTS_DIR}/${PACKAGE_TITLE}.dmg
@@ -80,7 +81,8 @@ INFILE_SUBST=\
   -e "s,@PREFIX@,${BACULA_PREFIX},g" \
   -e "s,@BACULA_VERSION@,${BACULA_VERSION},g" \
   -e "s,@FD_CONF@,${BACULA_FD_CONF},g" \
-  -e "s,@BACULA_DESTDIR@,${BACULA_DESTDIR},g"
+  -e "s,@BACULA_DESTDIR@,${BACULA_DESTDIR},g" \
+  -e "s,@PACKAGE_ID@,${PACKAGE_ID},g"
 
 dmg: pkg
 	hdiutil create -srcfolder "${PACKAGE_DIR}" "${PACKAGE_DMG}"
@@ -88,7 +90,7 @@ dmg: pkg
 pkg: ${BACULA_DESTDIR} ${BACULA_PMDOC} ${WORKING_DIR}/resources
 	mkdir -p "${PACKAGE_DIR}"
 
-	${PM} --doc "${BACULA_PMDOC}" --out "${PACKAGE_BUNDLE}"
+	${PM} --doc "${BACULA_PMDOC}" --id "${PACKAGE_ID}" --out "${PACKAGE_BUNDLE}"
 
 	cp ${WORKING_DIR}/resources/ReadMe.html "${PACKAGE_DIR}/ReadMe.html"
 
diff --git a/bacula/platforms/osx/files/installer.pmdoc.in/01destdir.xml b/bacula/platforms/osx/files/installer.pmdoc.in/01destdir.xml
index 35c2877e64..b8a8cfadc8 100644
--- a/bacula/platforms/osx/files/installer.pmdoc.in/01destdir.xml
+++ b/bacula/platforms/osx/files/installer.pmdoc.in/01destdir.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <pkgref spec="1.12" uuid="E3A20DCD-888A-4211-8318-BF9CAA10B769">
   <config>
-    <identifier>org.bacula.bacula-fd.pkg</identifier>
+    <identifier>@PACKAGE_ID@</identifier>
     <version>@BACULA_VERSION@</version>
     <description/>
     <post-install type="none"/>
diff --git a/bacula/platforms/osx/files/installer.pmdoc.in/index.xml b/bacula/platforms/osx/files/installer.pmdoc.in/index.xml
index 37ac4647db..04db0671d0 100644
--- a/bacula/platforms/osx/files/installer.pmdoc.in/index.xml
+++ b/bacula/platforms/osx/files/installer.pmdoc.in/index.xml
@@ -13,7 +13,7 @@
   </distribution>
   <contents>
     <choice title="destdir" id="choice0" starts_selected="true" starts_enabled="true" starts_hidden="false">
-      <pkgref id="org.bacula.bacula-fd.pkg"/>
+      <pkgref id="@PACKAGE_ID@"/>
     </choice>
   </contents>
   <resources bg-scale="none" bg-align="topleft">
-- 
2.39.5