merged in changes from the v0-40 pd-extended release branch

svn path=/trunk/; revision=10244

10 files changed, 114 insertions, 78 deletions

diff --git a/packages/Makefile b/packages/Makefile
index e97b6cdd..ecc7c17f 100644
--- a/packages/Makefile
+++ b/packages/Makefile
@@ -479,15 +479,16 @@ $(gem_src)/src/Gem.pd_linux: $(gem_src)/src/configure
 # always run aclocal/autoconf until "configure" is deleted from CVS
 	cd $(gem_src)/src && aclocal
 	cd $(gem_src)/src && autoconf
-	cd $(gem_src)/src && ./configure --without-ffmpeg --with-pd=$(pd_src) \
-		--disable-NV
+	cd $(gem_src)/src && ./configure \
+		--without-ffmpeg --with-pd=$(pd_src) --disable-NV
 	$(MAKE) -C $(gem_src)/src
 
 $(gem_src)/src/Gem.pd_darwin:
 # always run aclocal/autoconf until "configure" is deleted from CVS
 	cd $(gem_src)/src && aclocal
 	cd $(gem_src)/src && autoconf
-	cd $(gem_src)/src && ./configure --without-x --without-ImageMagick \
+	cd $(gem_src)/src && ./configure \
+		--without-x --without-ImageMagick \
 		--without-tiff --without-jpeg --without-mpeg --without-mpeg3 \
 		--without-ieee1394 --without-aviplay --without-avifile --without-ffmpeg \
 		--with-ftgl-includes=/sw/include --with-ftgl-libs=/sw/lib \
