[PC-BSD Commits] r3304 - in pbibuild/modules: freeorion freeorion/kmenu-dir freeorion/overlay-dir freeorion/overlay-dir/bin gpredict gpredict/overlay-dir

svn at pcbsd.org svn at pcbsd.org
Wed Jan 21 07:52:53 PST 2009


Author: kris
Date: 2009-01-21 07:52:53 -0800 (Wed, 21 Jan 2009)
New Revision: 3304

Added:
   pbibuild/modules/freeorion/overlay-dir/bin/freeorion.sh
   pbibuild/modules/freeorion/overlay-dir/bin/freeorionca.sh
   pbibuild/modules/freeorion/overlay-dir/bin/freeoriond.sh
Modified:
   pbibuild/modules/freeorion/build.sh
   pbibuild/modules/freeorion/copy-files
   pbibuild/modules/freeorion/kmenu-dir/freeorion
   pbibuild/modules/freeorion/kmenu-dir/freeorionca
   pbibuild/modules/freeorion/kmenu-dir/freeoriond
   pbibuild/modules/freeorion/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/freeorion/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/freeorion/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/gpredict/build.sh
   pbibuild/modules/gpredict/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/gpredict/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/gpredict/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/gpredict/pbi.conf
   pbibuild/modules/gpredict/preportmake.sh
Log:

Updated freeorion and gpredict to be 100% self-contained now. Looks like FreeOrion is broken on FreeBSD 7.1 though, it hangs when trying to start a game with some weird errors. 



Modified: pbibuild/modules/freeorion/build.sh
===================================================================
--- pbibuild/modules/freeorion/build.sh	2009-01-21 01:58:52 UTC (rev 3303)
+++ pbibuild/modules/freeorion/build.sh	2009-01-21 15:52:53 UTC (rev 3304)
@@ -9,3 +9,18 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
+# Save the right version number in the freeorion.sh
+sed -e "s,CHANGEME,FreeOrion${PORTVER},g" ${PBIDIR}/bin/freeorion.sh > /tmp/freeorion.sh
+mv /tmp/freeorion.sh ${PBIDIR}/bin/freeorion.sh
+chmod 755 ${PBIDIR}/bin/freeorion.sh
+
+# Save the right version number in the freeorion.sh
+sed -e "s,CHANGEME,FreeOrion${PORTVER},g" ${PBIDIR}/bin/freeorionca.sh > /tmp/freeorionca.sh
+mv /tmp/freeorionca.sh ${PBIDIR}/bin/freeorionca.sh
+chmod 755 ${PBIDIR}/bin/freeorionca.sh
+
+# Save the right version number in the freeorion.sh
+sed -e "s,CHANGEME,FreeOrion${PORTVER},g" ${PBIDIR}/bin/freeoriond.sh > /tmp/freeoriond.sh
+mv /tmp/freeoriond.sh ${PBIDIR}/bin/freeoriond.sh
+chmod 755 ${PBIDIR}/bin/freeoriond.sh
+

Modified: pbibuild/modules/freeorion/copy-files
===================================================================
--- pbibuild/modules/freeorion/copy-files	2009-01-21 01:58:52 UTC (rev 3303)
+++ pbibuild/modules/freeorion/copy-files	2009-01-21 15:52:53 UTC (rev 3304)
@@ -1,4 +1,4 @@
 /usr/local/bin/freeorion bin/
 /usr/local/bin/freeorionca bin/
 /usr/local/bin/freeoriond bin/
-/usr/local/share/freeorion share/
\ No newline at end of file
+/usr/local/share/free* share/

Modified: pbibuild/modules/freeorion/kmenu-dir/freeorion
===================================================================
--- pbibuild/modules/freeorion/kmenu-dir/freeorion	2009-01-21 01:58:52 UTC (rev 3303)
+++ pbibuild/modules/freeorion/kmenu-dir/freeorion	2009-01-21 15:52:53 UTC (rev 3304)
@@ -1,4 +1,4 @@
-ExePath: bin/freeorion
+ExePath: bin/freeorion.sh
 ExeIcon: share/pixmaps/freeorion.png
 ExeDescr: FreeOrion
 ExeNoDesktop: 0

Modified: pbibuild/modules/freeorion/kmenu-dir/freeorionca
===================================================================
--- pbibuild/modules/freeorion/kmenu-dir/freeorionca	2009-01-21 01:58:52 UTC (rev 3303)
+++ pbibuild/modules/freeorion/kmenu-dir/freeorionca	2009-01-21 15:52:53 UTC (rev 3304)
@@ -1,4 +1,4 @@
-ExePath: bin/freeorionca
+ExePath: bin/freeorionca.sh
 ExeIcon: share/pixmaps/freeorion.png
 ExeDescr: FreeOrion ca
 ExeNoDesktop: 0

