[PC-BSD Commits] r4617 - in pbibuild/modules/games/freedoom: . overlay-dir overlay-dir/bin

svn at pcbsd.org svn at pcbsd.org
Thu Oct 8 14:13:24 PDT 2009


Author: kris
Date: 2009-10-08 14:13:23 -0700 (Thu, 08 Oct 2009)
New Revision: 4617

Modified:
   pbibuild/modules/games/freedoom/copy-files
   pbibuild/modules/games/freedoom/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/games/freedoom/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/games/freedoom/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/games/freedoom/overlay-dir/bin/freedoom
   pbibuild/modules/games/freedoom/pbi.conf
Log:

Updated freedoom, works now, but game seems horribly buggy, crashes without reason :(



Modified: pbibuild/modules/games/freedoom/copy-files
===================================================================
--- pbibuild/modules/games/freedoom/copy-files	2009-10-08 20:41:38 UTC (rev 4616)
+++ pbibuild/modules/games/freedoom/copy-files	2009-10-08 21:13:23 UTC (rev 4617)
@@ -1,6 +1,2 @@
-/usr/local/lib/doomlegacy autolibs/
-/usr/local/lib/doomlegacy/lib/doomlegacy/llsndserv bin/
-/usr/local/lib/doomlegacy/lib/doomlegacy/lsdldoom bin/
-/usr/local/share/doom share/
-/usr/local/share/doc/doomlegacy share/doc/
-/usr/local/share/doom/freedoom/doom2.wad share/doom/
\ No newline at end of file
+/usr/local/lib/*SD* lib/
+/usr/local/lib/lib* lib/

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

Modified: pbibuild/modules/games/freedoom/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/games/freedoom/overlay-dir/PBI.RemoveScript.sh	2009-10-08 20:41:38 UTC (rev 4616)
+++ pbibuild/modules/games/freedoom/overlay-dir/PBI.RemoveScript.sh	2009-10-08 21:13:23 UTC (rev 4617)
@@ -6,21 +6,3 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR  /usr/local/bin/freedoom
-#rm -fR /usr/local/share/doc/doomlegacy
-if [ ! -z "$DISPLAY" ]
-then
- # Ask if we want to remove the user profiles
- kdialog --yesno "Do you want to remove Free Doom user settings and temporal files?" --title "Remove user settings"
- if [ "$?" = "0" ]
- then
-  cd /home
-  for i in `ls`
-  do
-   if [ -e "/home/${i}/.freedoom" ]
-   then
-    rm -rf /home/${i}/.freedoom
-   fi
-  done
- fi
-fi
\ No newline at end of file

Modified: pbibuild/modules/games/freedoom/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/games/freedoom/overlay-dir/PBI.SetupScript.sh	2009-10-08 20:41:38 UTC (rev 4616)
+++ pbibuild/modules/games/freedoom/overlay-dir/PBI.SetupScript.sh	2009-10-08 21:13:23 UTC (rev 4617)
@@ -14,8 +14,12 @@
 # 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/freedoom /usr/local/bin/freedoom
 #ln -s /Programs/${PROGDIR}/share/doom /usr/local/share/doom
-ln -s /Programs/${PROGDIR}/autolibs /Programs/${PROGDIR}/lib
 #ln -s /Programs/${PROGDIR}/share/doc/doomlegacy /usr/local/share/doc/doomlegacy
-echo "LAUNCHCLOSE: /usr/local/bin/freedoom"
+
+# Make sure we only use the libGL on the system
+rm /Programs/${PROGDIR}/lib/libGl.*
+rm /Programs/${PROGDIR}/lib/libGL.*
+rm /Programs/${PROGDIR}/lib/libGLU.*
+
+echo "LAUNCHCLOSE: /Programs/bin/freedoom"

Modified: pbibuild/modules/games/freedoom/overlay-dir/bin/freedoom
===================================================================
--- pbibuild/modules/games/freedoom/overlay-dir/bin/freedoom	2009-10-08 20:41:38 UTC (rev 4616)
+++ pbibuild/modules/games/freedoom/overlay-dir/bin/freedoom	2009-10-08 21:13:23 UTC (rev 4617)
@@ -17,5 +17,5 @@
 fi
 
 cd ~/.freedoom || exit 1
-exec ./lsdldoom "$@"
-#exec ./lsdldoom -nocheckwadversion "$@"
+#exec ./lsdldoom "$@"
+exec ./lsdldoom -nocheckwadversion -mb 10 "$@"

Modified: pbibuild/modules/games/freedoom/pbi.conf
===================================================================
--- pbibuild/modules/games/freedoom/pbi.conf	2009-10-08 20:41:38 UTC (rev 4616)
+++ pbibuild/modules/games/freedoom/pbi.conf	2009-10-08 21:13:23 UTC (rev 4617)
@@ -32,6 +32,10 @@
 
 # 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="02"
 
+PBIAUTOPOPULATE_PORTS="/usr/ports/games/doom-data
+/usr/ports/games/doomlegacy"
+export PBIAUTOPOPULATE_PORTS
+
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY



More information about the Commits mailing list