[PC-BSD Commits] r3345 - in pbibuild/modules: tellico tellico/overlay-dir torcs torcs/overlay-dir tremulous tremulous/kmenu-dir tremulous/overlay-dir trigger trigger/overlay-dir tuxmath tuxmath/overlay-dir tuxpaint tuxpaint/overlay-dir tuxpaint/overlay-dir/share

svn at pcbsd.org svn at pcbsd.org
Tue Jan 27 11:49:41 PST 2009


Author: kris
Date: 2009-01-27 11:49:41 -0800 (Tue, 27 Jan 2009)
New Revision: 3345

Removed:
   pbibuild/modules/tremulous/kmenu-dir/uninstall
   pbibuild/modules/tuxpaint/overlay-dir/share/tuxpaint/
Modified:
   pbibuild/modules/tellico/build.sh
   pbibuild/modules/tellico/copy-files
   pbibuild/modules/tellico/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/tellico/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/tellico/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/tellico/pbi.conf
   pbibuild/modules/torcs/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/torcs/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/torcs/pbi.conf
   pbibuild/modules/tremulous/build.sh
   pbibuild/modules/tremulous/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/tremulous/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/tremulous/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/tremulous/pbi.conf
   pbibuild/modules/trigger/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/trigger/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/trigger/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/trigger/pbi.conf
   pbibuild/modules/tuxmath/build.sh
   pbibuild/modules/tuxmath/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/tuxmath/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/tuxmath/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/tuxmath/pbi.conf
   pbibuild/modules/tuxpaint/build.sh
   pbibuild/modules/tuxpaint/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/tuxpaint/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/tuxpaint/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/tuxpaint/pbi.conf
Log:

Updated tellico, torcs, trumulous, trigger, tuxmath, tuxpaint to be 100% self-contained now



Modified: pbibuild/modules/tellico/build.sh
===================================================================
--- pbibuild/modules/tellico/build.sh	2009-01-27 19:37:21 UTC (rev 3344)
+++ pbibuild/modules/tellico/build.sh	2009-01-27 19:49:41 UTC (rev 3345)
@@ -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="tellico.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/tellico/copy-files
===================================================================
--- pbibuild/modules/tellico/copy-files	2009-01-27 19:37:21 UTC (rev 3344)
+++ pbibuild/modules/tellico/copy-files	2009-01-27 19:49:41 UTC (rev 3345)
@@ -1,10 +1,5 @@
 /usr/local/bin/tellico bin/
 /usr/local/share/applications/kde/tellico.desktop share/applications/kde/
-/usr/local/share/apps/tellico share/apps/
-/usr/local/share/apps/kconf_update/tellico-rename.upd share/apps/kconf_update/
-/usr/local/share/apps/kconf_update/tellico.upd share/apps/kconf_update/
-/usr/local/share/config/tellicorc share/config/
-/usr/local/share/config.kcfg/tellico_config.kcfg share/config.kcfg/
 /usr/local/share/doc/HTML/en/tellico share/doc/HTML/en/
 /usr/local/share/doc/HTML/fr/tellico share/doc/HTML/fr/
 /usr/local/share/icons/hicolor/128x128/apps/tellico.png share/icons/hicolor/128x128/apps/
@@ -19,4 +14,17 @@
 /usr/local/share/icons/hicolor/48x48/mimetypes/tellico.png share/icons/hicolor/48x48/mimetypes/
 /usr/local/share/icons/hicolor/64x64/apps/tellico.png share/icons/hicolor/64x64/apps/
 /usr/local/share/icons/hicolor/64x64/mimetypes/tellico.png share/icons/hicolor/64x64/mimetypes/
