[PC-BSD Commits] r4196 - in pbibuild/modules/games/frozenbubble: . kmenu-dir overlay-dir overlay-dir/bin

svn at pcbsd.org svn at pcbsd.org
Tue Jul 7 16:56:17 PDT 2009


Author: kris
Date: 2009-07-07 16:56:16 -0700 (Tue, 07 Jul 2009)
New Revision: 4196

Removed:
   pbibuild/modules/games/frozenbubble/overlay-dir/perllib/
Modified:
   pbibuild/modules/games/frozenbubble/copy-files
   pbibuild/modules/games/frozenbubble/kmenu-dir/editor
   pbibuild/modules/games/frozenbubble/kmenu-dir/fbserver
   pbibuild/modules/games/frozenbubble/kmenu-dir/frozenbubble
   pbibuild/modules/games/frozenbubble/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/games/frozenbubble/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/games/frozenbubble/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/games/frozenbubble/overlay-dir/bin/frozen-bubble-editor.sh
   pbibuild/modules/games/frozenbubble/overlay-dir/bin/frozen-bubble.sh
   pbibuild/modules/games/frozenbubble/pbi.conf
Log:

Fixed frozen bubble for PC-BSD 7.x and higher



Modified: pbibuild/modules/games/frozenbubble/copy-files
===================================================================
--- pbibuild/modules/games/frozenbubble/copy-files	2009-07-07 21:44:15 UTC (rev 4195)
+++ pbibuild/modules/games/frozenbubble/copy-files	2009-07-07 23:56:16 UTC (rev 4196)
@@ -6,5 +6,11 @@
 /usr/local/lib/libSD* autolibs/
 /usr/local/lib/libmi* autolibs/
 /usr/local/lib/libsmpeg* autolibs/
