[PC-BSD Commits] r5689 - pbibuild/modules/mail/thunderbird3

[svn at pcbsd.org]

Author: kris
Date: 2009-12-27 10:45:38 -0800 (Sun, 27 Dec 2009)
New Revision: 5689

Modified:
   pbibuild/modules/mail/thunderbird3/build.sh
   pbibuild/modules/mail/thunderbird3/pbi.conf
Log:

Rebuild tb 3 with fixes to location of its libdir



Modified: pbibuild/modules/mail/thunderbird3/build.sh
===================================================================
--- pbibuild/modules/mail/thunderbird3/build.sh	2009-12-27 16:24:38 UTC (rev 5688)
+++ pbibuild/modules/mail/thunderbird3/build.sh	2009-12-27 18:45:38 UTC (rev 5689)
@@ -11,6 +11,8 @@
 #          MODULEDIR = The location of the module directory for this PBI
 ##############################################################################
 
+TBLIBDIR="lib/thunderbird-3.0"
+
 # We need to modify the bin/firefox script to point to the PBI directory
 # properly
 rm /tmp/t-fixed 2>/dev/null
@@ -20,7 +22,7 @@
   echo $line | grep '^moz_libdir=' >/dev/null 2>/dev/null 
   if [ "$?" = "0" ]
   then
-    echo "moz_libdir=\"${PBI_TARGETFULLDIR}/autolibs/thunderbird\"" >>/tmp/t-fixed
+    echo "moz_libdir=\"${PBI_TARGETFULLDIR}/${TBLIBDIR}\"" >>/tmp/t-fixed
   else
     echo "${line}" >> /tmp/t-fixed 
   fi
@@ -35,12 +37,12 @@
 
 chmod 755 ${PBIDIR}/bin/*
 
-rm -rf /${PBIDIR}/autolibs/thunderbird/extensions/lang*
+rm -rf /${PBIDIR}/${TBLIBDIR}/extensions/lang*
 
 # Copy over the lang-packs
 if [ -d "/usr/local/lib/xpi" ]
 then
-  tar cvf - -C /usr/local/lib/xpi/ . | tar xvf - -C ${PBIDIR}/autolibs/thunderbird/extensions/
+  tar cvf - -C /usr/local/lib/xpi/ . | tar xvf - -C ${PBIDIR}/${TBLIBDIR}/extensions/
 fi
 
 
@@ -48,7 +50,7 @@
 # clicking on URLs will get a browser which works
 echo "pref(\"network.protocol-handler.app.http\", \"${PBI_TARGETFULLDIR}/bin/defaultbrowser\");
 pref(\"network.protocol-handler.app.ftp\", \"/${PBI_TARGETFULLDIR}/bin/defaultbrowser\");
-pref(\"network.protocol-handler.app.https\", \"${PBI_TARGETFULLDIR}/bin/defaultbrowser\");" >> ${PBIDIR}/autolibs/thunderbird/greprefs/all.js
+pref(\"network.protocol-handler.app.https\", \"${PBI_TARGETFULLDIR}/bin/defaultbrowser\");" >> ${PBIDIR}/${TBLIBDIR}/greprefs/all.js
 
 # Copy over our modified mimeTypes.rdf file to the correct location
-mv ${PBIDIR}/mimeTypes.rdf ${PBIDIR}/lib/thunderbird/defaults/profile
+mv ${PBIDIR}/mimeTypes.rdf ${PBIDIR}/${TBLIBDIR}/defaults/profile

Modified: pbibuild/modules/mail/thunderbird3/pbi.conf
===================================================================
--- pbibuild/modules/mail/thunderbird3/pbi.conf	2009-12-27 16:24:38 UTC (rev 5688)
+++ pbibuild/modules/mail/thunderbird3/pbi.conf	2009-12-27 18:45:38 UTC (rev 5689)
@@ -35,6 +35,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