Modified: pbibuild/modules/freeorion/kmenu-dir/freeoriond
===================================================================
--- pbibuild/modules/freeorion/kmenu-dir/freeoriond	2009-01-21 01:58:52 UTC (rev 3303)
+++ pbibuild/modules/freeorion/kmenu-dir/freeoriond	2009-01-21 15:52:53 UTC (rev 3304)
@@ -1,4 +1,4 @@
-ExePath: bin/freeoriond
+ExePath: bin/freeoriond.sh
 ExeIcon: share/pixmaps/freeorion.png
 ExeDescr: FreeOrion Dedicated
 ExeNoDesktop: 0

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

Modified: pbibuild/modules/freeorion/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/freeorion/overlay-dir/PBI.RemoveScript.sh	2009-01-21 01:58:52 UTC (rev 3303)
+++ pbibuild/modules/freeorion/overlay-dir/PBI.RemoveScript.sh	2009-01-21 15:52:53 UTC (rev 3304)
@@ -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/freeorion
-rm -fR /usr/local/bin/freeorionca
-rm -fR /usr/local/bin/freeoriond
-rm -fR /usr/local/share/freeorion
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/freeorion/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/freeorion/overlay-dir/PBI.SetupScript.sh	2009-01-21 01:58:52 UTC (rev 3303)
+++ pbibuild/modules/freeorion/overlay-dir/PBI.SetupScript.sh	2009-01-21 15:52:53 UTC (rev 3304)
@@ -14,8 +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/freeorion /usr/local/bin/freeorion
-ln -s /Programs/${PROGDIR}/.sbin/freeorionca /usr/local/bin/freeorionca
-ln -s /Programs/${PROGDIR}/.sbin/freeoriond /usr/local/bin/freeoriond
-ln -s /Programs/${PROGDIR}/share/freeorion /usr/local/share/freeorion
-echo "LAUNCHCLOSE: /usr/local/bin/freeorion"
+
+# 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/freeorion.sh"

Modified: pbibuild/modules/gpredict/build.sh
===================================================================
--- pbibuild/modules/gpredict/build.sh	2009-01-21 01:58:52 UTC (rev 3303)
+++ pbibuild/modules/gpredict/build.sh	2009-01-21 15:52:53 UTC (rev 3304)
@@ -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,Gpredict${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/gpredict/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/gpredict/overlay-dir/PBI.FirstRun.sh	2009-01-21 01:58:52 UTC (rev 3303)
+++ pbibuild/modules/gpredict/overlay-dir/PBI.FirstRun.sh	2009-01-21 15:52:53 UTC (rev 3304)
@@ -15,37 +15,3 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-
-PROG="gpredict"
-PROGL="GPREDICT"
-BINARY="/usr/local/bin/gpredict"
-
-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/gpredict/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/gpredict/overlay-dir/PBI.RemoveScript.sh	2009-01-21 01:58:52 UTC (rev 3303)
+++ pbibuild/modules/gpredict/overlay-dir/PBI.RemoveScript.sh	2009-01-21 15:52:53 UTC (rev 3304)
@@ -7,11 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/bin/gpredict
-rm /usr/local/share/services/kfile_gpredict.desktop
-rm /usr/local/share/gpredict
-rm /usr/local/share/pixmaps/gpredict 
-
 cd /home
 for i in `ls` 
    do 

Modified: pbibuild/modules/gpredict/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/gpredict/overlay-dir/PBI.SetupScript.sh	2009-01-21 01:58:52 UTC (rev 3303)
+++ pbibuild/modules/gpredict/overlay-dir/PBI.SetupScript.sh	2009-01-21 15:52:53 UTC (rev 3304)
@@ -14,8 +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/gpredict /usr/local/bin/gpredict
-ln -s /Programs/${PROGDIR}/share/gpredict /usr/local/share/gpredict
-ln -s /Programs/${PROGDIR}/share/pixmaps/gpredict /usr/local/share/pixmaps/gpredict
 
-echo "LAUNCHCLOSE: /usr/local/bin/gpredict
+# 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/gpredict"

Modified: pbibuild/modules/gpredict/pbi.conf
===================================================================
--- pbibuild/modules/gpredict/pbi.conf	2009-01-21 01:58:52 UTC (rev 3303)
+++ pbibuild/modules/gpredict/pbi.conf	2009-01-21 15:52:53 UTC (rev 3304)
@@ -25,13 +25,13 @@
 PBIUPDATE="http://update.pbidir.com"
 
 # Other Ports we need built (One per line)
-OTHERPORT=""
+OTHERPORT="/usr/ports/x11-themes/qtcurve-gtk2"
 
 # Enter your custom make options here
 MAKEOPTS=""
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="01"
+BUILDKEY="11"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/gpredict/preportmake.sh
===================================================================
--- pbibuild/modules/gpredict/preportmake.sh	2009-01-21 01:58:52 UTC (rev 3303)
+++ pbibuild/modules/gpredict/preportmake.sh	2009-01-21 15:52:53 UTC (rev 3304)
@@ -1,9 +1,2 @@
 #!/bin/sh
 
-mount -t devfs devfs /dev
-
-mkdir -p /usr/ports/distfiles
-cd /usr/ports/ftp/curl
-make install
-
-umount /dev



More information about the Commits mailing list