[PC-BSD Commits] r5282 - in pbibuild/modules: audio/exaile audio/musicpd database/dbvis database/pgadmin devel/codelite devel/eclipse devel/gambas devel/gambas/kmenu-dir devel/gambas/overlay-dir devel/netbeans editor emulator/dosbox emulator/dosbox/kmenu-dir emulator/dosbox/overlay-dir emulator/virtualbox emulator/wine emulator/wine/kmenu-dir emulator/wine/overlay-dir/scripts file-mgmt file-mgmt/mucommander games/alienarena games/alienarena/kmenu-dir games/alienarena/overlay-dir games/americasarmy games/armagetron games/armagetron/kmenu-dir games/armagetron/overlay-dir games/assaultcube games/assaultcube/kmenu-dir games/assaultcube/overlay-dir games/brainworkshop games/btanks games/bzflag games/bzflag/kmenu-dir games/bzflag/overlay-dir games/commandandconquer-GDI games/commandandconquer-GDI/overlay-dir/bin games/commandandconquer-NOD games/commandandconquer-NOD/overlay-dir/bin games/cs2d games/cs2d/overlay-dir/bin games/doom3demo games/doomlegacy games/doomlegacy/overlay-dir/bin game s/drascula games/drascula/overlay-dir games/drascula/overlay-dir/bin games/flightgear games/freedoom games/freedoom/overlay-dir/bin games/freeorion games/freeorion/overlay-dir/bin games/frozenbubble games/frozenbubble/overlay-dir/bin games/linux-quake4 games/lure games/lure/overlay-dir games/lure/overlay-dir/bin games/minigolfmaniacs games/minigolfmaniacs/overlay-dir/bin games/neverball games/q4demo games/scorched3d games/spring games/spring/overlay-dir/bin games/tribes games/tribes/overlay-dir/bin games/ut2003demo games/ut2004demo graphics graphics/jalbum graphics/opencascade hamradio/echolinux hamradio/echolinux/kmenu-dir hamradio/echolinux/overlay-dir hamradio/fldigi hamradio/fldigi/overlay-dir hamradio/geoid hamradio/geoid/kmenu-dir hamradio/geoid/overlay-dir hamradio/predict hamradio/predict/kmenu-dir hamradio/predict/overlay-dir hamradio/xastir hamradio/xastir/overlay-dir hamradio/xlog hamradio/xlog/overlay-dir mail/evolution mail/sylpheed mail/thunderbird mail/thunder bird/kmenu-dir mail/thunderbird/overlay-dir misc multimedia/atunes multimedia/aumix multimedia/gxmms2 multimedia/last.fm net-im net-im/amsn net-p2p net-p2p/amule net-p2p/amule/kmenu-dir net-p2p/amule/overlay-dir/scripts net-p2p/deluge net-p2p/kmldonkey net-p2p/limewire net-p2p/miro net-p2p/miro/overlay-dir/bin net-p2p/vuze network/ekiga network/vsftpd/kmenu-dir network/vsftpd/overlay-dir network/wol network/wxdfast office office/excelviewer2003 office/officeviewer office/openoffice3-de office/openoffice3-en office/openoffice3-es office/openoffice3-et office/openoffice3-fr office/openoffice3-it office/openoffice3-ja office/openoffice3-pt office/openoffice3-pt-BR office/openoffice3-ru office/openoffice3-uk office/openoffice3-zh-TW office/powerpointviewer2003 office/powerpointviewer2007 office/wordviewer2003 servers/abyssws servers/apache22 shells/zsh utilities/bpm/overlay-dir utilities/winrar3 utilities/winrar3/overlay-dir utilities/winrar3/overlay-dir/bin webbrowsers webbrows ers/firefox35 webbrowsers/firefox35/overlay-dir webbrowsers/firefox35/overlay-dir/bin webbrowsers/firefox35/overlay-dir/share/pixmaps webbrowsers/flock webbrowsers/iexplorer5.5 webbrowsers/iexplorer6 webbrowsers/iexplorer6/overlay-dir/bin webbrowsers/iexplorer7 webbrowsers/netscape webbrowsers/opera/overlay-dir webbrowsers/winfirefox2 webbrowsers/winfirefox2/overlay-dir/bin webbrowsers/winfirefox3 webbrowsers/winfirefox3/overlay-dir/bin windowmanager/enlightenment windowmanager/gnome windowmanager/kde3 x11-fm/rox-filer

svn at pcbsd.org svn at pcbsd.org
Mon Dec 7 13:00:36 PST 2009


Author: kris
Date: 2009-12-07 13:00:36 -0800 (Mon, 07 Dec 2009)
New Revision: 5282

Removed:
   pbibuild/modules/devel/gambas/kmenu-dir/uninstall
   pbibuild/modules/devel/gambas/overlay-dir/scripts/
   pbibuild/modules/editor/notepadpp/
   pbibuild/modules/emulator/dosbox/kmenu-dir/uninstall
   pbibuild/modules/emulator/dosbox/overlay-dir/scripts/
   pbibuild/modules/emulator/wine/kmenu-dir/remove
   pbibuild/modules/emulator/wine/overlay-dir/scripts/removewine.sh
   pbibuild/modules/file-mgmt/totalcommander/
   pbibuild/modules/games/alienarena/kmenu-dir/uninstall
   pbibuild/modules/games/alienarena/overlay-dir/autolibs/
   pbibuild/modules/games/alienarena/overlay-dir/bin/
   pbibuild/modules/games/alienarena/overlay-dir/lib/
   pbibuild/modules/games/alienarena/overlay-dir/scripts/
   pbibuild/modules/games/armagetron/kmenu-dir/uninstall
   pbibuild/modules/games/armagetron/overlay-dir/autolibs/
   pbibuild/modules/games/armagetron/overlay-dir/bin/
   pbibuild/modules/games/armagetron/overlay-dir/etc/
   pbibuild/modules/games/armagetron/overlay-dir/scripts/
   pbibuild/modules/games/assaultcube/kmenu-dir/uninstall
   pbibuild/modules/games/assaultcube/overlay-dir/autolibs/
   pbibuild/modules/games/assaultcube/overlay-dir/bin/
   pbibuild/modules/games/assaultcube/overlay-dir/libexec/
   pbibuild/modules/games/assaultcube/overlay-dir/scripts/
   pbibuild/modules/games/bzflag/kmenu-dir/uninstall
   pbibuild/modules/games/bzflag/overlay-dir/autolibs/
   pbibuild/modules/games/bzflag/overlay-dir/bin/
   pbibuild/modules/games/bzflag/overlay-dir/man/
   pbibuild/modules/games/bzflag/overlay-dir/scripts/
   pbibuild/modules/graphics/irfanview/
   pbibuild/modules/graphics/picasa/
   pbibuild/modules/graphics/smartision/
   pbibuild/modules/hamradio/echolinux/kmenu-dir/uninstall
   pbibuild/modules/hamradio/echolinux/overlay-dir/scripts/
   pbibuild/modules/hamradio/fldigi/overlay-dir/scripts/
   pbibuild/modules/hamradio/geoid/kmenu-dir/uninstall
   pbibuild/modules/hamradio/geoid/overlay-dir/scripts/
   pbibuild/modules/hamradio/predict/kmenu-dir/uninstall
   pbibuild/modules/hamradio/predict/overlay-dir/scripts/
   pbibuild/modules/hamradio/xastir/overlay-dir/lib/
   pbibuild/modules/hamradio/xastir/overlay-dir/scripts/
   pbibuild/modules/hamradio/xlog/overlay-dir/lib/
   pbibuild/modules/hamradio/xlog/overlay-dir/scripts/
   pbibuild/modules/mail/thunderbird/kmenu-dir/uninstall
   pbibuild/modules/mail/thunderbird/overlay-dir/scripts/
   pbibuild/modules/misc/ampfontviewer/
   pbibuild/modules/net-im/msn7/
   pbibuild/modules/net-p2p/amule/kmenu-dir/uninstall
   pbibuild/modules/net-p2p/amule/overlay-dir/scripts/removepbi.sh
   pbibuild/modules/net-p2p/utorrent/
   pbibuild/modules/network/vsftpd/kmenu-dir/uninstall
   pbibuild/modules/network/vsftpd/overlay-dir/removepbi.sh
   pbibuild/modules/office/acroread4/
   pbibuild/modules/utilities/bpm/overlay-dir/autolibs/
   pbibuild/modules/utilities/bpm/overlay-dir/bin/
   pbibuild/modules/utilities/bpm/overlay-dir/etc/
   pbibuild/modules/utilities/bpm/overlay-dir/lib/
   pbibuild/modules/utilities/bpm/overlay-dir/libdata/
   pbibuild/modules/utilities/bpm/overlay-dir/libexec/
   pbibuild/modules/utilities/bpm/overlay-dir/man/
   pbibuild/modules/utilities/bpm/overlay-dir/sbin/
   pbibuild/modules/utilities/bpm/overlay-dir/share/
   pbibuild/modules/webbrowsers/firefox35/overlay-dir/share/pixmaps/firefox.xpm
   pbibuild/modules/webbrowsers/iexplorere5/
Modified:
   pbibuild/modules/audio/exaile/build.sh
   pbibuild/modules/audio/exaile/pbi.conf
   pbibuild/modules/audio/musicpd/build.sh
   pbibuild/modules/database/dbvis/build.sh
   pbibuild/modules/database/dbvis/pbi.conf
   pbibuild/modules/database/pgadmin/build.sh
   pbibuild/modules/database/pgadmin/pbi.conf
   pbibuild/modules/devel/codelite/build.sh
   pbibuild/modules/devel/codelite/pbi.conf
   pbibuild/modules/devel/eclipse/build.sh
   pbibuild/modules/devel/eclipse/pbi.conf
   pbibuild/modules/devel/gambas/build.sh
   pbibuild/modules/devel/gambas/pbi.conf
   pbibuild/modules/devel/netbeans/build.sh
   pbibuild/modules/emulator/dosbox/build.sh
   pbibuild/modules/emulator/dosbox/pbi.conf
   pbibuild/modules/emulator/virtualbox/build.sh
   pbibuild/modules/emulator/wine/build.sh
   pbibuild/modules/emulator/wine/pbi.conf
   pbibuild/modules/file-mgmt/mucommander/build.sh
   pbibuild/modules/games/alienarena/build.sh
   pbibuild/modules/games/alienarena/pbi.conf
   pbibuild/modules/games/americasarmy/build.sh
   pbibuild/modules/games/armagetron/build.sh
   pbibuild/modules/games/armagetron/pbi.conf
   pbibuild/modules/games/assaultcube/build.sh
   pbibuild/modules/games/assaultcube/pbi.conf
   pbibuild/modules/games/brainworkshop/build.sh
   pbibuild/modules/games/btanks/build.sh
   pbibuild/modules/games/btanks/pbi.conf
   pbibuild/modules/games/bzflag/build.sh
   pbibuild/modules/games/bzflag/pbi.conf
   pbibuild/modules/games/commandandconquer-GDI/build.sh
   pbibuild/modules/games/commandandconquer-GDI/overlay-dir/bin/gdi
   pbibuild/modules/games/commandandconquer-NOD/build.sh
   pbibuild/modules/games/commandandconquer-NOD/overlay-dir/bin/nod
   pbibuild/modules/games/cs2d/build.sh
   pbibuild/modules/games/cs2d/overlay-dir/bin/cs2d
   pbibuild/modules/games/doom3demo/build.sh
   pbibuild/modules/games/doomlegacy/build.sh
   pbibuild/modules/games/doomlegacy/overlay-dir/bin/doomlegacy
   pbibuild/modules/games/drascula/build.sh
   pbibuild/modules/games/drascula/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/games/drascula/overlay-dir/bin/drascula
   pbibuild/modules/games/drascula/pbi.conf
   pbibuild/modules/games/flightgear/copy-files
   pbibuild/modules/games/freedoom/build.sh
   pbibuild/modules/games/freedoom/overlay-dir/bin/freedoom
   pbibuild/modules/games/freeorion/build.sh
   pbibuild/modules/games/freeorion/overlay-dir/bin/freeorion.sh
   pbibuild/modules/games/freeorion/overlay-dir/bin/freeorionca.sh
   pbibuild/modules/games/freeorion/overlay-dir/bin/freeoriond.sh
   pbibuild/modules/games/frozenbubble/build.sh
   pbibuild/modules/games/frozenbubble/overlay-dir/bin/frozen-bubble-editor.sh
   pbibuild/modules/games/frozenbubble/overlay-dir/bin/frozen-bubble.sh
   pbibuild/modules/games/frozenbubble/pbi.conf
   pbibuild/modules/games/linux-quake4/build.sh
   pbibuild/modules/games/lure/build.sh
   pbibuild/modules/games/lure/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/games/lure/overlay-dir/bin/lure
   pbibuild/modules/games/minigolfmaniacs/build.sh
   pbibuild/modules/games/minigolfmaniacs/overlay-dir/bin/minigolfm
   pbibuild/modules/games/neverball/build.sh
   pbibuild/modules/games/q4demo/build.sh
   pbibuild/modules/games/scorched3d/build.sh
   pbibuild/modules/games/spring/build.sh
   pbibuild/modules/games/spring/overlay-dir/bin/spring.sh
   pbibuild/modules/games/tribes/build.sh
   pbibuild/modules/games/tribes/overlay-dir/bin/tribes
   pbibuild/modules/games/ut2003demo/build.sh
   pbibuild/modules/games/ut2004demo/build.sh
   pbibuild/modules/graphics/jalbum/build.sh
   pbibuild/modules/graphics/opencascade/build.sh
   pbibuild/modules/hamradio/echolinux/build.sh
   pbibuild/modules/hamradio/fldigi/build.sh
   pbibuild/modules/hamradio/geoid/build.sh
   pbibuild/modules/hamradio/predict/build.sh
   pbibuild/modules/hamradio/xastir/build.sh
   pbibuild/modules/hamradio/xlog/build.sh
   pbibuild/modules/mail/evolution/build.sh
   pbibuild/modules/mail/sylpheed/build.sh
   pbibuild/modules/mail/thunderbird/build.sh
   pbibuild/modules/mail/thunderbird/pbi.conf
   pbibuild/modules/multimedia/atunes/build.sh
   pbibuild/modules/multimedia/aumix/copy-files
   pbibuild/modules/multimedia/gxmms2/build.sh
   pbibuild/modules/multimedia/last.fm/build.sh
   pbibuild/modules/net-im/amsn/build.sh
   pbibuild/modules/net-p2p/amule/build.sh
   pbibuild/modules/net-p2p/deluge/build.sh
   pbibuild/modules/net-p2p/kmldonkey/build.sh
   pbibuild/modules/net-p2p/limewire/build.sh
   pbibuild/modules/net-p2p/miro/build.sh
   pbibuild/modules/net-p2p/miro/overlay-dir/bin/miro.sh
   pbibuild/modules/net-p2p/vuze/build.sh
   pbibuild/modules/network/ekiga/build.sh
   pbibuild/modules/network/vsftpd/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/network/wol/copy-files
   pbibuild/modules/network/wxdfast/build.sh
   pbibuild/modules/office/excelviewer2003/build.sh
   pbibuild/modules/office/officeviewer/build.sh
   pbibuild/modules/office/openoffice3-de/build.sh
   pbibuild/modules/office/openoffice3-en/build.sh
   pbibuild/modules/office/openoffice3-es/build.sh
   pbibuild/modules/office/openoffice3-et/build.sh
   pbibuild/modules/office/openoffice3-fr/build.sh
   pbibuild/modules/office/openoffice3-it/build.sh
   pbibuild/modules/office/openoffice3-ja/build.sh
   pbibuild/modules/office/openoffice3-pt-BR/build.sh
   pbibuild/modules/office/openoffice3-pt/build.sh
   pbibuild/modules/office/openoffice3-ru/build.sh
   pbibuild/modules/office/openoffice3-uk/build.sh
   pbibuild/modules/office/openoffice3-zh-TW/build.sh
   pbibuild/modules/office/powerpointviewer2003/build.sh
   pbibuild/modules/office/powerpointviewer2007/build.sh
   pbibuild/modules/office/wordviewer2003/build.sh
   pbibuild/modules/servers/abyssws/build.sh
   pbibuild/modules/servers/apache22/build.sh
   pbibuild/modules/shells/zsh/build.sh
   pbibuild/modules/utilities/winrar3/build.sh
   pbibuild/modules/utilities/winrar3/overlay-dir/bin/winrar
   pbibuild/modules/utilities/winrar3/overlay-dir/winrar.desktop
   pbibuild/modules/webbrowsers/firefox35/build.sh
   pbibuild/modules/webbrowsers/firefox35/overlay-dir/bin/firefox3.sh
   pbibuild/modules/webbrowsers/firefox35/overlay-dir/mimeTypes.rdf
   pbibuild/modules/webbrowsers/firefox35/pbi.conf
   pbibuild/modules/webbrowsers/flock/build.sh
   pbibuild/modules/webbrowsers/iexplorer5.5/build.sh
   pbibuild/modules/webbrowsers/iexplorer6/build.sh
   pbibuild/modules/webbrowsers/iexplorer6/overlay-dir/bin/iexplorer6
   pbibuild/modules/webbrowsers/iexplorer7/build.sh
   pbibuild/modules/webbrowsers/iexplorer7/pbi.conf
   pbibuild/modules/webbrowsers/netscape/build.sh
   pbibuild/modules/webbrowsers/opera/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/webbrowsers/winfirefox2/build.sh
   pbibuild/modules/webbrowsers/winfirefox2/overlay-dir/bin/winfirefox2
   pbibuild/modules/webbrowsers/winfirefox3/build.sh
   pbibuild/modules/webbrowsers/winfirefox3/overlay-dir/bin/winfirefox3
   pbibuild/modules/windowmanager/enlightenment/build.sh
   pbibuild/modules/windowmanager/gnome/build.sh
   pbibuild/modules/windowmanager/kde3/build.sh
   pbibuild/modules/x11-fm/rox-filer/build.sh
   pbibuild/modules/x11-fm/rox-filer/pbi.conf