+/usr/local/lib/libvor* autolibs/
+/usr/local/lib/libo* autolibs/
+/usr/local/lib/*gtk* autolibs/
+/usr/local/lib/*pango* autolibs/
 /usr/local/share/frozenbubble share/
-/usr/local/lib/perl5 ./perllib
+/usr/local/lib/perl5 autolibs/
+/usr/local/etc/pango* etc/
+/usr/local/etc/gtk* etc/

Modified: pbibuild/modules/games/frozenbubble/kmenu-dir/editor
===================================================================
--- pbibuild/modules/games/frozenbubble/kmenu-dir/editor	2009-07-07 21:44:15 UTC (rev 4195)
+++ pbibuild/modules/games/frozenbubble/kmenu-dir/editor	2009-07-07 23:56:16 UTC (rev 4196)
@@ -3,6 +3,7 @@
 ExeDescr: Map Editor
 ExeNoDesktop: 1
 ExeNoMenu: 0
+ExeNoCrashHandler: 1
 ExeRunRoot: 0
 ExeRunShell: 0
 ExeNotify: 1

Modified: pbibuild/modules/games/frozenbubble/kmenu-dir/fbserver
===================================================================
--- pbibuild/modules/games/frozenbubble/kmenu-dir/fbserver	2009-07-07 21:44:15 UTC (rev 4195)
+++ pbibuild/modules/games/frozenbubble/kmenu-dir/fbserver	2009-07-07 23:56:16 UTC (rev 4196)
@@ -3,6 +3,7 @@
 ExeDescr: FB Server
 ExeNoDesktop: 1
 ExeNoMenu: 1
+ExeNoCrashHandler: 1
 ExeRunRoot: 0
 ExeRunShell: 0
 ExeNotify: 1

Modified: pbibuild/modules/games/frozenbubble/kmenu-dir/frozenbubble
===================================================================
--- pbibuild/modules/games/frozenbubble/kmenu-dir/frozenbubble	2009-07-07 21:44:15 UTC (rev 4195)
+++ pbibuild/modules/games/frozenbubble/kmenu-dir/frozenbubble	2009-07-07 23:56:16 UTC (rev 4196)
@@ -3,6 +3,7 @@
 ExeDescr: FrozenBubble
 ExeNoDesktop: 0
 ExeNoMenu: 0
+ExeNoCrashHandler: 1
 ExeRunRoot: 0
 ExeRunShell: 0
 ExeNotify: 1

Modified: pbibuild/modules/games/frozenbubble/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/games/frozenbubble/overlay-dir/PBI.FirstRun.sh	2009-07-07 21:44:15 UTC (rev 4195)
+++ pbibuild/modules/games/frozenbubble/overlay-dir/PBI.FirstRun.sh	2009-07-07 23:56:16 UTC (rev 4196)
@@ -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 FrozenBubble`
-if [ $? = 0 ]
-then
-	kdialog --msgbox "Please remove the previous version of FrozenBubble first"
-	exit 2
-fi
-

Modified: pbibuild/modules/games/frozenbubble/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/games/frozenbubble/overlay-dir/PBI.RemoveScript.sh	2009-07-07 21:44:15 UTC (rev 4195)
+++ pbibuild/modules/games/frozenbubble/overlay-dir/PBI.RemoveScript.sh	2009-07-07 23:56:16 UTC (rev 4196)
@@ -7,37 +7,5 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/bin/frozen-bubble
-rm /usr/local/bin/frozen-bubble-editor
-rm /usr/local/share/frozenbubble
-rm -rf /usr/local/libexec/frozenbubble
+rm /Programs/bin/fb-server
 
-
-# Remove the old locale files since we are uninstalling
-LANGFILE="frozenbubble.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
- kdialog --yesno "Do you want to remove FrozenBubble user settings?" --title "Remove user settings"
- if [ "$?" = "0" ]
- then
-  cd /home
-  for i in `ls`
-  do
-   if [ -e "/home/${i}/.fbrc" ]
-   then
-    rm -rf /home/${i}/.fbrc
-    rm -rf /home/${i}/.fbhighscores
-    rm -rf /home/${i}/.fbhighscores-mptrain
-    rm -rf /home/${i}/.fbhighlevelshistory
-   fi
-  done
- fi
-fi
-

Modified: pbibuild/modules/games/frozenbubble/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/games/frozenbubble/overlay-dir/PBI.SetupScript.sh	2009-07-07 21:44:15 UTC (rev 4195)
+++ pbibuild/modules/games/frozenbubble/overlay-dir/PBI.SetupScript.sh	2009-07-07 23:56:16 UTC (rev 4196)
@@ -12,23 +12,18 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-cd /Programs/${PROGDIR}
 
-ln -s /Programs/${PROGDIR}/share/frozenbubble /usr/local/share/frozenbubble
-ln -s /Programs/${PROGDIR}/.sbin/frozen-bubble.sh /usr/local/bin/frozen-bubble
-ln -s /Programs/${PROGDIR}/.sbin/frozen-bubble-editor.sh /usr/local/bin/frozen-bubble-editor
+# 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
+  ln -s /PCBSD/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+  ln -s /usr/local/lib/X11 /Programs/${PROGDIR}/lib/X11
+fi
 
-mkdir /usr/local/libexec/frozenbubble
-ln -s /Programs/${PROGDIR}/.sbin/fb-server /usr/local/libexec//frozenbubble/fb-server
 
+ln -fs /Programs/${PROGDIR}/.sbin/fb-server /Programs/bin/fb-server
 
-# Copy over all the LANG files
-LANGFILE="frozenbubble.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/frozen-bubble"
+echo "LAUNCHCLOSE: /Programs/bin/frozen-bubble.sh"

Modified: pbibuild/modules/games/frozenbubble/overlay-dir/bin/frozen-bubble-editor.sh
===================================================================
--- pbibuild/modules/games/frozenbubble/overlay-dir/bin/frozen-bubble-editor.sh	2009-07-07 21:44:15 UTC (rev 4195)
+++ pbibuild/modules/games/frozenbubble/overlay-dir/bin/frozen-bubble-editor.sh	2009-07-07 23:56:16 UTC (rev 4196)
@@ -1,17 +1,10 @@
 #!/bin/sh
 
-if [ -e "/usr/lib/libc.so" ]
-then
-  LD_PRELOAD="/usr/lib/libc.so" ; export LD_PRELOAD
-fi
+LD_PRELOAD="/usr/lib/libpthread.so" ; export LD_PRELOAD
 
-if [ -e "/usr/lib/libc_r.so" ]
-then
-  LD_PRELOAD="/usr/lib/libc_r.so" ; export LD_PRELOAD
-fi
-
 PROGDIR="CHANGEME"
 
-PERLLIB="/Programs/${PROGDIR}/perllib/perl5:/Programs/${PROGDIR}/perllib/perl5/5.8.8/BSDPAN:/Programs/${PROGDIR}/perllib/perl5/site_perl/5.8.8/mach:/Programs/${PROGDIR}/perllib/perl5/site_perl/5.8.8:/Programs/${PROGDIR}/perllib/perl5/site_perl:/Programs/${PROGDIR}/perllib/perl5/5.8.8/mach:/Programs/${PROGDIR}/perllib/perl5/5.8.8" ; export PERLLIB
+PERLLIB="/Programs/${PROGDIR}/lib/perl5"
+export PERLLIB
 
 /Programs/${PROGDIR}/bin/frozen-bubble-editor "$@"

Modified: pbibuild/modules/games/frozenbubble/overlay-dir/bin/frozen-bubble.sh
===================================================================
--- pbibuild/modules/games/frozenbubble/overlay-dir/bin/frozen-bubble.sh	2009-07-07 21:44:15 UTC (rev 4195)
+++ pbibuild/modules/games/frozenbubble/overlay-dir/bin/frozen-bubble.sh	2009-07-07 23:56:16 UTC (rev 4196)
@@ -1,17 +1,11 @@
 #!/bin/sh
 
-if [ -e "/usr/lib/libc.so" ]
-then
-  LD_PRELOAD="/usr/lib/libc.so" ; export LD_PRELOAD
-fi
+LD_PRELOAD="/usr/lib/libpthread.so" ; export LD_PRELOAD
 
-if [ -e "/usr/lib/libc_r.so" ]
-then
-  LD_PRELOAD="/usr/lib/libc_r.so" ; export LD_PRELOAD
-fi
 
 PROGDIR="CHANGEME"
 
-PERLLIB="/Programs/${PROGDIR}/perllib/perl5:/Programs/${PROGDIR}/perllib/perl5/5.8.8/BSDPAN:/Programs/${PROGDIR}/perllib/perl5/site_perl/5.8.8/mach:/Programs/${PROGDIR}/perllib/perl5/site_perl/5.8.8:/Programs/${PROGDIR}/perllib/perl5/site_perl:/Programs/${PROGDIR}/perllib/perl5/5.8.8/mach:/Programs/${PROGDIR}/perllib/perl5/5.8.8" ; export PERLLIB
+PERLLIB="/Programs/${PROGDIR}/lib/perl5"
+export PERLLIB
 
 /Programs/${PROGDIR}/bin/frozen-bubble "$@"

Modified: pbibuild/modules/games/frozenbubble/pbi.conf
===================================================================
--- pbibuild/modules/games/frozenbubble/pbi.conf	2009-07-07 21:44:15 UTC (rev 4195)
+++ pbibuild/modules/games/frozenbubble/pbi.conf	2009-07-07 23:56:16 UTC (rev 4196)
@@ -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"
 
 # 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