[PC-BSD Commits] r3344 - in pbibuild/modules: sauerbraten sauerbraten/kmenu-dir sauerbraten/overlay-dir schism schism/overlay-dir scorched3d scorched3d/overlay-dir scribus scribus/kmenu-dir scribus/overlay-dir scummvm scummvm/kmenu-dir scummvm/overlay-dir seamonkey seamonkey/overlay-dir secretmaryochronicle secretmaryochronicle/overlay-dir sim-im sim-im/overlay-dir skype skype/overlay-dir smb4k smb4k/overlay-dir stella stella/overlay-dir sturmbahnfahrer sturmbahnfahrer/overlay-dir

svn at pcbsd.org svn at pcbsd.org
Tue Jan 27 11:37:22 PST 2009


Author: kris
Date: 2009-01-27 11:37:21 -0800 (Tue, 27 Jan 2009)
New Revision: 3344

Removed:
   pbibuild/modules/sauerbraten/kmenu-dir/uninstall
   pbibuild/modules/scribus/kmenu-dir/uninstall
   pbibuild/modules/scummvm/kmenu-dir/uninstall
   pbibuild/modules/scummvm/overlay-dir/scripts/
Modified:
   pbibuild/modules/sauerbraten/build.sh
   pbibuild/modules/sauerbraten/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/sauerbraten/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/sauerbraten/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/sauerbraten/pbi.conf
   pbibuild/modules/schism/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/schism/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/schism/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/schism/pbi.conf
   pbibuild/modules/scorched3d/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/scorched3d/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/scorched3d/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/scorched3d/pbi.conf
   pbibuild/modules/scribus/build.sh
   pbibuild/modules/scribus/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/scribus/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/scribus/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/scribus/pbi.conf
   pbibuild/modules/scummvm/build.sh
   pbibuild/modules/scummvm/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/scummvm/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/scummvm/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/scummvm/pbi.conf
   pbibuild/modules/seamonkey/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/seamonkey/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/seamonkey/pbi.conf
   pbibuild/modules/secretmaryochronicle/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/secretmaryochronicle/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/secretmaryochronicle/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/secretmaryochronicle/pbi.conf
   pbibuild/modules/sim-im/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/sim-im/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/sim-im/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/sim-im/pbi.conf
   pbibuild/modules/skype/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/skype/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/skype/pbi.conf
   pbibuild/modules/smb4k/build.sh
   pbibuild/modules/smb4k/copy-files
   pbibuild/modules/smb4k/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/smb4k/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/smb4k/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/smb4k/pbi.conf
   pbibuild/modules/stella/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/stella/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/stella/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/stella/pbi.conf
   pbibuild/modules/sturmbahnfahrer/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/sturmbahnfahrer/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/sturmbahnfahrer/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/sturmbahnfahrer/pbi.conf
Log:

Updated sauerbraten, schism, scorched3d, scribus, scummvm, seamonkey, secretmaryo, sim-im, skype, smb4k, stella, sturm to be 100% self-contained now



