[PC-BSD Commits] r4281 - in pbibuild/modules/network/ekiga: . kmenu-dir overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2009-07-29 09:01:06 -0700 (Wed, 29 Jul 2009)
New Revision: 4281

Removed:
   pbibuild/modules/network/ekiga/overlay-dir/bin/
Modified:
   pbibuild/modules/network/ekiga/kmenu-dir/ekiga
   pbibuild/modules/network/ekiga/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/network/ekiga/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/network/ekiga/pbi.conf
Log:

Updated ekiga, fixed gconfd errors now, use system gconfd-2



Modified: pbibuild/modules/network/ekiga/kmenu-dir/ekiga
===================================================================
--- pbibuild/modules/network/ekiga/kmenu-dir/ekiga	2009-07-29 13:49:51 UTC (rev 4280)
+++ pbibuild/modules/network/ekiga/kmenu-dir/ekiga	2009-07-29 16:01:06 UTC (rev 4281)
@@ -1,4 +1,4 @@
-ExePath: bin/ekiga.sh
+ExePath: bin/ekiga
 ExeIcon: ekiga.png
 ExeDescr: Ekiga
 ExeNoDesktop: 0

Modified: pbibuild/modules/network/ekiga/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/network/ekiga/overlay-dir/PBI.RemoveScript.sh	2009-07-29 13:49:51 UTC (rev 4280)
+++ pbibuild/modules/network/ekiga/overlay-dir/PBI.RemoveScript.sh	2009-07-29 16:01:06 UTC (rev 4281)
@@ -6,3 +6,14 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
+
+if [ -d "/PCBSD/local" ]
+then
+  BASE="/PCBSD/local"
+else
+  BASE="/usr/local"
+fi
+
+rm ${BASE}/share/dbus-1/services/net.ekiga.helper.service
+rm ${BASE}/share/dbus-1/services/net.ekiga.instance.service
+

Modified: pbibuild/modules/network/ekiga/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/network/ekiga/overlay-dir/PBI.SetupScript.sh	2009-07-29 13:49:51 UTC (rev 4280)
+++ pbibuild/modules/network/ekiga/overlay-dir/PBI.SetupScript.sh	2009-07-29 16:01:06 UTC (rev 4281)
@@ -20,8 +20,26 @@
 if [ -d "/PCBSD/local/etc/fonts" ]
 then
   ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+  BASE="/PCBSD/local"
 else
   ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+  BASE="/usr/local"
 fi
 
-echo "LAUNCHCLOSE: /Programs/bin/ekiga.sh"
+# Need to copy over all the gconfd stuff, and dbus services
+mkdir -p ${BASE}/etc/gconf/gconf.xml.defaults >/dev/null 2>/dev/null
+mkdir -p ${BASE}/etc/gconf/schemas >/dev/null 2>/dev/null
+
+cd /Programs/${PROGDIR}/etc/gconf/gconf.xml.defaults/
+cp * ${BASE}/etc/gconf/gconf.xml.defaults/
+cd /Programs/${PROGDIR}/etc/gconf/schemas/
+cp * ${BASE}/etc/gconf/schemas/
+
+cp /Programs/${PROGDIR}/share/dbus-1/services/net.ekiga.helper.service ${BASE}/share/dbus-1/services/
+cp /Programs/${PROGDIR}/share/dbus-1/services/net.ekiga.instance.service ${BASE}/share/dbus-1/services/
+
+
+# Make sure we kill all gconfd-2 instances so they re-read settings
+killall -9 gconfd-2 >/dev/null 2>/dev/null
+
+echo "LAUNCHCLOSE: /Programs/bin/ekiga"

Modified: pbibuild/modules/network/ekiga/pbi.conf
===================================================================
--- pbibuild/modules/network/ekiga/pbi.conf	2009-07-29 13:49:51 UTC (rev 4280)
+++ pbibuild/modules/network/ekiga/pbi.conf	2009-07-29 16:01:06 UTC (rev 4281)
@@ -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="01"
+BUILDKEY="08"
 
 PBIAUTOPOPULATE="YES"
 export PBIAUTOPOPULATE