-/usr/local/share/mimelnk/application/x-tellico.desktop share/mimelnk/application/
+/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/
+/usr/local/lib/kde3/*kio* autolibs/kde3/
+/usr/local/lib/kde3/*knoti* autolibs/kde3/
+/usr/local/lib/kde3/kded* autolibs/kde3/
+/usr/local/bin/kio* bin/
+/usr/local/bin/*dcop* bin/
+/usr/local/bin/*arts* bin/

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

Modified: pbibuild/modules/tellico/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/tellico/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
+++ pbibuild/modules/tellico/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:49:41 UTC (rev 3345)
@@ -6,26 +6,7 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/tellico
-rm -fR /usr/local/share/apps/tellico
-rm -fR /usr/local/share/apps/kconf_update/tellico-rename.upd
-rm -fR /usr/local/share/apps/kconf_update/tellico.upd
-rm -fR /usr/local/share/config/tellicorc
-rm -fR /usr/local/share/config.kcfg/tellico_config.kcfg
-rm -fR /usr/local/share/doc/HTML/en/tellico
-rm -fR /usr/local/share/doc/HTML/fr/tellico
-rm -fR /usr/local/share/icons/hicolor/*/apps/tellico.png
-rm -fR /usr/local/share/icons/hicolor/*/mimetypes/tellico.png
-rm -fR /usr/local/share/mimelnk/application/x-tellico.desktop
 
-# Remove the old locale files since we are uninstalling
-LANGFILE="tellico.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/tellico/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/tellico/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
+++ pbibuild/modules/tellico/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:49:41 UTC (rev 3345)
@@ -15,35 +15,12 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-ln -s /Programs/${PROGDIR}/.sbin/tellico /usr/local/bin/tellico
-ln -s /Programs/${PROGDIR}/share/apps/tellico /usr/local/share/apps/tellico
-ln -s /Programs/${PROGDIR}/share/apps/kconf_update/tellico-rename.upd /usr/local/share/apps/kconf_update/tellico-rename.upd
-ln -s /Programs/${PROGDIR}/share/apps/kconf_update/tellico.upd /usr/local/share/apps/kconf_update/tellico.upd
-ln -s /Programs/${PROGDIR}/share/config/tellicorc /usr/local/share/config/tellicorc
-ln -s /Programs/${PROGDIR}/share/config.kcfg/tellico_config.kcfg /usr/local/share/config.kcfg/tellico_config.kcfg
-ln -s /Programs/${PROGDIR}/share/doc/HTML/en/tellico /usr/local/share/doc/HTML/en/tellico
-ln -s /Programs/${PROGDIR}/share/doc/HTML/fr/tellico /usr/local/share/doc/HTML/fr/tellico
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/128x128/apps/tellico.png /usr/local/share/icons/hicolor/128x128/apps/tellico.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/128x128/mimetypes/tellico.png /usr/local/share/icons/hicolor/128x128/mimetypes/tellico.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/16x16/apps/tellico.png /usr/local/share/icons/hicolor/16x16/apps/tellico.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/16x16/mimetypes/tellico.png /usr/local/share/icons/hicolor/16x16/mimetypes/tellico.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/22x22/apps/tellico.png /usr/local/share/icons/hicolor/22x22/apps/tellico.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/22x22/mimetypes/tellico.png /usr/local/share/icons/hicolor/22x22/mimetypes/tellico.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/32x32/apps/tellico.png /usr/local/share/icons/hicolor/32x32/apps/tellico.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/32x32/mimetypes/tellico.png /usr/local/share/icons/hicolor/32x32/mimetypes/tellico.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/48x48/apps/tellico.png /usr/local/share/icons/hicolor/48x48/apps/tellico.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/48x48/mimetypes/tellico.png /usr/local/share/icons/hicolor/48x48/mimetypes/tellico.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/64x64/apps/tellico.png /usr/local/share/icons/hicolor/64x64/apps/tellico.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/64x64/mimetypes/tellico.png /usr/local/share/icons/hicolor/64x64/mimetypes/tellico.png
-ln -s /Programs/${PROGDIR}/share/mimelnk/application/x-tellico.desktop /usr/local/share/mimelnk/application/x-tellico.desktop
+# 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="tellico.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/tellico"
+echo "LAUNCHCLOSE: /Programs/bin/tellico"

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

Modified: pbibuild/modules/torcs/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/torcs/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
+++ pbibuild/modules/torcs/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:49:41 UTC (rev 3345)
@@ -14,23 +14,13 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-rm -fR /Programs/${PROGDIR}/bin/accc-bin
-rm -fR /Programs/${PROGDIR}/bin/nfs2ac-bin
-rm -fR /Programs/${PROGDIR}/bin/nfsperf-bin
-rm -fR /Programs/${PROGDIR}/bin/texmapper-bin
-rm -fR /Programs/${PROGDIR}/bin/torcs-bin
-rm -fR /Programs/${PROGDIR}/bin/torcs-bin
-sed -e '20,30s:prefix=/usr/local:prefix=/Programs/${PROGDIR}:g' /Programs/${PROGDIR}/bin/accc > tempfile && mv -- tempfile /Programs/${PROGDIR}/bin/accc
-sed -e '20,30s:prefix=/usr/local:prefix=/Programs/${PROGDIR}:g' /Programs/${PROGDIR}/bin/nfs2ac > tempfile && mv -- tempfile /Programs/${PROGDIR}/bin/nfs2ac
-sed -e '20,30s:prefix=/usr/local:prefix=/Programs/${PROGDIR}:g' /Programs/${PROGDIR}/bin/nfsperf > tempfile && mv -- tempfile /Programs/${PROGDIR}/bin/nfsperf
-sed 's:prefix=/usr/local:prefix=/Programs/${PROGDIR}:g' /Programs/${PROGDIR}/bin/texmapper > tempfile && mv -- tempfile /Programs/${PROGDIR}/bin/texmapper
-sed -e '20,30s:prefix=/usr/local:prefix=/Programs/${PROGDIR}:g' /Programs/${PROGDIR}/bin/torcs > tempfile && mv -- tempfile /Programs/${PROGDIR}/bin/torcs
-sed -e '20,30s:prefix=/usr/local:prefix=/Programs/${PROGDIR}:g' /Programs/${PROGDIR}/bin/trackgen > tempfile && mv -- tempfile /Programs/${PROGDIR}/bin/trackgen
-chmod +x /Programs/${PROGDIR}/bin/accc
-chmod +x /Programs/${PROGDIR}/bin/nfs2ac
-chmod +x /Programs/${PROGDIR}/bin/nfsperf
-chmod +x /Programs/${PROGDIR}/bin/texmapper
-chmod +x /Programs/${PROGDIR}/bin/torcs
-chmod +x /Programs/${PROGDIR}/bin/trackgen
 
+# 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/torcs"

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

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

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

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

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

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

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

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

Modified: pbibuild/modules/tuxmath/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/tuxmath/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
+++ pbibuild/modules/tuxmath/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:49:41 UTC (rev 3345)
@@ -6,16 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/tuxmath
-rm -fR /usr/local/share/doc/tuxmath
-rm -fR /usr/local/share/tuxmath
-# Remove the old locale files since we are uninstalling
-LANGFILE="tuxmath.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
 
 
 if [ ! -z "$DISPLAY" ]

Modified: pbibuild/modules/tuxmath/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/tuxmath/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
+++ pbibuild/modules/tuxmath/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:49:41 UTC (rev 3345)
@@ -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/tuxmath /usr/local/bin/tuxmath
-ln -s /Programs/${PROGDIR}/share/doc/tuxmath /usr/local/share/doc/tuxmath
-ln -s /Programs/${PROGDIR}/share/tuxmath /usr/local/share/tuxmath
-# Copy over all the LANG files
-LANGFILE="tuxmath.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/tuxmath"
+# 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/tuxmath"

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

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

Modified: pbibuild/modules/tuxpaint/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/tuxpaint/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
+++ pbibuild/modules/tuxpaint/overlay-dir/PBI.RemoveScript.sh	2009-01-27 19:49:41 UTC (rev 3345)
@@ -6,24 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/tuxpaint
-rm -fR /usr/local/bin/tp-magic-config
-rm -fR /usr/local/bin/tuxpaint-import
-rm -fR /usr/local/etc/tuxpaint
-rm -fR /usr/local/include/tuxpaint
-rm -fR /usr/local/lib/tuxpaint
-rm -fR /usr/local/man/man1/tp-magic-config.1.gz
-rm -fR /usr/local/man/man1/tuxpaint-import.1.gz
-rm -fR /usr/local/man/man1/tuxpaint.1.gz
-rm -fR /usr/local/share/doc/tuxpaint
-rm -fR /usr/local/share/tuxpaint
-# Remove the old locale files since we are uninstalling
-LANGFILE="tuxpaint.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/tuxpaint/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/tuxpaint/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:37:21 UTC (rev 3344)
+++ pbibuild/modules/tuxpaint/overlay-dir/PBI.SetupScript.sh	2009-01-27 19:49:41 UTC (rev 3345)
@@ -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/tuxpaint /usr/local/bin/tuxpaint
-ln -s /Programs/${PROGDIR}/.sbin/tp-magic-config /usr/local/bin/tp-magic-config
-ln -s /Programs/${PROGDIR}/.sbin/tuxpaint-import /usr/local/bin/tuxpaint-import
-ln -s /Programs/${PROGDIR}/etc/tuxpaint /usr/local/etc/tuxpaint
-ln -s /Programs/${PROGDIR}/include/tuxpaint /usr/local/include/tuxpaint
-ln -s /Programs/${PROGDIR}/lib/tuxpaint /usr/local/lib/tuxpaint
-ln -s /Programs/${PROGDIR}/man/man1/tp-magic-config.1.gz /usr/local/man/man1/tp-magic-config.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/tuxpaint-import.1.gz /usr/local/man/man1/tuxpaint-import.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/tuxpaint.1.gz /usr/local/man/man1/tuxpaint.1.gz
-ln -s /Programs/${PROGDIR}/share/doc/tuxpaint /usr/local/share/doc/tuxpaint
-ln -s /Programs/${PROGDIR}/share/tuxpaint /usr/local/share/tuxpaint
-# Copy over all the LANG files
-LANGFILE="tuxpaint.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/tuxpaint"
+# 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/tuxpaint"

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



More information about the Commits mailing list