Modified: pbibuild/modules/sauerbraten/build.sh
===================================================================
--- pbibuild/modules/sauerbraten/build.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/sauerbraten/build.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -8,7 +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,Sauerbraten${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/sauerbraten/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/sauerbraten/overlay-dir/PBI.FirstRun.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/sauerbraten/overlay-dir/PBI.FirstRun.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -16,43 +16,10 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-
-if [ -e "/usr/local/bin/sauer_client" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/sauer_client | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "Sauerbraten is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/sauer_client | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep Sauerbraten 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "Sauerbraten could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "Sauerbraten 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 "Sauerbraten 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
\ No newline at end of file
+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/sauerbraten/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/sauerbraten/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/sauerbraten/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -6,13 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/sauer_client
-rm -fR /usr/local/bin/sauer_server
-rm -fR /usr/local/libexec/sauer_client
-rm -fR /usr/local/libexec/sauer_server
-rm -fR /usr/local/share/doc/sauerbraten
-rm -fR /usr/local/share/sauerbraten
-
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/sauerbraten/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/sauerbraten/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/sauerbraten/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -14,11 +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/sauer_client /usr/local/bin/sauer_client
-ln -s /Programs/${PROGDIR}/.sbin/sauer_server /usr/local/bin/sauer_server
-ln -s /Programs/${PROGDIR}/libexec/sauer_client /usr/local/libexec/sauer_client
-ln -s /Programs/${PROGDIR}/libexec/sauer_server /usr/local/libexec/sauer_server
-ln -s /Programs/${PROGDIR}/share/doc/sauerbraten /usr/local/share/doc/sauerbraten
-ln -s /Programs/${PROGDIR}/share/sauerbraten /usr/local/share/sauerbraten
 
-echo "LAUNCHCLOSE: /usr/local/bin/sauer_client"
+# 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/sauer_client"

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

Modified: pbibuild/modules/schism/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/schism/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/schism/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -6,4 +6,3 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/schism

Modified: pbibuild/modules/schism/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/schism/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/schism/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -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/schism /usr/local/bin/schism
 
-echo "LAUNCHCLOSE: /usr/local/bin/schism"
+# 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/schism"

Modified: pbibuild/modules/schism/pbi.conf
===================================================================
--- pbibuild/modules/schism/pbi.conf	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/schism/pbi.conf	2009-01-27 19:37:21 UTC (rev 3344)
@@ -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/scorched3d/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/scorched3d/overlay-dir/PBI.FirstRun.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/scorched3d/overlay-dir/PBI.FirstRun.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -15,32 +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/scorched3d" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/scorched3d | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "Scorched 3D is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/scorched3d | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep Scorched 3D 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "Scorched 3D could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "Scorched 3D 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 "Scorched 3D is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 

Modified: pbibuild/modules/scorched3d/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/scorched3d/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/scorched3d/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -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/scorched3d
-rm -fR /usr/local/games/scorched3d
 
 if [ ! -z "$DISPLAY" ]
 then

Modified: pbibuild/modules/scorched3d/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/scorched3d/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/scorched3d/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -14,12 +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/scorched3d /usr/local/bin/scorched3d
-   if [ -e "/usr/local/games" ]
-   then
-	ln -s /Programs/${PROGDIR}/games/scorched3d /usr/local/games/scorched3d
-   else
-	mkdir /usr/local/games
-	ln -s /Programs/${PROGDIR}/games/scorched3d /usr/local/games/scorched3d
-   fi
-echo "LAUNCHCLOSE: /usr/local/bin/scorched3d"
+
+# 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/scorched3d"

Modified: pbibuild/modules/scorched3d/pbi.conf
===================================================================
--- pbibuild/modules/scorched3d/pbi.conf	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/scorched3d/pbi.conf	2009-01-27 19:37:21 UTC (rev 3344)
@@ -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="03"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY VERKEY

Modified: pbibuild/modules/scribus/build.sh
===================================================================
--- pbibuild/modules/scribus/build.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/scribus/build.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -8,8 +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,Scribus${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/scribus/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/scribus/overlay-dir/PBI.FirstRun.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/scribus/overlay-dir/PBI.FirstRun.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -16,36 +16,3 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-PROG="scribus"
-PROGL="SCRIBUS"
-BINARY="/usr/local/bin/scribus"
-
-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/scribus/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/scribus/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/scribus/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -7,5 +7,3 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/bin/scribus
-rm /usr/local/share/scribus

Modified: pbibuild/modules/scribus/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/scribus/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/scribus/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -14,7 +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/scribus /usr/local/bin/scribus
-ln -s /Programs/${PROGDIR}/share/scribus /usr/local/share/scribus
 
-echo "LAUNCHCLOSE: /usr/local/bin/scribus
+# 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/scribus

Modified: pbibuild/modules/scribus/pbi.conf
===================================================================
--- pbibuild/modules/scribus/pbi.conf	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/scribus/pbi.conf	2009-01-27 19:37:21 UTC (rev 3344)
@@ -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="03"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/scummvm/build.sh
===================================================================
--- pbibuild/modules/scummvm/build.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/scummvm/build.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -8,8 +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,ScummVM${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/scummvm/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/scummvm/overlay-dir/PBI.FirstRun.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/scummvm/overlay-dir/PBI.FirstRun.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -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/scummvm" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/scummvm | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "ScummVM is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/scummvm | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep ScummVM 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "ScummVM could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "ScummVM 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 "ScummVM is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 

Modified: pbibuild/modules/scummvm/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/scummvm/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/scummvm/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -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/share/doc/scummvm
-rm -fR /usr/local/bin/scummvm
-rm -fR /usr/local/man/man6/scummvm.6.gz
-
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/scummvm/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/scummvm/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/scummvm/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -14,8 +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/scummvm /usr/local/bin/scummvm
-ln -s /Programs/${PROGDIR}/share/doc/scummvm /usr/local/share/doc/scummvm
-ln -s /Programs/${PROGDIR}/man/man6/scummvm.6.gz /usr/local/man/man6/scummvm.6.gz
 
-echo "LAUNCHCLOSE: /usr/local/bin/scummvm"
+# 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/scummvm"

Modified: pbibuild/modules/scummvm/pbi.conf
===================================================================
--- pbibuild/modules/scummvm/pbi.conf	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/scummvm/pbi.conf	2009-01-27 19:37:21 UTC (rev 3344)
@@ -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="16"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/seamonkey/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/seamonkey/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/seamonkey/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -7,9 +7,3 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-chflags -R noschg /Programs/${1}
-
-rm /usr/local/bin/seamonkey
-rm /usr/local/lib/seamonkey
-
-

Modified: pbibuild/modules/seamonkey/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/seamonkey/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/seamonkey/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -14,10 +14,16 @@
 # 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/seamonkey /usr/local/bin/seamonkey
-ln -fs /Programs/${PROGDIR}/autolibs/seamonkey /usr/local/lib/seamonkey
 
+# 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
 
+
 if [ ! -z "$DISPLAY" ]
 then
 
@@ -69,4 +75,4 @@
 
 fi
 
-echo "LAUNCHCLOSE: /usr/local/bin/seamonkey"
+echo "LAUNCHCLOSE: /Programs/bin/seamonkey"

Modified: pbibuild/modules/seamonkey/pbi.conf
===================================================================
--- pbibuild/modules/seamonkey/pbi.conf	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/seamonkey/pbi.conf	2009-01-27 19:37:21 UTC (rev 3344)
@@ -25,13 +25,14 @@
 PBIUPDATE="http://update.pbidir.com"
 
 # Other Ports we need built (One per line)
-OTHERPORT="/usr/ports/audio/esound"
+OTHERPORT="/usr/ports/audio/esound
+/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="12"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

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

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

Modified: pbibuild/modules/secretmaryochronicle/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/secretmaryochronicle/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/secretmaryochronicle/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -15,10 +15,12 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-ln -s /Programs/${PROGDIR}/.sbin/smc /usr/local/bin/smc
-ln -s /Programs/${PROGDIR}/share/doc/secretmaryochronicles /usr/local/share/doc/secretmaryochronicles
-ln -s /Programs/${PROGDIR}/share/smc /usr/local/share/smc
-ln -s /Programs/${PROGDIR}/autolibs/libCEGUIDevILImageCodec.so.0  /Programs/${PROGDIR}/autolibs/libCEGUIDevILImageCodec.so
-ln -s /Programs/${PROGDIR}/autolibs/libCEGUIXercesParser.so.0 /Programs/${PROGDIR}/autolibs/libCEGUIXercesParser.so
-ln -s /Programs/${PROGDIR}/autolibs/libCEGUIFalagardWRBase.so.1 /Programs/${PROGDIR}/autolibs/libCEGUIFalagardWRBase.so
-echo "LAUNCHCLOSE: /usr/local/bin/smc"
+# 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/smc"

Modified: pbibuild/modules/secretmaryochronicle/pbi.conf
===================================================================
--- pbibuild/modules/secretmaryochronicle/pbi.conf	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/secretmaryochronicle/pbi.conf	2009-01-27 19:37:21 UTC (rev 3344)
@@ -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/sim-im/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/sim-im/overlay-dir/PBI.FirstRun.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/sim-im/overlay-dir/PBI.FirstRun.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -16,33 +16,3 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-
-if [ -e "/usr/local/bin/sim" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/sim | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "Sim-IM is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/sim | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep Sim-IM 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "Sim-IM could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "Sim-IM 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 "Sim-IM is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 

Modified: pbibuild/modules/sim-im/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/sim-im/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/sim-im/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -6,28 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/sim
-rm -fR /usr/local/bin/simctrl
-rm -fR /usr/local/lib/libsim.a
-rm -fR /usr/local/lib/libsim.la
-rm -fR /usr/local/lib/libsim.so
-rm -fR /usr/local/lib/libsim.so.0
-rm -fR /usr/local/lib/sim
-rm -fR /usr/local/share/applications/kde/sim.desktop
-rm -fR /usr/local/share/apps/sim
-rm -fR /usr/local/share/mimelnk/application/x-icq.desktop
-rm -fR /usr/local/share/services/simctrl.desktop
-rm -fR /usr/local/share/icons/hicolor/16x16/apps/sim.png
-rm -fR /usr/local/share/icons/hicolor/32x32/apps/sim.png
-rm -fR /usr/local/share/icons/hicolor/48x48/apps/sim.png
-rm -fR /usr/local/share/icons/hicolor/64x64/apps/sim.png
-# Remove the old locale files since we are uninstalling
-LANGFILE="sim.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/sim-im/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/sim-im/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/sim-im/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -14,28 +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/sim /usr/local/bin/sim
-ln -s /Programs/${PROGDIR}/.sbin/simctrl /usr/local/bin/simctrl
-ln -s /Programs/${PROGDIR}/lib/libsim.a /usr/local/lib/libsim.a
-ln -s /Programs/${PROGDIR}/lib/libsim.la /usr/local/lib/libsim.la
-ln -s /Programs/${PROGDIR}/lib/libsim.so /usr/local/lib/libsim.so
-ln -s /Programs/${PROGDIR}/lib/libsim.so.0 /usr/local/lib/libsim.so.0
-ln -s /Programs/${PROGDIR}/lib/sim /usr/local/lib/sim
-#ln -s /Programs/${PROGDIR}/share/applications/kde/sim.desktop /usr/local/share/applications/kde/sim.desktop
-ln -s /Programs/${PROGDIR}/share/apps/sim /usr/local/share/apps/sim
-ln -s /Programs/${PROGDIR}/share/mimelnk/application/x-icq.desktop /usr/local/share/mimelnk/application/x-icq.desktop
-ln -s /Programs/${PROGDIR}/share/services/simctrl.desktop /usr/local/share/services/simctrl.desktop
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/16x16/apps/sim.png /usr/local/share/icons/hicolor/16x16/apps/sim.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/32x32/apps/sim.png /usr/local/share/icons/hicolor/32x32/apps/sim.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/48x48/apps/sim.png /usr/local/share/icons/hicolor/48x48/apps/sim.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/64x64/apps/sim.png /usr/local/share/icons/hicolor/64x64/apps/sim.png
-# Copy over all the LANG files
-LANGFILE="sim.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/sim"
+# 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/sim"

Modified: pbibuild/modules/sim-im/pbi.conf
===================================================================
--- pbibuild/modules/sim-im/pbi.conf	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/sim-im/pbi.conf	2009-01-27 19:37:21 UTC (rev 3344)
@@ -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="03"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/skype/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/skype/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/skype/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -6,11 +6,3 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -r /usr/local/share/skype
-rm /usr/local/bin/skype
-rm -r /compat/linux/usr/share/skype
-
-
-
-
-

Modified: pbibuild/modules/skype/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/skype/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/skype/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -15,16 +15,10 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-PROG_PATH="/Programs/${PROGDIR}"
-sed "s/PROGDIR/${PROGDIR}/g" ${PROG_PATH}/bin/skype.sh > ${PROG_PATH}/bin/skype.sh.1
-mv ${PROG_PATH}/bin/skype.sh.1 ${PROG_PATH}/bin/skype.sh
-chmod 7755 ${PROG_PATH}/bin/skype*
-
-ln -s /Programs/${PROGDIR}/share/skype /usr/local/share/skype
-ln -s /Programs/${PROGDIR}/.sbin/skype.sh /usr/local/bin/skype
-if [ -f /compat/linux/usr/share/skype ]
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
 then
-	rm -r //compat/linux/usr/share/skype
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
 fi
-ln -s /Programs/${PROGDIR}/share/skype /compat/linux/usr/share/skype
-

Modified: pbibuild/modules/skype/pbi.conf
===================================================================
--- pbibuild/modules/skype/pbi.conf	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/skype/pbi.conf	2009-01-27 19:37:21 UTC (rev 3344)
@@ -19,7 +19,7 @@
 PBIPORT="/usr/ports/net/skype"
 
 # Set to "Auto or NONE" to have the PBI creator auto-populate libs or not
-PROGLIBS="NONE"
+PROGLIBS="Auto"
 
 # PBI Update URL set to "" or the http:// URL of update checker
 PBIUPDATE="http://update.pbidir.com"
@@ -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/smb4k/build.sh
===================================================================
--- pbibuild/modules/smb4k/build.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/smb4k/build.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -8,17 +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="smb4k.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/smb4k/copy-files
===================================================================
--- pbibuild/modules/smb4k/copy-files	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/smb4k/copy-files	2009-01-27 19:37:21 UTC (rev 3344)
@@ -4,14 +4,23 @@
 /usr/local/include/smb4k* include/
 /usr/local/lib/libsmb4k* autolibs/
 /usr/local/lib/kde3/*smb4k* lib/kde3/
+/usr/local/lib/kde3/*kio* autolibs/kde3/
+/usr/local/lib/kde3/*knoti* autolibs/kde3/
+/usr/local/lib/kde3/kded* autolibs/kde3/
 /usr/local/share/applications/kde/smb4k.desktop share/applications/kde/
-/usr/local/share/apps/smb4k share/apps/
-/usr/local/share/apps/konqsidebartng/add/smb4k_add.desktop share/apps/konqsidebartng/add/
-/usr/local/share/apps/smb4knetworkbrowserpart share/apps/
-/usr/local/share/apps/smb4ksharesiconviewpart share/apps/
-/usr/local/share/apps/smb4kshareslistviewpart share/apps/
 /usr/local/share/doc/HTML/en/smb4k share/doc/HTML/en/
 /usr/local/share/icons/crystalsvg/16x16/apps/smb4k.png share/icons/crystalsvg/16x16/apps/
 /usr/local/share/icons/crystalsvg/32x32/apps/smb4k.png share/icons/crystalsvg/32x32/apps/
 /usr/local/share/icons/crystalsvg/48x48/apps/smb4k.png share/icons/crystalsvg/48x48/apps/
 /usr/local/share/icons/crystalsvg/64x64/apps/smb4k.png share/icons/crystalsvg/64x64/apps/
+/usr/local/bin/kio* bin/
+/usr/local/bin/*dcop* bin/
+/usr/local/bin/*arts* bin/
+/usr/local/share/apps share/
+/usr/local/share/config.kcfg share/config.kcfg
+/usr/local/share/config share/config
+/usr/local/share/services share/services
+/usr/local/share/servicetypes share/servicetypes
+/usr/local/share/mime share/mime
+/usr/local/share/mimelnk share/mimelnk
+/usr/local/libexec/gam* libexec/

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

Modified: pbibuild/modules/smb4k/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/smb4k/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/smb4k/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -6,40 +6,7 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/smb2awk
-rm -fR /usr/local/bin/smb2nsmbrc
-rm -fR /usr/local/bin/smb4k
-rm -fR /usr/local/bin/smb4k_cat
-rm -fR /usr/local/bin/smb4k_kill
-rm -fR /usr/local/bin/smb4k_mount
-rm -fR /usr/local/bin/smb4k_mv
-rm -fR /usr/local/bin/smb4k_umount
-rm -fR /usr/local/share/applications/kde/smb4k.desktop
-rm -fR /usr/local/share/apps/smb4k
-rm -fR /usr/local/share/apps/konqsidebartng/add/smb4k_add.desktop
-rm -fR /usr/local/share/doc/HTML/en/smb4k
-rm -fR /usr/local/share/icons/crystalsvg/16x16/apps/smb4k.png
-rm -fR /usr/local/share/icons/crystalsvg/32x32/apps/smb4k.png
-rm -fR /usr/local/share/icons/crystalsvg/48x48/apps/smb4k.png
-rm -fR /usr/local/share/icons/crystalsvg/64x64/apps/smb4k.png
 
-# Remove the old locale files since we are uninstalling
-LANGFILE="smb4k.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
-
-if [ -d "/Programs/${PROGDIR}/lib/kde3" ]
-then
- cd /Programs/${PROGDIR}/lib/kde3
- for i in `ls`
- do
-  rm /usr/local/lib/kde3/${i}
- done
-fi
-
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/smb4k/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/smb4k/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/smb4k/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -14,36 +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/smb2awk /usr/local/bin/smb2awk
-ln -s /Programs/${PROGDIR}/.sbin/smb2nsmbrc /usr/local/bin/smb2nsmbrc
-ln -s /Programs/${PROGDIR}/.sbin/smb4k /usr/local/bin/smb4k
-ln -s /Programs/${PROGDIR}/.sbin/smb4k_cat /usr/local/bin/smb4k_cat
-ln -s /Programs/${PROGDIR}/.sbin/smb4k_kill /usr/local/bin/smb4k_kill
-ln -s /Programs/${PROGDIR}/.sbin/smb4k_mount /usr/local/bin/smb4k_mount
-ln -s /Programs/${PROGDIR}/.sbin/smb4k_mv /usr/local/bin/smb4k_mv
-ln -s /Programs/${PROGDIR}/.sbin/smb4k_umount /usr/local/bin/smb4k_umount
-ln -s /Programs/${PROGDIR}/share/apps/smb4k /usr/local/share/apps/smb4k
-ln -s /Programs/${PROGDIR}/share/apps/konqsidebartng/add/smb4k_add.desktop /usr/local/share/apps/konqsidebartng/add/smb4k_add.desktop
-ln -s /Programs/${PROGDIR}/share/doc/HTML/en/smb4k /usr/local/share/doc/HTML/en/smb4k
-ln -s /Programs/${PROGDIR}/share/icons/crystalsvg/16x16/apps/smb4k.png /usr/local/share/icons/crystalsvg/16x16/apps/smb4k.png
-ln -s /Programs/${PROGDIR}/share/icons/crystalsvg/32x32/apps/smb4k.png /usr/local/share/icons/crystalsvg/32x32/apps/smb4k.png
-ln -s /Programs/${PROGDIR}/share/icons/crystalsvg/48x48/apps/smb4k.png /usr/local/share/icons/crystalsvg/48x48/apps/smb4k.png
-ln -s /Programs/${PROGDIR}/share/icons/crystalsvg/64x64/apps/smb4k.png /usr/local/share/icons/crystalsvg/64x64/apps/smb4k.png
 
-cd /Programs/${PROGDIR}/lib/kde3
-for i in `ls`
-do
-  ln -s /Programs/${PROGDIR}/lib/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
 
-
-# Copy over all the LANG files
-LANGFILE="smb4k.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/smb4k"
+echo "LAUNCHCLOSE: /Programs/bin/smb4k"

Modified: pbibuild/modules/smb4k/pbi.conf
===================================================================
--- pbibuild/modules/smb4k/pbi.conf	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/smb4k/pbi.conf	2009-01-27 19:37:21 UTC (rev 3344)
@@ -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="14"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/stella/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/stella/overlay-dir/PBI.FirstRun.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/stella/overlay-dir/PBI.FirstRun.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -15,34 +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/stella" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/stella | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "Stella is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/stella | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep Stella 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "Stella could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "Stella 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 "AbiWord is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 

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

Modified: pbibuild/modules/stella/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/stella/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/stella/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -14,7 +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/stella /usr/local/bin/stella
-ln -s /Programs/${PROGDIR}/share/doc/stella /usr/local/share/doc/stella
-ln -s /Programs/${PROGDIR}/share/stella /usr/local/share/stella
-echo "LAUNCHCLOSE: /usr/local/bin/stella"
+
+# 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/stella"

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

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

Modified: pbibuild/modules/sturmbahnfahrer/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/sturmbahnfahrer/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/sturmbahnfahrer/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
@@ -14,7 +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/sturmbahnfahrer /usr/local/bin/sturmbahnfahrer
-ln -s /Programs/${PROGDIR}/share/doc/sturmbahnfahrer /usr/local/share/doc/sturmbahnfahrer
-ln -s /Programs/${PROGDIR}/share/sturmbahnfahrer /usr/local/share/sturmbahnfahrer
-echo "LAUNCHCLOSE: /usr/local/bin/sturmbahnfahrer"
+
+# 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/sturmbahnfahrer"

Modified: pbibuild/modules/sturmbahnfahrer/pbi.conf
===================================================================
--- pbibuild/modules/sturmbahnfahrer/pbi.conf	2009-01-27 19:07:07 UTC (rev 3343)
+++ pbibuild/modules/sturmbahnfahrer/pbi.conf	2009-01-27 19:37:21 UTC (rev 3344)
@@ -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



More information about the Commits mailing list