[PC-BSD Commits] r12699 - in pbibuild/modules/mail/thunderbird: . kmenu-dir overlay-dir/bin

[svn at pcbsd.org]

Author: kris
Date: 2011-09-07 09:40:08 -0700 (Wed, 07 Sep 2011)
New Revision: 12699

Added:
   pbibuild/modules/mail/thunderbird/overlay-dir/bin/thunderbird-wrapper
Modified:
   pbibuild/modules/mail/thunderbird/build.sh
   pbibuild/modules/mail/thunderbird/kmenu-dir/thunderbird
   pbibuild/modules/mail/thunderbird/pbi.conf
Log:

Rebuild TB 8.x with enigmail fix



Modified: pbibuild/modules/mail/thunderbird/build.sh
===================================================================
--- pbibuild/modules/mail/thunderbird/build.sh	2011-09-07 16:24:13 UTC (rev 12698)
+++ pbibuild/modules/mail/thunderbird/build.sh	2011-09-07 16:40:08 UTC (rev 12699)
@@ -13,7 +13,13 @@
 
 # remove the -p line in the thunderbird file
 sed -i.bak "s,-p |,,g" ${PBIDIR}/bin/thunderbird
+rm ${PBIDIR}/bin/thunderbird-wrapper
 
+# Make sure to use the wrapper for enigmail
+sed -i.bak "s,CHANGEME,${PBI_TARGETFULLDIR},g" ${PBIDIR}/bin/thunderbird-wrapper
+rm ${PBIDIR}/bin/thunderbird-wrapper.bak
+chmod 755 ${PBIDIR}/bin/thunderbird-wrapper
+
 chmod 755 ${PBIDIR}/bin/*
 
 rm -rf /${PBIDIR}/${TBLIBDIR}/extensions/lang*

Modified: pbibuild/modules/mail/thunderbird/kmenu-dir/thunderbird
===================================================================
--- pbibuild/modules/mail/thunderbird/kmenu-dir/thunderbird	2011-09-07 16:24:13 UTC (rev 12698)
+++ pbibuild/modules/mail/thunderbird/kmenu-dir/thunderbird	2011-09-07 16:40:08 UTC (rev 12699)
@@ -1,4 +1,4 @@
-ExePath: bin/thunderbird
+ExePath: bin/thunderbird-wrapper
 ExeIcon: share/pixmaps/thunderbird-128.png
 ExeDescr: Thunderbird
 ExeNoDesktop: 0


Property changes on: pbibuild/modules/mail/thunderbird/overlay-dir/bin/thunderbird-wrapper
___________________________________________________________________
Added: svn:executable
   + *

Modified: pbibuild/modules/mail/thunderbird/pbi.conf
===================================================================
--- pbibuild/modules/mail/thunderbird/pbi.conf	2011-09-07 16:24:13 UTC (rev 12698)
+++ pbibuild/modules/mail/thunderbird/pbi.conf	2011-09-07 16:40:08 UTC (rev 12699)
@@ -38,6 +38,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="04"
+BUILDKEY="05"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY