[PC-BSD Commits] r3320 - in pbibuild/modules/lazarus: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2009-01-22 12:52:51 -0800 (Thu, 22 Jan 2009)
New Revision: 3320

Modified:
   pbibuild/modules/lazarus/build.sh
   pbibuild/modules/lazarus/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/lazarus/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/lazarus/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/lazarus/pbi.conf
Log:

Updated lazarus to be 100% self-contained, but the port is still broken and wont finish compiling



Modified: pbibuild/modules/lazarus/build.sh
===================================================================
--- pbibuild/modules/lazarus/build.sh	2009-01-22 20:51:56 UTC (rev 3319)
+++ pbibuild/modules/lazarus/build.sh	2009-01-22 20:52:51 UTC (rev 3320)
@@ -8,17 +8,3 @@
 # MODULEDIR = The location of the module directory for this PBI
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
-
-# Get all the various language files and copy them to the PBI
-LANGFILE="kmldonkey.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/lazarus/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/lazarus/overlay-dir/PBI.FirstRun.sh	2009-01-22 20:51:56 UTC (rev 3319)
+++ pbibuild/modules/lazarus/overlay-dir/PBI.FirstRun.sh	2009-01-22 20:52:51 UTC (rev 3320)
@@ -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/lazarus" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/lazarus | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "Lazarus is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/lazarus | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep Lazarus 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "Lazarus could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "Lazarus 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 "Lazarus is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 

Modified: pbibuild/modules/lazarus/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/lazarus/overlay-dir/PBI.RemoveScript.sh	2009-01-22 20:51:56 UTC (rev 3319)
+++ pbibuild/modules/lazarus/overlay-dir/PBI.RemoveScript.sh	2009-01-22 20:52:51 UTC (rev 3320)
@@ -6,12 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/lazarus
-rm -fR /usr/local/bin/lazbuild
-rm -fR /usr/local/man/man1/lazbuild.1.gz
-rm -fR /usr/local/share/doc/lazarus
-rm -fR /usr/local/share/examples/lazarus
-rm -fR /usr/local/share/lazarus
 
 if [ ! -z "$DISPLAY" ]
 then

Modified: pbibuild/modules/lazarus/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/lazarus/overlay-dir/PBI.SetupScript.sh	2009-01-22 20:51:56 UTC (rev 3319)
+++ pbibuild/modules/lazarus/overlay-dir/PBI.SetupScript.sh	2009-01-22 20:52:51 UTC (rev 3320)
@@ -14,11 +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/lazarus /usr/local/bin/lazarus
-ln -s /Programs/${PROGDIR}/.sbin/lazbuild /usr/local/bin/lazbuild
-ln -s /Programs/${PROGDIR}/man/man1/lazbuild.1.gz /usr/local/man/man1/lazbuild.1.gz
-ln -s /Programs/${PROGDIR}/share/doc/lazarus /usr/local/share/doc/lazarus
-ln -s /Programs/${PROGDIR}/share/examples/lazarus /usr/local/share/examples/lazarus
-ln -s /Programs/${PROGDIR}/share/lazarus /usr/local/share/lazarus
 
+# 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/lazarus"

Modified: pbibuild/modules/lazarus/pbi.conf
===================================================================
--- pbibuild/modules/lazarus/pbi.conf	2009-01-22 20:51:56 UTC (rev 3319)
+++ pbibuild/modules/lazarus/pbi.conf	2009-01-22 20:52:51 UTC (rev 3320)
@@ -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=""