[PC-BSD Commits] r3348 - in pbibuild/modules: warzone warzone/kmenu-dir warzone/overlay-dir webmin webmin/overlay-dir wesnoth wesnoth/overlay-dir widelands widelands/overlay-dir wine wine/overlay-dir worldofpadman worldofpadman/overlay-dir wormux wormux/kmenu-dir wormux/overlay-dir wxdfast wxdfast/overlay-dir xastir xastir/kmenu-dir xastir/overlay-dir xchat xchat/overlay-dir xlog xlog/overlay-dir yakuake yakuake/overlay-dir zsh/overlay-dir zsnes zsnes/overlay-dir

svn at pcbsd.org svn at pcbsd.org
Tue Jan 27 12:27:05 PST 2009


Author: kris
Date: 2009-01-27 12:27:05 -0800 (Tue, 27 Jan 2009)
New Revision: 3348

Added:
   pbibuild/modules/xastir/overlay-dir/xastir.png
Removed:
   pbibuild/modules/warzone/kmenu-dir/uninstall
   pbibuild/modules/warzone/overlay-dir/scripts/
   pbibuild/modules/wormux/kmenu-dir/uninstall
   pbibuild/modules/wormux/overlay-dir/scripts/
   pbibuild/modules/xastir/overlay-dir/xastir.xpm
   pbibuild/modules/zsh/overlay-dir/scripts/
Modified:
   pbibuild/modules/warzone/build.sh
   pbibuild/modules/warzone/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/warzone/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/warzone/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/warzone/pbi.conf
   pbibuild/modules/webmin/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/webmin/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/webmin/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/webmin/pbi.conf
   pbibuild/modules/wesnoth/build.sh
   pbibuild/modules/wesnoth/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/wesnoth/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/wesnoth/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/wesnoth/pbi.conf
   pbibuild/modules/widelands/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/widelands/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/widelands/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/widelands/pbi.conf
   pbibuild/modules/wine/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/wine/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/wine/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/wine/pbi.conf
   pbibuild/modules/worldofpadman/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/worldofpadman/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/worldofpadman/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/worldofpadman/pbi.conf
   pbibuild/modules/wormux/build.sh
   pbibuild/modules/wormux/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/wormux/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/wormux/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/wormux/pbi.conf
   pbibuild/modules/wxdfast/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/wxdfast/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/wxdfast/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/wxdfast/pbi.conf
   pbibuild/modules/xastir/kmenu-dir/xastir
   pbibuild/modules/xastir/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/xastir/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/xastir/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/xastir/pbi.conf
   pbibuild/modules/xchat/build.sh
   pbibuild/modules/xchat/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/xchat/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/xchat/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/xchat/pbi.conf
   pbibuild/modules/xlog/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/xlog/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/xlog/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/xlog/pbi.conf
   pbibuild/modules/yakuake/build.sh
   pbibuild/modules/yakuake/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/yakuake/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/yakuake/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/yakuake/pbi.conf
   pbibuild/modules/zsh/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/zsh/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/zsh/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/zsnes/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/zsnes/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/zsnes/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/zsnes/pbi.conf
Log:

updated warzone, webmin, wesnoth, widelands, wine, worldofpadman, wormux, wxd, xastir, xchat, xlog, yak, zsh, zsnes to be 100% self-contained. The webmin PBI will need to be applied to 7.1 systems, since it is set to use /Programs/rc.d now instead of /usr/local/etc/rc.d



