[PC-BSD Commits] r3152 - in pbibuild/modules: bibletime bibletime/overlay-dir firefox3 firefox3/overlay-dir

svn at pcbsd.org svn at pcbsd.org
Mon Dec 29 12:54:18 PST 2008


Author: kris
Date: 2008-12-29 12:54:18 -0800 (Mon, 29 Dec 2008)
New Revision: 3152

Added:
   pbibuild/modules/bibletime/overlay-dir/lib/
Modified:
   pbibuild/modules/bibletime/build.sh
   pbibuild/modules/bibletime/copy-files
   pbibuild/modules/bibletime/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/bibletime/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/bibletime/pbi.conf
   pbibuild/modules/firefox3/copy-files
   pbibuild/modules/firefox3/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/firefox3/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/firefox3/pbi.conf
Log:

Updated firefox3 & bibletime to use the new PBIv2 schema, with only a link in /usr/local/bin being created now for user convience :) The PBI's run entirely from their /Programs/<PBI> structure. 



Modified: pbibuild/modules/bibletime/build.sh
===================================================================
--- pbibuild/modules/bibletime/build.sh	2008-12-29 20:49:51 UTC (rev 3151)
+++ pbibuild/modules/bibletime/build.sh	2008-12-29 20:54:18 UTC (rev 3152)
@@ -9,3 +9,4 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
+

Modified: pbibuild/modules/bibletime/copy-files
===================================================================
--- pbibuild/modules/bibletime/copy-files	2008-12-29 20:49:51 UTC (rev 3151)
+++ pbibuild/modules/bibletime/copy-files	2008-12-29 20:54:18 UTC (rev 3152)
@@ -3,3 +3,10 @@
 /usr/local/kde4/share/icons/bibletime* ./
 /usr/local/share/sword share/
 /usr/local/etc/sword.conf etc/
+/usr/local/kde4/share/apps/khtml kde4/share/apps/khtml
+/usr/local/kde4/share/config kde4/share/config
+/usr/local/kde4/share/config.kcfg kde4/share/config.kcfg
+/usr/local/kde4/share/services kde4/share/services
+/usr/local/kde4/share/servicetypes kde4/share/servicetypes
+/usr/local/kde4/share/bibletime/icons/bibletime.svg share/bibletime/icons/.svg
+/usr/local/lib/qt4/plugins/imageformats lib/qt4/plugins/imageformats

Modified: pbibuild/modules/bibletime/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/bibletime/overlay-dir/PBI.RemoveScript.sh	2008-12-29 20:49:51 UTC (rev 3151)
+++ pbibuild/modules/bibletime/overlay-dir/PBI.RemoveScript.sh	2008-12-29 20:54:18 UTC (rev 3152)
@@ -7,10 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 rm -fR /usr/local/bin/bibletime
-rm /usr/local/kde4/share/bibletime
-rm /usr/local/kde4/share/icons/bibletime.svg
-rm /usr/local/share/sword
-rm /usr/local/etc/sword.conf
 
 if [ ! -z "$DISPLAY" ]
 then

Modified: pbibuild/modules/bibletime/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/bibletime/overlay-dir/PBI.SetupScript.sh	2008-12-29 20:49:51 UTC (rev 3151)
+++ pbibuild/modules/bibletime/overlay-dir/PBI.SetupScript.sh	2008-12-29 20:54:18 UTC (rev 3152)
@@ -15,9 +15,13 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 ln -s /Programs/${PROGDIR}/.sbin/bibletime /usr/local/bin/bibletime
-ln -s /Programs/${PROGDIR}/share/bibletime /usr/local/kde4/share/bibletime
-ln -s /Programs/${PROGDIR}/bibletime.svg /usr/local/kde4/share/icons/bibletime.svg
-ln -s /Programs/${PROGDIR}/share/sword /usr/local/share/sword
-ln -s /Programs/${PROGDIR}/etc/sword.conf /usr/local/etc/sword.conf
 
+# 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/bibletime"

Modified: pbibuild/modules/bibletime/pbi.conf
===================================================================
--- pbibuild/modules/bibletime/pbi.conf	2008-12-29 20:49:51 UTC (rev 3151)
+++ pbibuild/modules/bibletime/pbi.conf	2008-12-29 20:54:18 UTC (rev 3152)
@@ -32,6 +32,6 @@
 
 # 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

Modified: pbibuild/modules/firefox3/copy-files
===================================================================
--- pbibuild/modules/firefox3/copy-files	2008-12-29 20:49:51 UTC (rev 3151)
+++ pbibuild/modules/firefox3/copy-files	2008-12-29 20:54:18 UTC (rev 3152)
@@ -42,3 +42,4 @@
 /usr/local/lib/libsoftokn3* autolibs/
 /usr/local/lib/libsssl3* autolibs/
 /usr/local/share/idl/firefox* share/idl/
+/usr/local/share/themes share/

Modified: pbibuild/modules/firefox3/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/firefox3/overlay-dir/PBI.RemoveScript.sh	2008-12-29 20:49:51 UTC (rev 3151)
+++ pbibuild/modules/firefox3/overlay-dir/PBI.RemoveScript.sh	2008-12-29 20:54:18 UTC (rev 3152)
@@ -7,13 +7,9 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-chflags -R noschg /Programs/${1}
-
 rm /usr/local/bin/firefox3
 rm /usr/local/bin/firefox
-rm /usr/local/lib/firefox3
 
-
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/firefox3/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/firefox3/overlay-dir/PBI.SetupScript.sh	2008-12-29 20:49:51 UTC (rev 3151)
+++ pbibuild/modules/firefox3/overlay-dir/PBI.SetupScript.sh	2008-12-29 20:54:18 UTC (rev 3152)
@@ -16,8 +16,14 @@
 #########################################
 ln -fs /Programs/${PROGDIR}/.sbin/firefox3 /usr/local/bin/firefox
 ln -fs /Programs/${PROGDIR}/.sbin/firefox3 /usr/local/bin/firefox3
-ln -fs /Programs/${PROGDIR}/autolibs/firefox3 /usr/local/lib/firefox3
 
+# 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
 
 if [ ! -z "$DISPLAY" ]
 then

Modified: pbibuild/modules/firefox3/pbi.conf
===================================================================
--- pbibuild/modules/firefox3/pbi.conf	2008-12-29 20:49:51 UTC (rev 3151)
+++ pbibuild/modules/firefox3/pbi.conf	2008-12-29 20:54:18 UTC (rev 3152)
@@ -25,13 +25,14 @@
 PBIUPDATE="http://update.pbidir.com"
 
 # Other Ports we need built (One per line)
-OTHERPORT="/usr/ports/audio/esound"
+OTHERPORT="/usr/ports/audio/esound
+/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="21"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY



More information about the Commits mailing list