[PC-BSD Commits] r3342 - in pbibuild/modules: qcad qcad/overlay-dir qsstv qsstv/overlay-dir quake3 quake3/overlay-dir

svn at pcbsd.org svn at pcbsd.org
Tue Jan 27 10:46:04 PST 2009


Author: kris
Date: 2009-01-27 10:46:04 -0800 (Tue, 27 Jan 2009)
New Revision: 3342

Modified:
   pbibuild/modules/qcad/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/qcad/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/qcad/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/qcad/pbi.conf
   pbibuild/modules/qsstv/build.sh
   pbibuild/modules/qsstv/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/qsstv/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/qsstv/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/qsstv/pbi.conf
   pbibuild/modules/quake3/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/quake3/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/quake3/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/quake3/pbi.conf
Log:

Updated qcad, qsstv and quake3 to be 100% self-contained



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

Modified: pbibuild/modules/qcad/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/qcad/overlay-dir/PBI.RemoveScript.sh	2009-01-27 18:29:58 UTC (rev 3341)
+++ pbibuild/modules/qcad/overlay-dir/PBI.RemoveScript.sh	2009-01-27 18:46:04 UTC (rev 3342)
@@ -7,6 +7,3 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm -fR /usr/local/bin/qcad
-rm -fR /usr/local/share/qcad
-rm -fR /usr/local/share/doc/qcad

Modified: pbibuild/modules/qcad/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/qcad/overlay-dir/PBI.SetupScript.sh	2009-01-27 18:29:58 UTC (rev 3341)
+++ pbibuild/modules/qcad/overlay-dir/PBI.SetupScript.sh	2009-01-27 18:46:04 UTC (rev 3342)
@@ -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/qcad /usr/local/bin/qcad
-ln -s /Programs/${PROGDIR}/share/qcad /usr/local/share/qcad
-ln -s /Programs/${PROGDIR}/share/doc/qcad /usr/local/share/doc/qcad
-echo "LAUNCHCLOSE: /usr/local/bin/qcad"
+
+# 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/qcad"

Modified: pbibuild/modules/qcad/pbi.conf
===================================================================
--- pbibuild/modules/qcad/pbi.conf	2009-01-27 18:29:58 UTC (rev 3341)
+++ pbibuild/modules/qcad/pbi.conf	2009-01-27 18:46:04 UTC (rev 3342)
@@ -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="32"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/qsstv/build.sh
===================================================================
--- pbibuild/modules/qsstv/build.sh	2009-01-27 18:29:58 UTC (rev 3341)
+++ pbibuild/modules/qsstv/build.sh	2009-01-27 18:46:04 UTC (rev 3342)
@@ -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,Xlog${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh

Modified: pbibuild/modules/qsstv/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/qsstv/overlay-dir/PBI.FirstRun.sh	2009-01-27 18:29:58 UTC (rev 3341)
+++ pbibuild/modules/qsstv/overlay-dir/PBI.FirstRun.sh	2009-01-27 18:46:04 UTC (rev 3342)
@@ -16,36 +16,3 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-PROG="qsstv"
-PROGL="Qsstv"
-BINARY="/usr/local/bin/${PROG}"
-
-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/qsstv/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/qsstv/overlay-dir/PBI.RemoveScript.sh	2009-01-27 18:29:58 UTC (rev 3341)
+++ pbibuild/modules/qsstv/overlay-dir/PBI.RemoveScript.sh	2009-01-27 18:46:04 UTC (rev 3342)
@@ -7,9 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/bin/qsstv
-rm /usr/local/share/doc/qsstv
-
 cd /home
 for i in *
    do 

Modified: pbibuild/modules/qsstv/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/qsstv/overlay-dir/PBI.SetupScript.sh	2009-01-27 18:29:58 UTC (rev 3341)
+++ pbibuild/modules/qsstv/overlay-dir/PBI.SetupScript.sh	2009-01-27 18:46:04 UTC (rev 3342)
@@ -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/qsstv /usr/local/bin/qsstv
-ln -s /Programs/${PROGDIR}/share/doc /usr/local/share/doc/qsstv
 
-echo "LAUNCHCLOSE: /usr/local/bin/qsstv"
+# 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/qsstv"

Modified: pbibuild/modules/qsstv/pbi.conf
===================================================================
--- pbibuild/modules/qsstv/pbi.conf	2009-01-27 18:29:58 UTC (rev 3341)
+++ pbibuild/modules/qsstv/pbi.conf	2009-01-27 18:46:04 UTC (rev 3342)
@@ -13,7 +13,7 @@
 PROGAUTHOR="Johan ON4QZ"
 
 # Default Icon (Relative to overlay-dir)
-PROGICON="qsstv.xpm"
+PROGICON="qsstv.png"
 
 # Port we want to build
 PBIPORT="/usr/ports/comms/qsstv/"
@@ -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/quake3/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/quake3/overlay-dir/PBI.FirstRun.sh	2009-01-27 18:29:58 UTC (rev 3341)
+++ pbibuild/modules/quake3/overlay-dir/PBI.FirstRun.sh	2009-01-27 18:46:04 UTC (rev 3342)
@@ -16,42 +16,10 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-
-if [ -e "/usr/local/bin/quake3" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/quake3 | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "Quake3 is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/quake3 | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep Quake3 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "Quake3 could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "Quake3 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 "Quake3 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/quake3/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/quake3/overlay-dir/PBI.RemoveScript.sh	2009-01-27 18:29:58 UTC (rev 3341)
+++ pbibuild/modules/quake3/overlay-dir/PBI.RemoveScript.sh	2009-01-27 18:46:04 UTC (rev 3342)
@@ -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/quake3
-rm -fR /usr/local/bin/quake3-smp
-rm -fR /usr/local/bin/q3ded
-rm -fR /usr/local/share/quake3
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/quake3/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/quake3/overlay-dir/PBI.SetupScript.sh	2009-01-27 18:29:58 UTC (rev 3341)
+++ pbibuild/modules/quake3/overlay-dir/PBI.SetupScript.sh	2009-01-27 18:46:04 UTC (rev 3342)
@@ -14,9 +14,14 @@
 # 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/quake3 /usr/local/bin/quake3
-ln -s /Programs/${PROGDIR}/.sbin/quake3-smp /usr/local/bin/quake3-smp
-ln -s /Programs/${PROGDIR}/.sbin/q3ded /usr/local/bin/q3ded
-ln -s /Programs/${PROGDIR}/share/quake3 /usr/local/share/quake3
 
-echo "LAUNCHCLOSE: /usr/local/bin/quake3"
+
+# 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/quake3"

Modified: pbibuild/modules/quake3/pbi.conf
===================================================================
--- pbibuild/modules/quake3/pbi.conf	2009-01-27 18:29:58 UTC (rev 3341)
+++ pbibuild/modules/quake3/pbi.conf	2009-01-27 18:46:04 UTC (rev 3342)
@@ -32,7 +32,7 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="03"
+BUILDKEY="01"
 
 # Don't build this PBI on certian processors (i386 / amd64)
 ARCHIGNORE="amd64" ; export ARCHIGNORE



More information about the Commits mailing list