Log:

Very large-scale cleanup of the modules tree, use new vars in build.sh script, remove some obsolete win PBIs, remove old removal scripts, etc



Modified: pbibuild/modules/audio/exaile/build.sh
===================================================================
--- pbibuild/modules/audio/exaile/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/audio/exaile/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,12 +4,12 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-sed -e "s,CHANGEME,gxmms2${PORTVER},g" ${PBIDIR}/bin/xmms2-admin.sh > /tmp/sed
-mv /tmp/sed ${PBIDIR}/bin/xmms2-admin.sh
-chmod 755 ${PBIDIR}/bin/xmms2-admin.sh
 
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${PBIDIR}/bin/xmms2-admin.sh

Modified: pbibuild/modules/audio/exaile/pbi.conf
===================================================================
--- pbibuild/modules/audio/exaile/pbi.conf	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/audio/exaile/pbi.conf	2009-12-07 21:00:36 UTC (rev 5282)
@@ -34,6 +34,6 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="02"
+BUILDKEY="03"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/audio/musicpd/build.sh
===================================================================
--- pbibuild/modules/audio/musicpd/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/audio/musicpd/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -10,9 +10,7 @@
 ##############################################################################
 
 # Set the right version 
-sed -e "s,/bin/mpd,/.sbin/mpd,g" ${PBIDIR}/etc/rc.d/musicpd > /tmp/sed
-cp /tmp/sed ${PBIDIR}/etc/rc.d/musicpd
+sed -i.bak "s,/bin/mpd,/.sbin/mpd,g" ${PBIDIR}/etc/rc.d/musicpd
 
 # Don't run until we've started sound detection 
-sed -e "s,LOGIN,LOGIN DAEMON snddetect,g" ${PBIDIR}/etc/rc.d/musicpd > /tmp/sed
-cp /tmp/sed ${PBIDIR}/etc/rc.d/musicpd
+sed -i.bak "s,LOGIN,LOGIN DAEMON snddetect,g" ${PBIDIR}/etc/rc.d/musicpd

Modified: pbibuild/modules/database/dbvis/build.sh
===================================================================
--- pbibuild/modules/database/dbvis/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/database/dbvis/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,15 +4,16 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-
 # Copy over only the JRE portion
 cp -R /usr/local/diablo*jdk*/jre ${PBIDIR}/diablo-jre1.6.0
 
 # Make the javavms file
-echo "/Programs/DbVisualizer${PORTVER}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
+echo "${PBI_TARGETFULLDIR}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
 

Modified: pbibuild/modules/database/dbvis/pbi.conf
===================================================================
--- pbibuild/modules/database/dbvis/pbi.conf	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/database/dbvis/pbi.conf	2009-12-07 21:00:36 UTC (rev 5282)
@@ -32,7 +32,7 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="02"
+BUILDKEY="03"
 
 # Set this to YES to mark a port / module as broken
 #PORTBROKE="YES" ; export PORTBROKE

Modified: pbibuild/modules/database/pgadmin/build.sh
===================================================================
--- pbibuild/modules/database/pgadmin/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/database/pgadmin/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,13 +4,13 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Save the right version number in the pgadmin3.sh script
 MODFILE="${PBIDIR}/bin/pgadmin3.sh"
-sed -e "s,CHANGEME,pgAdmin${PORTVER},g" ${MODFILE} > ${MODFILE}.tmp
-mv ${MODFILE}.tmp ${MODFILE}
-chmod 755 ${MODFILE}
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${MODFILE}

Modified: pbibuild/modules/database/pgadmin/pbi.conf
===================================================================
--- pbibuild/modules/database/pgadmin/pbi.conf	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/database/pgadmin/pbi.conf	2009-12-07 21:00:36 UTC (rev 5282)
@@ -32,6 +32,6 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="02"
+BUILDKEY="03"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/devel/codelite/build.sh
===================================================================
--- pbibuild/modules/devel/codelite/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/devel/codelite/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,13 +4,13 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
+
 # Save the right version number in the codelite 
-sed -e "s,CHANGEME,Codelite${PORTVER},g" ${PBIDIR}/bin/codelite > /tmp/sed
-mv /tmp/sed ${PBIDIR}/bin/codelite
-chmod 755 ${PBIDIR}/bin/codelite
-
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${PBIDIR}/bin/codelite

Modified: pbibuild/modules/devel/codelite/pbi.conf
===================================================================
--- pbibuild/modules/devel/codelite/pbi.conf	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/devel/codelite/pbi.conf	2009-12-07 21:00:36 UTC (rev 5282)
@@ -32,7 +32,7 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="05"
+BUILDKEY="02"
 
 PBIAUTOPOPULATE="YES"
 export PBIAUTOPOPULATE

Modified: pbibuild/modules/devel/eclipse/build.sh
===================================================================
--- pbibuild/modules/devel/eclipse/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/devel/eclipse/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,13 +4,14 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 
-
 # Make the javavms file
-#echo "/Programs/Eclipse${PORTVER}/diablo-jdk1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
+#echo "${PBI_TARGETFULLDIR}/diablo-jdk1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
 

Modified: pbibuild/modules/devel/eclipse/pbi.conf
===================================================================
--- pbibuild/modules/devel/eclipse/pbi.conf	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/devel/eclipse/pbi.conf	2009-12-07 21:00:36 UTC (rev 5282)
@@ -54,7 +54,7 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="01"
+BUILDKEY="02"
 
 # If this port has a non-standard port version variable in Makefile, then
 # list the key here such as "OOOVERSION="