@@ -502,8 +503,10 @@ gem_install: gem $(helpdir)
 	install -p $(gem_src)/abstractions/*-help.pd $(helpdir)/$(GEM_NAME)
 	install -d $(objectsdir)/$(GEM_NAME)
 ifneq ($(OS_NAME),windows)
-	install -p $(gem_src)/src/Gem.$(EXTENSION)   $(objectsdir)
+	install -p $(gem_src)/src/Gem.$(EXTENSION)   $(objectsdir)/$(GEM_NAME)/
 endif
+# kludge to get helpfiles working since the HELPSYMBOL stuff changed
+	install -p $(gem_src)/help/*.*   $(objectsdir)/$(GEM_NAME)/
 	install -p $(shell ls -1 $(gem_src)/abstractions/*.* | \
 		grep -v '\-help.pd')  $(objectsdir)/$(GEM_NAME)
 	install -d $(manualsdir)/$(GEM_NAME)
@@ -609,14 +612,55 @@ ifeq ($(OS_NAME),linux)
 	echo "<p></p>" >> $(README_FILE)
 endif
 ifeq ($(OS_NAME),darwin)
-	echo "<p>To install Pd, drag the $(PACKAGE_NAME).app into your <b>/Applications</b> folder or to the shortcut in the disk image.  (<i>You might need to put the old one in the trash before copying this one to <b>/Applications</b></i>)</p>" >> $(README_FILE)	
-	echo "<p>By default, most of the included libraries are loaded at startup.  To change this, set your own preferences in the <b>Startup...</b> Preferences pane usings the <b>Save all settings</b> button.   If you want to start with a blank set of preferences, run this command in the Terminal.app: </p><p><code>touch ~/Library/Preferences/org.puredata.pd.plist</code> (<code>~</code> <i>means your home folder</i>)</p><p>The Preferences panels in Pd are currently buggy, so you might have better luck with the Apple utility, Property List Editor, which is freely available as part of XCode or the Server Tools.</p>" >> $(README_FILE)	
+	echo "<p>To install Pd, drag the $(PD_APP_NAME).app into your <b>/Applications</b> folder or to the shortcut in the disk image.  (<i>You might need to put the old one in the trash before copying this one to <b>/Applications</b></i>)</p>" >> $(README_FILE)	
+	echo "<p>By default, most of the included libraries are loaded at startup.  To change this, set your own preferences in the <b>Startup...</b> Preferences pane usings the <b>Save all settings</b> button.   If you want to start with a blank set of preferences, run this command in the Terminal.app: </p><p><code>touch ~/Library/Preferences/org.puredata.pd.plist</code> (<code>~</code> <i>means your home folder</i>)</p><p>The Preferences panels in Pd are currently buggy, so you might have better luck with the Apple utilities: <code>defaults read org.puredata.pd</code>, or, <b>Property List Editor</b>, which is freely available as part of <a href=\"http://developer.apple.com/tools/xcode/download/\" target=\"_blank\">XCode</a> or the <a href=\"http://www.apple.com/support/downloads/serveradmintools104.html\" target=\"_blank\">Server Tools</a>.</p>" >> $(README_FILE)
+	echo "If you want to use PDP on Mac OS X 10.4/Tiger or 10.3/Panther, you will need to install X11 (X11 comes installed with 10.5/Leopard).  It comes on the install CD/DVD that your computer came with.  For more detail, see <a href=\"http://www.simplehelp.net/2006/10/22/how-to-install-x11-in-os-x/\" target=\"_blank\">How to install X11 in OS X</a> or <a href=\"http://puredata.info/docs/faq/macosx\" target=\"_blank\">How do I install Pd on MacOS X?</a>." >> $(README_FILE)
 endif
 ifeq ($(OS_NAME),windows)
 	echo "<p>To install, run the installer.</p>" >> $(README_FILE)
 	echo "<p>To make sure that all of the included libraries are loaded when Pd runs, " >> $(README_FILE)
 	echo "double-click <code>C:\Program Files\pd\pd-settings.reg</code> to import the settings to the registry.  WARNING: this will overwrite any existing Pd preferences!</p>" >> $(README_FILE)
 endif
+	echo "<h3>License</h3>" >> $(README_FILE)	
+	echo "<p>" >> $(README_FILE)
+	echo 'This package is released under the <a href="http://www.gnu.org/copyleft/gpl.html" target="gpl">GNU GPL</a>.  The Pd core and some other included code is originally available with a <a href="http://pure-data.cvs.sourceforge.net/pure-data/pd/LICENSE.txt">BSD license</a> from the Pd CVS on SourceForge.' >> $(README_FILE)
+	echo "</p>" >> $(README_FILE)
+	echo "<h3>Installing Externals, Objects, and Help files</h3>" >> $(README_FILE)
+	echo "<p>" >> $(README_FILE)
+	echo "If you would like to install other externals, objects, help files, etc. there are special folders that Pd-extended uses." >> $(README_FILE)
+	echo "<dl>" >> $(README_FILE)
+	echo "<dt>User-specific</dt>" >> $(README_FILE)
+ifeq ($(OS_NAME),darwin)
+	echo "<dd>~/Library/Pd</dd>" >> $(README_FILE)
+endif
+ifeq ($(OS_NAME),linux)
+	echo "<dd>~/pd/</dd>" >> $(README_FILE)
+endif
+ifeq ($(OS_NAME),windows)
+	echo "<dd>%UserProfile%\Application Data\Pd</dd>" >> $(README_FILE)
+endif
+	echo "<dt>Global</dt>" >> $(README_FILE)
+ifeq ($(OS_NAME),darwin)
+	echo "<dd>/Library/Pd</dd>" >> $(README_FILE)
+endif
+ifeq ($(OS_NAME),linux)
+	echo "<dd>/usr/share/pd</dd>" >> $(README_FILE)
+endif
+ifeq ($(OS_NAME),windows)
+	echo "<dd>%ProgramFiles%\Common Files\Pd</dd>" >> $(README_FILE)
+endif
+	echo "</dl>" >> $(README_FILE)
+	echo "</p>" >> $(README_FILE)
+	echo "<h3>Patented Algorithms</h3>" >> $(README_FILE)
+	echo "<p>" >> $(README_FILE)
+	echo "This package may contain software that is covered by patents in certain countries, like the U.S. and Germany.  In order to use this software you must have the proper license.  Below is a list of the known software packages that are covered by patents in some countries:" >> $(README_FILE)
+	echo "</p>" >> $(README_FILE)
+	echo "<ul>" >> $(README_FILE)
+	echo '<li><a href="http://en.wikipedia.org/wiki/MP3" target="license">MP3 aka MPEG-1 Part 3 Layer 3</a></li>' >> $(README_FILE)
+	echo '<li><a href="http://en.wikipedia.org/wiki/MPEG-2" target="license">MPEG-2</a></li>' >> $(README_FILE)
+	echo '<li><a href="http://en.wikipedia.org/wiki/MPEG-4#Licensing" target="license">MPEG-4</a></li>' >> $(README_FILE)
+	echo "</ul>" >> $(README_FILE)
+	echo '<p>Please consider trying to get rid of software patents in your country: <a href="http://www.nosoftwarepatents.com" target="nsp">http://www.nosoftwarepatents.com</a></p>' >> $(README_FILE)
 	echo "<h3>Pure Data CVS Developers</h3>" >> $(README_FILE)	
 # this may seem whack, but it generates the list of developers from the SourceForge site:
 	curl 'http://sourceforge.net/project/memberlist.php?group_id=55736' | grep -A2 -e '<td>' | sed 's|\(href="\)|target="w" \1http://sourceforge.net|' >> $(README_FILE)
@@ -624,10 +668,6 @@ endif
 	echo "<p>" >> $(README_FILE)
 	echo "Many others not listed have contributed their time and effort, this is just a list of the current developers in the SourceForge project.  But really, every Pd user is a developer and is encouraged to contribute to the CVS repository." >> $(README_FILE)
 	echo "</p>" >> $(README_FILE)
-	echo "<h3>License</h3>" >> $(README_FILE)	
-	echo "<p>" >> $(README_FILE)
-	echo 'This package is released under the <a href="http://www.gnu.org/copyleft/gpl.html" target="gpl">GNU GPL</a>.  The Pd core and some other included code is originally available with a <a href="http://pure-data.cvs.sourceforge.net/pure-data/pd/LICENSE.txt">BSD license</a> from the Pd CVS on SourceForge.' >> $(README_FILE)
-	echo "</p>" >> $(README_FILE)
 	echo "<h3>Included Versions</h3>" >> $(README_FILE)	
 	echo "<p>These externals are all included from the Pd CVS repository:</p>" >> $(README_FILE)
 	echo "<ul>" >> $(README_FILE)
@@ -649,16 +689,6 @@ endif
 	echo "<li>unauthorized: `date +20%y.%m.%d`" >> $(README_FILE)
 	echo "<li>zexy: $(ZEXY_VERSION)" >> $(README_FILE)
 	echo "</ul>" >> $(README_FILE)
-	echo "<h3>Patented Algorithms</h3>" >> $(README_FILE)
-	echo "<p>" >> $(README_FILE)
-	echo "This package may contain software that is covered by patents in certain countries, like the U.S. and Germany.  In order to use this software you must have the proper license.  Below is a list of the known software packages that are covered by patents in some countries:" >> $(README_FILE)
-	echo "</p>" >> $(README_FILE)
-	echo "<ul>" >> $(README_FILE)
-	echo '<li><a href="http://en.wikipedia.org/wiki/MP3" target="license">MP3 aka MPEG-1 Part 3 Layer 3</a></li>' >> $(README_FILE)
-	echo '<li><a href="http://en.wikipedia.org/wiki/MPEG-2" target="license">MPEG-2</a></li>' >> $(README_FILE)
-	echo '<li><a href="http://en.wikipedia.org/wiki/MPEG-4#Licensing" target="license">MPEG-4</a></li>' >> $(README_FILE)
-	echo "</ul>" >> $(README_FILE)
-	echo '<p>Please consider trying to get rid of software patents in your country: <a href="http://www.nosoftwarepatents.com" target="nsp">http://www.nosoftwarepatents.com</a></p>' >> $(README_FILE)
 	echo "(this package was built on `date`) <BR>" >> $(README_FILE)
 	echo "</body></html>" >> $(README_FILE)
 
diff --git a/packages/darwin_app/DS_Store b/packages/darwin_app/DS_Store
index 120ca65c..4b3f378c 100644
--- a/packages/darwin_app/DS_Store
+++ b/packages/darwin_app/DS_Store
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
--- a/packages/darwin_app/VolumeIcon.icns
+++ b/packages/darwin_app/VolumeIcon.icns
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>
 
diff --git a/packages/linux_make/Makefile b/packages/linux_make/Makefile
index 6b4a2c51..a170f2d3 100755
--- a/packages/linux_make/Makefile
+++ b/packages/linux_make/Makefile
@@ -4,7 +4,8 @@
 
 CWD := $(shell pwd)
 
-DESTDIR = $(CWD)/build
+# DESTDIR needs the trailing slash
+DESTDIR = $(CWD)/build/
 cvs_root_dir := $(shell cd $(CWD)/../.. && pwd)
 BUILDLAYOUT_DIR = $(cvs_root_dir)/packages
 
@@ -23,7 +24,7 @@ endif
 TARGET_PLATFORM := $(shell uname -m)
 ifeq ($(TARGET_PLATFORM),i686)
 # Generic x86 (tune for Pentium III, since that's more common these days)
-OPT_CFLAGS += -mcpu=i686 -march=i386
+OPT_CFLAGS += -mtune=i686 -march=i386
 #OPT_CFLAGS += -march=pentium3 -msse -mfpmath=sse
 #OPT_CFLAGS += -march=pentium4 -msse -msse2 -mfpmath=sse
 endif
diff --git a/packages/linux_make/debian/control b/packages/linux_make/debian/control
index 6dc81594..d02855ca 100644
--- a/packages/linux_make/debian/control
+++ b/packages/linux_make/debian/control
@@ -1,5 +1,5 @@
 Source: pd-extended
-Version: 0.40.3cvs20080505-1
+Version: 0.40.3extended-1
 Section: sound
 Priority: optional
 Maintainer: Hans-Christoph Steiner <hans@at.or.at>
@@ -9,7 +9,7 @@ Depends: xterm | x-terminal-emulator, ttf-bitstream-vera, x-ttcidfont-conf, tcll
 Replaces: puredata, pd-externals, gem, pd-pdp, pd-zexy
 Conflicts: pd, pd-externals, gem, pd-pdp, pd-zexy
 Provides: pd
-Recommends: liblame0, qjackctl, xdg-utils
+Recommends: qjackctl, xdg-utils
 Suggests: xmms
 Description: Pure Data with patches and a large collection of externals
  Pd (aka Pure Data) is a real-time graphical programming environment for
diff --git a/packages/linux_make/default.pdsettings b/packages/linux_make/default.pdsettings
index 568e4619..5424e233 100644
--- a/packages/linux_make/default.pdsettings
+++ b/packages/linux_make/default.pdsettings
@@ -1,7 +1,7 @@
 standardpath: 1
 verbose: 0
 defeatrt: 0
-flags: -helppath /usr/share/pd
+flags: -helppath ~/pd -helppath /usr/share/pd
 loadlib1: libdir
 loadlib2: Gem
 loadlib3: cyclone
@@ -32,17 +32,15 @@ loadlib27: freeverb
 loadlib28: hcs
 loadlib29: jmmmp
 loadlib30: ext13
-loadlib31: hardware
-loadlib32: ggee
-loadlib33: iem_anything
-loadlib34: flib
-loadlib35: ekext
-loadlib36: flatspace
-loadlib37: deprecated
-loadlib38: pdp
-loadlib39: pidip
-nloadlib: 39
-path1: ~/pd
-path2: /usr/share/pd
+loadlib31: ggee
+loadlib32: iem_anything
+loadlib33: flib
+loadlib34: ekext
+loadlib35: flatspace
+loadlib36: pdp
+loadlib37: pidip
+nloadlib: 37
+path1: ~/pd-externals
+path2: /usr/local/lib/pd-externals
 path3: /var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType
 npath: 3
diff --git a/packages/win32_inno/pd-inno.iss.in b/packages/win32_inno/pd-inno.iss.in
index 6fbc7fd4..4a41e4f0 100755
--- a/packages/win32_inno/pd-inno.iss.in
+++ b/packages/win32_inno/pd-inno.iss.in
@@ -65,7 +65,9 @@ Root: HKCR; SubKey: Pure.Data\shell\open\command; ValueType: string; ValueData:
 Root: HKCR; SubKey: .pd; ValueType: string; ValueData: Pure.Data; Flags: noerror uninsdeletekey; Tasks: fileassociations

 Root: HKCR; SubKey: .pd; ValueType: string; ValueName: Content Type; ValueData: text/plain; Flags: noerror uninsdeletekey; Tasks: fileassociations

 ;

-; add pd-inno_registry after this comment:

+; STARTHERE: add pd-inno_registry after this comment:

+

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: flags; ValueData: -helppath %UserProfile%/applic~1/Pd -helppath %ProgramFiles%/common~1/pd; Tasks: libs; Flags: uninsdeletekey

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib1; ValueData: libdir; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib2; ValueData: Gem; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib3; ValueData: cyclone; Tasks: libs

@@ -96,14 +98,14 @@ Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib27; ValueD
 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib28; ValueData: hcs; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib29; ValueData: jmmmp; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib30; ValueData: ext13; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib31; ValueData: hardware; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib32; ValueData: ggee; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib33; ValueData: iem_anything; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib34; ValueData: flib; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib35; ValueData: ekext; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib36; ValueData: flatspace; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib37; ValueData: deprecated; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: nloadlib; ValueData: 37; Tasks: libs; Flags: uninsdeletekey

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib31; ValueData: ggee; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib32; ValueData: iem_anything; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib33; ValueData: flib; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib34; ValueData: ekext; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: loadlib35; ValueData: flatspace; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: nloadlib; ValueData: 35; Tasks: libs; Flags: uninsdeletekey

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib36; Flags: deletevalue; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib37; Flags: deletevalue; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib38; Flags: deletevalue; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib39; Flags: deletevalue; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib40; Flags: deletevalue; Tasks: libs

@@ -167,10 +169,10 @@ Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib97; Flags: d
 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib98; Flags: deletevalue; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib99; Flags: deletevalue; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: loadlib100; Flags: deletevalue; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: path1; ValueData: hex(2):25,00,53,00,79,00,73,00,74,00,65,00,6d,00,52,00,6f,00,6f,00,74,00,25,00,2f,00,46,00,6f,00,6e,00,74,00,73,00,00,00; Tasks: libs; Flags: uninsdeletekey

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: npath; ValueData: 1; Tasks: libs; Flags: uninsdeletekey

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path2; Flags: deletevalue; Tasks: libs

-Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path3; Flags: deletevalue; Tasks: libs

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: expandsz; ValueName: path1; ValueData: %USERPROFILE%/Application Data/Pd; Tasks: libs; Flags: uninsdeletekey

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: expandsz; ValueName: path2; ValueData: %ProgramFiles%/Common Files/Pd; Tasks: libs; Flags: uninsdeletekey

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: expandsz; ValueName: path3; ValueData: %SystemRoot%/Fonts; Tasks: libs; Flags: uninsdeletekey

+Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: string; ValueName: npath; ValueData: 3; Tasks: libs; Flags: uninsdeletekey

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path4; Flags: deletevalue; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path5; Flags: deletevalue; Tasks: libs

 Root: HKLM; SubKey: SOFTWARE\Pd; ValueType: none; ValueName: path6; Flags: deletevalue; Tasks: libs

diff --git a/packages/win32_inno/pd-settings.reg b/packages/win32_inno/pd-settings.reg
index ed72e272..bedb8540 100755
--- a/packages/win32_inno/pd-settings.reg
+++ b/packages/win32_inno/pd-settings.reg
@@ -1,6 +1,7 @@
 Windows Registry Editor Version 5.00
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\Pd]
+"flags"="-helppath %UserProfile%/applic~1/Pd -helppath %ProgramFiles%/common~1/pd"
 "loadlib1"="libdir"
 "loadlib2"="Gem"
 "loadlib3"="cyclone"
@@ -31,15 +32,15 @@ Windows Registry Editor Version 5.00
 "loadlib28"="hcs"
 "loadlib29"="jmmmp"
 "loadlib30"="ext13"
-"loadlib31"="hardware"
-"loadlib32"="ggee"
-"loadlib33"="iem_anything"
-"loadlib34"="flib"
-"loadlib35"="ekext"
-"loadlib36"="flatspace"
-"loadlib37"="deprecated"
-"nloadlib"=37
+"loadlib31"="ggee"
+"loadlib32"="iem_anything"
+"loadlib33"="flib"
+"loadlib34"="ekext"
+"loadlib35"="flatspace"
+"nloadlib"=35
 ; delete any previous loadlib flags
+"loadlib36"=-
+"loadlib37"=-
 "loadlib38"=-
 "loadlib39"=-
 "loadlib40"=-
@@ -103,11 +104,11 @@ Windows Registry Editor Version 5.00
 "loadlib98"=-
 "loadlib99"=-
 "loadlib100"=-
-"path1"=hex(2):25,00,53,00,79,00,73,00,74,00,65,00,6d,00,52,00,6f,00,6f,00,74,00,25,00,2f,00,46,00,6f,00,6e,00,74,00,73,00,00,00
-"npath"=1
+"path1"=hex(2):25,00,50,00,72,00,6f,00,67,00,72,00,61,00,6d,00,46,00,69,00,6c,00,65,00,73,00,25,00,2f,00,43,00,6f,00,6d,00,6d,00,6f,00,6e,00,20,00,46,00,69,00,6c,00,65,00,73,00,2f,00,50,00,64,00,00,00
+"path2"=hex(2):25,00,55,00,53,00,45,00,52,00,50,00,52,00,4f,00,46,00,49,00,4c,00,45,00,25,00,2f,00,41,00,70,00,70,00,6c,00,69,00,63,00,61,00,74,00,69,00,6f,00,6e,00,20,00,44,00,61,00,74,00,61,00,2f,00,50,00,64,00,00,00
+"path3"=hex(2):25,00,53,00,79,00,73,00,74,00,65,00,6d,00,52,00,6f,00,6f,00,74,00,25,00,2f,00,46,00,6f,00,6e,00,74,00,73,00,00,00
+"npath"=3
 ; delete all existing path flags
-"path2"=-
-"path3"=-
 "path4"=-
 "path5"=-
 "path6"=-
@@ -205,3 +206,4 @@ Windows Registry Editor Version 5.00
 "path98"=-
 "path99"=-
 "path100"=-
+; delete all existing path flags