[PC-BSD Commits] r3300 - in pbibuild/modules/freeciv: . kmenu-dir overlay-dir overlay-dir/scripts

svn at pcbsd.org svn at pcbsd.org
Tue Jan 20 14:11:13 PST 2009


Author: kris
Date: 2009-01-20 14:11:13 -0800 (Tue, 20 Jan 2009)
New Revision: 3300

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

Updated freeciv, now 100% self-contained, works great here :)



Modified: pbibuild/modules/freeciv/build.sh
===================================================================
--- pbibuild/modules/freeciv/build.sh	2009-01-20 20:57:12 UTC (rev 3299)
+++ pbibuild/modules/freeciv/build.sh	2009-01-20 22:11:13 UTC (rev 3300)
@@ -9,20 +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,FreeCiv${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh
-
-# Get all the various language files and copy them to the PBI
-LANGFILE="freeciv.mo"
-mkdir ${PBIDIR}/locale/
-cd /usr/local/share/locale
-for i in `ls`
-do
-  if [ -e "/usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}" ]
-  then
-    mkdir ${PBIDIR}/locale/${i}
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE} ${PBIDIR}/locale/${i}/
-  fi
-done

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

Modified: pbibuild/modules/freeciv/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/freeciv/overlay-dir/PBI.RemoveScript.sh	2009-01-20 20:57:12 UTC (rev 3299)
+++ pbibuild/modules/freeciv/overlay-dir/PBI.RemoveScript.sh	2009-01-20 22:11:13 UTC (rev 3300)
@@ -6,22 +6,7 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/civclient
-rm -fR /usr/local/bin/civserver
-rm -fR /usr/local/bin/civmanual
-rm -fR /usr/local/man/man6/civclient.6.gz
-rm -fR /usr/local/man/man6/civserver.6.gz
-rm -fR /usr/local/share/freeciv
-#rm -fR /usr/local/share/applications/freeciv.desktop
 
-# Remove the old locale files since we are uninstalling
-LANGFILE="freeciv.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

Modified: pbibuild/modules/freeciv/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/freeciv/overlay-dir/PBI.SetupScript.sh	2009-01-20 20:57:12 UTC (rev 3299)
+++ pbibuild/modules/freeciv/overlay-dir/PBI.SetupScript.sh	2009-01-20 22:11:13 UTC (rev 3300)
@@ -14,20 +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/civclient /usr/local/bin/civclient
-ln -s /Programs/${PROGDIR}/.sbin/civserver /usr/local/bin/civserver
-ln -s /Programs/${PROGDIR}/.sbin/civmanual /usr/local/bin/civmanual
-ln -s /Programs/${PROGDIR}/man/man6/civclient.6.gz /usr/local/man/man6/civclient.6.gz
-ln -s /Programs/${PROGDIR}/man/man6/civserver.6.gz /usr/local/man/man6/civserver.6.gz
-ln -s /Programs/${PROGDIR}/share/freeciv /usr/local/share/freeciv
-#ln -s /Programs/${PROGDIR}/share/applications/freeciv.desktop /usr/local/share/applications/freeciv.desktop
-# Copy over all the LANG files
-LANGFILE="freeciv.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/civclient"
+# 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/civclient"

Modified: pbibuild/modules/freeciv/pbi.conf
===================================================================
--- pbibuild/modules/freeciv/pbi.conf	2009-01-20 20:57:12 UTC (rev 3299)
+++ pbibuild/modules/freeciv/pbi.conf	2009-01-20 22:11:13 UTC (rev 3300)
@@ -25,7 +25,7 @@
 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=""



More information about the Commits mailing list