Modified: pbibuild/modules/devel/gambas/build.sh
===================================================================
--- pbibuild/modules/devel/gambas/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/devel/gambas/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,11 +4,10 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,Gambas${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh
+

Modified: pbibuild/modules/devel/gambas/pbi.conf
===================================================================
--- pbibuild/modules/devel/gambas/pbi.conf	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/devel/gambas/pbi.conf	2009-12-07 21:00:36 UTC (rev 5282)
@@ -32,7 +32,7 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="01"
+BUILDKEY="02"
 
 # Don't build this PBI on certian processors (i386 / amd64)
 ARCHIGNORE="amd64" ; export ARCHIGNORE

Modified: pbibuild/modules/devel/netbeans/build.sh
===================================================================
--- pbibuild/modules/devel/netbeans/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/devel/netbeans/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,13 +4,10 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-
-
-# Make the javavms file
-#echo "/Programs/Eclipse${PORTVER}/diablo-jdk1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
-

Modified: pbibuild/modules/emulator/dosbox/build.sh
===================================================================
--- pbibuild/modules/emulator/dosbox/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/emulator/dosbox/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,11 +4,9 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,DOSBox${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh
\ No newline at end of file

Modified: pbibuild/modules/emulator/dosbox/pbi.conf
===================================================================
--- pbibuild/modules/emulator/dosbox/pbi.conf	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/emulator/dosbox/pbi.conf	2009-12-07 21:00:36 UTC (rev 5282)
@@ -32,6 +32,6 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="01"
+BUILDKEY="03"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/emulator/virtualbox/build.sh
===================================================================
--- pbibuild/modules/emulator/virtualbox/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/emulator/virtualbox/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,13 +4,10 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-# Save the right version number in the virtualbox script
-#sed -e "s,CHANGEME,VirtualBox${PORTVER},g" ${PBIDIR}/bin/VirtualBox.sh > /tmp/sed
-#mv /tmp/sed ${PBIDIR}/bin/VirtualBox.sh
-#chmod 755 ${PBIDIR}/bin/VirtualBox.sh
-

Modified: pbibuild/modules/emulator/wine/build.sh
===================================================================
--- pbibuild/modules/emulator/wine/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/emulator/wine/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,12 +4,10 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,Wine${PORTVER},g" ${PBIDIR}/scripts/removewine.sh > /tmp/removewine.sh
-mv /tmp/removewine.sh ${PBIDIR}/scripts/removewine.sh
-chmod 755 ${PBIDIR}/scripts/removewine.sh

Modified: pbibuild/modules/emulator/wine/pbi.conf
===================================================================
--- pbibuild/modules/emulator/wine/pbi.conf	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/emulator/wine/pbi.conf	2009-12-07 21:00:36 UTC (rev 5282)
@@ -32,7 +32,7 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="02"
+BUILDKEY="03"
 
 PBIAUTOPOPULATE="YES"
 export PBIAUTOPOPULATE

Modified: pbibuild/modules/file-mgmt/mucommander/build.sh
===================================================================
--- pbibuild/modules/file-mgmt/mucommander/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/file-mgmt/mucommander/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,16 +4,18 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Copy over only the JRE portion
 cp -R /usr/local/diablo*jdk*/jre ${PBIDIR}/diablo-jre1.6.0
 
 # Make the javavms file
-echo "/Programs/muCommander${PORTVER}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
+echo "${PBI_TARGET_FULLDIR}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
 
 # Remove some extra libraries we don't need
 cd ${PBIDIR}/autolibs

Modified: pbibuild/modules/games/alienarena/build.sh
===================================================================
--- pbibuild/modules/games/alienarena/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/alienarena/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,11 +4,10 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,AlienArena${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh
+

Modified: pbibuild/modules/games/alienarena/pbi.conf
===================================================================
--- pbibuild/modules/games/alienarena/pbi.conf	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/alienarena/pbi.conf	2009-12-07 21:00:36 UTC (rev 5282)
@@ -32,7 +32,7 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="12"
+BUILDKEY="02"
 
 # Set this to YES to mark a port / module as broken
 PORTBROKE="YES" ; export PORTBROKE

Modified: pbibuild/modules/games/americasarmy/build.sh
===================================================================
--- pbibuild/modules/games/americasarmy/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/americasarmy/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -9,8 +9,4 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,export,LD_PRELOAD='/compat/linux/usr/lib/libGL.so.1' ; export LD_PRELOAD,g" ${PBIDIR}/lib/americasarmy/armyops > /tmp/sed
-cp /tmp/sed ${PBIDIR}/lib/americasarmy/armyops
-chmod 755 ${PBIDIR}/lib/americasarmy/armyops
-
+sed -i.bak "s,export,LD_PRELOAD='/compat/linux/usr/lib/libGL.so.1' ; export LD_PRELOAD,g" ${PBIDIR}/lib/americasarmy/armyops

Modified: pbibuild/modules/games/armagetron/build.sh
===================================================================
--- pbibuild/modules/games/armagetron/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/armagetron/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,12 +4,10 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,Armagetron${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh

Modified: pbibuild/modules/games/armagetron/pbi.conf
===================================================================
--- pbibuild/modules/games/armagetron/pbi.conf	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/armagetron/pbi.conf	2009-12-07 21:00:36 UTC (rev 5282)
@@ -32,6 +32,6 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="01"
+BUILDKEY="02"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/games/assaultcube/build.sh
===================================================================
--- pbibuild/modules/games/assaultcube/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/assaultcube/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,12 +4,10 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,AssaultCube${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh

Modified: pbibuild/modules/games/assaultcube/pbi.conf
===================================================================
--- pbibuild/modules/games/assaultcube/pbi.conf	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/assaultcube/pbi.conf	2009-12-07 21:00:36 UTC (rev 5282)
@@ -32,7 +32,7 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="61"
+BUILDKEY="01"
 
 PBIAUTOPOPULATE="YES"
 export PBIAUTOPOPULATE

Modified: pbibuild/modules/games/brainworkshop/build.sh
===================================================================
--- pbibuild/modules/games/brainworkshop/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/brainworkshop/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,13 +4,12 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-sed 's|/usr/bin/env python|/Programs/BrainWorkshop${PORTVER}/bin/python|g' ${PBIDIR}/bin/brainworkshop >/tmp/brainworkshop
-mv /tmp/brainworkshop ${PBIDIR}/bin/brainworkshop
-chmod 755 ${PBIDIR}/bin/brainworkshop
 
-rm -rf ${PBIDIR}/etc/fonts
+sed -i.bak 's|/usr/bin/env python|${PBI_TARGETFULLDIR}/bin/python|g' ${PBIDIR}/bin/brainworkshop

Modified: pbibuild/modules/games/btanks/build.sh
===================================================================
--- pbibuild/modules/games/btanks/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/btanks/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,12 +4,12 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Save the right version number in the btanks
-sed -e "s,CHANGEME,BattleTanks${PORTVER},g" ${PBIDIR}/bin/btanks > /tmp/btanks
-mv /tmp/btanks ${PBIDIR}/bin/btanks
-chmod 755 ${PBIDIR}/bin/btanks
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${PBIDIR}/bin/btanks

Modified: pbibuild/modules/games/btanks/pbi.conf
===================================================================
--- pbibuild/modules/games/btanks/pbi.conf	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/btanks/pbi.conf	2009-12-07 21:00:36 UTC (rev 5282)
@@ -32,6 +32,6 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="02"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/games/bzflag/build.sh
===================================================================
--- pbibuild/modules/games/bzflag/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/bzflag/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,12 +4,10 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,BZFlag${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh

Modified: pbibuild/modules/games/bzflag/pbi.conf
===================================================================
--- pbibuild/modules/games/bzflag/pbi.conf	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/bzflag/pbi.conf	2009-12-07 21:00:36 UTC (rev 5282)
@@ -32,6 +32,6 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="01"
+BUILDKEY="02"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/games/commandandconquer-GDI/build.sh
===================================================================
--- pbibuild/modules/games/commandandconquer-GDI/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/commandandconquer-GDI/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,18 +4,17 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,${PORTVER},g" ${PBIDIR}/bin/gdi > /tmp/gdi
-mv /tmp/gdi ${PBIDIR}/bin/gdi
-chmod 755 ${PBIDIR}/bin/gdi
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/bin/gdi
 
 # Fetch the ISO from the web for inclusion into this PBI
-cd ${PBIDIR}/GDI/drive_c/windows/temp
+cd ${PBI_CURDIR}/GDI/drive_c/windows/temp
 fetch ftp://ftp.pcbsd.org/pub/autobuildpkgs/GDI95.iso
 
 # Download the wine package

Modified: pbibuild/modules/games/commandandconquer-GDI/overlay-dir/bin/gdi
===================================================================
--- pbibuild/modules/games/commandandconquer-GDI/overlay-dir/bin/gdi	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/commandandconquer-GDI/overlay-dir/bin/gdi	2009-12-07 21:00:36 UTC (rev 5282)
@@ -1,6 +1,5 @@
 #!/bin/sh
-VER="CHANGEME"
-PROGDIR="CommandandConquerGold2${VER}"
+PROGDIR="CHANGEME"
 cd
-export WINEPREFIX="/Programs/${PROGDIR}/GDI"
-/Programs/${PROGDIR}/bin/wine "/Programs/${PROGDIR}/GDI/drive_c/WESTWOOD/C&C95/C&C95.exe" "$@"
+export WINEPREFIX="${PROGDIR}/GDI"
+${PROGDIR}/bin/wine "${PROGDIR}/GDI/drive_c/WESTWOOD/C&C95/C&C95.exe" "$@"

Modified: pbibuild/modules/games/commandandconquer-NOD/build.sh
===================================================================
--- pbibuild/modules/games/commandandconquer-NOD/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/commandandconquer-NOD/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,18 +4,17 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,${PORTVER},g" ${PBIDIR}/bin/nod > /tmp/nod
-mv /tmp/nod ${PBIDIR}/bin/nod
-chmod 755 ${PBIDIR}/bin/nod
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/bin/nod
 
 # Fetch the ISO from the web for inclusion into this PBI
-cd ${PBIDIR}/NOD/drive_c/windows/temp
+cd ${PBI_CURDIR}/NOD/drive_c/windows/temp
 fetch ftp://ftp.pcbsd.org/pub/autobuildpkgs/NOD95.iso
 
 # Download the wine package

Modified: pbibuild/modules/games/commandandconquer-NOD/overlay-dir/bin/nod
===================================================================
--- pbibuild/modules/games/commandandconquer-NOD/overlay-dir/bin/nod	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/commandandconquer-NOD/overlay-dir/bin/nod	2009-12-07 21:00:36 UTC (rev 5282)
@@ -1,6 +1,5 @@
 #!/bin/sh
-VER="CHANGEME"
-PROGDIR="CommandandConquerGold1${VER}"
+PROGDIR="CHANGEME"
 cd
-export WINEPREFIX="/Programs/${PROGDIR}/NOD"
-/Programs/${PROGDIR}/bin/wine "/Programs/${PROGDIR}/NOD/drive_c/WESTWOOD/C&C95/C&C95.exe" "$@"
+export WINEPREFIX="${PROGDIR}/NOD"
+${PROGDIR}/bin/wine "${PROGDIR}/NOD/drive_c/WESTWOOD/C&C95/C&C95.exe" "$@"

Modified: pbibuild/modules/games/cs2d/build.sh
===================================================================
--- pbibuild/modules/games/cs2d/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/cs2d/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,15 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Save the right version number in the cs2d script
-sed -e "s,CHANGEME,${PORTVER},g" ${PBIDIR}/bin/cs2d > /tmp/cs2d
-mv /tmp/cs2d ${PBIDIR}/bin/cs2d
-chmod 755 ${PBIDIR}/bin/cs2d
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/bin/cs2d
 
 # Download the wine package
 cd ${PBIDIR}/

Modified: pbibuild/modules/games/cs2d/overlay-dir/bin/cs2d
===================================================================
--- pbibuild/modules/games/cs2d/overlay-dir/bin/cs2d	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/cs2d/overlay-dir/bin/cs2d	2009-12-07 21:00:36 UTC (rev 5282)
@@ -1,15 +1,14 @@
 #!/bin/sh
-VER="CHANGEME"
-PROGDIR="Counter-Strike2D${VER}"
+PROGDIR="CHANGEME"
 
 if [ ! -e "${HOME}/.cs2d" ]
 then
   mkdir ${HOME}/.cs2d
-  ln -s /Programs/${PROGDIR}/cs2d/drive_c ${HOME}/.cs2d/drive_c
+  ln -s ${PROGDIR}/cs2d/drive_c ${HOME}/.cs2d/drive_c
 else
   rm ${HOME}/.cs2d/drive_c 
-  ln -s /Programs/${PROGDIR}/cs2d/drive_c ${HOME}/.cs2d/drive_c
+  ln -s ${PROGDIR}/cs2d/drive_c ${HOME}/.cs2d/drive_c
 fi
 
 export WINEPREFIX="${HOME}/.cs2d"
-/Programs/${PROGDIR}/bin/wine "${HOME}/.cs2d/drive_c/Program Files/cs2d/CounterStrike2D.exe" "$@"
+${PROGDIR}/bin/wine "${HOME}/.cs2d/drive_c/Program Files/cs2d/CounterStrike2D.exe" "$@"

Modified: pbibuild/modules/games/doom3demo/build.sh
===================================================================
--- pbibuild/modules/games/doom3demo/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/doom3demo/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,13 +4,11 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,exec,LD_PRELOAD='/compat/linux/usr/lib/libGL.so.1' ; export LD_PRELOAD ; exec,g" ${PBIDIR}/bin/linux-doom3-demo > /tmp/sed
-cp /tmp/sed ${PBIDIR}/bin/linux-doom3-demo
-chmod 755 ${PBIDIR}/bin/linux-doom3-demo
-
+sed -i.bak "s,exec,LD_PRELOAD='/compat/linux/usr/lib/libGL.so.1' ; export LD_PRELOAD ; exec,g" ${PBIDIR}/bin/linux-doom3-demo

Modified: pbibuild/modules/games/doomlegacy/build.sh
===================================================================
--- pbibuild/modules/games/doomlegacy/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/doomlegacy/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,11 +4,11 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 # Save the right version number in the doomlegacy
-sed -e "s,CHANGEME,DoomLegacy${PORTVER},g" ${PBIDIR}/bin/doomlegacy > /tmp/doomlegacy
-mv /tmp/doomlegacy ${PBIDIR}/bin/doomlegacy
-chmod 755 ${PBIDIR}/bin/doomlegacy
\ No newline at end of file
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/bin/doomlegacy 

Modified: pbibuild/modules/games/doomlegacy/overlay-dir/bin/doomlegacy
===================================================================
--- pbibuild/modules/games/doomlegacy/overlay-dir/bin/doomlegacy	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/doomlegacy/overlay-dir/bin/doomlegacy	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,16 +4,16 @@
 # files, libraries and executables. So we mirror the Doom Legacy data
 # directory to ~/.doomlegacy, and create symlinks to the data files.
 PROGNAME=CHANGEME
-DOOMWADDIR="/usr/Programs/${PROGNAME}/share/doom"; export DOOMWADDIR
+DOOMWADDIR="${PROGNAME}/share/doom"; export DOOMWADDIR
 
 if [ -d ~/.doomlegacy ]
 then
 	echo "Using existing ~/.doomlegacy directory."
 else
 	echo "Creating ~/.doomlegacy directory."
-	cd /usr/Programs/${PROGNAME}/lib/doomlegacy || exit 1
+	cd ${PROGNAME}/lib/doomlegacy || exit 1
 	mkdir -p ~/.doomlegacy
-	ln -s /usr/Programs/${PROGNAME}/lib/doomlegacy/* ~/.doomlegacy
+	ln -s ${PROGNAME}/lib/doomlegacy/* ~/.doomlegacy
 fi
 
 cd ~/.doomlegacy || exit 1

Modified: pbibuild/modules/games/drascula/build.sh
===================================================================
--- pbibuild/modules/games/drascula/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/drascula/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,11 +4,11 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 # Save the right version number in the drascula
-sed -e "s,CHANGEME,Drascula${PORTVER},g" ${PBIDIR}/bin/drascula > /tmp/drascula
-mv /tmp/drascula ${PBIDIR}/bin/drascula
-chmod 755 ${PBIDIR}/bin/drascula
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/bin/drascula

Modified: pbibuild/modules/games/drascula/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/games/drascula/overlay-dir/PBI.SetupScript.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/drascula/overlay-dir/PBI.SetupScript.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -44,8 +44,6 @@
       IDIOMA="en"
       fi
 # Save the right lang selected in the drascula
-sed -e "s,IDIOMA,${IDIOMA},g" /Programs/${PROGDIR}/bin/drascula > /tmp/drascula
-mv /tmp/drascula /Programs/${PROGDIR}/bin/drascula
+sed -i.bak "s,IDIOMA,${IDIOMA},g" /Programs/${PROGDIR}/bin/drascula
 chmod 755 /Programs/${PROGDIR}/bin/drascula
-chmod +x /Programs/${PROGDIR}/bin/drascula
 echo "LAUNCHCLOSE: /Programs/bin/drascula"

Modified: pbibuild/modules/games/drascula/overlay-dir/bin/drascula
===================================================================
--- pbibuild/modules/games/drascula/overlay-dir/bin/drascula	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/drascula/overlay-dir/bin/drascula	2009-12-07 21:00:36 UTC (rev 5282)
@@ -2,4 +2,4 @@
 # ScummVM script
 PROGNAME=CHANGEME
 LANG=IDIOMA
-/Programs/${PROGNAME}/bin/scummvm -q ${LANG} --config=/Programs/${PROGNAME}/game/drascularc -f -p /Programs/${PROGNAME}/game/drascula drascula
\ No newline at end of file
+${PROGNAME}/bin/scummvm -q ${LANG} --config=${PROGNAME}/game/drascularc -f -p ${PROGNAME}/game/drascula drascula

Modified: pbibuild/modules/games/drascula/pbi.conf
===================================================================
--- pbibuild/modules/games/drascula/pbi.conf	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/drascula/pbi.conf	2009-12-07 21:00:36 UTC (rev 5282)
@@ -32,7 +32,7 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="01"
+BUILDKEY="02"
 
 PBIAUTOPOPULATE="YES"
 export PBIAUTOPOPULATE

Modified: pbibuild/modules/games/flightgear/copy-files
===================================================================
--- pbibuild/modules/games/flightgear/copy-files	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/flightgear/copy-files	2009-12-07 21:00:36 UTC (rev 5282)
@@ -19,10 +19,3 @@
 /usr/local/man/man1/gl-info.1.gz man/man1/
 /usr/local/man/man1/fgfs.1.gz man/man1/
 /usr/local/share/FlightGear share/
-/usr/local/share/locale/de/LC_MESSAGES/fgrun.mo share/locale/de/LC_MESSAGES/
-/usr/local/share/locale/es/LC_MESSAGES/fgrun.mo share/locale/es/LC_MESSAGES/
-/usr/local/share/locale/fr/LC_MESSAGES/fgrun.mo share/locale/fr/LC_MESSAGES/
-/usr/local/share/locale/it/LC_MESSAGES/fgrun.mo share/locale/it/LC_MESSAGES/
-/usr/local/share/locale/nl/LC_MESSAGES/fgrun.mo share/locale/nl/LC_MESSAGES/
-/usr/local/share/locale/pl/LC_MESSAGES/fgrun.mo share/locale/pl/LC_MESSAGES/
-/usr/local/share/locale/pt/LC_MESSAGES/fgrun.mo share/locale/pt/LC_MESSAGES/

Modified: pbibuild/modules/games/freedoom/build.sh
===================================================================
--- pbibuild/modules/games/freedoom/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/freedoom/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,11 +4,11 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 # Save the right version number in the doomlegacy
-sed -e "s,CHANGEME,FreeDoom${PORTVER},g" ${PBIDIR}/bin/freedoom > /tmp/freedoom
-mv /tmp/freedoom ${PBIDIR}/bin/freedoom
-chmod 755 ${PBIDIR}/bin/freedoom
\ No newline at end of file
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/bin/freedoom

Modified: pbibuild/modules/games/freedoom/overlay-dir/bin/freedoom
===================================================================
--- pbibuild/modules/games/freedoom/overlay-dir/bin/freedoom	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/freedoom/overlay-dir/bin/freedoom	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,16 +4,16 @@
 # files, libraries and executables. So we mirror the Doom Legacy data
 # directory to ~/.freedoom, and create symlinks to the data files.
 PROGNAME=CHANGEME
-DOOMWADDIR="/Programs/${PROGNAME}/share/doom"; export DOOMWADDIR
+DOOMWADDIR="${PROGNAME}/share/doom"; export DOOMWADDIR
 
 if [ -d ~/.freedoom ]
 then
 	echo "Using existing ~/.freedoom directory."
 else
 	echo "Creating ~/.freedoom directory."
-	cd /Programs/${PROGNAME}/lib/doomlegacy || exit 1
+	cd ${PROGNAME}/lib/doomlegacy || exit 1
 	mkdir -p ~/.freedoom
-	ln -s /Programs/${PROGNAME}/lib/doomlegacy/* ~/.freedoom
+	ln -s ${PROGNAME}/lib/doomlegacy/* ~/.freedoom
 fi
 
 cd ~/.freedoom || exit 1

Modified: pbibuild/modules/games/freeorion/build.sh
===================================================================
--- pbibuild/modules/games/freeorion/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/freeorion/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,23 +4,19 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Save the right version number in the freeorion.sh
-sed -e "s,CHANGEME,FreeOrion${PORTVER},g" ${PBIDIR}/bin/freeorion.sh > /tmp/freeorion.sh
-mv /tmp/freeorion.sh ${PBIDIR}/bin/freeorion.sh
-chmod 755 ${PBIDIR}/bin/freeorion.sh
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/bin/freeorion.sh
 
 # Save the right version number in the freeorion.sh
-sed -e "s,CHANGEME,FreeOrion${PORTVER},g" ${PBIDIR}/bin/freeorionca.sh > /tmp/freeorionca.sh
-mv /tmp/freeorionca.sh ${PBIDIR}/bin/freeorionca.sh
-chmod 755 ${PBIDIR}/bin/freeorionca.sh
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/bin/freeorionca.sh
 
 # Save the right version number in the freeorion.sh
-sed -e "s,CHANGEME,FreeOrion${PORTVER},g" ${PBIDIR}/bin/freeoriond.sh > /tmp/freeoriond.sh
-mv /tmp/freeoriond.sh ${PBIDIR}/bin/freeoriond.sh
-chmod 755 ${PBIDIR}/bin/freeoriond.sh
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/bin/freeoriond.sh
 

Modified: pbibuild/modules/games/freeorion/overlay-dir/bin/freeorion.sh
===================================================================
--- pbibuild/modules/games/freeorion/overlay-dir/bin/freeorion.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/freeorion/overlay-dir/bin/freeorion.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -3,8 +3,8 @@
 
 PROGDIR=CHANGEME
 
-cd /Programs/${PROGDIR}/share/freeorion/
+cd ${PROGDIR}/share/freeorion/
 
-/Programs/${PROGDIR}/bin/freeorion "$@"
+${PROGDIR}/bin/freeorion "$@"
 
 

Modified: pbibuild/modules/games/freeorion/overlay-dir/bin/freeorionca.sh
===================================================================
--- pbibuild/modules/games/freeorion/overlay-dir/bin/freeorionca.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/freeorion/overlay-dir/bin/freeorionca.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -3,8 +3,8 @@
 
 PROGDIR=CHANGEME
 
-cd /Programs/${PROGDIR}/share/freeorion/
+cd ${PROGDIR}/share/freeorion/
 
-/Programs/${PROGDIR}/bin/freeorionca "$@"
+${PROGDIR}/bin/freeorionca "$@"
 
 

Modified: pbibuild/modules/games/freeorion/overlay-dir/bin/freeoriond.sh
===================================================================
--- pbibuild/modules/games/freeorion/overlay-dir/bin/freeoriond.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/freeorion/overlay-dir/bin/freeoriond.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -3,8 +3,8 @@
 
 PROGDIR=CHANGEME
 
-cd /Programs/${PROGDIR}/share/freeorion/
+cd ${PROGDIR}/share/freeorion/
 
-/Programs/${PROGDIR}/bin/freeoriond "$@"
+${PROGDIR}/bin/freeoriond "$@"
 
 

Modified: pbibuild/modules/games/frozenbubble/build.sh
===================================================================
--- pbibuild/modules/games/frozenbubble/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/frozenbubble/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,42 +4,23 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-# Get all the various language files and copy them to the PBI
-LANGFILE="frozenbubble.mo"
-mkdir ${PBIDIR}/locale/
-cd /usr/local/share/locale
-for i in `ls`
-do
-  if [ -e "/usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}" ]
-  then
-    mkdir ${PBIDIR}/locale/${i}
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE} ${PBIDIR}/locale/${i}/
-  fi
-done
 
-
 # Setup the perl call at the top of frozen-bubble properly
-sed -e "s,/usr/bin/perl,/Programs/FrozenBubble${PORTVER}/bin/perl,g" ${PBIDIR}/bin/frozen-bubble > /tmp/frozen-bubble
-mv /tmp/frozen-bubble ${PBIDIR}/bin/frozen-bubble
-chmod 755 ${PBIDIR}/bin/frozen-bubble
+sed -i.bak "s,/usr/bin/perl,${PBI_TARGETFULLDIR}/bin/perl,g" ${PBIDIR}/bin/frozen-bubble
 
 # Setup the perl call at the top of frozen-bubble properly
-sed -e "s,/usr/bin/perl,/Programs/FrozenBubble${PORTVER}/bin/perl,g" ${PBIDIR}/bin/frozen-bubble-editor > /tmp/frozen-bubble-editor
-mv /tmp/frozen-bubble-editor ${PBIDIR}/bin/frozen-bubble-editor
-chmod 755 ${PBIDIR}/bin/frozen-bubble-editor
+sed -i.bak "s,/usr/bin/perl,${PBI_TARGETFULLDIR}/bin/perl,g" ${PBIDIR}/bin/frozen-bubble-editor
 
 
 # Setup the PROGDIR at the top of frozen-bubble.sh properly
-sed -e "s,CHANGEME,FrozenBubble${PORTVER},g" ${PBIDIR}/bin/frozen-bubble.sh > /tmp/frozen-bubble.sh
-mv /tmp/frozen-bubble.sh ${PBIDIR}/bin/frozen-bubble.sh
-chmod 755 ${PBIDIR}/bin/frozen-bubble.sh
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/bin/frozen-bubble.sh
 
 # Setup the PROGDIR at the top of frozen-bubble-editor.sh properly
-sed -e "s,CHANGEME,FrozenBubble${PORTVER},g" ${PBIDIR}/bin/frozen-bubble-editor.sh > /tmp/frozen-bubble-editor.sh
-mv /tmp/frozen-bubble-editor.sh ${PBIDIR}/bin/frozen-bubble-editor.sh
-chmod 755 ${PBIDIR}/bin/frozen-bubble-editor.sh
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/bin/frozen-bubble-editor.sh

Modified: pbibuild/modules/games/frozenbubble/overlay-dir/bin/frozen-bubble-editor.sh
===================================================================
--- pbibuild/modules/games/frozenbubble/overlay-dir/bin/frozen-bubble-editor.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/frozenbubble/overlay-dir/bin/frozen-bubble-editor.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,7 +4,7 @@
 
 PROGDIR="CHANGEME"
 
-PERLLIB="/Programs/${PROGDIR}/lib/perl5"
+PERLLIB="${PROGDIR}/lib/perl5"
 export PERLLIB
 
-/Programs/${PROGDIR}/bin/frozen-bubble-editor "$@"
+${PROGDIR}/bin/frozen-bubble-editor "$@"

Modified: pbibuild/modules/games/frozenbubble/overlay-dir/bin/frozen-bubble.sh
===================================================================
--- pbibuild/modules/games/frozenbubble/overlay-dir/bin/frozen-bubble.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/frozenbubble/overlay-dir/bin/frozen-bubble.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -5,7 +5,7 @@
 
 PROGDIR="CHANGEME"
 
-PERLLIB="/Programs/${PROGDIR}/lib/perl5"
+PERLLIB="${PROGDIR}/lib/perl5"
 export PERLLIB
 
-/Programs/${PROGDIR}/bin/frozen-bubble "$@"
+${PROGDIR}/bin/frozen-bubble "$@"

Modified: pbibuild/modules/games/frozenbubble/pbi.conf
===================================================================
--- pbibuild/modules/games/frozenbubble/pbi.conf	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/frozenbubble/pbi.conf	2009-12-07 21:00:36 UTC (rev 5282)
@@ -32,7 +32,7 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="01"
+BUILDKEY="02"
 
 # If this port has a non-standard port version variable in Makefile, then
 # list the key here such as "OOOVERSION="

Modified: pbibuild/modules/games/linux-quake4/build.sh
===================================================================
--- pbibuild/modules/games/linux-quake4/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/linux-quake4/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -9,7 +9,6 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
 sed -i.bak "s,exec,LD_PRELOAD='/compat/linux/usr/lib/libGL.so.1' ; export LD_PRELOAD ; exec,g" ${PBIDIR}/bin/linux-quake4
 sed -i.bak "s,exec,LD_PRELOAD='/compat/linux/usr/lib/libGL.so.1' ; export LD_PRELOAD ; exec,g" ${PBIDIR}/bin/linux-quake4smp
 sed -i.bak "s,exec,LD_PRELOAD='/compat/linux/usr/lib/libGL.so.1' ; export LD_PRELOAD ; exec,g" ${PBIDIR}/bin/linux-quake4ded

Modified: pbibuild/modules/games/lure/build.sh
===================================================================
--- pbibuild/modules/games/lure/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/lure/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,11 +4,12 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
+
 # Save the right version number in the lure
-sed -e "s,CHANGEME,LureofTemptress${PORTVER},g" ${PBIDIR}/bin/lure > /tmp/lure
-mv /tmp/lure ${PBIDIR}/bin/lure
-chmod 755 ${PBIDIR}/bin/lure
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/bin/lure

Modified: pbibuild/modules/games/lure/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/games/lure/overlay-dir/PBI.SetupScript.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/lure/overlay-dir/PBI.SetupScript.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -55,8 +55,6 @@
 rm -rf /Programs/${PROGDIR}/game/lure/lang
 
 # Save the right lang selected in the lure
-sed -e "s,IDIOMA,${IDIOMA},g" /Programs/${PROGDIR}/bin/lure > /tmp/lure
-mv /tmp/lure /Programs/${PROGDIR}/bin/lure
+sed -i.bak "s,IDIOMA,${IDIOMA},g" /Programs/${PROGDIR}/bin/lure
 chmod 755 /Programs/${PROGDIR}/bin/lure
-chmod +x /Programs/${PROGDIR}/bin/lure
 echo "LAUNCHCLOSE: /Programs/bin/lure"

Modified: pbibuild/modules/games/lure/overlay-dir/bin/lure
===================================================================
--- pbibuild/modules/games/lure/overlay-dir/bin/lure	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/lure/overlay-dir/bin/lure	2009-12-07 21:00:36 UTC (rev 5282)
@@ -2,4 +2,4 @@
 # ScummVM script
 PROGNAME=CHANGEME
 LANG=IDIOMA
-/Programs/${PROGNAME}/bin/scummvm -q ${LANG} --config=/Programs/${PROGNAME}/game/lurerc -f -p /Programs/${PROGNAME}/game/lure lure
\ No newline at end of file
+${PROGNAME}/bin/scummvm -q ${LANG} --config=${PROGNAME}/game/lurerc -f -p ${PROGNAME}/game/lure lure

Modified: pbibuild/modules/games/minigolfmaniacs/build.sh
===================================================================
--- pbibuild/modules/games/minigolfmaniacs/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/minigolfmaniacs/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,22 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,MiniGolfManiacs${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh
+sed -i.bak "s,CHANGE,${PBI_TARGETFULLDIR},g" ${PBIDIR}/bin/minigolfm
 
-
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGE,MiniGolfManiacs${PORTVER},g" ${PBIDIR}/bin/minigolfm > /tmp/minigolfm
-mv /tmp/minigolfm ${PBIDIR}/bin/minigolfm
-chmod 755 ${PBIDIR}/bin/minigolfm
-
 # Download the wine package
 cd ${PBIDIR}/
 fetch ftp://ftp.pcbsd.org/pub/autobuildpkgs/minigoldmaniacs/MGM.tar.bz2

Modified: pbibuild/modules/games/minigolfmaniacs/overlay-dir/bin/minigolfm
===================================================================
--- pbibuild/modules/games/minigolfmaniacs/overlay-dir/bin/minigolfm	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/minigolfmaniacs/overlay-dir/bin/minigolfm	2009-12-07 21:00:36 UTC (rev 5282)
@@ -1,5 +1,5 @@
 #!/bin/sh
 PROGDIR="CHANGE"
 cd
-export WINEPREFIX="/Programs/${PROGDIR}/mgm"
-/Programs/${PROGDIR}/bin/wine "/Programs/${PROGDIR}/MGM/MINIGOLF.exe" "$@"
+export WINEPREFIX="${PROGDIR}/mgm"
+${PROGDIR}/bin/wine "${PROGDIR}/MGM/MINIGOLF.exe" "$@"

Modified: pbibuild/modules/games/neverball/build.sh
===================================================================
--- pbibuild/modules/games/neverball/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/neverball/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,12 +4,9 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
-
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,NeverBall${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh

Modified: pbibuild/modules/games/q4demo/build.sh
===================================================================
--- pbibuild/modules/games/q4demo/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/q4demo/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,13 +4,11 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,exec,LD_PRELOAD='/compat/linux/usr/lib/libGL.so.1' ; export LD_PRELOAD ; exec,g" ${PBIDIR}/bin/linux-quake4-demo > /tmp/sed
-cp /tmp/sed ${PBIDIR}/bin/linux-quake4-demo
-chmod 755 ${PBIDIR}/bin/linux-quake4-demo
-
+sed -i.bak "s,exec,LD_PRELOAD='/compat/linux/usr/lib/libGL.so.1' ; export LD_PRELOAD ; exec,g" ${PBIDIR}/bin/linux-quake4-demo

Modified: pbibuild/modules/games/scorched3d/build.sh
===================================================================
--- pbibuild/modules/games/scorched3d/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/scorched3d/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,12 +4,9 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
-
-# Save the right version number in the winfirefox3 script
-sed -e "s,CHANGEME,${PORTVER},g" ${PBIDIR}/bin/scorched3d > /tmp/scorched3d
-mv /tmp/scorched3d ${PBIDIR}/bin/scorched3d
-chmod 755 ${PBIDIR}/bin/scorched3d
\ No newline at end of file

Modified: pbibuild/modules/games/spring/build.sh
===================================================================
--- pbibuild/modules/games/spring/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/spring/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,13 +4,12 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Save the right version number in the spring.sh
-sed -e "s,CHANGEME,Spring${PORTVER},g" ${PBIDIR}/bin/spring.sh > /tmp/sed
-mv /tmp/sed ${PBIDIR}/bin/spring.sh
-chmod 755 ${PBIDIR}/bin/spring.sh
-
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/bin/spring.sh

Modified: pbibuild/modules/games/spring/overlay-dir/bin/spring.sh
===================================================================
--- pbibuild/modules/games/spring/overlay-dir/bin/spring.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/spring/overlay-dir/bin/spring.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -3,10 +3,10 @@
 PROGDIR=CHANGEME
 
 # Check if we have any mods / maps installed
-NUM=`ls /Programs/${PROGDIR}/share/spring/mods | wc -l | tr -d ' '`
+NUM=`ls ${PROGDIR}/share/spring/mods | wc -l | tr -d ' '`
 if [ "${NUM}" = "0" ]
 then
-   kdialog --warningyesno "The /Programs/${PROGDIR}/share/spring/mods folder does not contain any games. Do you wish to open a browser to the games list?"
+   kdialog --warningyesno "The ${PROGDIR}/share/spring/mods folder does not contain any games. Do you wish to open a browser to the games list?"
    if [ "$?" = "0" ]
    then
       konqueror http://spring.clan-sy.com/
@@ -15,10 +15,10 @@
 fi
 
 # Check if we have any maps installed
-NUM=`ls /Programs/${PROGDIR}/share/spring/maps | wc -l | tr -d ' '`
+NUM=`ls ${PROGDIR}/share/spring/maps | wc -l | tr -d ' '`
 if [ "${NUM}" = "0" ]
 then
-   kdialog --warningyesno "The /Programs/${PROGDIR}/share/spring/maps folder does not contain any maps. Do you wish to open a browser to the games list?"
+   kdialog --warningyesno "The ${PROGDIR}/share/spring/maps folder does not contain any maps. Do you wish to open a browser to the games list?"
    if [ "$?" = "0" ]
    then
       konqueror http://spring.clan-sy.com/
@@ -27,4 +27,4 @@
 fi
 
 
-/Programs/${PROGDIR}/bin/spring $@
+${PROGDIR}/bin/spring $@

Modified: pbibuild/modules/games/tribes/build.sh
===================================================================
--- pbibuild/modules/games/tribes/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/tribes/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,15 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Save the right version number in the winfirefox3 script
-sed -e "s,CHANGEME,${PORTVER},g" ${PBIDIR}/bin/tribes > /tmp/tribes
-mv /tmp/tribes ${PBIDIR}/bin/tribes
-chmod 755 ${PBIDIR}/bin/tribes
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/bin/tribes
 
 # Download the wine package
 cd ${PBIDIR}/

Modified: pbibuild/modules/games/tribes/overlay-dir/bin/tribes
===================================================================
--- pbibuild/modules/games/tribes/overlay-dir/bin/tribes	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/tribes/overlay-dir/bin/tribes	2009-12-07 21:00:36 UTC (rev 5282)
@@ -1,7 +1,6 @@
 #!/bin/sh
-VER="CHANGEME"
-PROGDIR="Tribes${VER}"
+PROGDIR="CHANGEME"
 cd
-export WINEPREFIX="/Programs/${PROGDIR}/TRIBES"
-cd /Programs/${PROGDIR}/TRIBES/drive_c/Dynamix/TRIBES/
-/Programs/${PROGDIR}/bin/wine "Tribes.exe" "$@"
+export WINEPREFIX="${PROGDIR}/TRIBES"
+cd ${PROGDIR}/TRIBES/drive_c/Dynamix/TRIBES/
+${PROGDIR}/bin/wine "Tribes.exe" "$@"

Modified: pbibuild/modules/games/ut2003demo/build.sh
===================================================================
--- pbibuild/modules/games/ut2003demo/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/ut2003demo/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -9,6 +9,5 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
 sed -i.bak "s,exec,LD_PRELOAD='/compat/linux/usr/lib/libGL.so.1' ; export LD_PRELOAD ; exec,g" ${PBIDIR}/bin/ut2003-demo
 

Modified: pbibuild/modules/games/ut2004demo/build.sh
===================================================================
--- pbibuild/modules/games/ut2004demo/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/games/ut2004demo/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,13 +4,11 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,exec,LD_PRELOAD='/compat/linux/usr/lib/libGL.so.1' ; export LD_PRELOAD ; exec,g" ${PBIDIR}/bin/ut2004-demo > /tmp/sed
-cp /tmp/sed ${PBIDIR}/bin/ut2004-demo
-chmod 755 ${PBIDIR}/bin/ut2004-demo
-
+sed -i.bak "s,exec,LD_PRELOAD='/compat/linux/usr/lib/libGL.so.1' ; export LD_PRELOAD ; exec,g" ${PBIDIR}/bin/ut2004-demo

Modified: pbibuild/modules/graphics/jalbum/build.sh
===================================================================
--- pbibuild/modules/graphics/jalbum/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/graphics/jalbum/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,9 +4,11 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 
@@ -14,5 +16,5 @@
 cp -R /usr/local/diablo*jdk*/jre ${PBIDIR}/diablo-jre1.6.0
 
 # Make the javavms file
-echo "/Programs/Jalbum${PORTVER}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
+echo "${PBI_TARGETFULLDIR}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
 

Modified: pbibuild/modules/graphics/opencascade/build.sh
===================================================================
--- pbibuild/modules/graphics/opencascade/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/graphics/opencascade/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,14 +4,12 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Save the right version number in the gnome-session.sh script
-sed -e "s,CHANGEME,OpenCascade${PORTVER},g" ${PBIDIR}/bin/DRAWEXE.sh > /tmp/sed
-mv /tmp/sed ${PBIDIR}/bin/DRAWEXE.sh
-chmod 755 ${PBIDIR}/bin/DRAWEXE.sh
-
-
+sed -i.bak "s,CHANGEME,${PBI_TARGERDIR},g" ${PBIDIR}/bin/DRAWEXE.sh

Modified: pbibuild/modules/hamradio/echolinux/build.sh
===================================================================
--- pbibuild/modules/hamradio/echolinux/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/hamradio/echolinux/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,17 +4,11 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,ECHOLINUX${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh
-
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,ECHOLINUX${PORTVER},g" ${PBIDIR}/bin/echolink.sh > /tmp/sed
-mv /tmp/sed ${PBIDIR}/bin/echolink.sh
-chmod 755 ${PBIDIR}/bin/echolink.sh
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${PBIDIR}/bin/echolink.sh

Modified: pbibuild/modules/hamradio/fldigi/build.sh
===================================================================
--- pbibuild/modules/hamradio/fldigi/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/hamradio/fldigi/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,12 +4,9 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
-
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,FLDIGI${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh

Modified: pbibuild/modules/hamradio/geoid/build.sh
===================================================================
--- pbibuild/modules/hamradio/geoid/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/hamradio/geoid/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,12 +4,9 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
-
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,XASTIR${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh

Modified: pbibuild/modules/hamradio/predict/build.sh
===================================================================
--- pbibuild/modules/hamradio/predict/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/hamradio/predict/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,12 +4,9 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
-
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,XASTIR${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh

Modified: pbibuild/modules/hamradio/xastir/build.sh
===================================================================
--- pbibuild/modules/hamradio/xastir/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/hamradio/xastir/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,12 +4,9 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
-
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,XASTIR${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh

Modified: pbibuild/modules/hamradio/xlog/build.sh
===================================================================
--- pbibuild/modules/hamradio/xlog/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/hamradio/xlog/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,12 +4,9 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
-
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,Xlog${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh

Modified: pbibuild/modules/mail/evolution/build.sh
===================================================================
--- pbibuild/modules/mail/evolution/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/mail/evolution/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,15 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Save the right version number in the evolution.sh script
-sed -e "s,CHANGEME,Evolution${PORTVER},g" ${PBIDIR}/bin/evolution.sh > /tmp/evolution.sh
-mv /tmp/evolution.sh ${PBIDIR}/bin/evolution.sh
-chmod 755 ${PBIDIR}/bin/evolution.sh
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${PBIDIR}/bin/evolution.sh
 
 
 # Remove the screensaver modules, don't need those

Modified: pbibuild/modules/mail/sylpheed/build.sh
===================================================================
--- pbibuild/modules/mail/sylpheed/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/mail/sylpheed/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,25 +4,13 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
-# Get all the various language files and copy them to the PBI
-LANGFILE="sylpheed.mo"
-mkdir ${PBIDIR}/share/locale/
-cd /usr/local/share/locale
-for i in `ls`
-do
-  if [ -e "/usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}" ]
-  then
-    mkdir ${PBIDIR}/share/locale/${i}
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE} ${PBIDIR}/share/locale/${i}/
-  fi
-done
 
 # Save the right version number in bin wrapper
-sed -e "s,CHANGEME,Sylpheed${PORTVER},g" ${PBIDIR}/bin/sylpheed > /tmp/sylpheed
-mv /tmp/sylpheed ${PBIDIR}/bin/sylpheed
-chmod 755 ${PBIDIR}/bin/sylpheed
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${PBIDIR}/bin/sylpheed
 

Modified: pbibuild/modules/mail/thunderbird/build.sh
===================================================================
--- pbibuild/modules/mail/thunderbird/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/mail/thunderbird/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,29 +4,13 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-#Only build this extension on 7.x, the port is major broken on 6.x
-uname -r | grep "^6."
-if [ "${?}" != "0" ]
-then
-  # Build the lightning-xpi module to include
-  cd /usr/ports/deskutils/lightning-xpi
-  make clean
-  make install
-fi
-
-# Copy over the lightning-xpi extensions
-if [ -d "/usr/local/lib/thunderbird/extensions" ]
-then
- cd /usr/local/lib/thunderbird/extensions
- tar cvf - . | tar xvf - -C ${PBIDIR}/autolibs/thunderbird/extensions/
-fi
-
-
 # We need to modify the bin/firefox script to point to the PBI directory
 # properly
 rm /tmp/t-fixed 2>/dev/null
@@ -36,7 +20,7 @@
   echo $line | grep '^moz_libdir=' >/dev/null 2>/dev/null 
   if [ "$?" = "0" ]
   then
-    echo "moz_libdir=\"/Programs/Thunderbird${PORTVER}/autolibs/thunderbird\"" >>/tmp/t-fixed
+    echo "moz_libdir=\"${PBI_TARGETFULLDIR}/autolibs/thunderbird\"" >>/tmp/t-fixed
   else
     echo "${line}" >> /tmp/t-fixed 
   fi
@@ -47,15 +31,8 @@
 chmod 755 ${PBIDIR}/bin/thunderbird
 
 # remove the -p line in the thunderbird file
-sed -e "s,-p |,,g" ${PBIDIR}/bin/thunderbird > /tmp/t-fixed
-mv /tmp/t-fixed ${PBIDIR}/bin/thunderbird
-chmod 755 ${PBIDIR}/bin/thunderbird
+sed -i.bak "s,-p |,,g" ${PBIDIR}/bin/thunderbird
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,Thunderbird${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh
-
 rm -rf /${PBIDIR}/autolibs/thunderbird/extensions/lang*
 
 # Copy over the lang-packs
@@ -67,9 +44,9 @@
 
 # Now append our prefs file with the default browser script so that users
 # clicking on URLs will get a browser which works
-echo "pref(\"network.protocol-handler.app.http\", \"/Programs/Thunderbird${PORTVER}/bin/defaultbrowser\");
-pref(\"network.protocol-handler.app.ftp\", \"/Programs/Thunderbird${PORTVER}/bin/defaultbrowser\");
-pref(\"network.protocol-handler.app.https\", \"/Programs/Thunderbird${PORTVER}/bin/defaultbrowser\");" >> ${PBIDIR}/autolibs/thunderbird/greprefs/all.js
+echo "pref(\"network.protocol-handler.app.http\", \"${PBI_TARGETFULLDIR}/bin/defaultbrowser\");
+pref(\"network.protocol-handler.app.ftp\", \"/${PBI_TARGETFULLDIR}/bin/defaultbrowser\");
+pref(\"network.protocol-handler.app.https\", \"${PBI_TARGETFULLDIR}/bin/defaultbrowser\");" >> ${PBIDIR}/autolibs/thunderbird/greprefs/all.js
 
 # Copy over our modified mimeTypes.rdf file to the correct location
 mv ${PBIDIR}/mimeTypes.rdf ${PBIDIR}/lib/thunderbird/defaults/profile

Modified: pbibuild/modules/mail/thunderbird/pbi.conf
===================================================================
--- pbibuild/modules/mail/thunderbird/pbi.conf	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/mail/thunderbird/pbi.conf	2009-12-07 21:00:36 UTC (rev 5282)
@@ -28,6 +28,7 @@
 OTHERPORT="/usr/ports/mail/thunderbird-i18n/
 /usr/ports/devel/gconf2
 /usr/ports/audio/esound
+/usr/ports/deskutils/lightning-xpi
 /usr/ports/x11-themes/qtcurve-gtk2"
 
 # Enter your custom make options here

Modified: pbibuild/modules/multimedia/atunes/build.sh
===================================================================
--- pbibuild/modules/multimedia/atunes/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/multimedia/atunes/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,13 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Copy over only the JRE portion
 cp -R /usr/local/diablo*jdk*/jre ${PBIDIR}/diablo-jre1.6.0
 
 # Make the javavms file
-echo "/Programs/aTunes${PORTVER}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
+echo "${PBI_TARGETFULLDIR}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms

Modified: pbibuild/modules/multimedia/aumix/copy-files
===================================================================
--- pbibuild/modules/multimedia/aumix/copy-files	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/multimedia/aumix/copy-files	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,15 +4,3 @@
 /usr/local/man/man1/aumix.1.gz man/man1/
 /usr/local/man/man1/xaumix.1.gz man/man1/
 /usr/local/share/aumix share/
-/usr/local/share/locale/de/LC_MESSAGES/aumix.mo share/locale/de/LC_MESSAGES/
-/usr/local/share/locale/el/LC_MESSAGES/aumix.mo share/locale/el/LC_MESSAGES/
-/usr/local/share/locale/es/LC_MESSAGES/aumix.mo share/locale/es/LC_MESSAGES/
-/usr/local/share/locale/gl/LC_MESSAGES/aumix.mo share/locale/gl/LC_MESSAGES/
-/usr/local/share/locale/ja/LC_MESSAGES/aumix.mo share/locale/ja/LC_MESSAGES/
-/usr/local/share/locale/nl/LC_MESSAGES/aumix.mo share/locale/nl/LC_MESSAGES/
-/usr/local/share/locale/pl/LC_MESSAGES/aumix.mo share/locale/pl/LC_MESSAGES/
-/usr/local/share/locale/pt_BR/LC_MESSAGES/aumix.mo share/locale/pt_BR/LC_MESSAGES/
-/usr/local/share/locale/ru/LC_MESSAGES/aumix.mo share/locale/ru/LC_MESSAGES/
-/usr/local/share/locale/sv/LC_MESSAGES/aumix.mo share/locale/sv/LC_MESSAGES/
-/usr/local/share/locale/uk/LC_MESSAGES/aumix.mo share/locale/uk/LC_MESSAGES/
-/usr/local/share/locale/zh_CN/LC_MESSAGES/aumix.mo share/locale/zh_CN/LC_MESSAGES/

Modified: pbibuild/modules/multimedia/gxmms2/build.sh
===================================================================
--- pbibuild/modules/multimedia/gxmms2/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/multimedia/gxmms2/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,12 +4,11 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-sed -e "s,CHANGEME,gxmms2${PORTVER},g" ${PBIDIR}/bin/xmms2-admin.sh > /tmp/sed
-mv /tmp/sed ${PBIDIR}/bin/xmms2-admin.sh
-chmod 755 ${PBIDIR}/bin/xmms2-admin.sh
-
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${PBIDIR}/bin/xmms2-admin.sh 

Modified: pbibuild/modules/multimedia/last.fm/build.sh
===================================================================
--- pbibuild/modules/multimedia/last.fm/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/multimedia/last.fm/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,12 +4,12 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Save the right version number in the last.fm
-sed -e "s,/usr/local,/Programs/Last.fm${PORTVER},g" ${PBIDIR}/bin/last.fm > /tmp/sed
-mv /tmp/sed ${PBIDIR}/bin/last.fm
-chmod 755 ${PBIDIR}/bin/last.fm
+sed -i.bak "s,/usr/local,${PBI_TARGETFULLDIR},g" ${PBIDIR}/bin/last.fm

Modified: pbibuild/modules/net-im/amsn/build.sh
===================================================================
--- pbibuild/modules/net-im/amsn/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/net-im/amsn/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,17 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Update links to tclsh to the right dir
-sed -e "s,/usr/bin,/Programs/aMSN${PORTVER}/bin,g" ${PBIDIR}/share/amsn/amsn-remote > /tmp/amsn-remote
-mv /tmp/amsn-remote ${PBIDIR}/share/amsn/amsn-remote
-chmod 755 ${PBIDIR}/share/amsn/amsn-remote
+sed -i.bak "s,/usr/bin,${PBI_TARGETFULLDIR}/bin,g" ${PBIDIR}/share/amsn/amsn-remote
 
 # Update links to tclsh to the right dir
-sed -e "s,/usr/bin,/Programs/aMSN${PORTVER}/bin,g" ${PBIDIR}/share/amsn/amsn-remote-CLI > /tmp/amsn-remote-CLI
-mv /tmp/amsn-remote-CLI ${PBIDIR}/share/amsn/amsn-remote-CLI
-chmod 755 ${PBIDIR}/share/amsn/amsn-remote-CLI
+sed -i.bak "s,/usr/bin,${PBI_TARGETFULLDIR}/bin,g" ${PBIDIR}/share/amsn/amsn-remote-CLI

Modified: pbibuild/modules/net-p2p/amule/build.sh
===================================================================
--- pbibuild/modules/net-p2p/amule/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/net-p2p/amule/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,27 +4,9 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
-
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,aMule${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh
-
-
-# Get all the various language files and copy them to the PBI
-LANGFILE="amule.mo"
-mkdir ${PBIDIR}/locale/
-cd /usr/local/share/locale
-for i in `ls`
-do
-  if [ -e "/usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}" ]
-  then
-    mkdir ${PBIDIR}/locale/${i}
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE} ${PBIDIR}/locale/${i}/
-  fi
-done
-

Modified: pbibuild/modules/net-p2p/deluge/build.sh
===================================================================
--- pbibuild/modules/net-p2p/deluge/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/net-p2p/deluge/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,18 +4,14 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Save the right version number in the deluge.sh
-sed -e "s,CHANGEME,Deluge${PORTVER},g" ${PBIDIR}/bin/deluge.sh > /tmp/deluge.sh
-mv /tmp/deluge.sh ${PBIDIR}/bin/deluge.sh
-chmod 755 ${PBIDIR}/bin/deluge.sh
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${PBIDIR}/bin/deluge.sh
 
-sed 's|/usr/local/bin|/Programs/Deluge${PORTVER}/bin|g' ${PBIDIR}/bin/deluge >/tmp/deluge
-mv /tmp/deluge ${PBIDIR}/bin/deluge
-chmod 755 ${PBIDIR}/bin/deluge
-
-rm -rf ${PBIDIR}/etc/fonts
+sed -i.bak 's|/usr/local/bin|${PBI_TARGETFULLDIR}/bin|g' ${PBIDIR}/bin/deluge

Modified: pbibuild/modules/net-p2p/kmldonkey/build.sh
===================================================================
--- pbibuild/modules/net-p2p/kmldonkey/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/net-p2p/kmldonkey/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,16 +4,14 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,KMLDonkey${PORTVER},g" ${PBIDIR}/mldonkeyrc > /tmp/sed
-mv /tmp/sed ${PBIDIR}/mldonkeyrc
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${PBIDIR}/mldonkeyrc
 
 # Update our kmldonkey wrapper script
-sed -e "s,CHANGEME,KMLDonkey${PORTVER},g" ${PBIDIR}/bin/kmldonkey.sh > /tmp/sed
-mv /tmp/sed ${PBIDIR}/bin/kmldonkey.sh
-chmod 755 ${PBIDIR}/bin/kmldonkey.sh
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${PBIDIR}/bin/kmldonkey.sh

Modified: pbibuild/modules/net-p2p/limewire/build.sh
===================================================================
--- pbibuild/modules/net-p2p/limewire/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/net-p2p/limewire/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,9 +4,11 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 
@@ -14,5 +16,5 @@
 cp -R /usr/local/diablo*jdk*/jre ${PBIDIR}/diablo-jre1.6.0
 
 # Make the javavms file
-echo "/Programs/LimeWire${PORTVER}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
+echo "${PBI_TARGETFULLDIR}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
 

Modified: pbibuild/modules/net-p2p/miro/build.sh
===================================================================
--- pbibuild/modules/net-p2p/miro/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/net-p2p/miro/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,15 +4,13 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 
 # Save the right version number in the evolution.sh script
-sed -e "s,CHANGEME,Miro${PORTVER},g" ${PBIDIR}/bin/miro.sh > /tmp/sed
-mv /tmp/sed ${PBIDIR}/bin/miro.sh
-chmod 755 ${PBIDIR}/bin/miro.sh
-
-
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/bin/miro.sh

Modified: pbibuild/modules/net-p2p/miro/overlay-dir/bin/miro.sh
===================================================================
--- pbibuild/modules/net-p2p/miro/overlay-dir/bin/miro.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/net-p2p/miro/overlay-dir/bin/miro.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -3,8 +3,8 @@
 
 PROGDIR=CHANGEME
 
-/Programs/${PROGDIR}/libexec/gconfd-2 &
+${PROGDIR}/libexec/gconfd-2 &
 sleep 1
 
-/Programs/${PROGDIR}/bin/miro.real "$@"
+${PROGDIR}/bin/miro.real "$@"
 

Modified: pbibuild/modules/net-p2p/vuze/build.sh
===================================================================
--- pbibuild/modules/net-p2p/vuze/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/net-p2p/vuze/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,16 +4,18 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Copy over only the JRE portion
 cp -R /usr/local/diablo*jdk*/jre ${PBIDIR}/diablo-jre1.6.0
 
 # Make the javavms file
-echo "/Programs/Vuze${PORTVER}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
+echo "${PBI_TARGETFULLDIR}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
 
 # Remove some extra libraries we don't need
 cd ${PBIDIR}/autolibs

Modified: pbibuild/modules/network/ekiga/build.sh
===================================================================
--- pbibuild/modules/network/ekiga/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/network/ekiga/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,14 +4,12 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Save the right version number in the ekiga.sh script
-sed -e "s,CHANGEME,Ekiga${PORTVER},g" ${PBIDIR}/bin/ekiga.sh > /tmp/sed
-mv /tmp/sed ${PBIDIR}/bin/ekiga.sh
-chmod 755 ${PBIDIR}/bin/ekiga.sh
-
-
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${PBIDIR}/bin/ekiga.sh

Modified: pbibuild/modules/network/vsftpd/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/network/vsftpd/overlay-dir/PBI.SetupScript.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/network/vsftpd/overlay-dir/PBI.SetupScript.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -16,9 +16,7 @@
 #########################################
 
 # Save the right version number in the vsftpd.conf file
-sed -e "s,CHANGEME,/Programs/$PROGDIR,g" /Programs/$PBIDIR/vsftpdcfg > /tmp/vsftpdcfg
-mv /tmp/vsftpdcfg /Programs/$PROGDIR/vsftpdcfg
-chmod 755 /Programs/$PROGDIR/vsftpdcfg
+sed -i.bak "s,CHANGEME,/Programs/$PROGDIR,g" /Programs/$PBIDIR/vsftpdcfg
 
 ln -s /Programs/${PROGDIR}/services/vsftpd /PCBSD/Services/vsftpd
 
@@ -30,7 +28,7 @@
 then 
 	if [ "$USERS" != "b" ] 
 	then
-		sed 's/anonymous_enable=NO/anonymous_enable=YES/g' /Programs/${PROGDIR}/vsftpd.conf > tempfile && mv -- tempfile /Programs/${PROGDIR}/vsftpd.conf
+		sed -u.bak 's/anonymous_enable=NO/anonymous_enable=YES/g' /Programs/${PROGDIR}/vsftpd.conf
 		#vsftpdanon
 		pw user add -n ftp -c "FTP User" -m -s /sbin/nologin -w none
 		chmod 755 /Programs/${PROGDIR}/anon_ftp
@@ -45,7 +43,7 @@
 	fi
 	if [ "$USERS" != "a" ] 
 	then 	
-		sed 's/local_enable=NO/local_enable=YES/g' /Programs/${PROGDIR}/vsftpd.conf > tempfile && mv -- tempfile /Programs/${PROGDIR}/vsftpd.conf
+		sed -i.bak 's/local_enable=NO/local_enable=YES/g' /Programs/${PROGDIR}/vsftpd.conf
 	fi
 else 
 	kdialog --title "vsftpd Server" --msgbox "No User specified. You will need to modify the vsftpd.conf"

Modified: pbibuild/modules/network/wol/copy-files
===================================================================
--- pbibuild/modules/network/wol/copy-files	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/network/wol/copy-files	2009-12-07 21:00:36 UTC (rev 5282)
@@ -6,9 +6,3 @@
 /usr/local/share/doc/wol/NEWS share/doc/
 /usr/local/share/doc/wol/README share/doc/
 /usr/local/share/doc/wol/TODO share/doc/
-/usr/local/share/locale/de/LC_MESSAGES/wol.mo share/locale/de/LC_MESSAGES/
-/usr/local/share/locale/es/LC_MESSAGES/wol.mo share/locale/es/LC_MESSAGES/
-/usr/local/share/locale/fr/LC_MESSAGES/wol.mo share/locale/fr/LC_MESSAGES/
-/usr/local/share/locale/it/LC_MESSAGES/wol.mo share/locale/it/LC_MESSAGES/
-/usr/local/share/locale/sv/LC_MESSAGES/wol.mo share/locale/sv/LC_MESSAGES/
-/usr/local/info/wol.info info/

Modified: pbibuild/modules/network/wxdfast/build.sh
===================================================================
--- pbibuild/modules/network/wxdfast/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/network/wxdfast/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,25 +4,11 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-# Get all the various language files and copy them to the PBI
-LANGFILE="wxDFast.mo"
-mkdir ${PBIDIR}/locale/
-cd /usr/local/share/locale
-for i in `ls`
-do
-  if [ -e "/usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}" ]
-  then
-    mkdir ${PBIDIR}/locale/${i}
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE} ${PBIDIR}/locale/${i}/
-  fi
-done
-
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGE,wxDownloadFast${PORTVER},g" ${PBIDIR}/bin/wxdfast.sh > /tmp/wxdfast.sh
-mv /tmp/wxdfast.sh ${PBIDIR}/bin/wxdfast.sh
-chmod 755 ${PBIDIR}/bin/wxdfast.sh
+sed -i.bak "s,CHANGE,${PBI_TARGETDIR},g" ${PBIDIR}/bin/wxdfast.sh

Modified: pbibuild/modules/office/excelviewer2003/build.sh
===================================================================
--- pbibuild/modules/office/excelviewer2003/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/office/excelviewer2003/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,14 +4,13 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGE,ExcelViewer2003${PORTVER},g" ${PBIDIR}/bin/excelview2003 > /tmp/excelview2003
-mv /tmp/excelview2003 ${PBIDIR}/bin/excelview2003
-chmod 755 ${PBIDIR}/bin/excelview2003
+sed -i.bak "s,CHANGE,${PBI_TARGETDIR},g" ${PBIDIR}/bin/excelview2003
 
 # Download the wine package
 cd ${PBIDIR}/

Modified: pbibuild/modules/office/officeviewer/build.sh
===================================================================
--- pbibuild/modules/office/officeviewer/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/office/officeviewer/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -9,27 +9,17 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
-# Save the right version number in the execution script
-
-PBIFOLDER="MicrosoftOfficeViewer${PORTVER}"
-
 #powerpoint
 MODFILE="${PBIDIR}/bin/powerpointviewer"
-sed -e "s,CHANGEME,${PBIFOLDER},g" ${MODFILE} > ${MODFILE}.tmp
-mv ${MODFILE}.tmp ${MODFILE}
-chmod 755 ${MODFILE}
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${MODFILE}
 
 #word
 MODFILE="${PBIDIR}/bin/wordviewer"
-sed -e "s,CHANGEME,${PBIFOLDER},g" ${MODFILE} > ${MODFILE}.tmp
-mv ${MODFILE}.tmp ${MODFILE}
-chmod 755 ${MODFILE}
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${MODFILE}
 
 #excel
 MODFILE="${PBIDIR}/bin/excelviewer"
-sed -e "s,CHANGEME,${PBIFOLDER},g" ${MODFILE} > ${MODFILE}.tmp
-mv ${MODFILE}.tmp ${MODFILE}
-chmod 755 ${MODFILE}
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${MODFILE}
 
 
 # Download the wine package

Modified: pbibuild/modules/office/openoffice3-de/build.sh
===================================================================
--- pbibuild/modules/office/openoffice3-de/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/office/openoffice3-de/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,18 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Copy over only the JRE portion
 cp -R /usr/local/diablo*jdk*/jre ${PBIDIR}/diablo-jre1.6.0
 
 # Make the javavms file
-echo "/Programs/OpenOffice-EN${PORTVER}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
-
-# Setup the OO dir in our install-dict.sh script
-sed -e "s,CHANGEME,OpenOffice-EN${PORTVER},g" ${PBIDIR}/bin/install-dict.sh > /tmp/install-dict.sh
-mv /tmp/install-dict.sh ${PBIDIR}/bin/install-dict.sh
-chmod 755 ${PBIDIR}/bin/install-dict.sh
+echo "${PBI_TARGETFULLDIR}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms

Modified: pbibuild/modules/office/openoffice3-en/build.sh
===================================================================
--- pbibuild/modules/office/openoffice3-en/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/office/openoffice3-en/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,18 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Copy over only the JRE portion
 cp -R /usr/local/diablo*jdk*/jre ${PBIDIR}/diablo-jre1.6.0
 
 # Make the javavms file
-echo "/Programs/OpenOffice-EN${PORTVER}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
-
-# Setup the OO dir in our install-dict.sh script
-sed -e "s,CHANGEME,OpenOffice-EN${PORTVER},g" ${PBIDIR}/bin/install-dict.sh > /tmp/install-dict.sh
-mv /tmp/install-dict.sh ${PBIDIR}/bin/install-dict.sh
-chmod 755 ${PBIDIR}/bin/install-dict.sh
+echo "${PBI_TARGETFULLDIR}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms

Modified: pbibuild/modules/office/openoffice3-es/build.sh
===================================================================
--- pbibuild/modules/office/openoffice3-es/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/office/openoffice3-es/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,18 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Copy over only the JRE portion
 cp -R /usr/local/diablo*jdk*/jre ${PBIDIR}/diablo-jre1.6.0
 
 # Make the javavms file
-echo "/Programs/OpenOffice-EN${PORTVER}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
-
-# Setup the OO dir in our install-dict.sh script
-sed -e "s,CHANGEME,OpenOffice-EN${PORTVER},g" ${PBIDIR}/bin/install-dict.sh > /tmp/install-dict.sh
-mv /tmp/install-dict.sh ${PBIDIR}/bin/install-dict.sh
-chmod 755 ${PBIDIR}/bin/install-dict.sh
+echo "${PBI_TARGETFULLDIR}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms

Modified: pbibuild/modules/office/openoffice3-et/build.sh
===================================================================
--- pbibuild/modules/office/openoffice3-et/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/office/openoffice3-et/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,18 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Copy over only the JRE portion
 cp -R /usr/local/diablo*jdk*/jre ${PBIDIR}/diablo-jre1.6.0
 
 # Make the javavms file
-echo "/Programs/OpenOffice-EN${PORTVER}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
-
-# Setup the OO dir in our install-dict.sh script
-sed -e "s,CHANGEME,OpenOffice-EN${PORTVER},g" ${PBIDIR}/bin/install-dict.sh > /tmp/install-dict.sh
-mv /tmp/install-dict.sh ${PBIDIR}/bin/install-dict.sh
-chmod 755 ${PBIDIR}/bin/install-dict.sh
+echo "${PBI_TARGETFULLDIR}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms

Modified: pbibuild/modules/office/openoffice3-fr/build.sh
===================================================================
--- pbibuild/modules/office/openoffice3-fr/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/office/openoffice3-fr/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,18 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Copy over only the JRE portion
 cp -R /usr/local/diablo*jdk*/jre ${PBIDIR}/diablo-jre1.6.0
 
 # Make the javavms file
-echo "/Programs/OpenOffice-EN${PORTVER}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
-
-# Setup the OO dir in our install-dict.sh script
-sed -e "s,CHANGEME,OpenOffice-EN${PORTVER},g" ${PBIDIR}/bin/install-dict.sh > /tmp/install-dict.sh
-mv /tmp/install-dict.sh ${PBIDIR}/bin/install-dict.sh
-chmod 755 ${PBIDIR}/bin/install-dict.sh
+echo "${PBI_TARGETFULLDIR}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms

Modified: pbibuild/modules/office/openoffice3-it/build.sh
===================================================================
--- pbibuild/modules/office/openoffice3-it/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/office/openoffice3-it/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,18 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Copy over only the JRE portion
 cp -R /usr/local/diablo*jdk*/jre ${PBIDIR}/diablo-jre1.6.0
 
 # Make the javavms file
-echo "/Programs/OpenOffice-EN${PORTVER}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
-
-# Setup the OO dir in our install-dict.sh script
-sed -e "s,CHANGEME,OpenOffice-EN${PORTVER},g" ${PBIDIR}/bin/install-dict.sh > /tmp/install-dict.sh
-mv /tmp/install-dict.sh ${PBIDIR}/bin/install-dict.sh
-chmod 755 ${PBIDIR}/bin/install-dict.sh
+echo "${PBI_TARGETFULLDIR}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms

Modified: pbibuild/modules/office/openoffice3-ja/build.sh
===================================================================
--- pbibuild/modules/office/openoffice3-ja/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/office/openoffice3-ja/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,18 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Copy over only the JRE portion
 cp -R /usr/local/diablo*jdk*/jre ${PBIDIR}/diablo-jre1.6.0
 
 # Make the javavms file
-echo "/Programs/OpenOffice-EN${PORTVER}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
-
-# Setup the OO dir in our install-dict.sh script
-sed -e "s,CHANGEME,OpenOffice-EN${PORTVER},g" ${PBIDIR}/bin/install-dict.sh > /tmp/install-dict.sh
-mv /tmp/install-dict.sh ${PBIDIR}/bin/install-dict.sh
-chmod 755 ${PBIDIR}/bin/install-dict.sh
+echo "${PBI_TARGETFULLDIR}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms

Modified: pbibuild/modules/office/openoffice3-pt/build.sh
===================================================================
--- pbibuild/modules/office/openoffice3-pt/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/office/openoffice3-pt/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,18 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Copy over only the JRE portion
 cp -R /usr/local/diablo*jdk*/jre ${PBIDIR}/diablo-jre1.6.0
 
 # Make the javavms file
-echo "/Programs/OpenOffice-EN${PORTVER}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
-
-# Setup the OO dir in our install-dict.sh script
-sed -e "s,CHANGEME,OpenOffice-EN${PORTVER},g" ${PBIDIR}/bin/install-dict.sh > /tmp/install-dict.sh
-mv /tmp/install-dict.sh ${PBIDIR}/bin/install-dict.sh
-chmod 755 ${PBIDIR}/bin/install-dict.sh
+echo "${PBI_TARGETFULLDIR}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms

Modified: pbibuild/modules/office/openoffice3-pt-BR/build.sh
===================================================================
--- pbibuild/modules/office/openoffice3-pt-BR/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/office/openoffice3-pt-BR/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,18 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Copy over only the JRE portion
 cp -R /usr/local/diablo*jdk*/jre ${PBIDIR}/diablo-jre1.6.0
 
 # Make the javavms file
-echo "/Programs/OpenOffice-EN${PORTVER}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
-
-# Setup the OO dir in our install-dict.sh script
-sed -e "s,CHANGEME,OpenOffice-EN${PORTVER},g" ${PBIDIR}/bin/install-dict.sh > /tmp/install-dict.sh
-mv /tmp/install-dict.sh ${PBIDIR}/bin/install-dict.sh
-chmod 755 ${PBIDIR}/bin/install-dict.sh
+echo "${PBI_TARGETFULLDIR}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms

Modified: pbibuild/modules/office/openoffice3-ru/build.sh
===================================================================
--- pbibuild/modules/office/openoffice3-ru/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/office/openoffice3-ru/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,18 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Copy over only the JRE portion
 cp -R /usr/local/diablo*jdk*/jre ${PBIDIR}/diablo-jre1.6.0
 
 # Make the javavms file
-echo "/Programs/OpenOffice-EN${PORTVER}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
-
-# Setup the OO dir in our install-dict.sh script
-sed -e "s,CHANGEME,OpenOffice-EN${PORTVER},g" ${PBIDIR}/bin/install-dict.sh > /tmp/install-dict.sh
-mv /tmp/install-dict.sh ${PBIDIR}/bin/install-dict.sh
-chmod 755 ${PBIDIR}/bin/install-dict.sh
+echo "${PBI_TARGETFULLDIR}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms

Modified: pbibuild/modules/office/openoffice3-uk/build.sh
===================================================================
--- pbibuild/modules/office/openoffice3-uk/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/office/openoffice3-uk/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,18 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Copy over only the JRE portion
 cp -R /usr/local/diablo*jdk*/jre ${PBIDIR}/diablo-jre1.6.0
 
 # Make the javavms file
-echo "/Programs/OpenOffice-EN${PORTVER}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
-
-# Setup the OO dir in our install-dict.sh script
-sed -e "s,CHANGEME,OpenOffice-EN${PORTVER},g" ${PBIDIR}/bin/install-dict.sh > /tmp/install-dict.sh
-mv /tmp/install-dict.sh ${PBIDIR}/bin/install-dict.sh
-chmod 755 ${PBIDIR}/bin/install-dict.sh
+echo "${PBI_TARGETFULLDIR}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms

Modified: pbibuild/modules/office/openoffice3-zh-TW/build.sh
===================================================================
--- pbibuild/modules/office/openoffice3-zh-TW/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/office/openoffice3-zh-TW/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,18 +4,16 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Copy over only the JRE portion
 cp -R /usr/local/diablo*jdk*/jre ${PBIDIR}/diablo-jre1.6.0
 
 # Make the javavms file
-echo "/Programs/OpenOffice-EN${PORTVER}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
+echo "${PBI_TARGETFULLDIR}/diablo-jre1.6.0/bin/java # DiabloCaffe1.6.0" > ${PBIDIR}/etc/javavms
 
-# Setup the OO dir in our install-dict.sh script
-sed -e "s,CHANGEME,OpenOffice-EN${PORTVER},g" ${PBIDIR}/bin/install-dict.sh > /tmp/install-dict.sh
-mv /tmp/install-dict.sh ${PBIDIR}/bin/install-dict.sh
-chmod 755 ${PBIDIR}/bin/install-dict.sh

Modified: pbibuild/modules/office/powerpointviewer2003/build.sh
===================================================================
--- pbibuild/modules/office/powerpointviewer2003/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/office/powerpointviewer2003/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,16 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
 MODFILE="${PBIDIR}/bin/pptview2003"
-sed -e "s,CHANGEME,PowerpointViewer2003${PORTVER},g" ${MODFILE} > ${MODFILE}.tmp
-mv ${MODFILE}.tmp ${MODFILE}
-chmod 755 ${MODFILE} 
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${MODFILE}
 
 # Download the wine package
 cd ${PBIDIR}/

Modified: pbibuild/modules/office/powerpointviewer2007/build.sh
===================================================================
--- pbibuild/modules/office/powerpointviewer2007/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/office/powerpointviewer2007/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,16 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
 MODFILE="${PBIDIR}/bin/pptview2007"
-sed -e "s,CHANGEME,PowerpointViewer2007${PORTVER},g" ${MODFILE} > ${MODFILE}.tmp
-mv ${MODFILE}.tmp ${MODFILE}
-chmod 755 ${MODFILE} 
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${MODFILE}
 
 # Download the wine package
 cd ${PBIDIR}/

Modified: pbibuild/modules/office/wordviewer2003/build.sh
===================================================================
--- pbibuild/modules/office/wordviewer2003/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/office/wordviewer2003/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,16 +4,16 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Change the MODFILE to a new name / version
 MODFILE="${PBIDIR}/bin/wordview2003"
-sed -e "s,CHANGE,WordViewer2003${PORTVER},g" ${MODFILE} > ${MODFILE}.tmp
-mv ${MODFILE}.tmp ${MODFILE}
-chmod 755 ${MODFILE}
+sed -i.bak "s,CHANGE,${PBI_TARGETDIR},g" ${MODFILE}
 
 # Download the wine package
 cd ${PBIDIR}/

Modified: pbibuild/modules/servers/abyssws/build.sh
===================================================================
--- pbibuild/modules/servers/abyssws/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/servers/abyssws/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,13 +4,13 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Update links to tclsh to the right dir
-sed -e "s,CHANGEME,AbyssWebServer${PORTVER},g" ${PBIDIR}/bin/abyssws-start > /tmp/abyssws-start
-mv /tmp/abyssws-start ${PBIDIR}/bin/abyssws-start
-chmod 755 ${PBIDIR}/bin/abyssws-start
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${PBIDIR}/bin/abyssws-start
 

Modified: pbibuild/modules/servers/apache22/build.sh
===================================================================
--- pbibuild/modules/servers/apache22/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/servers/apache22/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,12 +4,13 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 #Switch the DocumentRoot
-DOCROOT="/Programs/Apache${PORTVER}/www/apache22/"
-sed -e "s,${DOCROOT},/Programs/www/apache22/,g" ${PBIDIR}/etc/apache22/httpd.conf > /tmp/sed
-mv /tmp/sed ${PBIDIR}/etc/apache22/httpd.conf
+DOCROOT="${PBI_TARGETFULLDIR}/www/apache22/"
+sed -i.bak "s,${DOCROOT},/Programs/www/apache22/,g" ${PBIDIR}/etc/apache22/httpd.conf

Modified: pbibuild/modules/shells/zsh/build.sh
===================================================================
--- pbibuild/modules/shells/zsh/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/shells/zsh/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,12 +4,9 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
-
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,Xlog${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh

Modified: pbibuild/modules/utilities/winrar3/build.sh
===================================================================
--- pbibuild/modules/utilities/winrar3/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/utilities/winrar3/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,19 +4,18 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Save the right version number in the winrar script
-sed -e "s,CHANGEME,${PORTVER},g" ${PBIDIR}/bin/winrar > /tmp/winrar
-mv /tmp/winrar ${PBIDIR}/bin/winrar
-chmod 755 ${PBIDIR}/bin/winrar
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/bin/winrar
 
 # Save the right version number in the winrar.desktop file
-sed -e "s,CHANGEME,${PORTVER},g" ${PBIDIR}/winrar.desktop > /tmp/winrar.desktop
-mv /tmp/winrar.desktop ${PBIDIR}/winrar.desktop
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/winrar.desktop
 
 # Download the wine package
 cd ${PBIDIR}/

Modified: pbibuild/modules/utilities/winrar3/overlay-dir/bin/winrar
===================================================================
--- pbibuild/modules/utilities/winrar3/overlay-dir/bin/winrar	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/utilities/winrar3/overlay-dir/bin/winrar	2009-12-07 21:00:36 UTC (rev 5282)
@@ -1,17 +1,16 @@
 #!/bin/sh
 
-VER=CHANGEME
-PROGDIR="WinRAR${VER}"
+PROGDIR="CHANGEME"
 
 if [ ! -e "${HOME}/.winrar" ]
 then
   mkdir ${HOME}/.winrar
-  ln -s /Programs/${PROGDIR}/WINRAR/drive_c ${HOME}/.winrar/drive_c
+  ln -s ${PROGDIR}/WINRAR/drive_c ${HOME}/.winrar/drive_c
 else
   rm ${HOME}/.winrar/drive_c 
-  ln -s /Programs/${PROGDIR}/WINRAR/drive_c ${HOME}/.winrar/drive_c
+  ln -s ${PROGDIR}/WINRAR/drive_c ${HOME}/.winrar/drive_c
 fi
 
 export WINEPREFIX="${HOME}/.winrar"
-/Programs/${PROGDIR}/bin/wine "${HOME}/.winrar/drive_c/Program Files/WinRAR/WinRAR.exe" "$@"
+${PROGDIR}/bin/wine "${HOME}/.winrar/drive_c/Program Files/WinRAR/WinRAR.exe" "$@"
 

Modified: pbibuild/modules/utilities/winrar3/overlay-dir/winrar.desktop
===================================================================
--- pbibuild/modules/utilities/winrar3/overlay-dir/winrar.desktop	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/utilities/winrar3/overlay-dir/winrar.desktop	2009-12-07 21:00:36 UTC (rev 5282)
@@ -15,7 +15,7 @@
 Name[pl]=Otwórz w Winrar
 Name[de]=Öffnen mit Winrar
 Icon=winrar
-Exec=winrar "`/Programs/WinRARCHANGEME/bin/winepath -w %f`"
+Exec=winrar "`CHANGEME/bin/winepath -w %f`"
 
 
 
@@ -27,7 +27,7 @@
 Name[pl]=Wypakuj tutaj
 Name[de]=Hier entpacken
 Icon=winrar
-Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -iext -ow -ver  "`/Programs/WinRARCHANGEME/bin/winepath -w ./.winerartmp/`*.*" "`/Programs/WinRARCHANGEME/bin/winepath -w ./`" ; rm -R ./.winerartmp
+Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -iext -ow -ver  "`CHANGEME/bin/winepath -w ./.winerartmp/`*.*" "`CHANGEME/bin/winepath -w ./`" ; rm -R ./.winerartmp
 
 
 
@@ -39,7 +39,7 @@
 Name[pl]=Wypakuj do folderu
 Name[de]=Entpacken in Ordner
 Icon=winrar
-Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -ow -ver -ad "`/Programs/WinRARCHANGEME/bin/winepath -w ./.winerartmp/`*.*" "`/Programs/WinRARCHANGEME/bin/winepath -w ./`" ; rm -R ./.winerartmp
+Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -ow -ver -ad "`CHANGEME/bin/winepath -w ./.winerartmp/`*.*" "`CHANGEME/bin/winepath -w ./`" ; rm -R ./.winerartmp
 
 
 
@@ -51,7 +51,7 @@
 Name[pl]=Wypakuj pliki...
 Name[de]=Entpacken nach...
 Icon=winrar
-Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -iext -ow -ver -- "`/Programs/WinRARCHANGEME/bin/winepath -w ./.winerartmp/`*.*" '?\' ; rm -R ./.winerartmp
+Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar x -iext -ow -ver -- "`CHANGEME/bin/winepath -w ./.winerartmp/`*.*" '?\' ; rm -R ./.winerartmp
 
 
 
@@ -63,7 +63,7 @@
 Name[pl]=Szybka kompresja
 Name[de]=Schnell komprimieren
 Icon=winrar
-Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar a -r -ep1 -iext "`kdialog --inputbox 'Please, enter the archive name' \`basename %F\`  `".rar "`/Programs/WinRARCHANGEME/bin/winepath -w ./.winerartmp/`*" ; rm -R ./.winerartmp
+Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar a -r -ep1 -iext "`kdialog --inputbox 'Please, enter the archive name' \`basename %F\`  `".rar "`CHANGEME/bin/winepath -w ./.winerartmp/`*" ; rm -R ./.winerartmp
 
 
 
@@ -75,7 +75,7 @@
 Name[pl]=Kompresuj...
 Name[de]=Komprimieren...
 Icon=winrar
-Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar a -r -iext -ep1 -- . "`/Programs/WinRARCHANGEME/bin/winepath -w ./.winerartmp/`*" ; rm -R ./.winerartmp
+Exec=cd %D ; rm -R ./.winerartmp;mkdir ./.winerartmp/;ln -s %F ./.winerartmp;winrar a -r -iext -ep1 -- . "`CHANGEME/bin/winepath -w ./.winerartmp/`*" ; rm -R ./.winerartmp
 
 
 
@@ -87,4 +87,4 @@
 Name[pl]=Napraw archiwum
 Name[de]=Archiv reparieren
 Icon=winrar
-Exec=cd %D ;winrar R "`/Programs/WinRARCHANGEME/bin/winepath -w %f`"
+Exec=cd %D ;winrar R "`CHANGEME/bin/winepath -w %f`"

Modified: pbibuild/modules/webbrowsers/firefox35/build.sh
===================================================================
--- pbibuild/modules/webbrowsers/firefox35/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/webbrowsers/firefox35/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,15 +4,14 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,Firefox${PORTVER},g" ${PBIDIR}/bin/firefox3.sh > /tmp/sed
-mv /tmp/sed ${PBIDIR}/bin/firefox3.sh
-chmod 755 ${PBIDIR}/bin/firefox3.sh
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/bin/firefox3.sh
 
 rm -rf /${PBIDIR}/autolibs/firefox3/extensions/lang*
 
@@ -20,8 +19,7 @@
 tar cvf - -C /usr/local/lib/xpi/ . | tar xvf - -C ${PBIDIR}/autolibs/firefox3/extensions/
 
 # We need to setup the mimeTypes.rdf file, so that FF3 can use the defaultemail script
-sed -e "s,CHANGEME,Firefox${PORTVER},g" ${PBIDIR}/mimeTypes.rdf > /tmp/sed
-mv /tmp/sed ${PBIDIR}/lib/firefox3/defaults/profile/mimeTypes.rdf
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/mimeTypes.rdf
 
 # Save a print setting for ff3
 echo "pref(\"print.whileInPrintPreview\", true);" >> ${PBIDIR}/lib/firefox3/greprefs/all.js

Modified: pbibuild/modules/webbrowsers/firefox35/overlay-dir/bin/firefox3.sh
===================================================================
--- pbibuild/modules/webbrowsers/firefox35/overlay-dir/bin/firefox3.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/webbrowsers/firefox35/overlay-dir/bin/firefox3.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -26,11 +26,11 @@
     kdialog --title "Firefox is not the default browser" --yesno "Do you wish to make Firefox your default browser?" --dontagain ${HOMEDIR}/.mozilla/firefox/askdefault:prompt
     if [ "$?" = "0" ]
     then
-       /Programs/${PROGDIR}/makedefault.sh
+       ${PROGDIR}/makedefault.sh
     fi
 
   fi
 
 fi
 
-/Programs/${PROGDIR}/bin/firefox3 "$@"
+${PROGDIR}/bin/firefox3 "$@"

Modified: pbibuild/modules/webbrowsers/firefox35/overlay-dir/mimeTypes.rdf
===================================================================
--- pbibuild/modules/webbrowsers/firefox35/overlay-dir/mimeTypes.rdf	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/webbrowsers/firefox35/overlay-dir/mimeTypes.rdf	2009-12-07 21:00:36 UTC (rev 5282)
@@ -103,9 +103,9 @@
 <RDF:Description RDF:about="urn:handler:web:https://mail.google.com/mail/?extsrc=mailto&amp;url=%s"
                    NC:prettyName="Gmail"
                    NC:uriTemplate="https://mail.google.com/mail/?extsrc=mailto&amp;url=%s" />
-<RDF:Description RDF:about="urn:handler:local:/Programs/CHANGEME/bin/defaultemail"
+<RDF:Description RDF:about="urn:handler:local:CHANGEME/bin/defaultemail"
                    NC:prettyName="ExternalMail"
-                   NC:path="/Programs/CHANGEME/bin/defaultemail" />
+                   NC:path="CHANGEME/bin/defaultemail" />
 	 	  
 
 

Modified: pbibuild/modules/webbrowsers/firefox35/pbi.conf
===================================================================
--- pbibuild/modules/webbrowsers/firefox35/pbi.conf	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/webbrowsers/firefox35/pbi.conf	2009-12-07 21:00:36 UTC (rev 5282)
@@ -41,6 +41,6 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="01"
+BUILDKEY="02"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/webbrowsers/flock/build.sh
===================================================================
--- pbibuild/modules/webbrowsers/flock/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/webbrowsers/flock/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,21 +4,19 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Now append our prefs file with the default email script
-echo "pref(\"network.protocol-handler.app.mailto\", \"/Programs/Flock${PORTVER}/bin/defaultemail\");" >> ${PBIDIR}/lib/flock/greprefs/all.js
+echo "pref(\"network.protocol-handler.app.mailto\", \"${PBI_TARGETFULLDIR}/bin/defaultemail\");" >> ${PBIDIR}/lib/flock/greprefs/all.js
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,Flock${PORTVER},g" ${PBIDIR}/bin/flock-browser.sh > /tmp/sed
-mv /tmp/sed ${PBIDIR}/bin/flock-browser.sh
-chmod 755 ${PBIDIR}/bin/flock-browser.sh
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${PBIDIR}/bin/flock-browser.sh
 chmod 755 ${PBIDIR}/makedefault.sh
 
 
 # We need to setup the mimeTypes.rdf file, so that FF3 can use the defaultemail script
-sed -e "s,CHANGEME,Flock${PORTVER},g" ${PBIDIR}/mimeTypes.rdf > /tmp/sed
-mv /tmp/sed ${PBIDIR}/lib/flock-2.0/defaults/profile/mimeTypes.rdf
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${PBIDIR}/mimeTypes.rdf

Modified: pbibuild/modules/webbrowsers/iexplorer5.5/build.sh
===================================================================
--- pbibuild/modules/webbrowsers/iexplorer5.5/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/webbrowsers/iexplorer5.5/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,15 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Save the right progname / version in the iexplorer6
-sed -e "s,CHANGEME,IExplorer5.5${PORTVER},g" ${PBIDIR}/bin/iexplorer55 > /tmp/iexplorer55
-mv /tmp/iexplorer7 ${PBIDIR}/bin/iexplorer55
-chmod 755 ${PBIDIR}/scripts/iexplorer55
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${PBIDIR}/bin/iexplorer55
 
 # Download the wine package
 cd ${PBIDIR}/

Modified: pbibuild/modules/webbrowsers/iexplorer6/build.sh
===================================================================
--- pbibuild/modules/webbrowsers/iexplorer6/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/webbrowsers/iexplorer6/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,15 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Save the right progname / version in the iexplorer6
-sed -e "s,CHANGEME,${PORTVER},g" ${PBIDIR}/bin/iexplorer6 > /tmp/iexplorer6
-mv /tmp/iexplorer6 ${PBIDIR}/bin/iexplorer6
-chmod 755 ${PBIDIR}/bin/iexplorer6
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/bin/iexplorer6
 
 # Download the wine package
 cd ${PBIDIR}/

Modified: pbibuild/modules/webbrowsers/iexplorer6/overlay-dir/bin/iexplorer6
===================================================================
--- pbibuild/modules/webbrowsers/iexplorer6/overlay-dir/bin/iexplorer6	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/webbrowsers/iexplorer6/overlay-dir/bin/iexplorer6	2009-12-07 21:00:36 UTC (rev 5282)
@@ -1,18 +1,17 @@
 #!/bin/sh
-VER="CHANGEME"
-PROGDIR="IExplorer6${VER}"
+PROGDIR="CHANGEME"
 
 if [ ! -e "${HOME}/.ie6" ]
 then
   mkdir ${HOME}/.ie6
-  cp /Programs/${PROGDIR}/ie6/*.reg ${HOME}/.ie6/
-  ln -s /Programs/${PROGDIR}/ie6/drive_c ${HOME}/.ie6/drive_c
+  cp ${PROGDIR}/ie6/*.reg ${HOME}/.ie6/
+  ln -s ${PROGDIR}/ie6/drive_c ${HOME}/.ie6/drive_c
 else
   rm ${HOME}/.ie6/drive_c 
-  ln -s /Programs/${PROGDIR}/ie6/drive_c ${HOME}/.ie6/drive_c
+  ln -s ${PROGDIR}/ie6/drive_c ${HOME}/.ie6/drive_c
 fi
 
 sleep 1
 export WINEPREFIX="${HOME}/.ie6"
-/Programs/${PROGDIR}/bin/wine "${HOME}/.ie6/drive_c/Program Files/Internet Explorer/iexplore.exe" "$@"
+${PROGDIR}/bin/wine "${HOME}/.ie6/drive_c/Program Files/Internet Explorer/iexplore.exe" "$@"
 

Modified: pbibuild/modules/webbrowsers/iexplorer7/build.sh
===================================================================
--- pbibuild/modules/webbrowsers/iexplorer7/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/webbrowsers/iexplorer7/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,15 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Save the right progname / version in the iexplorer6
-sed -e "s,CHANGEME,IExplorer7${PORTVER},g" ${PBIDIR}/bin/iexplorer7 > /tmp/iexplorer7
-mv /tmp/iexplorer7 ${PBIDIR}/bin/iexplorer7
-chmod 755 ${PBIDIR}/scripts/iexplorer7
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${PBIDIR}/bin/iexplorer7
 
 # Download the wine package
 cd ${PBIDIR}/

Modified: pbibuild/modules/webbrowsers/iexplorer7/pbi.conf
===================================================================
--- pbibuild/modules/webbrowsers/iexplorer7/pbi.conf	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/webbrowsers/iexplorer7/pbi.conf	2009-12-07 21:00:36 UTC (rev 5282)
@@ -32,7 +32,7 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="02"
+BUILDKEY="01"
 
 # Don't build this PBI on certian processors (i386 / amd64)
 ARCHIGNORE="amd64" ; export ARCHIGNORE

Modified: pbibuild/modules/webbrowsers/netscape/build.sh
===================================================================
--- pbibuild/modules/webbrowsers/netscape/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/webbrowsers/netscape/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,15 +4,14 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,Netscape${PORTVER},g" ${PBIDIR}/bin/netscape > /tmp/netscape
-mv /tmp/netscape ${PBIDIR}/bin/netscape
-chmod 755 ${PBIDIR}/bin/netscape
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${PBIDIR}/bin/netscape
 
 # Download the wine package
 cd ${PBIDIR}/

Modified: pbibuild/modules/webbrowsers/opera/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/webbrowsers/opera/overlay-dir/PBI.SetupScript.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/webbrowsers/opera/overlay-dir/PBI.SetupScript.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -25,9 +25,7 @@
   ln -s /PCBSD/local/lib/X11 /Programs/${PROGDIR}/lib/X11
 
   # Fix the plugin search paths
-  cat /Programs/${PROGDIR}/share/opera/defaults/pluginpath.ini | sed -e "s|/usr/local|/usr/PCBSD/local|g" \
-      > /Programs/${PROGDIR}/share/opera/defaults/pluginpath.ini.new
-  mv /Programs/${PROGDIR}/share/opera/defaults/pluginpath.ini.new /Programs/${PROGDIR}/share/opera/defaults/pluginpath.ini
+  sed -i.bak "s|/usr/local|/usr/PCBSD/local|g" \ /Programs/${PROGDIR}/share/opera/defaults/pluginpath.ini
 else
   ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
   ln -s /usr/local/lib/X11 /Programs/${PROGDIR}/lib/X11

Modified: pbibuild/modules/webbrowsers/winfirefox2/build.sh
===================================================================
--- pbibuild/modules/webbrowsers/winfirefox2/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/webbrowsers/winfirefox2/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,15 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Save the right version number in the winfirefox3 script
-sed -e "s,CHANGEME,${PORTVER},g" ${PBIDIR}/bin/winfirefox2 > /tmp/winfirefox2
-mv /tmp/winfirefox2 ${PBIDIR}/bin/winfirefox2
-chmod 755 ${PBIDIR}/bin/winfirefox2
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/bin/winfirefox2
 
 # Download the wine package
 cd ${PBIDIR}/

Modified: pbibuild/modules/webbrowsers/winfirefox2/overlay-dir/bin/winfirefox2
===================================================================
--- pbibuild/modules/webbrowsers/winfirefox2/overlay-dir/bin/winfirefox2	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/webbrowsers/winfirefox2/overlay-dir/bin/winfirefox2	2009-12-07 21:00:36 UTC (rev 5282)
@@ -1,6 +1,5 @@
 #!/bin/sh
-VER="CHANGEME"
-PROGDIR="WinFirefox2${VER}"
+PROGDIR="CHANGEME"
 cd
-export WINEPREFIX="/Programs/${PROGDIR}/WINFF"
-/Programs/${PROGDIR}/bin/wine "/Programs/${PROGDIR}/WINFF/drive_c/Program Files/Mozilla Firefox/firefox.exe" "$@"
+export WINEPREFIX="${PROGDIR}/WINFF"
+${PROGDIR}/bin/wine "${PROGDIR}/WINFF/drive_c/Program Files/Mozilla Firefox/firefox.exe" "$@"

Modified: pbibuild/modules/webbrowsers/winfirefox3/build.sh
===================================================================
--- pbibuild/modules/webbrowsers/winfirefox3/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/webbrowsers/winfirefox3/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,15 +4,15 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Save the right version number in the winfirefox3 script
-sed -e "s,CHANGEME,${PORTVER},g" ${PBIDIR}/bin/winfirefox3 > /tmp/winfirefox3
-mv /tmp/winfirefox3 ${PBIDIR}/bin/winfirefox3
-chmod 755 ${PBIDIR}/bin/winfirefox3
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/bin/winfirefox3
 
 # Download the wine package
 cd ${PBIDIR}/

Modified: pbibuild/modules/webbrowsers/winfirefox3/overlay-dir/bin/winfirefox3
===================================================================
--- pbibuild/modules/webbrowsers/winfirefox3/overlay-dir/bin/winfirefox3	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/webbrowsers/winfirefox3/overlay-dir/bin/winfirefox3	2009-12-07 21:00:36 UTC (rev 5282)
@@ -1,15 +1,14 @@
 #!/bin/sh
-VER="CHANGEME"
-PROGDIR="WinFirefox3${VER}"
+PROGDIR="CHANGEME"
 
 if [ ! -e "${HOME}/.winff3" ]
 then
   mkdir ${HOME}/.winff3
-  ln -s /Programs/${PROGDIR}/WINFF/drive_c ${HOME}/.winff3/drive_c
+  ln -s ${PROGDIR}/WINFF/drive_c ${HOME}/.winff3/drive_c
 else
   rm ${HOME}/.winff3/drive_c 
-  ln -s /Programs/${PROGDIR}/WINFF/drive_c ${HOME}/.winff3/drive_c
+  ln -s ${PROGDIR}/WINFF/drive_c ${HOME}/.winff3/drive_c
 fi
 
 export WINEPREFIX="${HOME}/.winff3"
-/Programs/${PROGDIR}/bin/wine "${HOME}/.winff3/drive_c/Program Files/Mozilla Firefox/firefox.exe" "$@"
+${PROGDIR}/bin/wine "${HOME}/.winff3/drive_c/Program Files/Mozilla Firefox/firefox.exe" "$@"

Modified: pbibuild/modules/windowmanager/enlightenment/build.sh
===================================================================
--- pbibuild/modules/windowmanager/enlightenment/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/windowmanager/enlightenment/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,14 +4,9 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
-
-# Save the right version number in the gnome-session.sh script
-#sed -e "s,CHANGEME,Gnome${PORTVER},g" ${PBIDIR}/bin/gnome-session.sh > /tmp/sed
-#mv /tmp/sed ${PBIDIR}/bin/gnome-session.sh
-#chmod 755 ${PBIDIR}/bin/gnome-session.sh
-
-

Modified: pbibuild/modules/windowmanager/gnome/build.sh
===================================================================
--- pbibuild/modules/windowmanager/gnome/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/windowmanager/gnome/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,14 +4,12 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 # Save the right version number in the gnome-session.sh script
-sed -e "s,CHANGEME,Gnome${PORTVER},g" ${PBIDIR}/bin/gnome-session.sh > /tmp/sed
-mv /tmp/sed ${PBIDIR}/bin/gnome-session.sh
-chmod 755 ${PBIDIR}/bin/gnome-session.sh
-
-
+sed -i.bak "s,CHANGEME,${PBI_TARGETDIR},g" ${PBIDIR}/bin/gnome-session.sh

Modified: pbibuild/modules/windowmanager/kde3/build.sh
===================================================================
--- pbibuild/modules/windowmanager/kde3/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/windowmanager/kde3/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,16 +4,11 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 mv ${PBIDIR}/bin/startkde ${PBIDIR}/bin/startkde3
-
-# Save the right version number in the gnome-session.sh script
-#sed -e "s,CHANGEME,KDE${PORTVER},g" ${PBIDIR}/kde3.desktop > /tmp/sed
-#mv /tmp/sed ${PBIDIR}/kde3.desktop
-#chmod 755 ${PBIDIR}/kde3.desktop
-
-

Modified: pbibuild/modules/x11-fm/rox-filer/build.sh
===================================================================
--- pbibuild/modules/x11-fm/rox-filer/build.sh	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/x11-fm/rox-filer/build.sh	2009-12-07 21:00:36 UTC (rev 5282)
@@ -4,17 +4,16 @@
 # Build your PBI here, and exit 0 on success, or exit 1 on failure.
 ##############################################################################
 # Available Variables
-#    PBIDIR = The location of where you can populate your PBI directory
-# MODULEDIR = The location of the module directory for this PBI
-#   PORTVER = Version number of the port we used to build
+#  PBI_TARGETFULLDIR = The target location of the installed application (/Programs/FireFox)
+#      PBI_TARGETDIR = The target directory name of the installed application (FireFox)
+#         PBI_CURDIR = The current location of where you can populate your PBI directory
+#        PBI_VERSION = Version number of this PBI
+#          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
 
 # Save the path info in the .desktop file
-sed -e "s,CHANGEME,/Programs/ROXFiler${PORTVER},g" ${PBIDIR}/rox.desktop > /tmp/sed
-cp /tmp/sed ${PBIDIR}/rox.desktop
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/rox.desktop
 
 # Fix up the rox-session file
-sed -e "s,exec,export PATH ; export LD_LIBRARY_PATH ; exec,g" ${PBIDIR}/sbin/rox-session > /tmp/sed
-cp /tmp/sed ${PBIDIR}/sbin/rox-session
-chmod 755 ${PBIDIR}/sbin/rox-session
+sed -i.bak "s,exec,export PATH ; export LD_LIBRARY_PATH ; exec,g" ${PBIDIR}/sbin/rox-session

Modified: pbibuild/modules/x11-fm/rox-filer/pbi.conf
===================================================================
--- pbibuild/modules/x11-fm/rox-filer/pbi.conf	2009-12-07 19:16:32 UTC (rev 5281)
+++ pbibuild/modules/x11-fm/rox-filer/pbi.conf	2009-12-07 21:00:36 UTC (rev 5282)
@@ -39,6 +39,6 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="02"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY



More information about the Commits mailing list