[PC-BSD Commits] r3340 - in pbibuild/modules: openarena openarena/kmenu-dir openarena/overlay-dir openmortal openmortal/overlay-dir opera opera/overlay-dir

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


Author: kris
Date: 2009-01-27 10:09:27 -0800 (Tue, 27 Jan 2009)
New Revision: 3340

Removed:
   pbibuild/modules/openarena/kmenu-dir/uninstall
   pbibuild/modules/openarena/overlay-dir/scripts/
Modified:
   pbibuild/modules/openarena/build.sh
   pbibuild/modules/openarena/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/openarena/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/openarena/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/openarena/pbi.conf
   pbibuild/modules/openmortal/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/openmortal/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/openmortal/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/openmortal/pbi.conf
   pbibuild/modules/opera/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/opera/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/opera/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/opera/pbi.conf
Log:

Updated openarena, openmortal, opera to be 100% self-contained now




Modified: pbibuild/modules/openarena/build.sh
===================================================================
--- pbibuild/modules/openarena/build.sh	2009-01-27 17:58:31 UTC (rev 3339)
+++ pbibuild/modules/openarena/build.sh	2009-01-27 18:09:27 UTC (rev 3340)
@@ -9,7 +9,3 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,Open Arena${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/openarena/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/openarena/overlay-dir/PBI.FirstRun.sh	2009-01-27 17:58:31 UTC (rev 3339)
+++ pbibuild/modules/openarena/overlay-dir/PBI.FirstRun.sh	2009-01-27 18:09:27 UTC (rev 3340)
@@ -16,36 +16,6 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-
-if [ -e "/usr/local/bin/openarena" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/openarena | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "Open Arena is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/openarena | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep Open Arena 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "Open Arena could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "Open Arena 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 "Open Arena 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
@@ -54,4 +24,4 @@
    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
+fi

Modified: pbibuild/modules/openarena/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/openarena/overlay-dir/PBI.RemoveScript.sh	2009-01-27 17:58:31 UTC (rev 3339)
+++ pbibuild/modules/openarena/overlay-dir/PBI.RemoveScript.sh	2009-01-27 18:09:27 UTC (rev 3340)
@@ -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/openarena
-rm -fR /usr/local/bin/openarena-smp
-rm -fR /usr/local/bin/openarenaded
-rm -fR /usr/local/share/openarena
 
 if [ ! -z "$DISPLAY" ]
 then

Modified: pbibuild/modules/openarena/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/openarena/overlay-dir/PBI.SetupScript.sh	2009-01-27 17:58:31 UTC (rev 3339)
+++ pbibuild/modules/openarena/overlay-dir/PBI.SetupScript.sh	2009-01-27 18:09:27 UTC (rev 3340)
@@ -14,10 +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/openarena /usr/local/bin/openarena
-ln -s /Programs/${PROGDIR}/.sbin/openarena-smp /usr/local/bin/openarena-smp
-ln -s /Programs/${PROGDIR}/.sbin/openarenaded /usr/local/bin/openarenaded
-ln -s /Programs/${PROGDIR}/share/openarena /usr/local/share/openarena
 
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
 
-echo "LAUNCHCLOSE: /usr/local/bin/openarena-smp"
+echo "LAUNCHCLOSE: /Programs/bin/openarena-smp"

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

Modified: pbibuild/modules/openmortal/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/openmortal/overlay-dir/PBI.RemoveScript.sh	2009-01-27 17:58:31 UTC (rev 3339)
+++ pbibuild/modules/openmortal/overlay-dir/PBI.RemoveScript.sh	2009-01-27 18:09:27 UTC (rev 3340)
@@ -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/openmortal
-rm -fR /usr/local/share/openmortal
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/openmortal/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/openmortal/overlay-dir/PBI.SetupScript.sh	2009-01-27 17:58:31 UTC (rev 3339)
+++ pbibuild/modules/openmortal/overlay-dir/PBI.SetupScript.sh	2009-01-27 18:09:27 UTC (rev 3340)
@@ -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/openmortal /usr/local/bin/openmortal
-ln -s /Programs/${PROGDIR}/share/openmortal /usr/local/share/openmortal
-echo "LAUNCHCLOSE: /usr/local/bin/openmortal"
+
+# 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/openmortal"

Modified: pbibuild/modules/openmortal/pbi.conf
===================================================================
--- pbibuild/modules/openmortal/pbi.conf	2009-01-27 17:58:31 UTC (rev 3339)
+++ pbibuild/modules/openmortal/pbi.conf	2009-01-27 18:09:27 UTC (rev 3340)
@@ -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/opera/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/opera/overlay-dir/PBI.FirstRun.sh	2009-01-27 17:58:31 UTC (rev 3339)
+++ pbibuild/modules/opera/overlay-dir/PBI.FirstRun.sh	2009-01-27 18:09:27 UTC (rev 3340)
@@ -12,10 +12,3 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-INSTALLED=`ls /Programs | grep Opera`
-if [ $? = 0 ]
-then
-	kdialog --msgbox "Please remove the previous version of Opera first"
-	exit 2
-fi
-

Modified: pbibuild/modules/opera/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/opera/overlay-dir/PBI.RemoveScript.sh	2009-01-27 17:58:31 UTC (rev 3339)
+++ pbibuild/modules/opera/overlay-dir/PBI.RemoveScript.sh	2009-01-27 18:09:27 UTC (rev 3340)
@@ -7,9 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/bin/opera
-rm /usr/local/share/opera
-
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/opera/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/opera/overlay-dir/PBI.SetupScript.sh	2009-01-27 17:58:31 UTC (rev 3339)
+++ pbibuild/modules/opera/overlay-dir/PBI.SetupScript.sh	2009-01-27 18:09:27 UTC (rev 3340)
@@ -14,12 +14,16 @@
 
 cd /Programs/${PROGDIR}
 
-ln -s /Programs/${PROGDIR}/share/opera /usr/local/share/opera
-ln -s /Programs/${PROGDIR}/bin/opera /usr/local/bin/opera
-
 # Copy the extra lang packages to the locale dir
 cd extra-langs
 mv *.lng /Programs/${PROGDIR}/share/opera/locale/
 
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
 
-echo "LAUNCHCLOSE: /usr/local/bin/opera"
+echo "LAUNCHCLOSE: /Programs/bin/opera"

Modified: pbibuild/modules/opera/pbi.conf
===================================================================
--- pbibuild/modules/opera/pbi.conf	2009-01-27 17:58:31 UTC (rev 3339)
+++ pbibuild/modules/opera/pbi.conf	2009-01-27 18:09:27 UTC (rev 3340)
@@ -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="21"
+BUILDKEY="01"
 
 # If this port has a non-standard port version variable in Makefile, then
 # list the key here such as "OOOVERSION="



More information about the Commits mailing list