Modified: pbibuild/modules/warzone/build.sh
===================================================================
--- pbibuild/modules/warzone/build.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/warzone/build.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -9,7 +9,3 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,Warzone2100${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/warzone/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/warzone/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/warzone/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -16,42 +16,3 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-if [ -e "/usr/local/bin/warzone2100" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/warzone2100 | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "Warzone 2100 is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/warzone2100 | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep Warzone2100 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "Warzone 2100 could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "Warzone 2100 is already installed, it must be uninstalled before loading this PBI"
-        return 2
-      fi
-      
-    else
-      # Could not find a link to PBI folder
-      kdialog --sorry "Warzone 2100 is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi
-
-#3D APPLICATION: 3D ACC IS NEEDED
- 
-glxinfo | grep "direct rendering:" | grep " Yes" 2>/dev/null
-if [ "$?" != "0" ]
-then
-   kdialog --msgbox "Your system does not appear to have hardware 3D 
-support enabled. This application requires 3D acceleration to function 
-properly."
-fi

Modified: pbibuild/modules/warzone/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/warzone/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/warzone/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -7,9 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm -fR /usr/local/bin/warzone2100
-rm -fR /usr/local/share/doc/warzone2100
-rm -fR /usr/local/share/warzone2100
 cd /home 
 for i in `ls` 
 do 

Modified: pbibuild/modules/warzone/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/warzone/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/warzone/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -14,13 +14,14 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-rm /usr/local/bin/warzone2100
-rm /usr/local/share/doc/warzone2100
-rm /usr/local/share/warzone2100
 
-ln -s /Programs/${PROGDIR}/.sbin/warzone2100 /usr/local/bin/warzone2100
-ln -s /Programs/${PROGDIR}/share/doc/warzone2100/ /usr/local/share/doc/warzone2100
-ln -s /Programs/${PROGDIR}/share/warzone2100/ /usr/local/share/warzone2100
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
 
-echo "LAUNCHCLOSE: /usr/local/bin/warzone2100"
+echo "LAUNCHCLOSE: /Programs/bin/warzone2100"
 

Modified: pbibuild/modules/warzone/pbi.conf
===================================================================
--- pbibuild/modules/warzone/pbi.conf	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/warzone/pbi.conf	2009-01-27 20:27:05 UTC (rev 3348)
@@ -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="05"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/webmin/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/webmin/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/webmin/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -12,10 +12,3 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-INSTALLED=`ls /Programs | grep Webmin`
-if [ $? = 0 ]
-then
-	kdialog --msgbox "Please remove the previous version of Webmin first"
-	exit 2
-fi
-

Modified: pbibuild/modules/webmin/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/webmin/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/webmin/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -7,12 +7,10 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-/usr/local/etc/rc.d/webmin stop
+/Programs/rc.d/webmin stop
 killall -9 webmin
-rm /usr/local/lib/webmin
 rm /PCBSD/Services/webmin
-rm /usr/local/etc/rc.d/webmin
-rm -Rf /usr/local/etc/webmin/
+rm /Programs/rc.d/webmin
 rm -Rf /var/log/webmin
 
 cat /etc/rc.conf | grep -v "webmin_enable=" > /tmp/.rc.conf

Modified: pbibuild/modules/webmin/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/webmin/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/webmin/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -17,9 +17,8 @@
 
 cd /Programs/${PROGDIR}
 
-ln -s /Programs/${PROGDIR}/autolibs/webmin /usr/local/lib/webmin
 ln -s /Programs/${PROGDIR}/services/webmin /PCBSD/Services/webmin
-ln -s /Programs/${PROGDIR}/etc/rc.d/webmin /usr/local/etc/rc.d/webmin
+ln -s /Programs/${PROGDIR}/etc/rc.d/webmin /Programs/rc.d/webmin
 
 chmod -Rf 755 /Programs/${PROGDIR}/services/webmin/*
 
@@ -33,7 +32,7 @@
 echo "MSG: Starting webmin..."
 echo "" >> /etc/rc.conf
 echo "webmin_enable=\"YES\"" >> /etc/rc.conf
-/usr/local/etc/rc.d/webmin start
+/Programs/rc.d/webmin start
 
 echo "MSG: Finished!"
 echo "SETSETPS: 4"

Modified: pbibuild/modules/webmin/pbi.conf
===================================================================
--- pbibuild/modules/webmin/pbi.conf	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/webmin/pbi.conf	2009-01-27 20:27:05 UTC (rev 3348)
@@ -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="15"
+BUILDKEY="01"
 
 # If this port has a non-standard port version variable in Makefile, then
 # list the key here such as "OOOVERSION="

Modified: pbibuild/modules/wesnoth/build.sh
===================================================================
--- pbibuild/modules/wesnoth/build.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/wesnoth/build.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -9,36 +9,3 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
-
-# Get all the various language files and copy them to the PBI
-LANGFILE="wesnoth.mo"
-LANGFILE1="wesnoth-editor.mo"
-LANGFILE2="wesnoth-ei.mo"
-LANGFILE3="wesnoth-httt.mo"
-LANGFILE4="wesnoth-lib.mo"
-LANGFILE5="wesnoth-tb.mo"
-LANGFILE6="wesnoth-trow.mo"
-LANGFILE7="wesnoth-tsg.mo"
-LANGFILE8="wesnoth-tutorial.mo"
-LANGFILE9="wesnoth-utbs.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}/
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE1} ${PBIDIR}/locale/${i}/
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE2} ${PBIDIR}/locale/${i}/
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE3} ${PBIDIR}/locale/${i}/
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE4} ${PBIDIR}/locale/${i}/
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE5} ${PBIDIR}/locale/${i}/
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE6} ${PBIDIR}/locale/${i}/
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE7} ${PBIDIR}/locale/${i}/
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE8} ${PBIDIR}/locale/${i}/
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE9} ${PBIDIR}/locale/${i}/
-  fi
-done
-
-

Modified: pbibuild/modules/wesnoth/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/wesnoth/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/wesnoth/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -12,9 +12,3 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-INSTALLED=`ls /Programs | grep Wesnoth`
-if [ $? = 0 ]
-then
-	kdialog --msgbox "Please remove the previous version of Wesnoth first!"
-	exit 2
-fi

Modified: pbibuild/modules/wesnoth/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/wesnoth/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/wesnoth/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -7,38 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/bin/wesnoth
-rm /usr/local/share/wesnoth
-
-
-
-# Remove the old locale files since we are uninstalling
-LANGFILE="wesnoth.mo"
-LANGFILE1="wesnoth-editor.mo"
-LANGFILE2="wesnoth-ei.mo"
-LANGFILE3="wesnoth-httt.mo"
-LANGFILE4="wesnoth-lib.mo"
-LANGFILE5="wesnoth-tb.mo"
-LANGFILE6="wesnoth-trow.mo"
-LANGFILE7="wesnoth-tsg.mo"
-LANGFILE8="wesnoth-tutorial.mo"
-LANGFILE9="wesnoth-utbs.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE1}
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE2}
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE3}
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE4}
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE5}
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE6}
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE7}
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE8}
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE9}
-done
-
-
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/wesnoth/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/wesnoth/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/wesnoth/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -12,36 +12,12 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-ln -s /Programs/${PROGDIR}/.sbin/wesnoth /usr/local/bin/wesnoth
-ln -s /Programs/${PROGDIR}/share/wesnoth /usr/local/share/wesnoth
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
 
-
-# Copy over all the LANG files
-LANGFILE="wesnoth.mo"
-LANGFILE1="wesnoth-editor.mo"
-LANGFILE2="wesnoth-ei.mo"
-LANGFILE3="wesnoth-httt.mo"
-LANGFILE4="wesnoth-lib.mo"
-LANGFILE5="wesnoth-tb.mo"
-LANGFILE6="wesnoth-trow.mo"
-LANGFILE7="wesnoth-tsg.mo"
-LANGFILE8="wesnoth-tutorial.mo"
-LANGFILE9="wesnoth-utbs.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  mkdir -p /usr/local/share/locale/${i}/LC_MESSAGES >/dev/null 2>/dev/null
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE1} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE1}
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE2} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE2}
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE3} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE3}
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE4} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE4}
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE5} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE5}
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE6} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE6}
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE7} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE7}
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE8} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE8}
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE9} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE9}
-done
-
-
 echo "LAUNCHCLOSE: /Programs/${PROGDIR}/.sbin/wesnoth"

Modified: pbibuild/modules/wesnoth/pbi.conf
===================================================================
--- pbibuild/modules/wesnoth/pbi.conf	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/wesnoth/pbi.conf	2009-01-27 20:27:05 UTC (rev 3348)
@@ -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="15"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/widelands/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/widelands/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/widelands/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -16,33 +16,3 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-
-if [ -e "/usr/local/bin/widelands" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/widelands | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "Widelands is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/widelands | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep Widelands 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "Widelands could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "Widelands is already installed, it must be uninstalled before loading this PBI"
-        return 2
-      fi
-      
-    else
-      # Could not find a link to PBI folder
-      kdialog --sorry "Widelands is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 

Modified: pbibuild/modules/widelands/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/widelands/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/widelands/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -6,8 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/widelands
-rm -fR /usr/local/share/widelands
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/widelands/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/widelands/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/widelands/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -14,6 +14,13 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR}/.sbin/widelands /usr/local/bin/widelands
-ln -s /Programs/${PROGDIR}/share/widelands /usr/local/share/widelands
-echo "LAUNCHCLOSE: /usr/local/bin/widelands"
+
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
+
+echo "LAUNCHCLOSE: /Programs/bin/widelands"

Modified: pbibuild/modules/widelands/pbi.conf
===================================================================
--- pbibuild/modules/widelands/pbi.conf	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/widelands/pbi.conf	2009-01-27 20:27:05 UTC (rev 3348)
@@ -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="04"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/wine/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/wine/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/wine/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -1,7 +1 @@
 #!/bin/sh
-
-if [ -e "/usr/local/bin/wine" ]
-then
-	kdialog --msgbox "Please remove the previous version of Wine first"
-	exit 2
-fi
\ No newline at end of file

Modified: pbibuild/modules/wine/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/wine/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/wine/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -6,13 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm  /usr/local/bin/wine
-rm  /usr/local/bin/wineserver
-rm  /usr/local/bin/wineprefixcreate
-rm  /usr/local/bin/regedit
-rm  /usr/local/bin/notepad
-rm  /usr/local/bin/winecfg
-
 cd /home 
  for i in `ls` 
  do 

Modified: pbibuild/modules/wine/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/wine/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/wine/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -14,9 +14,3 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -fs /Programs/${PROGDIR}/.sbin/wine /usr/local/bin/wine
-ln -fs /Programs/${PROGDIR}/.sbin/wineserver /usr/local/bin/wineserver
-ln -fs /Programs/${PROGDIR}/.sbin/wineprefixcreate /usr/local/bin/wineprefixcreate
-ln -fs /Programs/${PROGDIR}/.sbin/regedit /usr/local/bin/regedit
-ln -fs /Programs/${PROGDIR}/.sbin/notepad /usr/local/bin/notepad
-ln -fs /Programs/${PROGDIR}/.sbin/winecfg /usr/local/bin/winecfg

Modified: pbibuild/modules/wine/pbi.conf
===================================================================
--- pbibuild/modules/wine/pbi.conf	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/wine/pbi.conf	2009-01-27 20:27:05 UTC (rev 3348)
@@ -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="51"
 
 # Don't build this PBI on certian processors (i386 / amd64)
 ARCHIGNORE="amd64" ; export ARCHIGNORE

Modified: pbibuild/modules/worldofpadman/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/worldofpadman/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/worldofpadman/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -16,39 +16,3 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-
-if [ ! -z "$DISPLAY" ]
-then
-
-
-if [ -e "/usr/local/bin/worldofpadman" ]
-then
-    # Looks like WOP is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/worldofpadman | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "WoP is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/worldofpadman | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep WorldOfPadman 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "WoP could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "WoP is already installed, it must be uninstalled before loading this PBI"
-        return 2
-      fi
-      
-    else
-      # Could not find a link to PBI folder
-      kdialog --sorry "WoP is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 
-
-fi

Modified: pbibuild/modules/worldofpadman/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/worldofpadman/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/worldofpadman/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -7,11 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/bin/worldofpadman
-rm /usr/local/bin/worldofpadman-smp
-rm /usr/local/share/worldofpadman
-rm /usr/local/share/pixmaps/worldofpadman.png
-
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/worldofpadman/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/worldofpadman/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/worldofpadman/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -14,9 +14,13 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR}/.sbin/worldofpadman /usr/local/bin/worldofpadman
-ln -s /Programs/${PROGDIR}/.sbin/worldofpadman-smp /usr/local/bin/worldofpadman-smp
-ln -s /Programs/${PROGDIR}/share/worldofpadman /usr/local/share/worldofpadman
-ln -s /Programs/${PROGDIR}/share/pixmaps/worldofpadman.png /usr/local/share/pixmaps/worldofpadman.png
 
-echo "LAUNCHCLOSE: /usr/local/bin/worldofpadman"
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
+
+echo "LAUNCHCLOSE: /Programs/bin/worldofpadman"

Modified: pbibuild/modules/worldofpadman/pbi.conf
===================================================================
--- pbibuild/modules/worldofpadman/pbi.conf	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/worldofpadman/pbi.conf	2009-01-27 20:27:05 UTC (rev 3348)
@@ -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="61"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/wormux/build.sh
===================================================================
--- pbibuild/modules/wormux/build.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/wormux/build.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -8,21 +8,3 @@
 # MODULEDIR = The location of the module directory for this PBI
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
-
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,Wormux${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="wormux.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
\ No newline at end of file

Modified: pbibuild/modules/wormux/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/wormux/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/wormux/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -15,43 +15,3 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-
-if [ -e "/usr/local/bin/wormux" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/wormux | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "Wormux is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/wormux | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep Wormux 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "Wormux could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "Wormux is already installed, it must be uninstalled before loading this PBI"
-        return 2
-      fi
-      
-    else
-      # Could not find a link to PBI folder
-      kdialog --sorry "Wormux is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 
-
-#3D APPLICATION: 3D ACC IS NEEDED
- 
-glxinfo | grep "direct rendering:" | grep " Yes" 2>/dev/null
-if [ "$?" != "0" ]
-then
-   kdialog --msgbox "Your system does not appear to have hardware 3D 
-support enabled. This application requires 3D acceleration to function 
-properly."
-fi

Modified: pbibuild/modules/wormux/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/wormux/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/wormux/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -6,18 +6,7 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/wormux
-rm -fR /usr/local/man/man6/wormux.6.gz
-rm -fR /usr/local/share/wormux
 
-# Remove the old locale files since we are uninstalling
-LANGFILE="wormux.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
-
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/wormux/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/wormux/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/wormux/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -14,17 +14,13 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR}/.sbin/wormux /usr/local/bin/wormux
-ln -s /Programs/${PROGDIR}/man/man6/wormux.6.gz /usr/local/man/man6/wormux.6.gz
-ln -s /Programs/${PROGDIR}/share/wormux /usr/local/share/wormux
 
-# Copy over all the LANG files
-LANGFILE="wormux.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  mkdir -p /usr/local/share/locale/${i}/LC_MESSAGES >/dev/null 2>/dev/null
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
 
-echo "LAUNCHCLOSE: /usr/local/bin/wormux"
+echo "LAUNCHCLOSE: /Programs/bin/wormux"

Modified: pbibuild/modules/wormux/pbi.conf
===================================================================
--- pbibuild/modules/wormux/pbi.conf	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/wormux/pbi.conf	2009-01-27 20:27:05 UTC (rev 3348)
@@ -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="22"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/wxdfast/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/wxdfast/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/wxdfast/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -16,33 +16,3 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-
-if [ -e "/usr/local/bin/wxdfast" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/wxdfast | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "wxDownload Fast is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/wxdfast | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep wxDownload Fast 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "wxDownload Fast could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "wxDownload Fast is already installed, it must be uninstalled before loading this PBI"
-        return 2
-      fi
-      
-    else
-      # Could not find a link to PBI folder
-      kdialog --sorry "wxDownload Fast is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 

Modified: pbibuild/modules/wxdfast/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/wxdfast/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/wxdfast/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -6,10 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/wxdfast
-rm -fR /usr/local/man/man1/wxdfast.1.gz
-#rm -fR /usr/local/share/applications/wxdfast.desktop
-rm -fR /usr/local/share/wxdfast
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/wxdfast/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/wxdfast/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/wxdfast/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -14,16 +14,13 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR}/.sbin/wxdfast.sh /usr/local/bin/wxdfast
-ln -s /Programs/${PROGDIR}/man/man1/wxdfast.1.gz /usr/local/man/man1/wxdfast.1.gz
-#ln -s /Programs/${PROGDIR}/share/applications/wxdfast.desktop /usr/local/share/applications/wxdfast.desktop
-ln -s /Programs/${PROGDIR}/share/wxdfast /usr/local/share/wxdfast
-# Copy over all the LANG files
-LANGFILE="wxDFast.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  mkdir -p /usr/local/share/locale/${i}/LC_MESSAGES >/dev/null 2>/dev/null
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
-echo "LAUNCHCLOSE: /usr/local/bin/wxdfast"
+
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
+
+echo "LAUNCHCLOSE: /Programs/bin/wxdfast"

Modified: pbibuild/modules/wxdfast/pbi.conf
===================================================================
--- pbibuild/modules/wxdfast/pbi.conf	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/wxdfast/pbi.conf	2009-01-27 20:27:05 UTC (rev 3348)
@@ -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="24"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/xastir/kmenu-dir/xastir
===================================================================
--- pbibuild/modules/xastir/kmenu-dir/xastir	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/xastir/kmenu-dir/xastir	2009-01-27 20:27:05 UTC (rev 3348)
@@ -1,5 +1,5 @@
 ExePath: bin/xastir
-ExeIcon: xastir.xpm
+ExeIcon: xastir.png
 ExeDescr: XASTIR
 ExeNoDesktop: 0
 ExeNoMenu: 0

Modified: pbibuild/modules/xastir/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/xastir/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/xastir/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -16,36 +16,3 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-PROG="xastir"
-PROGL="XASTIR"
-BINARY="/usr/local/bin/xastir"
-
-if [ -e ${BINARY} ]
-then
-    # Looks like ${PROG} is installed, ask if they want to remove the old one
-    ls -al ${BINARY} | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "${PROGL} is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        TODEL="`ls -al ${BINARY} | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo ${TODEL} | grep ${PROG}
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${TODEL}
-        else
-          kdialog --sorry "${PROGL} could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "${PROGL} is already installed, it must be uninstalled before loading this PBI"
-        return 2
-      fi
-      
-    else
-      # Could not find a link to PBI folder
-      kdialog --sorry "${PROGL} is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi

Modified: pbibuild/modules/xastir/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/xastir/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/xastir/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -7,25 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/bin/xastir
-rm /usr/local/share/services/kfile_xastir.desktop
-rm /usr/local/share/xastir
-rm /usr/local/share/pixmaps/xastir.xpm
-
-# Remove the services links
-cd /Programs/${1}/autolibs/kde3/
-for i in `ls`
-do
- rm /usr/local/lib/kde3/${i}
-done
-
-# Remove the sound links
-cd /Programs/${1}/share/sounds/
-for i in `ls`
-do
- rm /usr/local/share/sounds/${i}
-done
-
 cd /home
 for i in `ls` 
    do 

Modified: pbibuild/modules/xastir/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/xastir/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/xastir/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -14,24 +14,13 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR}/.sbin/xastir /usr/local/bin/xastir
-ln -s /Programs/${PROGDIR}/share/xastir /usr/local/share/xastir
-ln -s /Programs/${PROGDIR}/xastir.xpm /usr/local/share/pixmaps/xastir.xpm
 
-# Make links for services
-cd /Programs/${PROGDIR}/autolibs/xastir/
-for i in `ls`
-do
- # Link the services now
- ln -s /Programs/${PROGDIR}/autolibs/kde3/${i} /usr/local/lib/kde3/${i}
-done
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
 
-# Make links for sounds wav files
-cd /Programs/${PROGDIR}/share/sounds/
-for i in `ls`
-do
- # Link the services now
- ln -s /Programs/${PROGDIR}/share/sounds/${i} /usr/local/share/sounds/${i}
-done
-
-echo "LAUNCHCLOSE: /usr/local/bin/xastir
+echo "LAUNCHCLOSE: /Programs/bin/xastir


Property changes on: pbibuild/modules/xastir/overlay-dir/xastir.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: pbibuild/modules/xastir/pbi.conf
===================================================================
--- pbibuild/modules/xastir/pbi.conf	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/xastir/pbi.conf	2009-01-27 20:27:05 UTC (rev 3348)
@@ -13,7 +13,7 @@
 PROGAUTHOR="Xastir team Charles Byam KG4IJB (fearless leader)"
 
 # Default Icon (Relative to overlay-dir)
-PROGICON="xastir.xpm"
+PROGICON="xastir.png"
 
 # Port we want to build
 PBIPORT="/usr/ports/comms/xastir/"
@@ -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/xchat/build.sh
===================================================================
--- pbibuild/modules/xchat/build.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/xchat/build.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -9,15 +9,3 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
-# Get all the various language files and copy them to the PBI
-LANGFILE="xchat.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
\ No newline at end of file

Modified: pbibuild/modules/xchat/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/xchat/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/xchat/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -16,33 +16,3 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-
-if [ -e "/usr/local/bin/xchat" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/xchat | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "XChat is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/xchat | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep XChat 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "XChat could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "XChat is already installed, it must be uninstalled before loading this PBI"
-        return 2
-      fi
-      
-    else
-      # Could not find a link to PBI folder
-      kdialog --sorry "XChat is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 

Modified: pbibuild/modules/xchat/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/xchat/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/xchat/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -7,16 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-# Remove the old locale files since we are uninstalling
-LANGFILE="xchat.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
-
-rm -fR /usr/local/bin/xchat
-
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/xchat/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/xchat/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/xchat/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -12,15 +12,13 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-ln -s /Programs/${PROGDIR}/.sbin/xchat /usr/local/bin/xchat
-# Copy over all the LANG files
-LANGFILE="xchat.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  mkdir -p /usr/local/share/locale/${i}/LC_MESSAGES >/dev/null 2>/dev/null
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
 
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
 
-echo "LAUNCHCLOSE: /usr/local/bin/xchat"
\ No newline at end of file
+echo "LAUNCHCLOSE: /Programs/bin/xchat"

Modified: pbibuild/modules/xchat/pbi.conf
===================================================================
--- pbibuild/modules/xchat/pbi.conf	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/xchat/pbi.conf	2009-01-27 20:27:05 UTC (rev 3348)
@@ -25,13 +25,13 @@
 PBIUPDATE="http://update.pbidir.com"
 
 # Other Ports we need built (One per line)
-OTHERPORT=""
+OTHERPORT="/usr/ports/x11-themes/qtcurve-gtk2"
 
 # Enter your custom make options here
 MAKEOPTS=""
 
 # 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="24"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/xlog/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/xlog/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/xlog/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -16,36 +16,3 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-PROG="xlog"
-PROGL="Xlog"
-BINARY="/usr/local/bin/xlog"
-
-if [ -e ${BINARY} ]
-then
-    # Looks like ${PROG} is installed, ask if they want to remove the old one
-    ls -al ${BINARY} | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "${PROGL} is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        TODEL="`ls -al ${BINARY} | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo ${TODEL} | grep ${PROG}
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${TODEL}
-        else
-          kdialog --sorry "${PROGL} could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "${PROGL} is already installed, it must be uninstalled before loading this PBI"
-        return 2
-      fi
-      
-    else
-      # Could not find a link to PBI folder
-      kdialog --sorry "${PROGL} is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi

Modified: pbibuild/modules/xlog/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/xlog/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/xlog/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -7,25 +7,7 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/bin/xlog
-rm /usr/local/share/services/kfile_xlog.desktop
-rm /usr/local/share/xlog
-rm /usr/local/share/pixmaps/xlog
 
-# Remove the services links
-cd /Programs/${1}/autolibs/kde3/
-for i in `ls`
-do
- rm /usr/local/lib/kde3/${i}
-done
-
-# Remove the sound links
-cd /Programs/${1}/share/sounds/
-for i in `ls`
-do
- rm /usr/local/share/sounds/${i}
-done
-
 cd /home
 for i in `ls` 
    do 

Modified: pbibuild/modules/xlog/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/xlog/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/xlog/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -14,24 +14,13 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR}/.sbin/xlog /usr/local/bin/xlog
-ln -s /Programs/${PROGDIR}/share/xlog /usr/local/share/xlog
-ln -s /Programs/${PROGDIR}/share/pixmaps/xlog /usr/local/share/pixmaps/xlog
 
-# Make links for services
-cd /Programs/${PROGDIR}/autolibs/xlog/
-for i in `ls`
-do
- # Link the services now
- ln -s /Programs/${PROGDIR}/autolibs/kde3/${i} /usr/local/lib/kde3/${i}
-done
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
 
-# Make links for sounds wav files
-cd /Programs/${PROGDIR}/share/sounds/
-for i in `ls`
-do
- # Link the services now
- ln -s /Programs/${PROGDIR}/share/sounds/${i} /usr/local/share/sounds/${i}
-done
-
-echo "LAUNCHCLOSE: /usr/local/bin/xlog
+echo "LAUNCHCLOSE: /usr/local/bin/xlog"

Modified: pbibuild/modules/xlog/pbi.conf
===================================================================
--- pbibuild/modules/xlog/pbi.conf	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/xlog/pbi.conf	2009-01-27 20:27:05 UTC (rev 3348)
@@ -25,13 +25,13 @@
 PBIUPDATE="http://update.pbidir.com"
 
 # Other Ports we need built (One per line)
-OTHERPORT=""
+OTHERPORT="/usr/ports/x11-themes/qtcurve-gtk2"
 
 # Enter your custom make options here
 MAKEOPTS=""
 
 # 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="05"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/yakuake/build.sh
===================================================================
--- pbibuild/modules/yakuake/build.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/yakuake/build.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -8,15 +8,3 @@
 # MODULEDIR = The location of the module directory for this PBI
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
-# Get all the various language files and copy them to the PBI
-LANGFILE="yakuake.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/yakuake/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/yakuake/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/yakuake/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -15,33 +15,3 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-
-if [ -e "/usr/local/bin/yakuake" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/yakuake | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "Yakuake is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/yakuake | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep Yakuake 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "Yakuake could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "Yakuake is already installed, it must be uninstalled before loading this PBI"
-        return 2
-      fi
-      
-    else
-      # Could not find a link to PBI folder
-      kdialog --sorry "Yakuake is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 

Modified: pbibuild/modules/yakuake/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/yakuake/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/yakuake/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -6,15 +6,3 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/yakuake
-rm -fR /usr/local/share/apps/yakuake 
-rm -fR /usr/local/share/config.kcfg/yakuake.kcfg
-rm -fR /usr/local/share/icons/hicolor/*/apps/yakuake.png
-
-# Remove the old locale files since we are uninstalling
-LANGFILE="yakuake.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
\ No newline at end of file

Modified: pbibuild/modules/yakuake/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/yakuake/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/yakuake/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -15,19 +15,13 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-ln -s /Programs/${PROGDIR}/.sbin/yakuake /usr/local/bin/yakuake
-ln -s /Programs/${PROGDIR}/share/apps/yakuake /usr/local/share/apps/yakuake 
-ln -s /Programs/${PROGDIR}/share/config.kcfg/yakuake.kcfg /usr/local/share/config.kcfg/yakuake.kcfg
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/16x16/apps/yakuake.png /usr/local/share/icons/hicolor/16x16/apps/yakuake.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/32x32/apps/yakuake.png /usr/local/share/icons/hicolor/32x32/apps/yakuake.png
 
-# Copy over all the LANG files
-LANGFILE="yakuake.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  mkdir -p /usr/local/share/locale/${i}/LC_MESSAGES >/dev/null 2>/dev/null
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
 
-echo "LAUNCHCLOSE: /usr/local/bin/yakuake"
+echo "LAUNCHCLOSE: /Programs/bin/yakuake"

Modified: pbibuild/modules/yakuake/pbi.conf
===================================================================
--- pbibuild/modules/yakuake/pbi.conf	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/yakuake/pbi.conf	2009-01-27 20:27:05 UTC (rev 3348)
@@ -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="35"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/zsh/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/zsh/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/zsh/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -15,37 +15,3 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-
-PROG="zsh"
-PROGL="Zsh"
-BINARY="/usr/local/bin/zsh"
-
-if [ -e ${BINARY} ]
-then
-    # Looks like ${PROG} is installed, ask if they want to remove the old one
-    ls -al ${BINARY} | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "${PROGL} is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        TODEL="`ls -al ${BINARY} | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo ${TODEL} | grep ${PROG}
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${TODEL}
-        else
-          kdialog --sorry "${PROGL} could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "${PROGL} is already installed, it must be uninstalled before loading this PBI"
-        return 2
-      fi
-      
-    else
-      # Could not find a link to PBI folder
-      kdialog --sorry "${PROGL} is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi

Modified: pbibuild/modules/zsh/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/zsh/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/zsh/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -7,44 +7,9 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/bin/zsh
-rm /usr/local/share/services/kfile_zsh.desktop
-rm /usr/local/share/zsh
-rm /usr/local/lib/zsh
-rm /usr/local/man/man1/zsh.1.gz
-rm /usr/local/man/man1/zshroadmap.1.gz
-rm /usr/local/man/man1/zshmisc.1.gz
-rm /usr/local/man/man1/zshexpn.1.gz
-rm /usr/local/man/man1/zshparam.1.gz
-rm /usr/local/man/man1/zshoptions.1.gz
-rm /usr/local/man/man1/zshbuiltins.1.gz
-rm /usr/local/man/man1/zshzle.1.gz
-rm /usr/local/man/man1/zshcompwid.1.gz
-rm /usr/local/man/man1/zshcompsys.1.gz
-rm /usr/local/man/man1/zshcompctl.1.gz
-rm /usr/local/man/man1/zshmodules.1.gz
-rm /usr/local/man/man1/zshcalsys.1.gz
-rm /usr/local/man/man1/zshcpsys.1.gz
-rm /usr/local/man/man1/zshzftpsys.1.gz
-rm /usr/local/man/man1/zshcontrib.1.gz
-rm /usr/local/man/man1/zshall.1.gz
 # remove shell from /etc/shells
 cp /etc/shells /etc/shells.bak; (grep -v /usr/local/bin/zsh /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
 
-# Remove the services links
-cd /Programs/${1}/autolibs/kde3/
-for i in `ls`
-do
- rm /usr/local/lib/kde3/${i}
-done
-
-# Remove the sound links
-cd /Programs/${1}/share/sounds/
-for i in `ls`
-do
- rm /usr/local/share/sounds/${i}
-done
-
 cd /home
 for i in `ls` 
    do 

Modified: pbibuild/modules/zsh/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/zsh/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/zsh/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -14,42 +14,6 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR}/.sbin/zsh /usr/local/bin/zsh
-ln -s /Programs/${PROGDIR}/share/zsh /usr/local/share/zsh
-ln -s /Programs/${PROGDIR}/lib/zsh /usr/local/lib/zsh
-ln -s /Programs/${PROGDIR}/man/man1/zsh.1.gz /usr/local/man/man1/zsh.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/zshroadmap.1.gz /usr/local/man/man1/zshroadmap.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/zshmisc.1.gz /usr/local/man/man1/zshmisc.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/zshexpn.1.gz /usr/local/man/man1/zshexpn.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/zshparam.1.gz /usr/local/man/man1/zshparam.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/zshoptions.1.gz /usr/local/man/man1/zshoptions.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/zshbuiltins.1.gz /usr/local/man/man1/zshbuiltins.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/zshzle.1.gz /usr/local/man/man1/zshzle.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/zshcompwid.1.gz /usr/local/man/man1/zshcompwid.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/zshcompsys.1.gz /usr/local/man/man1/zshcompsys.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/zshcompctl.1.gz /usr/local/man/man1/zshcompctl.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/zshmodules.1.gz /usr/local/man/man1/zshmodules.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/zshcalsys.1.gz /usr/local/man/man1/zshcalsys.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/zshtcpsys.1.gz /usr/local/man/man1/zshtcpsys.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/zshzftpsys.1.gz /usr/local/man/man1/zshzftpsys.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/zshcontrib.1.gz /usr/local/man/man1/zshcontrib.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/zshall.1.gz /usr/local/man/man1/zshall.1.gz
 echo "/usr/local/bin/zsh" >> /etc/shells
 
-# Make links for services
-cd /Programs/${PROGDIR}/autolibs/zsh/
-for i in `ls`
-do
- # Link the services now
- ln -s /Programs/${PROGDIR}/autolibs/kde3/${i} /usr/local/lib/kde3/${i}
-done
-
-# Make links for sounds wav files
-cd /Programs/${PROGDIR}/share/sounds/
-for i in `ls`
-do
- # Link the services now
- ln -s /Programs/${PROGDIR}/share/sounds/${i} /usr/local/share/sounds/${i}
-done
-
-echo "LAUNCHCLOSE: /usr/local/bin/zsh
+echo "LAUNCHCLOSE: /Programs/bin/zsh

Modified: pbibuild/modules/zsnes/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/zsnes/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/zsnes/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -16,33 +16,3 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-
-if [ -e "/usr/local/bin/zsnes" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/zsnes | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "ZSNES is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/zsnes | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep ZSNES 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "ZSNES could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "ZSNES is already installed, it must be uninstalled before loading this PBI"
-        return 2
-      fi
-      
-    else
-      # Could not find a link to PBI folder
-      kdialog --sorry "ZSNES is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 

Modified: pbibuild/modules/zsnes/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/zsnes/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/zsnes/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -6,8 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/zsnes
-rm -fR /usr/local/man/man1/zsnes.1.gz
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/zsnes/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/zsnes/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/zsnes/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
@@ -14,6 +14,13 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR}/.sbin/zsnes /usr/local/bin/zsnes
-ln -s /Programs/${PROGDIR}/man/man1/zsnes.1.gz /usr/local/man/man1/zsnes.1.gz
-echo "LAUNCHCLOSE: /usr/local/bin/zsnes"
+
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
+
+echo "LAUNCHCLOSE: /Programs/bin/zsnes"

Modified: pbibuild/modules/zsnes/pbi.conf
===================================================================
--- pbibuild/modules/zsnes/pbi.conf	2009-01-27 20:05:07 UTC (rev 3347)
+++ pbibuild/modules/zsnes/pbi.conf	2009-01-27 20:27:05 UTC (rev 3348)
@@ -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="26"
+BUILDKEY="01"
 
 # Don't build this PBI on certian processors (i386 / amd64)
 ARCHIGNORE="amd64" ; export ARCHIGNORE



More information about the Commits mailing list