From 8e4cc7c19066c82a091dc66bd8ce79bce16e830d Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Thu, 14 Aug 2008 17:41:19 +0000
Subject: merged in changes from the v0-40 pd-extended release branch

svn path=/trunk/; revision=10244
---
 packages/darwin_app/DS_Store                      | Bin 12292 -> 12292 bytes
 packages/darwin_app/Makefile                      |  12 ++++++++---
 packages/darwin_app/VolumeIcon.icns               | Bin 47903 -> 47204 bytes
 packages/darwin_app/org.puredata.pd.default.plist |  23 ++++++++++------------
 4 files changed, 19 insertions(+), 16 deletions(-)

(limited to 'packages/darwin_app')

diff --git a/packages/darwin_app/DS_Store b/packages/darwin_app/DS_Store
index 120ca65c..4b3f378c 100644
Binary files a/packages/darwin_app/DS_Store and b/packages/darwin_app/DS_Store differ
diff --git a/packages/darwin_app/Makefile b/packages/darwin_app/Makefile
index 161d5ef0..568e7422 100644
--- a/packages/darwin_app/Makefile
+++ b/packages/darwin_app/Makefile
@@ -163,7 +163,7 @@ Info.plist: Info.plist.in
 		sed 's/CFBUNDLESHORTVERSIONSTRING/$(PD_MAJOR_VERSION).$(PD_MINOR_VERSION).$(PD_BUGFIX_VERSION)/' | \
 		sed 's/CFBUNDLEVERSION/$(CFBUNDLEVERSION_DATE)/' > \
 		Info.plist
-		
+
 spotlight_importer_install:
 	cd spotlight_importer && xcodebuild
 	install -d -m0755 "$(PD_APP_CONTENTS)/Library/Spotlight"
@@ -175,14 +175,20 @@ rez_install:
 	cd $(bindir) && /Developer/Tools/Rez -t APPL mac.r -o pd
 
 
-# switch Linux-only pdp_v4l to Mac pdp_ieee1394
+# switch Linux-only pdp_v4l to Mac-only pdp_ieee1394
 pdp_help_hack:
 	sed -i.bak 's|pdp_v4l|pdp_ieee1394|' $(helpdir)/pdp*-help.pd
 	rm -f --  $(helpdir)/pdp*-help.pd.bak
+	sed -i.bak 's|pdp_v4l|pdp_ieee1394|' $(helpdir)/pdp/*.pd
+	rm -f --  $(helpdir)/pdp/*.pd
+	sed -i.bak 's|pdp_v4l|pdp_ieee1394|' $(helpdir)/pidip/*.pd
+	rm -f --  $(helpdir)/pidip/*.pd
 	sed -i.bak 's|pdp_v4l|pdp_ieee1394|' $(examplesdir)/pdp/*.pd
 	rm -f --  $(examplesdir)/pdp/*.pd.bak
 	sed -i.bak 's|pdp_v4l|pdp_ieee1394|' $(examplesdir)/pidip/*.pd
 	rm -f --  $(examplesdir)/pidip/*.pd.bak
+	sed -i.bak 's|pdp_v4l|pdp_ieee1394|' $(examplesdir)/3dp/*.pd
+	rm -f --  $(examplesdir)/3dp/*.pd.bak
 
 darwin_app_embed_libs:
 # embed libquicktime plugins
@@ -206,7 +212,7 @@ darwin_app_core: darwin_app_wrapper
 	cd "$(PD_APP_CONTENTS)" && ln -s Resources/extra Plugins
 	install -p -m0644 org.puredata.pd.default.plist "$(PD_APP_CONTENTS)/"
 # create directory to put Spotlight Importers into
-	
+
 
 
 #------------------------------------------------------------------------------#
diff --git a/packages/darwin_app/VolumeIcon.icns b/packages/darwin_app/VolumeIcon.icns
index 82a295ec..4d094c0c 100644
Binary files a/packages/darwin_app/VolumeIcon.icns and b/packages/darwin_app/VolumeIcon.icns differ
diff --git a/packages/darwin_app/org.puredata.pd.default.plist b/packages/darwin_app/org.puredata.pd.default.plist
index b2f081e8..834dc095 100644
--- a/packages/darwin_app/org.puredata.pd.default.plist
+++ b/packages/darwin_app/org.puredata.pd.default.plist
@@ -5,7 +5,7 @@
 	<key>defeatrt</key>
 	<string>0</string>
 	<key>flags</key>
-	<string>-helppath /Library/Pd</string>
+	<string>-helppath ~/Library/Pd -helppath /Library/Pd</string>
 	<key>loadlib1</key>
 	<string>libdir</string>
 	<key>loadlib2</key>
@@ -67,25 +67,21 @@
 	<key>loadlib30</key>
 	<string>ext13</string>
 	<key>loadlib31</key>
-	<string>hardware</string>
-	<key>loadlib32</key>
 	<string>ggee</string>
-	<key>loadlib33</key>
+	<key>loadlib32</key>
 	<string>iem_anything</string>
-	<key>loadlib34</key>
+	<key>loadlib33</key>
 	<string>flib</string>
-	<key>loadlib35</key>
+	<key>loadlib34</key>
 	<string>ekext</string>
-	<key>loadlib36</key>
+	<key>loadlib35</key>
 	<string>flatspace</string>
-	<key>loadlib37</key>
-	<string>deprecated</string>
-	<key>loadlib38</key>
+	<key>loadlib36</key>
 	<string>pdp</string>
-	<key>loadlib39</key>
+	<key>loadlib37</key>
 	<string>pidip</string>
 	<key>nloadlib</key>
-	<string>39</string>
+	<string>37</string>
 	<key>path1</key>
 	<string>~/Library/Pd</string>
 	<key>path2</key>
@@ -109,5 +105,6 @@
 	<key>npath</key>
 	<string>10</string>
 </dict>
- </plist>
+
+</plist>
 
-- 
cgit v1.2.1