[PC-BSD Commits] r3201 - in pbibuild/modules/bpm: . kmenu-dir overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2009-01-08 10:36:06 -0800 (Thu, 08 Jan 2009)
New Revision: 3201

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

Updated bpm  tobe 100% self-contained now, and only run with kdesu, since it needs root access to work with ports. 



Modified: pbibuild/modules/bpm/build.sh
===================================================================
--- pbibuild/modules/bpm/build.sh	2009-01-08 17:30:26 UTC (rev 3200)
+++ pbibuild/modules/bpm/build.sh	2009-01-08 18:36:06 UTC (rev 3201)
@@ -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="bpm.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/bpm/kmenu-dir/bpm
===================================================================
--- pbibuild/modules/bpm/kmenu-dir/bpm	2009-01-08 17:30:26 UTC (rev 3200)
+++ pbibuild/modules/bpm/kmenu-dir/bpm	2009-01-08 18:36:06 UTC (rev 3201)
@@ -3,7 +3,7 @@
 ExeDescr: BPM
 ExeNoDesktop: 0
 ExeNoMenu: 0
-ExeRunRoot: 0
+ExeRunRoot: 1
 ExeRunShell: 0
 ExeNotify: 1
 ExeLink: 0

Modified: pbibuild/modules/bpm/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/bpm/overlay-dir/PBI.RemoveScript.sh	2009-01-08 17:30:26 UTC (rev 3200)
+++ pbibuild/modules/bpm/overlay-dir/PBI.RemoveScript.sh	2009-01-08 18:36:06 UTC (rev 3201)
@@ -6,25 +6,11 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/bpm
-rm -fR /usr/local/bin/gtk-su
-rm -fR /usr/local/libexec/bpm
-rm -fR /usr/local/share/bpm
-rm -fR /usr/local/share/applications/bpm.desktop
 
-# Remove the old locale files since we are uninstalling
-LANGFILE="bpm.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 BPM user settings and temporal files?" --title "Remove user settings"
+ kdialog --yesno "Do you want to remove BPM user settings and temp files?" --title "Remove user settings"
  if [ "$?" = "0" ]
  then
   cd /home

Modified: pbibuild/modules/bpm/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/bpm/overlay-dir/PBI.SetupScript.sh	2009-01-08 17:30:26 UTC (rev 3200)
+++ pbibuild/modules/bpm/overlay-dir/PBI.SetupScript.sh	2009-01-08 18:36:06 UTC (rev 3201)
@@ -14,19 +14,13 @@
 # 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/bpm /usr/local/bin/bpm
-#ln -s /Programs/${PROGDIR}/.sbin/gtk-su /usr/local/bin/gtk-su
-ln -s /Programs/${PROGDIR}/libexec/bpm /usr/local/libexec/bpm
-ln -s /Programs/${PROGDIR}/share/bpm /usr/local/share/bpm
-ln -s /Programs/${PROGDIR}/share/applications/bpm.desktop /usr/local/share/applications/bpm.desktop
-ln -s /Programs/${PROGDIR}/sbin/* /Programs/${PROGDIR}/bin/
-# Copy over all the LANG files
-LANGFILE="bpm.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/bpm"
+o# 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: kdesu /Programs/bin/bpm"

Modified: pbibuild/modules/bpm/pbi.conf
===================================================================
--- pbibuild/modules/bpm/pbi.conf	2009-01-08 17:30:26 UTC (rev 3200)
+++ pbibuild/modules/bpm/pbi.conf	2009-01-08 18:36:06 UTC (rev 3201)
@@ -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="02"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY