diff options
Diffstat (limited to 'mail')
78 files changed, 1258 insertions, 684 deletions
diff --git a/mail/thunderbird-esr-i18n/Makefile b/mail/thunderbird-esr-i18n/Makefile index c8f6c6123175..8bc8a86ce9c5 100644 --- a/mail/thunderbird-esr-i18n/Makefile +++ b/mail/thunderbird-esr-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= thunderbird-i18n -PORTVERSION= 3.1.11 +PORTVERSION= 5.0 CATEGORIES= mail MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/linux-i686/xpi PKGNAMEPREFIX= @@ -16,6 +16,8 @@ DIST_SUBDIR= xpi/${DISTNAME} MAINTAINER= gecko@FreeBSD.org COMMENT= Localized interface for Thunderbird +EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip + .ifndef WITHOUT_SWITCHER RUN_DEPENDS+= xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher .endif @@ -24,15 +26,15 @@ NO_BUILD= yes USE_THUNDERBIRD= yes USE_XPI= *thunderbird -THUNDERBIRD_I18N_ALL= af ar be bg bn-BD ca cs da de el en-GB en-US es-AR es-ES \ - et eu fi fr fy-NL ga-IE he hu id is it ja ko lt nb-NO nl \ - nn-NO pa-IN pl pt-BR pt-PT ro ru si sk sl sq sv-SE tr uk \ - zh-CN zh-TW +THUNDERBIRD_I18N_ALL= ar bg br ca cs da de en-GB en-US es-AR es-ES et eu fi fr \ + fy-NL ga-IE gd gl he hu is it ja ko lt nb-NO nl nn-NO \ + pa-IN pl pt-BR pt-PT rm ru si sk sl sq sv-SE ta-LK tr uk \ + zh-TW .ifdef PACKAGE_BUILDING THUNDERBIRD_I18N?= all .else -THUNDERBIRD_I18N?= zh-CN es-ES pt-BR ru ja de fr pa-IN ko it +THUNDERBIRD_I18N?= es-ES pt-BR ru ja de fr pa-IN ko it .endif .if ${THUNDERBIRD_I18N} == all @@ -45,8 +47,8 @@ WDIR= langpack-*@thunderbird.mozilla.org XPI_DISTNAMES= ${THUNDERBIRD_I18N_} .for dist in ${XPI_DISTNAMES} XPI_ID_${dist}= langpack-${dist}@thunderbird.mozilla.org -XPI_FILES_${dist}= chrome.manifest install.rdf chrome/${dist}.jar defaults/pref/all-l10n.js -XPI_DIRS_${dist}= chrome defaults/pref defaults +XPI_FILES_${dist}= chrome.manifest install.rdf chrome/${dist}.jar +XPI_DIRS_${dist}= chrome .endfor do-extract: @@ -56,7 +58,9 @@ do-extract: if ! (${EXTRACT_CMD} ${_DISTDIR}/$$lang.xpi -d ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org);\ then \ exit 1; \ - fi \ + fi; \ + cd ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org/chrome; \ + ${LOCALBASE}/bin/zip -r $$lang.jar $$lang; \ done do-install: @@ -68,8 +72,8 @@ do-install: @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \ ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A} - @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${WDIR} ; }' ${_A} - @${ECHO_CMD} '@unexec rmdir ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A} + @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ${XPI_LIBDIR}; { ${RM} -fR $$_dir/${WDIR} ; }' ${_A} + @${ECHO_CMD} '@unexec ${RMDIR} ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A} post-patch: ${FIND} ${WRKSRC} -name install.rdf -print0 | \ diff --git a/mail/thunderbird-esr-i18n/distinfo b/mail/thunderbird-esr-i18n/distinfo index b6024eff57db..88d1a2cbcee4 100644 --- a/mail/thunderbird-esr-i18n/distinfo +++ b/mail/thunderbird-esr-i18n/distinfo @@ -1,92 +1,88 @@ -SHA256 (xpi/thunderbird-i18n-3.1.11/af.xpi) = d2676300f8fea683c381b07c046316cc9259b2ec762642cbd9bcb66214d0dc2f -SIZE (xpi/thunderbird-i18n-3.1.11/af.xpi) = 210615 -SHA256 (xpi/thunderbird-i18n-3.1.11/ar.xpi) = 30649cdcc5cce17c0322932698133efb3ecae0da3bed18b5622a2029be4c812a -SIZE (xpi/thunderbird-i18n-3.1.11/ar.xpi) = 230384 -SHA256 (xpi/thunderbird-i18n-3.1.11/be.xpi) = b5d2d70496baf0cd5475ed416dbcc87110eab7163eabe71c4291cf7332ad1d0a -SIZE (xpi/thunderbird-i18n-3.1.11/be.xpi) = 194430 -SHA256 (xpi/thunderbird-i18n-3.1.11/bg.xpi) = 2b4b023866113eccb07e5090852d410d6d85d2f071178ed4fc4d30934a451eb3 -SIZE (xpi/thunderbird-i18n-3.1.11/bg.xpi) = 235125 -SHA256 (xpi/thunderbird-i18n-3.1.11/bn-BD.xpi) = 18e0cf60c411be7a7ad29f0e8f20dddd598703979df2c7a65549738aad47671e -SIZE (xpi/thunderbird-i18n-3.1.11/bn-BD.xpi) = 244827 -SHA256 (xpi/thunderbird-i18n-3.1.11/ca.xpi) = 5e1b3002068406612f13b68514a6f44b9ffc30c70dab159172ddd48884c929db -SIZE (xpi/thunderbird-i18n-3.1.11/ca.xpi) = 219359 -SHA256 (xpi/thunderbird-i18n-3.1.11/cs.xpi) = de60a3b46922507659a804f8d4c22481b1c3de8e1d08d6f85baa9e7a51b9cd37 -SIZE (xpi/thunderbird-i18n-3.1.11/cs.xpi) = 218194 -SHA256 (xpi/thunderbird-i18n-3.1.11/da.xpi) = a609ed3e1fcf4ae4ba36fffcf0b3b6a1ec421b3651a26c96a2db4f625e8954a9 -SIZE (xpi/thunderbird-i18n-3.1.11/da.xpi) = 203226 -SHA256 (xpi/thunderbird-i18n-3.1.11/de.xpi) = 8c66b7b527e025e148f11fbe19fd0b8acc45bf8b2baac6400cbb30b248c9c355 -SIZE (xpi/thunderbird-i18n-3.1.11/de.xpi) = 222817 -SHA256 (xpi/thunderbird-i18n-3.1.11/el.xpi) = 0bfe08f807b4b529bf12053526c803fa104b6c38d132f8f262a498f846ca9762 -SIZE (xpi/thunderbird-i18n-3.1.11/el.xpi) = 210073 -SHA256 (xpi/thunderbird-i18n-3.1.11/en-GB.xpi) = 0e8bfde8e4e442f03afb8f9d85deb1b7b99324194ad9306dd771305ce60d1a11 -SIZE (xpi/thunderbird-i18n-3.1.11/en-GB.xpi) = 203675 -SHA256 (xpi/thunderbird-i18n-3.1.11/en-US.xpi) = e9d8815a034151824700b22daadeaf196e8c3fef3620542d0345a7c43fc0a9ab -SIZE (xpi/thunderbird-i18n-3.1.11/en-US.xpi) = 202586 -SHA256 (xpi/thunderbird-i18n-3.1.11/es-AR.xpi) = ee7e5ffb47d60e47dcd1c40f747541a358eca46b2cc3d950921d144b2dd7e1c7 -SIZE (xpi/thunderbird-i18n-3.1.11/es-AR.xpi) = 218588 -SHA256 (xpi/thunderbird-i18n-3.1.11/es-ES.xpi) = 691410443b2ea2db2b7ced24de3c0628985991ce55e35200ddf474bb93110dc1 -SIZE (xpi/thunderbird-i18n-3.1.11/es-ES.xpi) = 172879 -SHA256 (xpi/thunderbird-i18n-3.1.11/et.xpi) = e4fe7777c73d32cf64bc8d4689d18e7e4f670d8f965bfdd3edcad81bceee3091 -SIZE (xpi/thunderbird-i18n-3.1.11/et.xpi) = 221753 -SHA256 (xpi/thunderbird-i18n-3.1.11/eu.xpi) = 84793c78d3d9120adc189df98c94c4d73511d7f805449fc67a43d4a6482990a3 -SIZE (xpi/thunderbird-i18n-3.1.11/eu.xpi) = 211283 -SHA256 (xpi/thunderbird-i18n-3.1.11/fi.xpi) = 786054a681a8a7077f1810930c9210fbd0e9ec708e58b344840cfdb2241f3afa -SIZE (xpi/thunderbird-i18n-3.1.11/fi.xpi) = 219474 -SHA256 (xpi/thunderbird-i18n-3.1.11/fr.xpi) = 184cfde6453301b5fdfa0549a5793134917f9d3729a953e280161ec9a2cbc9de -SIZE (xpi/thunderbird-i18n-3.1.11/fr.xpi) = 221771 -SHA256 (xpi/thunderbird-i18n-3.1.11/fy-NL.xpi) = c71c158840e3f7c9a2b48db7c4eb887783983e0d221ffacc08ca6a34226509ff -SIZE (xpi/thunderbird-i18n-3.1.11/fy-NL.xpi) = 220800 -SHA256 (xpi/thunderbird-i18n-3.1.11/ga-IE.xpi) = a809fabd7328ecb5e60b9bb6626abd5e44fa8078ac5d597ecd4dfdf5f8d597cf -SIZE (xpi/thunderbird-i18n-3.1.11/ga-IE.xpi) = 219429 -SHA256 (xpi/thunderbird-i18n-3.1.11/he.xpi) = 05d3daad9c69694611513fcbb7dd63ec99468412d6e076d3a8c774fb4f4092a8 -SIZE (xpi/thunderbird-i18n-3.1.11/he.xpi) = 204908 -SHA256 (xpi/thunderbird-i18n-3.1.11/hu.xpi) = 6210fc89e67c1f08c4260b23b5a114114df852498d271ec839bc7b5a0a929257 -SIZE (xpi/thunderbird-i18n-3.1.11/hu.xpi) = 226159 -SHA256 (xpi/thunderbird-i18n-3.1.11/id.xpi) = b1de7097b7be766685aedbe814b1c8a2b2e9c08b393fcd5cb9ae987d20ce9120 -SIZE (xpi/thunderbird-i18n-3.1.11/id.xpi) = 185845 -SHA256 (xpi/thunderbird-i18n-3.1.11/is.xpi) = b4446bcc95fa68bda9f8f1880f1b60f9aecffa28db1d4493130572b5d66b6c02 -SIZE (xpi/thunderbird-i18n-3.1.11/is.xpi) = 214017 -SHA256 (xpi/thunderbird-i18n-3.1.11/it.xpi) = c450d0f68c2f0982fc9cc9f3279439715d7b8fa7559bb75bb59b31955ef671b7 -SIZE (xpi/thunderbird-i18n-3.1.11/it.xpi) = 171393 -SHA256 (xpi/thunderbird-i18n-3.1.11/ja.xpi) = c2191f03aca9b32ac07a7d195f64424a3f1d5ed82d8a75c4a0b7c0dffc5d4b55 -SIZE (xpi/thunderbird-i18n-3.1.11/ja.xpi) = 236626 -SHA256 (xpi/thunderbird-i18n-3.1.11/ko.xpi) = f53b79ffa380f54b226a3a61e2d2277742cf70527e4c186f019d651e1d26f3b3 -SIZE (xpi/thunderbird-i18n-3.1.11/ko.xpi) = 194783 -SHA256 (xpi/thunderbird-i18n-3.1.11/lt.xpi) = 1648ea194666162de0c8ad742df2fcc673916b2b342511cb6f2944f48f27654c -SIZE (xpi/thunderbird-i18n-3.1.11/lt.xpi) = 235296 -SHA256 (xpi/thunderbird-i18n-3.1.11/nb-NO.xpi) = 6dd25c3ba6b5c482a4ea124111b61d6d43e0d791d4c9944a1cfa736a111efbc5 -SIZE (xpi/thunderbird-i18n-3.1.11/nb-NO.xpi) = 213869 -SHA256 (xpi/thunderbird-i18n-3.1.11/nl.xpi) = 6d98d6181ed04ca66798a3e8511b650ab4cb301400685cc065da69e950d1dc7f -SIZE (xpi/thunderbird-i18n-3.1.11/nl.xpi) = 216584 -SHA256 (xpi/thunderbird-i18n-3.1.11/nn-NO.xpi) = 3a9ab5f556968292866f5a492406d4c09f10dde4fb0f6165486f6602115cad72 -SIZE (xpi/thunderbird-i18n-3.1.11/nn-NO.xpi) = 215631 -SHA256 (xpi/thunderbird-i18n-3.1.11/pa-IN.xpi) = 654ee53022ee53a75b9716775ab0e5421b04923178c0ba3d307b46b3897a48f8 -SIZE (xpi/thunderbird-i18n-3.1.11/pa-IN.xpi) = 241100 -SHA256 (xpi/thunderbird-i18n-3.1.11/pl.xpi) = d4ba0ba503d213a4a821ab99678743bd156540ae1a7459b80fa4e078c46ed3b3 -SIZE (xpi/thunderbird-i18n-3.1.11/pl.xpi) = 203878 -SHA256 (xpi/thunderbird-i18n-3.1.11/pt-BR.xpi) = c0529bf7af12a245b7c55f5e0c3c9d9ee4e8f168462a123cc8d91983ad21d44c -SIZE (xpi/thunderbird-i18n-3.1.11/pt-BR.xpi) = 215018 -SHA256 (xpi/thunderbird-i18n-3.1.11/pt-PT.xpi) = ed8f735f7433dbe78c2a767d7dfb65e165d7946a256a0bdc600f05fd6f222b67 -SIZE (xpi/thunderbird-i18n-3.1.11/pt-PT.xpi) = 214252 -SHA256 (xpi/thunderbird-i18n-3.1.11/ro.xpi) = 53b54449117ee582197c97b527a5a2f3213e6be575ba5c1853bd7d5e062b1fce -SIZE (xpi/thunderbird-i18n-3.1.11/ro.xpi) = 221215 -SHA256 (xpi/thunderbird-i18n-3.1.11/ru.xpi) = e1d500dd8c51cbe585e4c0702bfdf6ba5e6aef61064703718dd33ee6a3f4170a -SIZE (xpi/thunderbird-i18n-3.1.11/ru.xpi) = 198272 -SHA256 (xpi/thunderbird-i18n-3.1.11/si.xpi) = 23fee1ef7b12266892d0c8311a6bb0c54299dd477c5bcc1bfc9502b9c2f415a4 -SIZE (xpi/thunderbird-i18n-3.1.11/si.xpi) = 246153 -SHA256 (xpi/thunderbird-i18n-3.1.11/sk.xpi) = 2ae452e53ce3ace687d5ca6d413cd50f68c947568fe96a598bf78be3bb1f7811 -SIZE (xpi/thunderbird-i18n-3.1.11/sk.xpi) = 224600 -SHA256 (xpi/thunderbird-i18n-3.1.11/sl.xpi) = cd04565d38131759fc2ab455cd94e228f3d1f4ae351ed75544eb75b26b224b64 -SIZE (xpi/thunderbird-i18n-3.1.11/sl.xpi) = 218485 -SHA256 (xpi/thunderbird-i18n-3.1.11/sq.xpi) = 8a9443f06d1bd34f282639fc9ea127a851ab46387213e32aca4960f730ab99aa -SIZE (xpi/thunderbird-i18n-3.1.11/sq.xpi) = 211283 -SHA256 (xpi/thunderbird-i18n-3.1.11/sv-SE.xpi) = 42b9e49a41d0684937cbcb3576dfb962cd721cd09415d96373c36e216611769d -SIZE (xpi/thunderbird-i18n-3.1.11/sv-SE.xpi) = 221171 -SHA256 (xpi/thunderbird-i18n-3.1.11/tr.xpi) = 8d458a6eded9e4eb0985b9601918f7424922db549e4fd6eece7889b670b79202 -SIZE (xpi/thunderbird-i18n-3.1.11/tr.xpi) = 215821 -SHA256 (xpi/thunderbird-i18n-3.1.11/uk.xpi) = 0df41a6bf414778e9274dad896b3d8e116a3994564bf6e74fdda87e4edc83b7c -SIZE (xpi/thunderbird-i18n-3.1.11/uk.xpi) = 244808 -SHA256 (xpi/thunderbird-i18n-3.1.11/zh-CN.xpi) = c8c3b092a4a999bb30d47797f9c0850634282ad561a233132f28ced48a0be01f -SIZE (xpi/thunderbird-i18n-3.1.11/zh-CN.xpi) = 219649 -SHA256 (xpi/thunderbird-i18n-3.1.11/zh-TW.xpi) = 5719a75ab55111a2adfff2c982aa7fba6dae91e0977479060f2bf259c2de9024 -SIZE (xpi/thunderbird-i18n-3.1.11/zh-TW.xpi) = 220607 +SHA256 (xpi/thunderbird-i18n-5.0/ar.xpi) = bb3f5afa529bb9ad91004d57c2e4ae77266c4fceaac3af13e69b25756c926eec +SIZE (xpi/thunderbird-i18n-5.0/ar.xpi) = 426291 +SHA256 (xpi/thunderbird-i18n-5.0/bg.xpi) = c19da2505f426dc8d2190db5b6dc3723e92b7f44a48ff03a3b7942b5668a27a7 +SIZE (xpi/thunderbird-i18n-5.0/bg.xpi) = 444151 +SHA256 (xpi/thunderbird-i18n-5.0/br.xpi) = 19c3387c0f66a2787bb1fe7cc89b72d401db476726480e2e7a0e052f4f9e98ac +SIZE (xpi/thunderbird-i18n-5.0/br.xpi) = 356430 +SHA256 (xpi/thunderbird-i18n-5.0/ca.xpi) = 0e1aedbe17a62ae8b6588ef76aeee7468743835857b13b6fa11dc96ca23ca4aa +SIZE (xpi/thunderbird-i18n-5.0/ca.xpi) = 407700 +SHA256 (xpi/thunderbird-i18n-5.0/cs.xpi) = af1c3be0944244dff7f35c7d335b2e28385d83e0ea572c4a43e4dfb3cc4d692c +SIZE (xpi/thunderbird-i18n-5.0/cs.xpi) = 407837 +SHA256 (xpi/thunderbird-i18n-5.0/da.xpi) = 92514d7df29168123279a0b486264d25fdac8ea984d9ea53c1158e0f850fc304 +SIZE (xpi/thunderbird-i18n-5.0/da.xpi) = 350465 +SHA256 (xpi/thunderbird-i18n-5.0/de.xpi) = fcd373a837dcb615b64635d1d2583d55ca5fe36e5dd32f11cdf1c6e50dc656c0 +SIZE (xpi/thunderbird-i18n-5.0/de.xpi) = 406252 +SHA256 (xpi/thunderbird-i18n-5.0/en-GB.xpi) = f7dbb262115a52d4cb6fe2e7119861241b285d08fbdc2a481bc2648bf9bca591 +SIZE (xpi/thunderbird-i18n-5.0/en-GB.xpi) = 381468 +SHA256 (xpi/thunderbird-i18n-5.0/en-US.xpi) = 7f89a05fd921e3fcfe5d83060bac92d4ac54be9dd7b90e9ee2f7b4ae3e7dd99c +SIZE (xpi/thunderbird-i18n-5.0/en-US.xpi) = 381080 +SHA256 (xpi/thunderbird-i18n-5.0/es-AR.xpi) = 4249e4dd9e39bcfb1d08ce2ebd042fd4ee332b949dadc5b706026130c178523b +SIZE (xpi/thunderbird-i18n-5.0/es-AR.xpi) = 399330 +SHA256 (xpi/thunderbird-i18n-5.0/es-ES.xpi) = a952b2c5f098a9685b22b72176575c8d8ba70c8415a24fab2b0a7414242690be +SIZE (xpi/thunderbird-i18n-5.0/es-ES.xpi) = 343865 +SHA256 (xpi/thunderbird-i18n-5.0/et.xpi) = 2dcb8d5086963964889b07d268baa681abc7744fef01219bc8f35db5184822e9 +SIZE (xpi/thunderbird-i18n-5.0/et.xpi) = 399580 +SHA256 (xpi/thunderbird-i18n-5.0/eu.xpi) = 7c940255e7e5dae14fdd725a9a722f13d5aa38eee98ab0f0ff2cca96db98b7cd +SIZE (xpi/thunderbird-i18n-5.0/eu.xpi) = 395631 +SHA256 (xpi/thunderbird-i18n-5.0/fi.xpi) = ff2a8aae8c48be298d3fdd7b0dc5621eff9af2c43a4a9e42c961fb8ecd9c3db7 +SIZE (xpi/thunderbird-i18n-5.0/fi.xpi) = 400828 +SHA256 (xpi/thunderbird-i18n-5.0/fr.xpi) = 49f54a41e64d53cf78b6576e89341672f16e629e25b3ffe689a71431fc796768 +SIZE (xpi/thunderbird-i18n-5.0/fr.xpi) = 403253 +SHA256 (xpi/thunderbird-i18n-5.0/fy-NL.xpi) = 8f0e32f4bcd7b097d746f7ed376e3ff01a28d2f2e8e02be1a3015853888f7fb0 +SIZE (xpi/thunderbird-i18n-5.0/fy-NL.xpi) = 403075 +SHA256 (xpi/thunderbird-i18n-5.0/ga-IE.xpi) = a69b3a0818b5ab7a6c27298884cb415dec7dc3f96ad4a8b78ef8d6a3d851d2d7 +SIZE (xpi/thunderbird-i18n-5.0/ga-IE.xpi) = 411750 +SHA256 (xpi/thunderbird-i18n-5.0/gd.xpi) = 0c84eec07f1a1f8a122c73b56f079445abdd9f029231f5471aba231cfce92ac4 +SIZE (xpi/thunderbird-i18n-5.0/gd.xpi) = 414203 +SHA256 (xpi/thunderbird-i18n-5.0/gl.xpi) = 794eb2977a964108ef031bc952babee6a0dc0e93d40263ee12297c28187f39b8 +SIZE (xpi/thunderbird-i18n-5.0/gl.xpi) = 398333 +SHA256 (xpi/thunderbird-i18n-5.0/he.xpi) = 3f49799adfe9e65d39639402a7a9ce6f8bcf036fbe25aa4aadd483007172f864 +SIZE (xpi/thunderbird-i18n-5.0/he.xpi) = 415116 +SHA256 (xpi/thunderbird-i18n-5.0/hu.xpi) = 8ea419595e4ef5034296485290cf89dc6091361b8f785be8e137ac37e934ed7e +SIZE (xpi/thunderbird-i18n-5.0/hu.xpi) = 415270 +SHA256 (xpi/thunderbird-i18n-5.0/is.xpi) = 8cdf6ddaa75c09ed31e57031f242eb56f0bb87dfc3965f019642a0b035664a44 +SIZE (xpi/thunderbird-i18n-5.0/is.xpi) = 401557 +SHA256 (xpi/thunderbird-i18n-5.0/it.xpi) = d995d24b281c79f36026d302ceb73638d156c619c8a29f7eeaa09c05a6edf89d +SIZE (xpi/thunderbird-i18n-5.0/it.xpi) = 337738 +SHA256 (xpi/thunderbird-i18n-5.0/ja.xpi) = a582214664357c360e2c8aaae8dab7fdd735e9827c8e3f9190542ca85fd89a04 +SIZE (xpi/thunderbird-i18n-5.0/ja.xpi) = 446749 +SHA256 (xpi/thunderbird-i18n-5.0/ko.xpi) = cc629295d61ea7c9f7103a0ddd096af438bd0ef049a6d6d3aef28c1c4104f0b6 +SIZE (xpi/thunderbird-i18n-5.0/ko.xpi) = 358753 +SHA256 (xpi/thunderbird-i18n-5.0/lt.xpi) = bb3e3dde6f71b303cc6a26fc92db9f724c186ab16932cf1532d740decd62a168 +SIZE (xpi/thunderbird-i18n-5.0/lt.xpi) = 523993 +SHA256 (xpi/thunderbird-i18n-5.0/nb-NO.xpi) = 222f84d8e0b791e2b66e76ada384efca190a0cf4c1262d9cb203b506969ae769 +SIZE (xpi/thunderbird-i18n-5.0/nb-NO.xpi) = 396958 +SHA256 (xpi/thunderbird-i18n-5.0/nl.xpi) = b4fd06c5ea15d7ad769f380ce25cd8e2b867f88d49761bc23e1f8e9150a9afa9 +SIZE (xpi/thunderbird-i18n-5.0/nl.xpi) = 397102 +SHA256 (xpi/thunderbird-i18n-5.0/nn-NO.xpi) = 2a8c106becb4d730cd9dc10588ec87fbbb85f55b15575b98a592ae1c63e9eb95 +SIZE (xpi/thunderbird-i18n-5.0/nn-NO.xpi) = 398579 +SHA256 (xpi/thunderbird-i18n-5.0/pa-IN.xpi) = 9f8214b81a7e850cfb1dc977072638578f8fd1cf65b1f6b9235258b86d353c2f +SIZE (xpi/thunderbird-i18n-5.0/pa-IN.xpi) = 434024 +SHA256 (xpi/thunderbird-i18n-5.0/pl.xpi) = 54586577f86b4d2c39c909c90e80075e9ff521227bd5c4dc5b947ed84d0152da +SIZE (xpi/thunderbird-i18n-5.0/pl.xpi) = 383672 +SHA256 (xpi/thunderbird-i18n-5.0/pt-BR.xpi) = c3a827b736e999b24098b6bfa37e4442ae835d66d567bba9b50634aff40ec3f7 +SIZE (xpi/thunderbird-i18n-5.0/pt-BR.xpi) = 406009 +SHA256 (xpi/thunderbird-i18n-5.0/pt-PT.xpi) = 76ee0e9bccf2a225b7ead1259ad82ece574d4db64d383bbf540733c202865f0e +SIZE (xpi/thunderbird-i18n-5.0/pt-PT.xpi) = 402739 +SHA256 (xpi/thunderbird-i18n-5.0/rm.xpi) = aa91f09081aa264b07996f5c5b5f1058ddb5cf12b2bb47c2c4e3cfac1780a8d1 +SIZE (xpi/thunderbird-i18n-5.0/rm.xpi) = 403569 +SHA256 (xpi/thunderbird-i18n-5.0/ru.xpi) = 561e74bae50a7c8a7e436bf70a3188d0e35f8890387d0091178de6c362a3054b +SIZE (xpi/thunderbird-i18n-5.0/ru.xpi) = 398261 +SHA256 (xpi/thunderbird-i18n-5.0/si.xpi) = 36b97239a8b87c0bb5f3ef50ea51ea485f0a9976fb9cd1dbc0cf09c8382375ef +SIZE (xpi/thunderbird-i18n-5.0/si.xpi) = 443551 +SHA256 (xpi/thunderbird-i18n-5.0/sk.xpi) = f8d0f45a365df808d2dc9e7d14037440a9883cef4eadb98bfc5048eb089090ed +SIZE (xpi/thunderbird-i18n-5.0/sk.xpi) = 413255 +SHA256 (xpi/thunderbird-i18n-5.0/sl.xpi) = bed8303d78a69d19f403e881e85756945b06e542a53e2371c7667cd2f5784576 +SIZE (xpi/thunderbird-i18n-5.0/sl.xpi) = 399391 +SHA256 (xpi/thunderbird-i18n-5.0/sq.xpi) = de288e144e65f46d7b6954e828b434cf2fef10444cdc3bdfd09ff015d68a350b +SIZE (xpi/thunderbird-i18n-5.0/sq.xpi) = 347151 +SHA256 (xpi/thunderbird-i18n-5.0/sv-SE.xpi) = 0e388da663b96521c0f5b1b7942bbbe65073a82cbf4e3e9852baa081decc3f37 +SIZE (xpi/thunderbird-i18n-5.0/sv-SE.xpi) = 467630 +SHA256 (xpi/thunderbird-i18n-5.0/ta-LK.xpi) = 42799b855d5b3563d29e68662c13a06c971449a8c68a543f02155951566f946a +SIZE (xpi/thunderbird-i18n-5.0/ta-LK.xpi) = 457259 +SHA256 (xpi/thunderbird-i18n-5.0/tr.xpi) = 0f202abbd2758dc8b995f69be7f3c355ffb8fbf42b54382759930274a9917d36 +SIZE (xpi/thunderbird-i18n-5.0/tr.xpi) = 402358 +SHA256 (xpi/thunderbird-i18n-5.0/uk.xpi) = 63af2eed2f83137928019105f737f3512a1cd0d150f4ff47f903644d08455d3a +SIZE (xpi/thunderbird-i18n-5.0/uk.xpi) = 451686 +SHA256 (xpi/thunderbird-i18n-5.0/zh-TW.xpi) = 48d0ec4797b8ee021e947828d872e682ec56234fba8de6cba5d16ff8cdd7bbc2 +SIZE (xpi/thunderbird-i18n-5.0/zh-TW.xpi) = 419985 diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile index 64fb062c6962..5b32e07c702b 100644 --- a/mail/thunderbird-esr/Makefile +++ b/mail/thunderbird-esr/Makefile @@ -6,7 +6,7 @@ # PORTNAME= thunderbird -DISTVERSION= 3.1.11 +DISTVERSION= 5.0 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source @@ -15,11 +15,13 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}.source MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above -BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr +BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr +LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ + event-1.4:${PORTSDIR}/devel/libevent USE_AUTOTOOLS= autoconf213 USE_GECKO= gecko -CONFLICTS_INSTALL= thunderbird-3.0* +CONFLICTS_INSTALL= thunderbird-3.1* USE_MOZILLA= -png -nss -dbm -jpeg -xft MOZ_TOOLKIT= cairo-gtk2 @@ -31,16 +33,19 @@ MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}" HAS_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes +USE_GL= gl -MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data +MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data,wyciwyg MOZ_GRAPHICS= default,-xbm MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --enable-single-profile --disable-profilesharing \ --enable-application=mail --enable-official-branding \ - --disable-updater --disable-necko-wifi + --disable-updater --disable-necko-wifi \ + --with-system-libevent=${LOCALBASE} MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 -MOZILLA_PLIST_DIRS= bin lib +GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/bin lib/${MOZILLA}/idl \ + lib/${MOZILLA}/include lib/${MOZILLA}/lib MOZ_PKGCONFIG_FILES= PORTNAME_ICON= ${PORTNAME}.png @@ -53,16 +58,9 @@ OPTIONS= .include <bsd.port.pre.mk> -WRKSRC= ${WRKDIR}/comm-1.9.2 +WRKSRC= ${WRKDIR}/comm-miramar MOZSRC:= ${WRKSRC}/mozilla -.if ${OSVERSION} < 700000 -LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio -EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio -.else -EXTRA_PATCHES= ${FILESDIR}/liboggplay_oss -.endif - .if ${ARCH} == powerpc64 .if ${OSVERSION} < 900033 BROKEN= Needs binutils 2.17.50 to build @@ -88,13 +86,21 @@ LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ notify.1:${PORTSDIR}/devel/libnotify .endif +.if ${ARCH} == amd64 || ${ARCH} == i386 +BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm +.endif + post-extract:: ${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \ <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop post-patch: + @${GREP} -Flr \"/proc ${MOZSRC}/ipc/chromium/src/base | ${XARGS} ${REINPLACE_CMD} \ + -e 's|/proc/self/fd|/dev/fd|' \ + -e 's|/proc["/]|/compat/linux&|' ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ ${MOZSRC}/storage/build/Makefile.in \ + ${MOZSRC}/toolkit/library/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${MOZSRC}/security/manager/ssl/src/Makefile.in \ diff --git a/mail/thunderbird-esr/distinfo b/mail/thunderbird-esr/distinfo index 5a7887b45123..e8291769814f 100644 --- a/mail/thunderbird-esr/distinfo +++ b/mail/thunderbird-esr/distinfo @@ -1,2 +1,2 @@ -SHA256 (thunderbird-3.1.11.source.tar.bz2) = 3e78284661b1be1d35753550b7a183d583d7ee68c8bac683283d3931f90fdd1a -SIZE (thunderbird-3.1.11.source.tar.bz2) = 68716700 +SHA256 (thunderbird-5.0.source.tar.bz2) = bb1858dc44e1e9f92b44a1eaf9456190d55b485cf65435266848300ac2b7c5de +SIZE (thunderbird-5.0.source.tar.bz2) = 86637589 diff --git a/mail/thunderbird-esr/files/liboggplay_oss b/mail/thunderbird-esr/files/liboggplay_oss deleted file mode 100644 index e43b0725eea2..000000000000 --- a/mail/thunderbird-esr/files/liboggplay_oss +++ /dev/null @@ -1,15 +0,0 @@ ---- mozilla/media/libsydneyaudio/src/Makefile.in_orgi 2009-04-10 12:12:45.000000000 +0200 -+++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-04-10 12:13:12.000000000 +0200 -@@ -45,6 +45,12 @@ - LIBRARY_NAME = sydneyaudio - FORCE_STATIC_LIB= 1 - -+ifeq ($(OS_ARCH),FreeBSD) -+CSRCS = \ -+ sydney_audio_oss.c \ -+ $(NULL) -+endif -+ - ifeq ($(OS_ARCH),Linux) - CSRCS = \ - sydney_audio_alsa.c \ diff --git a/mail/thunderbird-esr/files/patch-configure.in b/mail/thunderbird-esr/files/patch-configure.in index ae9642b9fffd..b63787947e2a 100644 --- a/mail/thunderbird-esr/files/patch-configure.in +++ b/mail/thunderbird-esr/files/patch-configure.in @@ -1,6 +1,6 @@ ---- configure.in.orig 2009-08-14 11:24:58.206076928 +0200 -+++ configure.in 2009-08-14 11:25:29.601293359 +0200 -@@ -5680,7 +5680,7 @@ +--- configure.in.orig 2011-03-14 14:50:16.000000000 +0100 ++++ configure.in 2011-04-22 12:52:35.061444423 +0200 +@@ -1420,7 +1420,7 @@ CPU_ARCH=sparc ;; @@ -8,4 +8,22 @@ +amd64 | x86_64 | ia64) CPU_ARCH="$OS_TEST" ;; + +@@ -1440,7 +1440,7 @@ + dnl =============================================================== + INTEL_ARCHITECTURE= + case "$OS_TEST" in +- x86_64|i?86) ++ amd64|x86_64|i?86) + INTEL_ARCHITECTURE=1 esac + +@@ -4388,7 +4388,7 @@ + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS + +-if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then ++if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then + ZLIB_CFLAGS="-I${ZLIB_DIR}/include" + ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" + fi diff --git a/mail/thunderbird-esr/files/patch-directory_xpcom_base_src_Makefile.in b/mail/thunderbird-esr/files/patch-directory_xpcom_base_src_Makefile.in deleted file mode 100644 index f56d7b17f104..000000000000 --- a/mail/thunderbird-esr/files/patch-directory_xpcom_base_src_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- directory/xpcom/base/src/Makefile.in.orig 2009-11-22 03:44:31.000000000 +0100 -+++ directory/xpcom/base/src/Makefile.in 2009-11-26 13:06:53.000000000 +0100 -@@ -97,6 +97,10 @@ - $(NULL) - endif - -+ifeq ($(OS_ARCH), FreeBSD) -+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread -+endif -+ - EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(LDAP_LIBS) - - include $(topsrcdir)/config/rules.mk diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc new file mode 100644 index 000000000000..ffb56ac25100 --- /dev/null +++ b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc @@ -0,0 +1,10 @@ +--- mozilla/ipc/chromium/src/base/atomicops_internals_mutex.cc~ ++++ mozilla/ipc/chromium/src/base/atomicops_internals_mutex.cc +@@ -39,6 +39,7 @@ + * ***** END LICENSE BLOCK ***** */ + + #include "base/atomicops.h" ++#include "base/lock.h" + + namespace base { + namespace subtle { diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util.h b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util.h new file mode 100644 index 000000000000..81a4693140a8 --- /dev/null +++ b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util.h @@ -0,0 +1,13 @@ +--- mozilla/ipc/chromium/src/base/file_util.h~ ++++ mozilla/ipc/chromium/src/base/file_util.h +@@ -15,8 +15,9 @@ + #elif defined(ANDROID) + #include <sys/stat.h> + #elif defined(OS_POSIX) ++#include <sys/types.h> ++#include <sys/stat.h> + #include <fts.h> +-#include <sys/stat.h> + #endif + + #include <stdio.h> diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc new file mode 100644 index 000000000000..d0cc3b14e68b --- /dev/null +++ b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/base/file_util_linux.cc~ ++++ mozilla/ipc/chromium/src/base/file_util_linux.cc +@@ -28,7 +28,7 @@ bool GetShmemTempDir(FilePath* path) { + #ifdef ANDROID + return GetTempDir(path); + #else +- *path = FilePath("/dev/shm"); ++ *path = FilePath("/tmp"); + return true; + #endif + } diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_posix.cc b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_posix.cc new file mode 100644 index 000000000000..3c722016e77b --- /dev/null +++ b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-file_util_posix.cc @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/base/file_util_posix.cc~ ++++ mozilla/ipc/chromium/src/base/file_util_posix.cc +@@ -30,6 +30,8 @@ + #include "base/string_util.h" + #include "base/time.h" + ++#define stat64 stat ++ + namespace file_util { + + #if defined(GOOGLE_CHROME_BUILD) diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-platform_file_posix.cc b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-platform_file_posix.cc new file mode 100644 index 000000000000..14e333ca339b --- /dev/null +++ b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-platform_file_posix.cc @@ -0,0 +1,10 @@ +--- mozilla/ipc/chromium/src/base/platform_file_posix.cc~ ++++ mozilla/ipc/chromium/src/base/platform_file_posix.cc +@@ -9,6 +9,7 @@ + #ifdef ANDROID + #include <linux/stat.h> + #endif ++#include <sys/stat.h> + + #include "base/logging.h" + #include "base/string_util.h" diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-platform_thread_posix.cc b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-platform_thread_posix.cc new file mode 100644 index 000000000000..3445b281bc48 --- /dev/null +++ b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-platform_thread_posix.cc @@ -0,0 +1,12 @@ +--- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2011-04-27 09:34:28.000000000 +0200 ++++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc 2011-04-27 19:47:36.344446266 +0200 +@@ -34,7 +33,8 @@ + #if defined(OS_MACOSX) + return mach_thread_self(); + #elif defined(OS_LINUX) +- return syscall(__NR_gettid); ++ // TODO(BSD): find a better thread ID ++ return reinterpret_cast<int64>(pthread_self()); + #endif + } + diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h new file mode 100644 index 000000000000..ca7b24fa4860 --- /dev/null +++ b/mail/thunderbird-esr/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h~ ++++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h +@@ -34,7 +34,7 @@ + #include "base/third_party/nspr/prcpucfg_win.h" + #elif defined(__APPLE__) + #include "base/third_party/nspr/prcpucfg_mac.h" +-#elif defined(__linux__) || defined(ANDROID) ++#elif defined(__FreeBSD__) || defined(ANDROID) + #include "base/third_party/nspr/prcpucfg_linux.h" + #else + #error Provide a prcpucfg.h appropriate for your platform diff --git a/mail/thunderbird-esr/files/patch-ipc-chromium-src-build-build_config.h b/mail/thunderbird-esr/files/patch-ipc-chromium-src-build-build_config.h new file mode 100644 index 000000000000..e7540d38eceb --- /dev/null +++ b/mail/thunderbird-esr/files/patch-ipc-chromium-src-build-build_config.h @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/build/build_config.h~ ++++ mozilla/ipc/chromium/src/build/build_config.h +@@ -17,7 +17,7 @@ + // A set of macros to use for platform detection. + #if defined(__APPLE__) + #define OS_MACOSX 1 +-#elif defined(__linux__) || defined(ANDROID) ++#elif defined(__FreeBSD__) || defined(ANDROID) + #define OS_LINUX 1 + #elif defined(_WIN32) + #define OS_WIN 1 diff --git a/mail/thunderbird/files/patch-directory-sdks-c-sdk-ldap-libraries-libldap-Makefile.in b/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in index 8a065107cd16..63f7b76052c3 100644 --- a/mail/thunderbird/files/patch-directory-sdks-c-sdk-ldap-libraries-libldap-Makefile.in +++ b/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in @@ -1,5 +1,5 @@ ---- directory/sdks/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2009-11-10 09:56:42.000000000 +0100 -+++ directory/sdks/c-sdk/ldap/libraries/libldap/Makefile.in 2009-11-10 09:58:15.000000000 +0100 +--- ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2009-11-10 09:56:42.000000000 +0100 ++++ ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in 2009-11-10 09:58:15.000000000 +0100 @@ -254,6 +254,10 @@ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe endif diff --git a/mail/thunderbird/files/patch-directory-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in b/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in index ff5e375f156b..df2e10326632 100644 --- a/mail/thunderbird/files/patch-directory-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in +++ b/mail/thunderbird-esr/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in @@ -1,5 +1,5 @@ ---- directory/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2008-09-11 16:38:35.000000000 +0200 -+++ directory/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in 2009-12-09 08:53:46.000000000 +0100 +--- ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2008-09-11 16:38:35.000000000 +0200 ++++ ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in 2009-12-09 08:53:46.000000000 +0100 @@ -147,6 +147,11 @@ CUSTOM_LIBS=1 endif diff --git a/mail/thunderbird-esr/files/patch-mozilla-config-rules.mk b/mail/thunderbird-esr/files/patch-mozilla-config-rules.mk deleted file mode 100644 index bbe6fec94311..000000000000 --- a/mail/thunderbird-esr/files/patch-mozilla-config-rules.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- mozilla/config/rules.mk.orig Thu Sep 14 14:07:03 2006 -+++ mozilla/config/rules.mk Wed Oct 18 11:00:09 2006 -@@ -442,9 +442,7 @@ - endif - - ifeq ($(OS_ARCH),FreeBSD) --ifdef IS_COMPONENT --EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic --endif -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc - endif - - ifeq ($(OS_ARCH),NetBSD) diff --git a/mail/thunderbird-esr/files/patch-mozilla-config_autoconf.mk.in b/mail/thunderbird-esr/files/patch-mozilla-config_autoconf.mk.in index 763f8ebfa6de..2cd507fbf7a8 100644 --- a/mail/thunderbird-esr/files/patch-mozilla-config_autoconf.mk.in +++ b/mail/thunderbird-esr/files/patch-mozilla-config_autoconf.mk.in @@ -19,3 +19,13 @@ DIST = $(DEPTH)/dist LIBXUL_SDK = @LIBXUL_SDK@ +@@ -275,7 +275,7 @@ + OS_CPPFLAGS = @CPPFLAGS@ + OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@ + OS_CXXFLAGS = $(OS_CPPFLAGS) @CXXFLAGS@ +-OS_LDFLAGS = @LDFLAGS@ ++OS_LDFLAGS = @LDFLAGS@ -lc + + OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@ + OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@ + diff --git a/mail/thunderbird-esr/files/patch-mozilla-configure.in b/mail/thunderbird-esr/files/patch-mozilla-configure.in index f08b95aa5c20..4ccc7bfe5017 100644 --- a/mail/thunderbird-esr/files/patch-mozilla-configure.in +++ b/mail/thunderbird-esr/files/patch-mozilla-configure.in @@ -1,6 +1,6 @@ ---- mozilla/configure.in.orig 2009-08-14 11:24:58.206076928 +0200 -+++ mozilla/configure.in 2009-08-14 11:25:29.601293359 +0200 -@@ -5680,7 +5680,7 @@ +--- mozilla/configure.in.orig 2010-11-04 21:05:18.000000000 +0100 ++++ mozilla/configure.in 2010-11-09 12:59:28.000000000 +0100 +@@ -1549,7 +1549,7 @@ CPU_ARCH=sparc ;; @@ -8,4 +8,79 @@ +amd64 | x86_64 | ia64) CPU_ARCH="$OS_TEST" ;; + +@@ -1567,7 +1567,7 @@ dnl Set INTEL_ARCHITECTURE if we're comp + dnl =============================================================== + INTEL_ARCHITECTURE= + case "$OS_TEST" in +- x86_64|i?86) ++ amd64|x86_64|i?86) + INTEL_ARCHITECTURE=1 esac + +@@ -3803,19 +3803,21 @@ + AC_CHECK_FUNCS(localtime_r strtok_r) + + dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt +-_SAVE_LDFLAGS=$LDFLAGS +-LDFLAGS="$LDFLAGS -lrt" +-AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt, ++_SAVE_LIBS=$LIBS ++AC_SEARCH_LIBS(clock_gettime, rt) ++AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC), + ac_cv_have_clock_monotonic, + [AC_TRY_LINK([#include <time.h>], + [ struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); ], + ac_cv_have_clock_monotonic=yes, + ac_cv_have_clock_monotonic=no)]) +-LDFLAGS=$_SAVE_LDFLAGS ++LIBS=$_SAVE_LIBS + if test "$ac_cv_have_clock_monotonic" = "yes"; then + HAVE_CLOCK_MONOTONIC=1 +- REALTIME_LIBS=-lrt ++ if test "$ac_cv_search_clock_gettime" != "none required"; then ++ REALTIME_LIBS=$ac_cv_search_clock_gettime ++ fi + AC_DEFINE(HAVE_CLOCK_MONOTONIC) + AC_SUBST(HAVE_CLOCK_MONOTONIC) + AC_SUBST(REALTIME_LIBS) +@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS + +-if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then ++if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then + ZLIB_CFLAGS="-I${ZLIB_DIR}/include" + ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" + fi +@@ -6022,6 +6024,14 @@ + VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" + VPX_X86_ASM=1 + ;; ++ FreeBSD:i386) ++ VPX_ASFLAGS="-f elf32 -rnasm -pnasm" ++ VPX_X86_ASM=1 ++ ;; ++ FreeBSD:amd64) ++ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" ++ VPX_X86_ASM=1 ++ ;; + SunOS:x86) + VPX_ASFLAGS="-f elf32 -rnasm -pnasm" + VPX_X86_ASM=1 +@@ -6392,6 +6402,14 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then + LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" + LIBJPEG_TURBO_X64_ASM=1 + ;; ++ FreeBSD:i386) ++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" ++ LIBJPEG_TURBO_X86_ASM=1 ++ ;; ++ FreeBSD:amd64) ++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" ++ LIBJPEG_TURBO_X64_ASM=1 ++ ;; + SunOS:i?86) + LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" + LIBJPEG_TURBO_X86_ASM=1 diff --git a/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-Makefile.in new file mode 100644 index 000000000000..bad2cf563256 --- /dev/null +++ b/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-Makefile.in @@ -0,0 +1,14 @@ +--- mozilla/gfx/qcms/Makefile.in.orig 2010-11-25 20:10:32.000000000 +0100 ++++ mozilla/gfx/qcms/Makefile.in 2010-11-25 20:10:06.000000000 +0100 +@@ -44,6 +44,11 @@ + endif + endif + endif ++ifeq ($(OS_TEST),amd64) ++ CSRCS += transform-sse2.c transform-sse1.c ++ SSE1_FLAGS=-msse ++ SSE2_FLAGS=-msse2 ++endif + + FORCE_STATIC_LIB = 1 + # This library is used by other shared libs diff --git a/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-qcmstypes.h b/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-qcmstypes.h new file mode 100644 index 000000000000..7a23c9dd3820 --- /dev/null +++ b/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-qcmstypes.h @@ -0,0 +1,11 @@ +--- mozilla/gfx/qcms/qcmstypes.h.orig 2010-11-22 12:01:36.000000000 +0100 ++++ mozilla/gfx/qcms/qcmstypes.h 2010-11-22 12:02:42.000000000 +0100 +@@ -25,7 +25,7 @@ + #ifdef __OS2__ + /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */ + #include <stdlib.h> +-#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED) ++#elif !defined(__intptr_t_defined) && !defined(_INTPTR_T_DECLARED) + typedef PRUptrdiff uintptr_t; + #endif + #endif diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-ctypes-libffi-configure b/mail/thunderbird-esr/files/patch-mozilla-js-ctypes-libffi-configure deleted file mode 100644 index 6a86c5e6fc39..000000000000 --- a/mail/thunderbird-esr/files/patch-mozilla-js-ctypes-libffi-configure +++ /dev/null @@ -1,14 +0,0 @@ -B ---- mozilla/js/ctypes/libffi/configure.orig 2011-02-26 21:17:36.000000000 +0100 -+++ mozilla/js/ctypes/libffi/configure 2011-02-26 21:18:35.000000000 +0100 -@@ -21036,6 +21036,9 @@ - - powerpc-*-freebsd*) - TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc - ;; -+ powerpc64-*-freebsd*) -+ TARGET=POWERPC; TARGETDIR=powerpc -+ ;; - powerpc*-*-rtems*) - TARGET=POWERPC; TARGETDIR=powerpc - ;; diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-src-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-js-src-Makefile.in new file mode 100644 index 000000000000..6aab1acfd935 --- /dev/null +++ b/mail/thunderbird-esr/files/patch-mozilla-js-src-Makefile.in @@ -0,0 +1,22 @@ +--- mozilla/js/src/Makefile.in.orig 2011-03-17 18:51:39.000000000 +0100 ++++ mozilla/js/src/Makefile.in 2011-03-18 19:41:09.000000000 +0100 +@@ -612,7 +612,7 @@ + # to reliably get limit macros defined, we'd always have to define the + # one below before including any header, but that's obscure and + # fragile, so we do it here. +-DEFINES += -D__STDC_LIMIT_MACROS ++DEFINES += -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS + + INCLUDES += -I$(srcdir) + +@@ -666,7 +666,8 @@ + endif # WINNT + + ifeq ($(OS_ARCH),FreeBSD) +-EXTRA_LIBS += -pthread ++DEFINES += -DFREEBSD ++EXTRA_LIBS += -pthread -lc + endif + ifeq ($(OS_ARCH),IRIX) + ifdef USE_N32 + diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-src-build-autoconf-config.sub b/mail/thunderbird-esr/files/patch-mozilla-js-src-build-autoconf-config.sub deleted file mode 100644 index 2cb48a88c0e9..000000000000 --- a/mail/thunderbird-esr/files/patch-mozilla-js-src-build-autoconf-config.sub +++ /dev/null @@ -1,12 +0,0 @@ ---- mozilla/js/src/build/autoconf/config.sub.orig 2010-01-08 09:52:25.000000000 +0100 -+++ mozilla/js/src/build/autoconf/config.sub 2010-01-08 09:52:33.000000000 +0100 -@@ -403,9 +403,6 @@ - amd64) - basic_machine=x86_64-pc - ;; -- amd64-*) -- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` -- ;; - amdahl) - basic_machine=580-amdahl - os=-sysv diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-src-config_config.mk b/mail/thunderbird-esr/files/patch-mozilla-js-src-config_config.mk new file mode 100644 index 000000000000..c5b42ad3457c --- /dev/null +++ b/mail/thunderbird-esr/files/patch-mozilla-js-src-config_config.mk @@ -0,0 +1,10 @@ +--- mozilla/js/src/config/config.mk.orig 2009-08-07 00:49:23.000000000 +0200 ++++ mozilla/js/src/config/config.mk 2009-08-09 20:50:05.000000000 +0200 +@@ -506,6 +506,7 @@ + -I$(srcdir) \ + -I. \ + -I$(DIST)/include -I$(DIST)/include/nsprpub \ ++ -I%%LOCALBASE%%/include \ + $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \ + $(OS_INCLUDES) \ + $(NULL) diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in b/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in index fe78e75474bb..331c5ba47267 100644 --- a/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in +++ b/mail/thunderbird-esr/files/patch-mozilla-js-src-configure.in @@ -1,22 +1,33 @@ ---- mozilla/js/src/configure.in.orig 2010-05-12 21:05:58.000000000 +0200 -+++ mozilla/js/src/configure.in 2010-06-22 16:17:20.000000000 +0200 -@@ -1218,7 +1218,7 @@ - CPU_ARCH=sparc +--- mozilla/js/src/configure.in.orig 2010-11-04 21:05:48.000000000 +0100 ++++ mozilla/js/src/configure.in 2010-11-22 21:30:24.000000000 +0100 +@@ -2621,7 +2621,7 @@ + AC_DEFINE(JS_CPU_X86) + AC_DEFINE(JS_NUNBOX32) ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - esac -@@ -2466,10 +2466,6 @@ - ENABLE_JIT=1 - NANOJIT_ARCH=ARM +-x86_64*-*) ++x86_64*-*|amd64*-*) + ENABLE_TRACEJIT=1 + NANOJIT_ARCH=X64 + ENABLE_METHODJIT=1 +@@ -2638,11 +2638,6 @@ + AC_DEFINE(JS_CPU_ARM) + AC_DEFINE(JS_NUNBOX32) ;; -sparc*-*) -- ENABLE_JIT=1 +- ENABLE_TRACEJIT=1 - NANOJIT_ARCH=Sparc +- AC_DEFINE(JS_CPU_SPARC) - ;; esac - MOZ_ARG_DISABLE_BOOL(jit, + MOZ_ARG_DISABLE_BOOL(methodjit, +@@ -2693,7 +2688,7 @@ + i?86-*) + AC_DEFINE(AVMPLUS_IA32) + ;; +-x86_64*-*) ++x86_64*-*|amd64*-*) + AC_DEFINE(AVMPLUS_AMD64) + AC_DEFINE(AVMPLUS_64BIT) + ;; + diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-src-jslock.cpp b/mail/thunderbird-esr/files/patch-mozilla-js-src-jslock.cpp deleted file mode 100644 index 03f5c60cccf8..000000000000 --- a/mail/thunderbird-esr/files/patch-mozilla-js-src-jslock.cpp +++ /dev/null @@ -1,18 +0,0 @@ ---- mozilla/js/src/jslock.cpp.orig 2010-01-23 20:35:45.000000000 +0100 -+++ mozilla/js/src/jslock.cpp 2010-01-23 20:37:35.000000000 +0100 -@@ -160,8 +160,13 @@ - unsigned int res; - - __asm__ __volatile__ ( -- "stbar\n" -- "cas [%1],%2,%3\n" -+ "membar #StoreLoad | #LoadLoad\n" -+# if defined (__sparc64__) -+ "casx [%1],%2,%3\n" -+# else -+ "cas [%1],%2,%3\n" /* 32-bit version */ -+# endif -+ "membar #StoreLoad | #LoadLoad\n" - "cmp %2,%3\n" - "be,a 1f\n" - "mov 1,%0\n" diff --git a/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnativestack.cpp b/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnativestack.cpp new file mode 100644 index 000000000000..97bf06c41be0 --- /dev/null +++ b/mail/thunderbird-esr/files/patch-mozilla-js-src-jsnativestack.cpp @@ -0,0 +1,11 @@ +--- mozilla/js/src/jsnativestack.cpp~ ++++ mozilla/js/src/jsnativestack.cpp +@@ -50,7 +50,8 @@ + #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX) + # include <pthread.h> + +-# if defined(__FreeBSD__) ++# if defined(FREEBSD) ++# include <cstddef> + # include <pthread_np.h> + # endif diff --git a/mail/thunderbird-esr/files/patch-mozilla-layout-generic-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-layout-generic-Makefile.in index afdc6fd8ae0f..c406d410a4da 100644 --- a/mail/thunderbird-esr/files/patch-mozilla-layout-generic-Makefile.in +++ b/mail/thunderbird-esr/files/patch-mozilla-layout-generic-Makefile.in @@ -1,9 +1,9 @@ ---- mozilla/layout/generic/Makefile.in.orig 2010-01-20 18:57:00.000000000 +0100 -+++ mozilla/layout/generic/Makefile.in 2010-01-20 18:57:48.000000000 +0100 -@@ -191,9 +191,10 @@ - -I$(srcdir)/../../content/base/src \ +--- mozilla/layout/generic/Makefile.in.orig 2011-05-28 15:25:03.000000000 +0200 ++++ mozilla/layout/generic/Makefile.in 2011-06-03 08:21:03.853676671 +0200 +@@ -160,9 +160,10 @@ -I$(srcdir)/../../content/html/content/src \ -I$(srcdir)/../../dom/base \ + -I$(srcdir)/../../modules/plugin/base/src \ - $(MOZ_CAIRO_CFLAGS) \ $(NULL) diff --git a/mail/thunderbird-esr/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h b/mail/thunderbird-esr/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h deleted file mode 100644 index 726dc875e37f..000000000000 --- a/mail/thunderbird-esr/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h.orig 2010-09-06 11:33:54.000000000 +0200 -+++ mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h 2010-09-06 11:34:16.000000000 +0200 -@@ -59,7 +59,7 @@ - - #include <sys/types.h> - --#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX) -+#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX) || defined (__FreeBSD__) - typedef off_t oggz_off_t; - #else - typedef loff_t oggz_off_t; diff --git a/mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.c b/mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.c new file mode 100644 index 000000000000..b97d147914fe --- /dev/null +++ b/mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.c @@ -0,0 +1,16 @@ +--- mozilla/media/libvpx/vpx_config_c.c~ ++++ mozilla/media/libvpx/vpx_config_c.c +@@ -12,11 +12,11 @@ + /* 32 bit MacOS. */ + #include "vpx_config_x86-darwin9-gcc.c" + +-#elif defined(__linux__) && defined(__i386__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__) + /* 32 bit Linux. */ + #include "vpx_config_x86-linux-gcc.c" + +-#elif defined(__linux__) && defined(__x86_64__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__) + /* 64 bit Linux. */ + #include "vpx_config_x86_64-linux-gcc.c" + diff --git a/mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.h b/mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.h new file mode 100644 index 000000000000..b4ba5cd8986a --- /dev/null +++ b/mail/thunderbird-esr/files/patch-mozilla-media-libvpx-vpx_config.h @@ -0,0 +1,16 @@ +--- mozilla/media/libvpx/vpx_config.h~ ++++ mozilla/media/libvpx/vpx_config.h +@@ -12,11 +12,11 @@ + /* 32 bit MacOS. */ + #include "vpx_config_x86-darwin9-gcc.h" + +-#elif defined(__linux__) && defined(__i386__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__) + /* 32 bit Linux. */ + #include "vpx_config_x86-linux-gcc.h" + +-#elif defined(__linux__) && defined(__x86_64__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__) + /* 64 bit Linux. */ + #include "vpx_config_x86_64-linux-gcc.h" + diff --git a/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk b/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk index 39272d788b83..dc4e96c7c439 100644 --- a/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk +++ b/mail/thunderbird-esr/files/patch-mozilla-security-coreconf-FreeBSD.mk @@ -1,22 +1,29 @@ ---- mozilla/security/coreconf/FreeBSD.mk.orig 2010-04-30 19:44:32.000000000 +0000 -+++ mozilla/security/coreconf/FreeBSD.mk 2010-05-10 13:04:45.000000000 +0000 -@@ -52,6 +52,15 @@ - ifeq ($(CPU_ARCH),amd64) - CPU_ARCH = x86_64 +--- mozilla/security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000 ++++ mozilla/security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000 +@@ -49,8 +49,20 @@ + ifeq ($(CPU_ARCH),pc98) + CPU_ARCH = x86 endif +-ifeq ($(CPU_ARCH),amd64) +-CPU_ARCH = x86_64 ++ifeq ($(OS_TEST),alpha) ++CPU_ARCH = alpha ++endif +ifeq ($(OS_TEST),amd64) +CPU_ARCH = amd64 +endif ++ifeq ($(OS_TEST),ia64) ++CPU_ARCH = ia64 ++endif +ifeq ($(OS_TEST),powerpc) +CPU_ARCH = powerpc +endif +ifeq ($(OS_TEST),sparc64) +CPU_ARCH = sparc64 -+endif + endif OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - -@@ -78,7 +87,7 @@ +@@ -78,7 +90,7 @@ DLL_SUFFIX = so.1.0 endif @@ -25,7 +32,7 @@ ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif -@@ -87,4 +96,4 @@ +@@ -87,4 +99,4 @@ G++INCLUDES = -I/usr/include/g++ diff --git a/mail/thunderbird-esr/files/patch-mozilla-toolkit-library-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-toolkit-library-Makefile.in new file mode 100644 index 000000000000..f222b6dca9e9 --- /dev/null +++ b/mail/thunderbird-esr/files/patch-mozilla-toolkit-library-Makefile.in @@ -0,0 +1,12 @@ +--- mozilla/toolkit/library/Makefile.in.orig 2010-01-11 12:13:08.000000000 -0500 ++++ mozilla/toolkit/library/Makefile.in 2010-01-11 12:15:05.000000000 -0500 +@@ -181,7 +181,7 @@ + export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS) + $(INSTALL) $^ . + +-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) ++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% + + ifdef MOZ_ENABLE_LIBXUL + include $(srcdir)/libxul-rules.mk + diff --git a/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in index 7dd5b80a1ced..e896cec90613 100644 --- a/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in +++ b/mail/thunderbird-esr/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in @@ -1,8 +1,8 @@ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2010-12-07 17:36:07.000000000 +0100 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-02-26 21:30:36.000000000 +0100 -@@ -73,6 +73,9 @@ - DEFINES += -DKEEP_STACK_16_BYTE_ALIGNED - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp +--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-05-28 15:26:21.000000000 +0200 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-06-03 18:39:42.769434047 +0200 +@@ -74,6 +74,9 @@ + # NOTE: MODULE_OPTIMIZE_FLAGS must be set before including config.mk + MODULE_OPTIMIZE_FLAGS=-O3 endif +ifeq (x86_64,$(OS_TEST)) +CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp @@ -10,7 +10,7 @@ endif endif -@@ -96,7 +99,7 @@ +@@ -117,7 +120,7 @@ endif endif # IA64 Linux @@ -19,20 +19,20 @@ ifneq (,$(findstring ia64,$(OS_TEST))) CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -115,6 +118,12 @@ - CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp +@@ -129,6 +132,12 @@ + ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64) + CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp endif - # +# FreeBSD/amd64 +# +ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64) +CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp +endif +# - # BeOS/Intel (uses the same unixish_x86 code) # - ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC) -@@ -165,9 +174,15 @@ + # Neutrino/Intel (uses the same unixish_x86 code) + # +@@ -184,9 +193,15 @@ ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s endif # @@ -49,7 +49,7 @@ CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp endif # -@@ -322,7 +337,7 @@ +@@ -341,7 +356,7 @@ # # Linux/PPC # @@ -58,16 +58,7 @@ CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s AS := $(CC) -c -x assembler-with-cpp -@@ -331,7 +346,7 @@ - # - # Linux/PPC64 - # --ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64) -+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp - ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s - AS := $(CC) -c -x assembler-with-cpp -@@ -400,6 +415,15 @@ +@@ -419,6 +434,15 @@ ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s endif # diff --git a/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md_freebsd.cfg b/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md_freebsd.cfg new file mode 100644 index 000000000000..e98cce3e3d8f --- /dev/null +++ b/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md_freebsd.cfg @@ -0,0 +1,100 @@ +--- mozilla/nsprpub/pr/include/md/_freebsd.cfg.orig 2010-12-23 17:34:06.000000000 +0100 ++++ mozilla/nsprpub/pr/include/md/_freebsd.cfg 2010-12-23 17:34:44.000000000 +0100 +@@ -283,6 +283,97 @@ + #define PR_ALIGN_OF_POINTER 8 + #define PR_ALIGN_OF_WORD 8 + ++#elif defined(__powerpc64__) ++ ++#undef IS_LITTLE_ENDIAN ++#define IS_BIG_ENDIAN 1 ++#define IS_64 ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT 4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 8 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 8 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE 8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG 64 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD 64 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG2 5 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 6 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 6 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG 8 ++#define PR_ALIGN_OF_INT64 8 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 8 ++#define PR_ALIGN_OF_POINTER 8 ++#define PR_ALIGN_OF_WORD 8 ++ ++#define PR_BYTES_PER_WORD_LOG2 3 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ ++#elif defined(__powerpc__) ++ ++#undef IS_LITTLE_ENDIAN ++#define IS_BIG_ENDIAN 1 ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT 4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 4 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 4 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE 8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG 32 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD 32 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG2 5 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 5 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 5 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG 4 ++#define PR_ALIGN_OF_INT64 8 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 8 ++#define PR_ALIGN_OF_POINTER 4 ++#define PR_ALIGN_OF_WORD 4 ++ ++#define PR_BYTES_PER_WORD_LOG2 2 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ + #else + + #error "Unknown CPU architecture" diff --git a/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md_freebsd.h b/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md_freebsd.h new file mode 100644 index 000000000000..2be831a3ec9c --- /dev/null +++ b/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md_freebsd.h @@ -0,0 +1,30 @@ +--- mozilla/nsprpub/pr/include/md/_freebsd.h.orig 2010-12-23 17:34:13.000000000 +0100 ++++ mozilla/nsprpub/pr/include/md/_freebsd.h 2010-12-23 17:34:46.000000000 +0100 +@@ -57,6 +57,10 @@ + #define _PR_SI_ARCHITECTURE "ia64" + #elif defined(__amd64__) + #define _PR_SI_ARCHITECTURE "amd64" ++#elif defined(__powerpc64__) ++#define _PR_SI_ARCHITECTURE "powerpc64" ++#elif defined(__powerpc__) ++#define _PR_SI_ARCHITECTURE "powerpc" + #else + #error "Unknown CPU architecture" + #endif +@@ -106,6 +110,16 @@ + #define _PR_IPV6_V6ONLY_PROBE + #endif + ++#if (__FreeBSD_version >= 700016) || (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103) ++#if defined(_PR_PTHREADS) ++#define _PR_HAVE_GETPROTO_R ++#define _PR_HAVE_5_ARG_GETPROTO_R ++#define _PR_HAVE_GETHOST_R ++#define _PR_HAVE_GETHOST_R_INT ++#define _PR_HAVE_THREADSAFE_GETHOST ++#endif ++#endif ++ + #define USE_SETJMP + + #ifndef _PR_PTHREADS diff --git a/mail/thunderbird-esr/files/releng6_pulseaudio b/mail/thunderbird-esr/files/releng6_pulseaudio deleted file mode 100644 index 37203b52a5ee..000000000000 --- a/mail/thunderbird-esr/files/releng6_pulseaudio +++ /dev/null @@ -1,66 +0,0 @@ ---- mozilla/media/libsydneyaudio/src/Makefile.in.orig 2009-08-20 21:43:41.000000000 +0200 -+++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-08-20 21:44:17.000000000 +0200 -@@ -45,6 +45,12 @@ - LIBRARY_NAME = sydneyaudio - FORCE_STATIC_LIB= 1 - -+ifeq ($(OS_ARCH),FreeBSD) -+CSRCS = \ -+ sydney_audio_pulseaudio.c \ -+ $(NULL) -+endif -+ - ifeq ($(OS_ARCH),Linux) - CSRCS = \ - sydney_audio_alsa.c \ ---- mozilla/toolkit/library/Makefile.in.orig 2010-01-19 20:28:10.000000000 +0000 -+++ mozilla/toolkit/library/Makefile.in 2010-01-25 09:38:40.000000000 +0000 -@@ -235,12 +235,12 @@ - endif - - ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT)) --EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread -lc - EXTRA_DSO_LDOPTS += $(FT2_LIBS) - endif - - ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) --EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -lpulse -lpthread -lc - EXTRA_DSO_LDOPTS += $(FT2_LIBS) - endif - ---- mozilla/js/src/Makefile.in.orig 2009-08-21 00:34:43.000000000 +0200 -+++ mozilla/js/src/Makefile.in 2009-08-21 00:36:59.000000000 +0200 -@@ -427,7 +427,7 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) --EXTRA_LIBS += -pthread -+EXTRA_LIBS += -pthread -lpulse -lc - endif - ifeq ($(OS_ARCH),IRIX) - ifdef USE_N32 ---- config/rules.mk.orig 2009-08-22 15:30:16.000000000 +0200 -+++ config/rules.mk 2009-08-22 15:30:46.000000000 +0200 -@@ -583,6 +583,7 @@ - ifdef IS_COMPONENT - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic - endif -+EXTRA_LIBS += -pthread -lpulse -lc - endif - - ifeq ($(OS_ARCH),NetBSD) ---- mozilla/layout/build/Makefile.in.orig 2009-08-22 01:00:21.000000000 +0200 -+++ mozilla/layout/build/Makefile.in 2009-08-22 01:00:57.000000000 +0200 -@@ -269,6 +269,10 @@ - endif - endif - -+ifeq ($(OS_ARCH),FreeBSD) -+EXTRA_LIBS += -lpulse -+endif -+ - include $(topsrcdir)/config/rules.mk - - LOCAL_INCLUDES += -I$(srcdir)/../base \ diff --git a/mail/thunderbird-i18n/Makefile b/mail/thunderbird-i18n/Makefile index c8f6c6123175..8bc8a86ce9c5 100644 --- a/mail/thunderbird-i18n/Makefile +++ b/mail/thunderbird-i18n/Makefile @@ -6,7 +6,7 @@ # PORTNAME= thunderbird-i18n -PORTVERSION= 3.1.11 +PORTVERSION= 5.0 CATEGORIES= mail MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/linux-i686/xpi PKGNAMEPREFIX= @@ -16,6 +16,8 @@ DIST_SUBDIR= xpi/${DISTNAME} MAINTAINER= gecko@FreeBSD.org COMMENT= Localized interface for Thunderbird +EXTRACT_DEPENDS= zip:${PORTSDIR}/archivers/zip + .ifndef WITHOUT_SWITCHER RUN_DEPENDS+= xpi-quick-locale-switcher>=0:${PORTSDIR}/www/xpi-quick-locale-switcher .endif @@ -24,15 +26,15 @@ NO_BUILD= yes USE_THUNDERBIRD= yes USE_XPI= *thunderbird -THUNDERBIRD_I18N_ALL= af ar be bg bn-BD ca cs da de el en-GB en-US es-AR es-ES \ - et eu fi fr fy-NL ga-IE he hu id is it ja ko lt nb-NO nl \ - nn-NO pa-IN pl pt-BR pt-PT ro ru si sk sl sq sv-SE tr uk \ - zh-CN zh-TW +THUNDERBIRD_I18N_ALL= ar bg br ca cs da de en-GB en-US es-AR es-ES et eu fi fr \ + fy-NL ga-IE gd gl he hu is it ja ko lt nb-NO nl nn-NO \ + pa-IN pl pt-BR pt-PT rm ru si sk sl sq sv-SE ta-LK tr uk \ + zh-TW .ifdef PACKAGE_BUILDING THUNDERBIRD_I18N?= all .else -THUNDERBIRD_I18N?= zh-CN es-ES pt-BR ru ja de fr pa-IN ko it +THUNDERBIRD_I18N?= es-ES pt-BR ru ja de fr pa-IN ko it .endif .if ${THUNDERBIRD_I18N} == all @@ -45,8 +47,8 @@ WDIR= langpack-*@thunderbird.mozilla.org XPI_DISTNAMES= ${THUNDERBIRD_I18N_} .for dist in ${XPI_DISTNAMES} XPI_ID_${dist}= langpack-${dist}@thunderbird.mozilla.org -XPI_FILES_${dist}= chrome.manifest install.rdf chrome/${dist}.jar defaults/pref/all-l10n.js -XPI_DIRS_${dist}= chrome defaults/pref defaults +XPI_FILES_${dist}= chrome.manifest install.rdf chrome/${dist}.jar +XPI_DIRS_${dist}= chrome .endfor do-extract: @@ -56,7 +58,9 @@ do-extract: if ! (${EXTRACT_CMD} ${_DISTDIR}/$$lang.xpi -d ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org);\ then \ exit 1; \ - fi \ + fi; \ + cd ${WRKSRC}/langpack-$$lang@thunderbird.mozilla.org/chrome; \ + ${LOCALBASE}/bin/zip -r $$lang.jar $$lang; \ done do-install: @@ -68,8 +72,8 @@ do-install: @${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A} @${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { \ ${LN} -sf ${XPI_LIBDIR}/${WDIR} $$_dir/ ${_Q}; }' ${_A} - @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${WDIR} ; }' ${_A} - @${ECHO_CMD} '@unexec rmdir ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A} + @${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ${XPI_LIBDIR}; { ${RM} -fR $$_dir/${WDIR} ; }' ${_A} + @${ECHO_CMD} '@unexec ${RMDIR} ${XPI_DIRS_TRY:S,^,%D/,} ${_Q}' ${_A} post-patch: ${FIND} ${WRKSRC} -name install.rdf -print0 | \ diff --git a/mail/thunderbird-i18n/distinfo b/mail/thunderbird-i18n/distinfo index b6024eff57db..88d1a2cbcee4 100644 --- a/mail/thunderbird-i18n/distinfo +++ b/mail/thunderbird-i18n/distinfo @@ -1,92 +1,88 @@ -SHA256 (xpi/thunderbird-i18n-3.1.11/af.xpi) = d2676300f8fea683c381b07c046316cc9259b2ec762642cbd9bcb66214d0dc2f -SIZE (xpi/thunderbird-i18n-3.1.11/af.xpi) = 210615 -SHA256 (xpi/thunderbird-i18n-3.1.11/ar.xpi) = 30649cdcc5cce17c0322932698133efb3ecae0da3bed18b5622a2029be4c812a -SIZE (xpi/thunderbird-i18n-3.1.11/ar.xpi) = 230384 -SHA256 (xpi/thunderbird-i18n-3.1.11/be.xpi) = b5d2d70496baf0cd5475ed416dbcc87110eab7163eabe71c4291cf7332ad1d0a -SIZE (xpi/thunderbird-i18n-3.1.11/be.xpi) = 194430 -SHA256 (xpi/thunderbird-i18n-3.1.11/bg.xpi) = 2b4b023866113eccb07e5090852d410d6d85d2f071178ed4fc4d30934a451eb3 -SIZE (xpi/thunderbird-i18n-3.1.11/bg.xpi) = 235125 -SHA256 (xpi/thunderbird-i18n-3.1.11/bn-BD.xpi) = 18e0cf60c411be7a7ad29f0e8f20dddd598703979df2c7a65549738aad47671e -SIZE (xpi/thunderbird-i18n-3.1.11/bn-BD.xpi) = 244827 -SHA256 (xpi/thunderbird-i18n-3.1.11/ca.xpi) = 5e1b3002068406612f13b68514a6f44b9ffc30c70dab159172ddd48884c929db -SIZE (xpi/thunderbird-i18n-3.1.11/ca.xpi) = 219359 -SHA256 (xpi/thunderbird-i18n-3.1.11/cs.xpi) = de60a3b46922507659a804f8d4c22481b1c3de8e1d08d6f85baa9e7a51b9cd37 -SIZE (xpi/thunderbird-i18n-3.1.11/cs.xpi) = 218194 -SHA256 (xpi/thunderbird-i18n-3.1.11/da.xpi) = a609ed3e1fcf4ae4ba36fffcf0b3b6a1ec421b3651a26c96a2db4f625e8954a9 -SIZE (xpi/thunderbird-i18n-3.1.11/da.xpi) = 203226 -SHA256 (xpi/thunderbird-i18n-3.1.11/de.xpi) = 8c66b7b527e025e148f11fbe19fd0b8acc45bf8b2baac6400cbb30b248c9c355 -SIZE (xpi/thunderbird-i18n-3.1.11/de.xpi) = 222817 -SHA256 (xpi/thunderbird-i18n-3.1.11/el.xpi) = 0bfe08f807b4b529bf12053526c803fa104b6c38d132f8f262a498f846ca9762 -SIZE (xpi/thunderbird-i18n-3.1.11/el.xpi) = 210073 -SHA256 (xpi/thunderbird-i18n-3.1.11/en-GB.xpi) = 0e8bfde8e4e442f03afb8f9d85deb1b7b99324194ad9306dd771305ce60d1a11 -SIZE (xpi/thunderbird-i18n-3.1.11/en-GB.xpi) = 203675 -SHA256 (xpi/thunderbird-i18n-3.1.11/en-US.xpi) = e9d8815a034151824700b22daadeaf196e8c3fef3620542d0345a7c43fc0a9ab -SIZE (xpi/thunderbird-i18n-3.1.11/en-US.xpi) = 202586 -SHA256 (xpi/thunderbird-i18n-3.1.11/es-AR.xpi) = ee7e5ffb47d60e47dcd1c40f747541a358eca46b2cc3d950921d144b2dd7e1c7 -SIZE (xpi/thunderbird-i18n-3.1.11/es-AR.xpi) = 218588 -SHA256 (xpi/thunderbird-i18n-3.1.11/es-ES.xpi) = 691410443b2ea2db2b7ced24de3c0628985991ce55e35200ddf474bb93110dc1 -SIZE (xpi/thunderbird-i18n-3.1.11/es-ES.xpi) = 172879 -SHA256 (xpi/thunderbird-i18n-3.1.11/et.xpi) = e4fe7777c73d32cf64bc8d4689d18e7e4f670d8f965bfdd3edcad81bceee3091 -SIZE (xpi/thunderbird-i18n-3.1.11/et.xpi) = 221753 -SHA256 (xpi/thunderbird-i18n-3.1.11/eu.xpi) = 84793c78d3d9120adc189df98c94c4d73511d7f805449fc67a43d4a6482990a3 -SIZE (xpi/thunderbird-i18n-3.1.11/eu.xpi) = 211283 -SHA256 (xpi/thunderbird-i18n-3.1.11/fi.xpi) = 786054a681a8a7077f1810930c9210fbd0e9ec708e58b344840cfdb2241f3afa -SIZE (xpi/thunderbird-i18n-3.1.11/fi.xpi) = 219474 -SHA256 (xpi/thunderbird-i18n-3.1.11/fr.xpi) = 184cfde6453301b5fdfa0549a5793134917f9d3729a953e280161ec9a2cbc9de -SIZE (xpi/thunderbird-i18n-3.1.11/fr.xpi) = 221771 -SHA256 (xpi/thunderbird-i18n-3.1.11/fy-NL.xpi) = c71c158840e3f7c9a2b48db7c4eb887783983e0d221ffacc08ca6a34226509ff -SIZE (xpi/thunderbird-i18n-3.1.11/fy-NL.xpi) = 220800 -SHA256 (xpi/thunderbird-i18n-3.1.11/ga-IE.xpi) = a809fabd7328ecb5e60b9bb6626abd5e44fa8078ac5d597ecd4dfdf5f8d597cf -SIZE (xpi/thunderbird-i18n-3.1.11/ga-IE.xpi) = 219429 -SHA256 (xpi/thunderbird-i18n-3.1.11/he.xpi) = 05d3daad9c69694611513fcbb7dd63ec99468412d6e076d3a8c774fb4f4092a8 -SIZE (xpi/thunderbird-i18n-3.1.11/he.xpi) = 204908 -SHA256 (xpi/thunderbird-i18n-3.1.11/hu.xpi) = 6210fc89e67c1f08c4260b23b5a114114df852498d271ec839bc7b5a0a929257 -SIZE (xpi/thunderbird-i18n-3.1.11/hu.xpi) = 226159 -SHA256 (xpi/thunderbird-i18n-3.1.11/id.xpi) = b1de7097b7be766685aedbe814b1c8a2b2e9c08b393fcd5cb9ae987d20ce9120 -SIZE (xpi/thunderbird-i18n-3.1.11/id.xpi) = 185845 -SHA256 (xpi/thunderbird-i18n-3.1.11/is.xpi) = b4446bcc95fa68bda9f8f1880f1b60f9aecffa28db1d4493130572b5d66b6c02 -SIZE (xpi/thunderbird-i18n-3.1.11/is.xpi) = 214017 -SHA256 (xpi/thunderbird-i18n-3.1.11/it.xpi) = c450d0f68c2f0982fc9cc9f3279439715d7b8fa7559bb75bb59b31955ef671b7 -SIZE (xpi/thunderbird-i18n-3.1.11/it.xpi) = 171393 -SHA256 (xpi/thunderbird-i18n-3.1.11/ja.xpi) = c2191f03aca9b32ac07a7d195f64424a3f1d5ed82d8a75c4a0b7c0dffc5d4b55 -SIZE (xpi/thunderbird-i18n-3.1.11/ja.xpi) = 236626 -SHA256 (xpi/thunderbird-i18n-3.1.11/ko.xpi) = f53b79ffa380f54b226a3a61e2d2277742cf70527e4c186f019d651e1d26f3b3 -SIZE (xpi/thunderbird-i18n-3.1.11/ko.xpi) = 194783 -SHA256 (xpi/thunderbird-i18n-3.1.11/lt.xpi) = 1648ea194666162de0c8ad742df2fcc673916b2b342511cb6f2944f48f27654c -SIZE (xpi/thunderbird-i18n-3.1.11/lt.xpi) = 235296 -SHA256 (xpi/thunderbird-i18n-3.1.11/nb-NO.xpi) = 6dd25c3ba6b5c482a4ea124111b61d6d43e0d791d4c9944a1cfa736a111efbc5 -SIZE (xpi/thunderbird-i18n-3.1.11/nb-NO.xpi) = 213869 -SHA256 (xpi/thunderbird-i18n-3.1.11/nl.xpi) = 6d98d6181ed04ca66798a3e8511b650ab4cb301400685cc065da69e950d1dc7f -SIZE (xpi/thunderbird-i18n-3.1.11/nl.xpi) = 216584 -SHA256 (xpi/thunderbird-i18n-3.1.11/nn-NO.xpi) = 3a9ab5f556968292866f5a492406d4c09f10dde4fb0f6165486f6602115cad72 -SIZE (xpi/thunderbird-i18n-3.1.11/nn-NO.xpi) = 215631 -SHA256 (xpi/thunderbird-i18n-3.1.11/pa-IN.xpi) = 654ee53022ee53a75b9716775ab0e5421b04923178c0ba3d307b46b3897a48f8 -SIZE (xpi/thunderbird-i18n-3.1.11/pa-IN.xpi) = 241100 -SHA256 (xpi/thunderbird-i18n-3.1.11/pl.xpi) = d4ba0ba503d213a4a821ab99678743bd156540ae1a7459b80fa4e078c46ed3b3 -SIZE (xpi/thunderbird-i18n-3.1.11/pl.xpi) = 203878 -SHA256 (xpi/thunderbird-i18n-3.1.11/pt-BR.xpi) = c0529bf7af12a245b7c55f5e0c3c9d9ee4e8f168462a123cc8d91983ad21d44c -SIZE (xpi/thunderbird-i18n-3.1.11/pt-BR.xpi) = 215018 -SHA256 (xpi/thunderbird-i18n-3.1.11/pt-PT.xpi) = ed8f735f7433dbe78c2a767d7dfb65e165d7946a256a0bdc600f05fd6f222b67 -SIZE (xpi/thunderbird-i18n-3.1.11/pt-PT.xpi) = 214252 -SHA256 (xpi/thunderbird-i18n-3.1.11/ro.xpi) = 53b54449117ee582197c97b527a5a2f3213e6be575ba5c1853bd7d5e062b1fce -SIZE (xpi/thunderbird-i18n-3.1.11/ro.xpi) = 221215 -SHA256 (xpi/thunderbird-i18n-3.1.11/ru.xpi) = e1d500dd8c51cbe585e4c0702bfdf6ba5e6aef61064703718dd33ee6a3f4170a -SIZE (xpi/thunderbird-i18n-3.1.11/ru.xpi) = 198272 -SHA256 (xpi/thunderbird-i18n-3.1.11/si.xpi) = 23fee1ef7b12266892d0c8311a6bb0c54299dd477c5bcc1bfc9502b9c2f415a4 -SIZE (xpi/thunderbird-i18n-3.1.11/si.xpi) = 246153 -SHA256 (xpi/thunderbird-i18n-3.1.11/sk.xpi) = 2ae452e53ce3ace687d5ca6d413cd50f68c947568fe96a598bf78be3bb1f7811 -SIZE (xpi/thunderbird-i18n-3.1.11/sk.xpi) = 224600 -SHA256 (xpi/thunderbird-i18n-3.1.11/sl.xpi) = cd04565d38131759fc2ab455cd94e228f3d1f4ae351ed75544eb75b26b224b64 -SIZE (xpi/thunderbird-i18n-3.1.11/sl.xpi) = 218485 -SHA256 (xpi/thunderbird-i18n-3.1.11/sq.xpi) = 8a9443f06d1bd34f282639fc9ea127a851ab46387213e32aca4960f730ab99aa -SIZE (xpi/thunderbird-i18n-3.1.11/sq.xpi) = 211283 -SHA256 (xpi/thunderbird-i18n-3.1.11/sv-SE.xpi) = 42b9e49a41d0684937cbcb3576dfb962cd721cd09415d96373c36e216611769d -SIZE (xpi/thunderbird-i18n-3.1.11/sv-SE.xpi) = 221171 -SHA256 (xpi/thunderbird-i18n-3.1.11/tr.xpi) = 8d458a6eded9e4eb0985b9601918f7424922db549e4fd6eece7889b670b79202 -SIZE (xpi/thunderbird-i18n-3.1.11/tr.xpi) = 215821 -SHA256 (xpi/thunderbird-i18n-3.1.11/uk.xpi) = 0df41a6bf414778e9274dad896b3d8e116a3994564bf6e74fdda87e4edc83b7c -SIZE (xpi/thunderbird-i18n-3.1.11/uk.xpi) = 244808 -SHA256 (xpi/thunderbird-i18n-3.1.11/zh-CN.xpi) = c8c3b092a4a999bb30d47797f9c0850634282ad561a233132f28ced48a0be01f -SIZE (xpi/thunderbird-i18n-3.1.11/zh-CN.xpi) = 219649 -SHA256 (xpi/thunderbird-i18n-3.1.11/zh-TW.xpi) = 5719a75ab55111a2adfff2c982aa7fba6dae91e0977479060f2bf259c2de9024 -SIZE (xpi/thunderbird-i18n-3.1.11/zh-TW.xpi) = 220607 +SHA256 (xpi/thunderbird-i18n-5.0/ar.xpi) = bb3f5afa529bb9ad91004d57c2e4ae77266c4fceaac3af13e69b25756c926eec +SIZE (xpi/thunderbird-i18n-5.0/ar.xpi) = 426291 +SHA256 (xpi/thunderbird-i18n-5.0/bg.xpi) = c19da2505f426dc8d2190db5b6dc3723e92b7f44a48ff03a3b7942b5668a27a7 +SIZE (xpi/thunderbird-i18n-5.0/bg.xpi) = 444151 +SHA256 (xpi/thunderbird-i18n-5.0/br.xpi) = 19c3387c0f66a2787bb1fe7cc89b72d401db476726480e2e7a0e052f4f9e98ac +SIZE (xpi/thunderbird-i18n-5.0/br.xpi) = 356430 +SHA256 (xpi/thunderbird-i18n-5.0/ca.xpi) = 0e1aedbe17a62ae8b6588ef76aeee7468743835857b13b6fa11dc96ca23ca4aa +SIZE (xpi/thunderbird-i18n-5.0/ca.xpi) = 407700 +SHA256 (xpi/thunderbird-i18n-5.0/cs.xpi) = af1c3be0944244dff7f35c7d335b2e28385d83e0ea572c4a43e4dfb3cc4d692c +SIZE (xpi/thunderbird-i18n-5.0/cs.xpi) = 407837 +SHA256 (xpi/thunderbird-i18n-5.0/da.xpi) = 92514d7df29168123279a0b486264d25fdac8ea984d9ea53c1158e0f850fc304 +SIZE (xpi/thunderbird-i18n-5.0/da.xpi) = 350465 +SHA256 (xpi/thunderbird-i18n-5.0/de.xpi) = fcd373a837dcb615b64635d1d2583d55ca5fe36e5dd32f11cdf1c6e50dc656c0 +SIZE (xpi/thunderbird-i18n-5.0/de.xpi) = 406252 +SHA256 (xpi/thunderbird-i18n-5.0/en-GB.xpi) = f7dbb262115a52d4cb6fe2e7119861241b285d08fbdc2a481bc2648bf9bca591 +SIZE (xpi/thunderbird-i18n-5.0/en-GB.xpi) = 381468 +SHA256 (xpi/thunderbird-i18n-5.0/en-US.xpi) = 7f89a05fd921e3fcfe5d83060bac92d4ac54be9dd7b90e9ee2f7b4ae3e7dd99c +SIZE (xpi/thunderbird-i18n-5.0/en-US.xpi) = 381080 +SHA256 (xpi/thunderbird-i18n-5.0/es-AR.xpi) = 4249e4dd9e39bcfb1d08ce2ebd042fd4ee332b949dadc5b706026130c178523b +SIZE (xpi/thunderbird-i18n-5.0/es-AR.xpi) = 399330 +SHA256 (xpi/thunderbird-i18n-5.0/es-ES.xpi) = a952b2c5f098a9685b22b72176575c8d8ba70c8415a24fab2b0a7414242690be +SIZE (xpi/thunderbird-i18n-5.0/es-ES.xpi) = 343865 +SHA256 (xpi/thunderbird-i18n-5.0/et.xpi) = 2dcb8d5086963964889b07d268baa681abc7744fef01219bc8f35db5184822e9 +SIZE (xpi/thunderbird-i18n-5.0/et.xpi) = 399580 +SHA256 (xpi/thunderbird-i18n-5.0/eu.xpi) = 7c940255e7e5dae14fdd725a9a722f13d5aa38eee98ab0f0ff2cca96db98b7cd +SIZE (xpi/thunderbird-i18n-5.0/eu.xpi) = 395631 +SHA256 (xpi/thunderbird-i18n-5.0/fi.xpi) = ff2a8aae8c48be298d3fdd7b0dc5621eff9af2c43a4a9e42c961fb8ecd9c3db7 +SIZE (xpi/thunderbird-i18n-5.0/fi.xpi) = 400828 +SHA256 (xpi/thunderbird-i18n-5.0/fr.xpi) = 49f54a41e64d53cf78b6576e89341672f16e629e25b3ffe689a71431fc796768 +SIZE (xpi/thunderbird-i18n-5.0/fr.xpi) = 403253 +SHA256 (xpi/thunderbird-i18n-5.0/fy-NL.xpi) = 8f0e32f4bcd7b097d746f7ed376e3ff01a28d2f2e8e02be1a3015853888f7fb0 +SIZE (xpi/thunderbird-i18n-5.0/fy-NL.xpi) = 403075 +SHA256 (xpi/thunderbird-i18n-5.0/ga-IE.xpi) = a69b3a0818b5ab7a6c27298884cb415dec7dc3f96ad4a8b78ef8d6a3d851d2d7 +SIZE (xpi/thunderbird-i18n-5.0/ga-IE.xpi) = 411750 +SHA256 (xpi/thunderbird-i18n-5.0/gd.xpi) = 0c84eec07f1a1f8a122c73b56f079445abdd9f029231f5471aba231cfce92ac4 +SIZE (xpi/thunderbird-i18n-5.0/gd.xpi) = 414203 +SHA256 (xpi/thunderbird-i18n-5.0/gl.xpi) = 794eb2977a964108ef031bc952babee6a0dc0e93d40263ee12297c28187f39b8 +SIZE (xpi/thunderbird-i18n-5.0/gl.xpi) = 398333 +SHA256 (xpi/thunderbird-i18n-5.0/he.xpi) = 3f49799adfe9e65d39639402a7a9ce6f8bcf036fbe25aa4aadd483007172f864 +SIZE (xpi/thunderbird-i18n-5.0/he.xpi) = 415116 +SHA256 (xpi/thunderbird-i18n-5.0/hu.xpi) = 8ea419595e4ef5034296485290cf89dc6091361b8f785be8e137ac37e934ed7e +SIZE (xpi/thunderbird-i18n-5.0/hu.xpi) = 415270 +SHA256 (xpi/thunderbird-i18n-5.0/is.xpi) = 8cdf6ddaa75c09ed31e57031f242eb56f0bb87dfc3965f019642a0b035664a44 +SIZE (xpi/thunderbird-i18n-5.0/is.xpi) = 401557 +SHA256 (xpi/thunderbird-i18n-5.0/it.xpi) = d995d24b281c79f36026d302ceb73638d156c619c8a29f7eeaa09c05a6edf89d +SIZE (xpi/thunderbird-i18n-5.0/it.xpi) = 337738 +SHA256 (xpi/thunderbird-i18n-5.0/ja.xpi) = a582214664357c360e2c8aaae8dab7fdd735e9827c8e3f9190542ca85fd89a04 +SIZE (xpi/thunderbird-i18n-5.0/ja.xpi) = 446749 +SHA256 (xpi/thunderbird-i18n-5.0/ko.xpi) = cc629295d61ea7c9f7103a0ddd096af438bd0ef049a6d6d3aef28c1c4104f0b6 +SIZE (xpi/thunderbird-i18n-5.0/ko.xpi) = 358753 +SHA256 (xpi/thunderbird-i18n-5.0/lt.xpi) = bb3e3dde6f71b303cc6a26fc92db9f724c186ab16932cf1532d740decd62a168 +SIZE (xpi/thunderbird-i18n-5.0/lt.xpi) = 523993 +SHA256 (xpi/thunderbird-i18n-5.0/nb-NO.xpi) = 222f84d8e0b791e2b66e76ada384efca190a0cf4c1262d9cb203b506969ae769 +SIZE (xpi/thunderbird-i18n-5.0/nb-NO.xpi) = 396958 +SHA256 (xpi/thunderbird-i18n-5.0/nl.xpi) = b4fd06c5ea15d7ad769f380ce25cd8e2b867f88d49761bc23e1f8e9150a9afa9 +SIZE (xpi/thunderbird-i18n-5.0/nl.xpi) = 397102 +SHA256 (xpi/thunderbird-i18n-5.0/nn-NO.xpi) = 2a8c106becb4d730cd9dc10588ec87fbbb85f55b15575b98a592ae1c63e9eb95 +SIZE (xpi/thunderbird-i18n-5.0/nn-NO.xpi) = 398579 +SHA256 (xpi/thunderbird-i18n-5.0/pa-IN.xpi) = 9f8214b81a7e850cfb1dc977072638578f8fd1cf65b1f6b9235258b86d353c2f +SIZE (xpi/thunderbird-i18n-5.0/pa-IN.xpi) = 434024 +SHA256 (xpi/thunderbird-i18n-5.0/pl.xpi) = 54586577f86b4d2c39c909c90e80075e9ff521227bd5c4dc5b947ed84d0152da +SIZE (xpi/thunderbird-i18n-5.0/pl.xpi) = 383672 +SHA256 (xpi/thunderbird-i18n-5.0/pt-BR.xpi) = c3a827b736e999b24098b6bfa37e4442ae835d66d567bba9b50634aff40ec3f7 +SIZE (xpi/thunderbird-i18n-5.0/pt-BR.xpi) = 406009 +SHA256 (xpi/thunderbird-i18n-5.0/pt-PT.xpi) = 76ee0e9bccf2a225b7ead1259ad82ece574d4db64d383bbf540733c202865f0e +SIZE (xpi/thunderbird-i18n-5.0/pt-PT.xpi) = 402739 +SHA256 (xpi/thunderbird-i18n-5.0/rm.xpi) = aa91f09081aa264b07996f5c5b5f1058ddb5cf12b2bb47c2c4e3cfac1780a8d1 +SIZE (xpi/thunderbird-i18n-5.0/rm.xpi) = 403569 +SHA256 (xpi/thunderbird-i18n-5.0/ru.xpi) = 561e74bae50a7c8a7e436bf70a3188d0e35f8890387d0091178de6c362a3054b +SIZE (xpi/thunderbird-i18n-5.0/ru.xpi) = 398261 +SHA256 (xpi/thunderbird-i18n-5.0/si.xpi) = 36b97239a8b87c0bb5f3ef50ea51ea485f0a9976fb9cd1dbc0cf09c8382375ef +SIZE (xpi/thunderbird-i18n-5.0/si.xpi) = 443551 +SHA256 (xpi/thunderbird-i18n-5.0/sk.xpi) = f8d0f45a365df808d2dc9e7d14037440a9883cef4eadb98bfc5048eb089090ed +SIZE (xpi/thunderbird-i18n-5.0/sk.xpi) = 413255 +SHA256 (xpi/thunderbird-i18n-5.0/sl.xpi) = bed8303d78a69d19f403e881e85756945b06e542a53e2371c7667cd2f5784576 +SIZE (xpi/thunderbird-i18n-5.0/sl.xpi) = 399391 +SHA256 (xpi/thunderbird-i18n-5.0/sq.xpi) = de288e144e65f46d7b6954e828b434cf2fef10444cdc3bdfd09ff015d68a350b +SIZE (xpi/thunderbird-i18n-5.0/sq.xpi) = 347151 +SHA256 (xpi/thunderbird-i18n-5.0/sv-SE.xpi) = 0e388da663b96521c0f5b1b7942bbbe65073a82cbf4e3e9852baa081decc3f37 +SIZE (xpi/thunderbird-i18n-5.0/sv-SE.xpi) = 467630 +SHA256 (xpi/thunderbird-i18n-5.0/ta-LK.xpi) = 42799b855d5b3563d29e68662c13a06c971449a8c68a543f02155951566f946a +SIZE (xpi/thunderbird-i18n-5.0/ta-LK.xpi) = 457259 +SHA256 (xpi/thunderbird-i18n-5.0/tr.xpi) = 0f202abbd2758dc8b995f69be7f3c355ffb8fbf42b54382759930274a9917d36 +SIZE (xpi/thunderbird-i18n-5.0/tr.xpi) = 402358 +SHA256 (xpi/thunderbird-i18n-5.0/uk.xpi) = 63af2eed2f83137928019105f737f3512a1cd0d150f4ff47f903644d08455d3a +SIZE (xpi/thunderbird-i18n-5.0/uk.xpi) = 451686 +SHA256 (xpi/thunderbird-i18n-5.0/zh-TW.xpi) = 48d0ec4797b8ee021e947828d872e682ec56234fba8de6cba5d16ff8cdd7bbc2 +SIZE (xpi/thunderbird-i18n-5.0/zh-TW.xpi) = 419985 diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile index 64fb062c6962..5b32e07c702b 100644 --- a/mail/thunderbird/Makefile +++ b/mail/thunderbird/Makefile @@ -6,7 +6,7 @@ # PORTNAME= thunderbird -DISTVERSION= 3.1.11 +DISTVERSION= 5.0 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source @@ -15,11 +15,13 @@ DISTNAME= ${PORTNAME}-${DISTVERSION}.source MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above -BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr +BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr +LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ + event-1.4:${PORTSDIR}/devel/libevent USE_AUTOTOOLS= autoconf213 USE_GECKO= gecko -CONFLICTS_INSTALL= thunderbird-3.0* +CONFLICTS_INSTALL= thunderbird-3.1* USE_MOZILLA= -png -nss -dbm -jpeg -xft MOZ_TOOLKIT= cairo-gtk2 @@ -31,16 +33,19 @@ MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}" HAS_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes +USE_GL= gl -MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data +MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data,wyciwyg MOZ_GRAPHICS= default,-xbm MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --enable-single-profile --disable-profilesharing \ --enable-application=mail --enable-official-branding \ - --disable-updater --disable-necko-wifi + --disable-updater --disable-necko-wifi \ + --with-system-libevent=${LOCALBASE} MOZ_MK_OPTIONS= MOZ_MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 MOZ_EXPORT= MOZ_THUNDERBIRD=1 MAIL_PKG_SHARED=1 -MOZILLA_PLIST_DIRS= bin lib +GECKO_PLIST_PRE_DIRS= lib/${MOZILLA}/bin lib/${MOZILLA}/idl \ + lib/${MOZILLA}/include lib/${MOZILLA}/lib MOZ_PKGCONFIG_FILES= PORTNAME_ICON= ${PORTNAME}.png @@ -53,16 +58,9 @@ OPTIONS= .include <bsd.port.pre.mk> -WRKSRC= ${WRKDIR}/comm-1.9.2 +WRKSRC= ${WRKDIR}/comm-miramar MOZSRC:= ${WRKSRC}/mozilla -.if ${OSVERSION} < 700000 -LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio -EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio -.else -EXTRA_PATCHES= ${FILESDIR}/liboggplay_oss -.endif - .if ${ARCH} == powerpc64 .if ${OSVERSION} < 900033 BROKEN= Needs binutils 2.17.50 to build @@ -88,13 +86,21 @@ LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ notify.1:${PORTSDIR}/devel/libnotify .endif +.if ${ARCH} == amd64 || ${ARCH} == i386 +BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm +.endif + post-extract:: ${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \ <${FILESDIR}/thunderbird.desktop.in >${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop post-patch: + @${GREP} -Flr \"/proc ${MOZSRC}/ipc/chromium/src/base | ${XARGS} ${REINPLACE_CMD} \ + -e 's|/proc/self/fd|/dev/fd|' \ + -e 's|/proc["/]|/compat/linux&|' ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ ${MOZSRC}/storage/build/Makefile.in \ + ${MOZSRC}/toolkit/library/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ ${MOZSRC}/security/manager/ssl/src/Makefile.in \ diff --git a/mail/thunderbird/distinfo b/mail/thunderbird/distinfo index 5a7887b45123..e8291769814f 100644 --- a/mail/thunderbird/distinfo +++ b/mail/thunderbird/distinfo @@ -1,2 +1,2 @@ -SHA256 (thunderbird-3.1.11.source.tar.bz2) = 3e78284661b1be1d35753550b7a183d583d7ee68c8bac683283d3931f90fdd1a -SIZE (thunderbird-3.1.11.source.tar.bz2) = 68716700 +SHA256 (thunderbird-5.0.source.tar.bz2) = bb1858dc44e1e9f92b44a1eaf9456190d55b485cf65435266848300ac2b7c5de +SIZE (thunderbird-5.0.source.tar.bz2) = 86637589 diff --git a/mail/thunderbird/files/liboggplay_oss b/mail/thunderbird/files/liboggplay_oss deleted file mode 100644 index e43b0725eea2..000000000000 --- a/mail/thunderbird/files/liboggplay_oss +++ /dev/null @@ -1,15 +0,0 @@ ---- mozilla/media/libsydneyaudio/src/Makefile.in_orgi 2009-04-10 12:12:45.000000000 +0200 -+++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-04-10 12:13:12.000000000 +0200 -@@ -45,6 +45,12 @@ - LIBRARY_NAME = sydneyaudio - FORCE_STATIC_LIB= 1 - -+ifeq ($(OS_ARCH),FreeBSD) -+CSRCS = \ -+ sydney_audio_oss.c \ -+ $(NULL) -+endif -+ - ifeq ($(OS_ARCH),Linux) - CSRCS = \ - sydney_audio_alsa.c \ diff --git a/mail/thunderbird/files/patch-configure.in b/mail/thunderbird/files/patch-configure.in index ae9642b9fffd..b63787947e2a 100644 --- a/mail/thunderbird/files/patch-configure.in +++ b/mail/thunderbird/files/patch-configure.in @@ -1,6 +1,6 @@ ---- configure.in.orig 2009-08-14 11:24:58.206076928 +0200 -+++ configure.in 2009-08-14 11:25:29.601293359 +0200 -@@ -5680,7 +5680,7 @@ +--- configure.in.orig 2011-03-14 14:50:16.000000000 +0100 ++++ configure.in 2011-04-22 12:52:35.061444423 +0200 +@@ -1420,7 +1420,7 @@ CPU_ARCH=sparc ;; @@ -8,4 +8,22 @@ +amd64 | x86_64 | ia64) CPU_ARCH="$OS_TEST" ;; + +@@ -1440,7 +1440,7 @@ + dnl =============================================================== + INTEL_ARCHITECTURE= + case "$OS_TEST" in +- x86_64|i?86) ++ amd64|x86_64|i?86) + INTEL_ARCHITECTURE=1 esac + +@@ -4388,7 +4388,7 @@ + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS + +-if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then ++if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then + ZLIB_CFLAGS="-I${ZLIB_DIR}/include" + ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" + fi diff --git a/mail/thunderbird/files/patch-directory_xpcom_base_src_Makefile.in b/mail/thunderbird/files/patch-directory_xpcom_base_src_Makefile.in deleted file mode 100644 index f56d7b17f104..000000000000 --- a/mail/thunderbird/files/patch-directory_xpcom_base_src_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- directory/xpcom/base/src/Makefile.in.orig 2009-11-22 03:44:31.000000000 +0100 -+++ directory/xpcom/base/src/Makefile.in 2009-11-26 13:06:53.000000000 +0100 -@@ -97,6 +97,10 @@ - $(NULL) - endif - -+ifeq ($(OS_ARCH), FreeBSD) -+EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread -+endif -+ - EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(LDAP_LIBS) - - include $(topsrcdir)/config/rules.mk diff --git a/mail/thunderbird/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc b/mail/thunderbird/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc new file mode 100644 index 000000000000..ffb56ac25100 --- /dev/null +++ b/mail/thunderbird/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc @@ -0,0 +1,10 @@ +--- mozilla/ipc/chromium/src/base/atomicops_internals_mutex.cc~ ++++ mozilla/ipc/chromium/src/base/atomicops_internals_mutex.cc +@@ -39,6 +39,7 @@ + * ***** END LICENSE BLOCK ***** */ + + #include "base/atomicops.h" ++#include "base/lock.h" + + namespace base { + namespace subtle { diff --git a/mail/thunderbird/files/patch-ipc-chromium-src-base-file_util.h b/mail/thunderbird/files/patch-ipc-chromium-src-base-file_util.h new file mode 100644 index 000000000000..81a4693140a8 --- /dev/null +++ b/mail/thunderbird/files/patch-ipc-chromium-src-base-file_util.h @@ -0,0 +1,13 @@ +--- mozilla/ipc/chromium/src/base/file_util.h~ ++++ mozilla/ipc/chromium/src/base/file_util.h +@@ -15,8 +15,9 @@ + #elif defined(ANDROID) + #include <sys/stat.h> + #elif defined(OS_POSIX) ++#include <sys/types.h> ++#include <sys/stat.h> + #include <fts.h> +-#include <sys/stat.h> + #endif + + #include <stdio.h> diff --git a/mail/thunderbird/files/patch-ipc-chromium-src-base-file_util_linux.cc b/mail/thunderbird/files/patch-ipc-chromium-src-base-file_util_linux.cc new file mode 100644 index 000000000000..d0cc3b14e68b --- /dev/null +++ b/mail/thunderbird/files/patch-ipc-chromium-src-base-file_util_linux.cc @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/base/file_util_linux.cc~ ++++ mozilla/ipc/chromium/src/base/file_util_linux.cc +@@ -28,7 +28,7 @@ bool GetShmemTempDir(FilePath* path) { + #ifdef ANDROID + return GetTempDir(path); + #else +- *path = FilePath("/dev/shm"); ++ *path = FilePath("/tmp"); + return true; + #endif + } diff --git a/mail/thunderbird/files/patch-ipc-chromium-src-base-file_util_posix.cc b/mail/thunderbird/files/patch-ipc-chromium-src-base-file_util_posix.cc new file mode 100644 index 000000000000..3c722016e77b --- /dev/null +++ b/mail/thunderbird/files/patch-ipc-chromium-src-base-file_util_posix.cc @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/base/file_util_posix.cc~ ++++ mozilla/ipc/chromium/src/base/file_util_posix.cc +@@ -30,6 +30,8 @@ + #include "base/string_util.h" + #include "base/time.h" + ++#define stat64 stat ++ + namespace file_util { + + #if defined(GOOGLE_CHROME_BUILD) diff --git a/mail/thunderbird/files/patch-ipc-chromium-src-base-platform_file_posix.cc b/mail/thunderbird/files/patch-ipc-chromium-src-base-platform_file_posix.cc new file mode 100644 index 000000000000..14e333ca339b --- /dev/null +++ b/mail/thunderbird/files/patch-ipc-chromium-src-base-platform_file_posix.cc @@ -0,0 +1,10 @@ +--- mozilla/ipc/chromium/src/base/platform_file_posix.cc~ ++++ mozilla/ipc/chromium/src/base/platform_file_posix.cc +@@ -9,6 +9,7 @@ + #ifdef ANDROID + #include <linux/stat.h> + #endif ++#include <sys/stat.h> + + #include "base/logging.h" + #include "base/string_util.h" diff --git a/mail/thunderbird/files/patch-ipc-chromium-src-base-platform_thread_posix.cc b/mail/thunderbird/files/patch-ipc-chromium-src-base-platform_thread_posix.cc new file mode 100644 index 000000000000..3445b281bc48 --- /dev/null +++ b/mail/thunderbird/files/patch-ipc-chromium-src-base-platform_thread_posix.cc @@ -0,0 +1,12 @@ +--- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2011-04-27 09:34:28.000000000 +0200 ++++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc 2011-04-27 19:47:36.344446266 +0200 +@@ -34,7 +33,8 @@ + #if defined(OS_MACOSX) + return mach_thread_self(); + #elif defined(OS_LINUX) +- return syscall(__NR_gettid); ++ // TODO(BSD): find a better thread ID ++ return reinterpret_cast<int64>(pthread_self()); + #endif + } + diff --git a/mail/thunderbird/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h b/mail/thunderbird/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h new file mode 100644 index 000000000000..ca7b24fa4860 --- /dev/null +++ b/mail/thunderbird/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h~ ++++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h +@@ -34,7 +34,7 @@ + #include "base/third_party/nspr/prcpucfg_win.h" + #elif defined(__APPLE__) + #include "base/third_party/nspr/prcpucfg_mac.h" +-#elif defined(__linux__) || defined(ANDROID) ++#elif defined(__FreeBSD__) || defined(ANDROID) + #include "base/third_party/nspr/prcpucfg_linux.h" + #else + #error Provide a prcpucfg.h appropriate for your platform diff --git a/mail/thunderbird/files/patch-ipc-chromium-src-build-build_config.h b/mail/thunderbird/files/patch-ipc-chromium-src-build-build_config.h new file mode 100644 index 000000000000..e7540d38eceb --- /dev/null +++ b/mail/thunderbird/files/patch-ipc-chromium-src-build-build_config.h @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/build/build_config.h~ ++++ mozilla/ipc/chromium/src/build/build_config.h +@@ -17,7 +17,7 @@ + // A set of macros to use for platform detection. + #if defined(__APPLE__) + #define OS_MACOSX 1 +-#elif defined(__linux__) || defined(ANDROID) ++#elif defined(__FreeBSD__) || defined(ANDROID) + #define OS_LINUX 1 + #elif defined(_WIN32) + #define OS_WIN 1 diff --git a/mail/thunderbird-esr/files/patch-directory-sdks-c-sdk-ldap-libraries-libldap-Makefile.in b/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in index 8a065107cd16..63f7b76052c3 100644 --- a/mail/thunderbird-esr/files/patch-directory-sdks-c-sdk-ldap-libraries-libldap-Makefile.in +++ b/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in @@ -1,5 +1,5 @@ ---- directory/sdks/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2009-11-10 09:56:42.000000000 +0100 -+++ directory/sdks/c-sdk/ldap/libraries/libldap/Makefile.in 2009-11-10 09:58:15.000000000 +0100 +--- ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2009-11-10 09:56:42.000000000 +0100 ++++ ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in 2009-11-10 09:58:15.000000000 +0100 @@ -254,6 +254,10 @@ EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe endif diff --git a/mail/thunderbird-esr/files/patch-directory-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in b/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in index ff5e375f156b..df2e10326632 100644 --- a/mail/thunderbird-esr/files/patch-directory-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in +++ b/mail/thunderbird/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in @@ -1,5 +1,5 @@ ---- directory/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2008-09-11 16:38:35.000000000 +0200 -+++ directory/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in 2009-12-09 08:53:46.000000000 +0100 +--- ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2008-09-11 16:38:35.000000000 +0200 ++++ ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in 2009-12-09 08:53:46.000000000 +0100 @@ -147,6 +147,11 @@ CUSTOM_LIBS=1 endif diff --git a/mail/thunderbird/files/patch-mozilla-config-rules.mk b/mail/thunderbird/files/patch-mozilla-config-rules.mk deleted file mode 100644 index bbe6fec94311..000000000000 --- a/mail/thunderbird/files/patch-mozilla-config-rules.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- mozilla/config/rules.mk.orig Thu Sep 14 14:07:03 2006 -+++ mozilla/config/rules.mk Wed Oct 18 11:00:09 2006 -@@ -442,9 +442,7 @@ - endif - - ifeq ($(OS_ARCH),FreeBSD) --ifdef IS_COMPONENT --EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic --endif -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc - endif - - ifeq ($(OS_ARCH),NetBSD) diff --git a/mail/thunderbird/files/patch-mozilla-config_autoconf.mk.in b/mail/thunderbird/files/patch-mozilla-config_autoconf.mk.in index 763f8ebfa6de..2cd507fbf7a8 100644 --- a/mail/thunderbird/files/patch-mozilla-config_autoconf.mk.in +++ b/mail/thunderbird/files/patch-mozilla-config_autoconf.mk.in @@ -19,3 +19,13 @@ DIST = $(DEPTH)/dist LIBXUL_SDK = @LIBXUL_SDK@ +@@ -275,7 +275,7 @@ + OS_CPPFLAGS = @CPPFLAGS@ + OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@ + OS_CXXFLAGS = $(OS_CPPFLAGS) @CXXFLAGS@ +-OS_LDFLAGS = @LDFLAGS@ ++OS_LDFLAGS = @LDFLAGS@ -lc + + OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@ + OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@ + diff --git a/mail/thunderbird/files/patch-mozilla-configure.in b/mail/thunderbird/files/patch-mozilla-configure.in index f08b95aa5c20..4ccc7bfe5017 100644 --- a/mail/thunderbird/files/patch-mozilla-configure.in +++ b/mail/thunderbird/files/patch-mozilla-configure.in @@ -1,6 +1,6 @@ ---- mozilla/configure.in.orig 2009-08-14 11:24:58.206076928 +0200 -+++ mozilla/configure.in 2009-08-14 11:25:29.601293359 +0200 -@@ -5680,7 +5680,7 @@ +--- mozilla/configure.in.orig 2010-11-04 21:05:18.000000000 +0100 ++++ mozilla/configure.in 2010-11-09 12:59:28.000000000 +0100 +@@ -1549,7 +1549,7 @@ CPU_ARCH=sparc ;; @@ -8,4 +8,79 @@ +amd64 | x86_64 | ia64) CPU_ARCH="$OS_TEST" ;; + +@@ -1567,7 +1567,7 @@ dnl Set INTEL_ARCHITECTURE if we're comp + dnl =============================================================== + INTEL_ARCHITECTURE= + case "$OS_TEST" in +- x86_64|i?86) ++ amd64|x86_64|i?86) + INTEL_ARCHITECTURE=1 esac + +@@ -3803,19 +3803,21 @@ + AC_CHECK_FUNCS(localtime_r strtok_r) + + dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt +-_SAVE_LDFLAGS=$LDFLAGS +-LDFLAGS="$LDFLAGS -lrt" +-AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt, ++_SAVE_LIBS=$LIBS ++AC_SEARCH_LIBS(clock_gettime, rt) ++AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC), + ac_cv_have_clock_monotonic, + [AC_TRY_LINK([#include <time.h>], + [ struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); ], + ac_cv_have_clock_monotonic=yes, + ac_cv_have_clock_monotonic=no)]) +-LDFLAGS=$_SAVE_LDFLAGS ++LIBS=$_SAVE_LIBS + if test "$ac_cv_have_clock_monotonic" = "yes"; then + HAVE_CLOCK_MONOTONIC=1 +- REALTIME_LIBS=-lrt ++ if test "$ac_cv_search_clock_gettime" != "none required"; then ++ REALTIME_LIBS=$ac_cv_search_clock_gettime ++ fi + AC_DEFINE(HAVE_CLOCK_MONOTONIC) + AC_SUBST(HAVE_CLOCK_MONOTONIC) + AC_SUBST(REALTIME_LIBS) +@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS + +-if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then ++if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then + ZLIB_CFLAGS="-I${ZLIB_DIR}/include" + ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" + fi +@@ -6022,6 +6024,14 @@ + VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" + VPX_X86_ASM=1 + ;; ++ FreeBSD:i386) ++ VPX_ASFLAGS="-f elf32 -rnasm -pnasm" ++ VPX_X86_ASM=1 ++ ;; ++ FreeBSD:amd64) ++ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" ++ VPX_X86_ASM=1 ++ ;; + SunOS:x86) + VPX_ASFLAGS="-f elf32 -rnasm -pnasm" + VPX_X86_ASM=1 +@@ -6392,6 +6402,14 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then + LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" + LIBJPEG_TURBO_X64_ASM=1 + ;; ++ FreeBSD:i386) ++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" ++ LIBJPEG_TURBO_X86_ASM=1 ++ ;; ++ FreeBSD:amd64) ++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" ++ LIBJPEG_TURBO_X64_ASM=1 ++ ;; + SunOS:i?86) + LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" + LIBJPEG_TURBO_X86_ASM=1 diff --git a/mail/thunderbird/files/patch-mozilla-gfx-qcms-Makefile.in b/mail/thunderbird/files/patch-mozilla-gfx-qcms-Makefile.in new file mode 100644 index 000000000000..bad2cf563256 --- /dev/null +++ b/mail/thunderbird/files/patch-mozilla-gfx-qcms-Makefile.in @@ -0,0 +1,14 @@ +--- mozilla/gfx/qcms/Makefile.in.orig 2010-11-25 20:10:32.000000000 +0100 ++++ mozilla/gfx/qcms/Makefile.in 2010-11-25 20:10:06.000000000 +0100 +@@ -44,6 +44,11 @@ + endif + endif + endif ++ifeq ($(OS_TEST),amd64) ++ CSRCS += transform-sse2.c transform-sse1.c ++ SSE1_FLAGS=-msse ++ SSE2_FLAGS=-msse2 ++endif + + FORCE_STATIC_LIB = 1 + # This library is used by other shared libs diff --git a/mail/thunderbird/files/patch-mozilla-gfx-qcms-qcmstypes.h b/mail/thunderbird/files/patch-mozilla-gfx-qcms-qcmstypes.h new file mode 100644 index 000000000000..7a23c9dd3820 --- /dev/null +++ b/mail/thunderbird/files/patch-mozilla-gfx-qcms-qcmstypes.h @@ -0,0 +1,11 @@ +--- mozilla/gfx/qcms/qcmstypes.h.orig 2010-11-22 12:01:36.000000000 +0100 ++++ mozilla/gfx/qcms/qcmstypes.h 2010-11-22 12:02:42.000000000 +0100 +@@ -25,7 +25,7 @@ + #ifdef __OS2__ + /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */ + #include <stdlib.h> +-#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED) ++#elif !defined(__intptr_t_defined) && !defined(_INTPTR_T_DECLARED) + typedef PRUptrdiff uintptr_t; + #endif + #endif diff --git a/mail/thunderbird/files/patch-mozilla-js-ctypes-libffi-configure b/mail/thunderbird/files/patch-mozilla-js-ctypes-libffi-configure deleted file mode 100644 index 6a86c5e6fc39..000000000000 --- a/mail/thunderbird/files/patch-mozilla-js-ctypes-libffi-configure +++ /dev/null @@ -1,14 +0,0 @@ -B ---- mozilla/js/ctypes/libffi/configure.orig 2011-02-26 21:17:36.000000000 +0100 -+++ mozilla/js/ctypes/libffi/configure 2011-02-26 21:18:35.000000000 +0100 -@@ -21036,6 +21036,9 @@ - - powerpc-*-freebsd*) - TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc - ;; -+ powerpc64-*-freebsd*) -+ TARGET=POWERPC; TARGETDIR=powerpc -+ ;; - powerpc*-*-rtems*) - TARGET=POWERPC; TARGETDIR=powerpc - ;; diff --git a/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in b/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in new file mode 100644 index 000000000000..6aab1acfd935 --- /dev/null +++ b/mail/thunderbird/files/patch-mozilla-js-src-Makefile.in @@ -0,0 +1,22 @@ +--- mozilla/js/src/Makefile.in.orig 2011-03-17 18:51:39.000000000 +0100 ++++ mozilla/js/src/Makefile.in 2011-03-18 19:41:09.000000000 +0100 +@@ -612,7 +612,7 @@ + # to reliably get limit macros defined, we'd always have to define the + # one below before including any header, but that's obscure and + # fragile, so we do it here. +-DEFINES += -D__STDC_LIMIT_MACROS ++DEFINES += -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS + + INCLUDES += -I$(srcdir) + +@@ -666,7 +666,8 @@ + endif # WINNT + + ifeq ($(OS_ARCH),FreeBSD) +-EXTRA_LIBS += -pthread ++DEFINES += -DFREEBSD ++EXTRA_LIBS += -pthread -lc + endif + ifeq ($(OS_ARCH),IRIX) + ifdef USE_N32 + diff --git a/mail/thunderbird/files/patch-mozilla-js-src-build-autoconf-config.sub b/mail/thunderbird/files/patch-mozilla-js-src-build-autoconf-config.sub deleted file mode 100644 index 2cb48a88c0e9..000000000000 --- a/mail/thunderbird/files/patch-mozilla-js-src-build-autoconf-config.sub +++ /dev/null @@ -1,12 +0,0 @@ ---- mozilla/js/src/build/autoconf/config.sub.orig 2010-01-08 09:52:25.000000000 +0100 -+++ mozilla/js/src/build/autoconf/config.sub 2010-01-08 09:52:33.000000000 +0100 -@@ -403,9 +403,6 @@ - amd64) - basic_machine=x86_64-pc - ;; -- amd64-*) -- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` -- ;; - amdahl) - basic_machine=580-amdahl - os=-sysv diff --git a/mail/thunderbird/files/patch-mozilla-js-src-config_config.mk b/mail/thunderbird/files/patch-mozilla-js-src-config_config.mk new file mode 100644 index 000000000000..c5b42ad3457c --- /dev/null +++ b/mail/thunderbird/files/patch-mozilla-js-src-config_config.mk @@ -0,0 +1,10 @@ +--- mozilla/js/src/config/config.mk.orig 2009-08-07 00:49:23.000000000 +0200 ++++ mozilla/js/src/config/config.mk 2009-08-09 20:50:05.000000000 +0200 +@@ -506,6 +506,7 @@ + -I$(srcdir) \ + -I. \ + -I$(DIST)/include -I$(DIST)/include/nsprpub \ ++ -I%%LOCALBASE%%/include \ + $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \ + $(OS_INCLUDES) \ + $(NULL) diff --git a/mail/thunderbird/files/patch-mozilla-js-src-configure.in b/mail/thunderbird/files/patch-mozilla-js-src-configure.in index fe78e75474bb..331c5ba47267 100644 --- a/mail/thunderbird/files/patch-mozilla-js-src-configure.in +++ b/mail/thunderbird/files/patch-mozilla-js-src-configure.in @@ -1,22 +1,33 @@ ---- mozilla/js/src/configure.in.orig 2010-05-12 21:05:58.000000000 +0200 -+++ mozilla/js/src/configure.in 2010-06-22 16:17:20.000000000 +0200 -@@ -1218,7 +1218,7 @@ - CPU_ARCH=sparc +--- mozilla/js/src/configure.in.orig 2010-11-04 21:05:48.000000000 +0100 ++++ mozilla/js/src/configure.in 2010-11-22 21:30:24.000000000 +0100 +@@ -2621,7 +2621,7 @@ + AC_DEFINE(JS_CPU_X86) + AC_DEFINE(JS_NUNBOX32) ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - esac -@@ -2466,10 +2466,6 @@ - ENABLE_JIT=1 - NANOJIT_ARCH=ARM +-x86_64*-*) ++x86_64*-*|amd64*-*) + ENABLE_TRACEJIT=1 + NANOJIT_ARCH=X64 + ENABLE_METHODJIT=1 +@@ -2638,11 +2638,6 @@ + AC_DEFINE(JS_CPU_ARM) + AC_DEFINE(JS_NUNBOX32) ;; -sparc*-*) -- ENABLE_JIT=1 +- ENABLE_TRACEJIT=1 - NANOJIT_ARCH=Sparc +- AC_DEFINE(JS_CPU_SPARC) - ;; esac - MOZ_ARG_DISABLE_BOOL(jit, + MOZ_ARG_DISABLE_BOOL(methodjit, +@@ -2693,7 +2688,7 @@ + i?86-*) + AC_DEFINE(AVMPLUS_IA32) + ;; +-x86_64*-*) ++x86_64*-*|amd64*-*) + AC_DEFINE(AVMPLUS_AMD64) + AC_DEFINE(AVMPLUS_64BIT) + ;; + diff --git a/mail/thunderbird/files/patch-mozilla-js-src-jslock.cpp b/mail/thunderbird/files/patch-mozilla-js-src-jslock.cpp deleted file mode 100644 index 03f5c60cccf8..000000000000 --- a/mail/thunderbird/files/patch-mozilla-js-src-jslock.cpp +++ /dev/null @@ -1,18 +0,0 @@ ---- mozilla/js/src/jslock.cpp.orig 2010-01-23 20:35:45.000000000 +0100 -+++ mozilla/js/src/jslock.cpp 2010-01-23 20:37:35.000000000 +0100 -@@ -160,8 +160,13 @@ - unsigned int res; - - __asm__ __volatile__ ( -- "stbar\n" -- "cas [%1],%2,%3\n" -+ "membar #StoreLoad | #LoadLoad\n" -+# if defined (__sparc64__) -+ "casx [%1],%2,%3\n" -+# else -+ "cas [%1],%2,%3\n" /* 32-bit version */ -+# endif -+ "membar #StoreLoad | #LoadLoad\n" - "cmp %2,%3\n" - "be,a 1f\n" - "mov 1,%0\n" diff --git a/mail/thunderbird/files/patch-mozilla-js-src-jsnativestack.cpp b/mail/thunderbird/files/patch-mozilla-js-src-jsnativestack.cpp new file mode 100644 index 000000000000..97bf06c41be0 --- /dev/null +++ b/mail/thunderbird/files/patch-mozilla-js-src-jsnativestack.cpp @@ -0,0 +1,11 @@ +--- mozilla/js/src/jsnativestack.cpp~ ++++ mozilla/js/src/jsnativestack.cpp +@@ -50,7 +50,8 @@ + #elif defined(XP_MACOSX) || defined(DARWIN) || defined(XP_UNIX) + # include <pthread.h> + +-# if defined(__FreeBSD__) ++# if defined(FREEBSD) ++# include <cstddef> + # include <pthread_np.h> + # endif diff --git a/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in b/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in index afdc6fd8ae0f..c406d410a4da 100644 --- a/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in +++ b/mail/thunderbird/files/patch-mozilla-layout-generic-Makefile.in @@ -1,9 +1,9 @@ ---- mozilla/layout/generic/Makefile.in.orig 2010-01-20 18:57:00.000000000 +0100 -+++ mozilla/layout/generic/Makefile.in 2010-01-20 18:57:48.000000000 +0100 -@@ -191,9 +191,10 @@ - -I$(srcdir)/../../content/base/src \ +--- mozilla/layout/generic/Makefile.in.orig 2011-05-28 15:25:03.000000000 +0200 ++++ mozilla/layout/generic/Makefile.in 2011-06-03 08:21:03.853676671 +0200 +@@ -160,9 +160,10 @@ -I$(srcdir)/../../content/html/content/src \ -I$(srcdir)/../../dom/base \ + -I$(srcdir)/../../modules/plugin/base/src \ - $(MOZ_CAIRO_CFLAGS) \ $(NULL) diff --git a/mail/thunderbird/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h b/mail/thunderbird/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h deleted file mode 100644 index 726dc875e37f..000000000000 --- a/mail/thunderbird/files/patch-mozilla-media-liboggz-include-oggz-oggz_off_t_generated.h +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h.orig 2010-09-06 11:33:54.000000000 +0200 -+++ mozilla/media/liboggz/include/oggz/oggz_off_t_generated.h 2010-09-06 11:34:16.000000000 +0200 -@@ -59,7 +59,7 @@ - - #include <sys/types.h> - --#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX) -+#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined (_AIX) || defined (__FreeBSD__) - typedef off_t oggz_off_t; - #else - typedef loff_t oggz_off_t; diff --git a/mail/thunderbird/files/patch-mozilla-media-libvpx-vpx_config.c b/mail/thunderbird/files/patch-mozilla-media-libvpx-vpx_config.c new file mode 100644 index 000000000000..b97d147914fe --- /dev/null +++ b/mail/thunderbird/files/patch-mozilla-media-libvpx-vpx_config.c @@ -0,0 +1,16 @@ +--- mozilla/media/libvpx/vpx_config_c.c~ ++++ mozilla/media/libvpx/vpx_config_c.c +@@ -12,11 +12,11 @@ + /* 32 bit MacOS. */ + #include "vpx_config_x86-darwin9-gcc.c" + +-#elif defined(__linux__) && defined(__i386__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__) + /* 32 bit Linux. */ + #include "vpx_config_x86-linux-gcc.c" + +-#elif defined(__linux__) && defined(__x86_64__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__) + /* 64 bit Linux. */ + #include "vpx_config_x86_64-linux-gcc.c" + diff --git a/mail/thunderbird/files/patch-mozilla-media-libvpx-vpx_config.h b/mail/thunderbird/files/patch-mozilla-media-libvpx-vpx_config.h new file mode 100644 index 000000000000..b4ba5cd8986a --- /dev/null +++ b/mail/thunderbird/files/patch-mozilla-media-libvpx-vpx_config.h @@ -0,0 +1,16 @@ +--- mozilla/media/libvpx/vpx_config.h~ ++++ mozilla/media/libvpx/vpx_config.h +@@ -12,11 +12,11 @@ + /* 32 bit MacOS. */ + #include "vpx_config_x86-darwin9-gcc.h" + +-#elif defined(__linux__) && defined(__i386__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__) + /* 32 bit Linux. */ + #include "vpx_config_x86-linux-gcc.h" + +-#elif defined(__linux__) && defined(__x86_64__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__) + /* 64 bit Linux. */ + #include "vpx_config_x86_64-linux-gcc.h" + diff --git a/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk b/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk index 39272d788b83..dc4e96c7c439 100644 --- a/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk +++ b/mail/thunderbird/files/patch-mozilla-security-coreconf-FreeBSD.mk @@ -1,22 +1,29 @@ ---- mozilla/security/coreconf/FreeBSD.mk.orig 2010-04-30 19:44:32.000000000 +0000 -+++ mozilla/security/coreconf/FreeBSD.mk 2010-05-10 13:04:45.000000000 +0000 -@@ -52,6 +52,15 @@ - ifeq ($(CPU_ARCH),amd64) - CPU_ARCH = x86_64 +--- mozilla/security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000 ++++ mozilla/security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.000000000 +0000 +@@ -49,8 +49,20 @@ + ifeq ($(CPU_ARCH),pc98) + CPU_ARCH = x86 endif +-ifeq ($(CPU_ARCH),amd64) +-CPU_ARCH = x86_64 ++ifeq ($(OS_TEST),alpha) ++CPU_ARCH = alpha ++endif +ifeq ($(OS_TEST),amd64) +CPU_ARCH = amd64 +endif ++ifeq ($(OS_TEST),ia64) ++CPU_ARCH = ia64 ++endif +ifeq ($(OS_TEST),powerpc) +CPU_ARCH = powerpc +endif +ifeq ($(OS_TEST),sparc64) +CPU_ARCH = sparc64 -+endif + endif OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - -@@ -78,7 +87,7 @@ +@@ -78,7 +90,7 @@ DLL_SUFFIX = so.1.0 endif @@ -25,7 +32,7 @@ ifdef MAPFILE MKSHLIB += -Wl,--version-script,$(MAPFILE) endif -@@ -87,4 +96,4 @@ +@@ -87,4 +99,4 @@ G++INCLUDES = -I/usr/include/g++ diff --git a/mail/thunderbird/files/patch-mozilla-toolkit-library-Makefile.in b/mail/thunderbird/files/patch-mozilla-toolkit-library-Makefile.in new file mode 100644 index 000000000000..f222b6dca9e9 --- /dev/null +++ b/mail/thunderbird/files/patch-mozilla-toolkit-library-Makefile.in @@ -0,0 +1,12 @@ +--- mozilla/toolkit/library/Makefile.in.orig 2010-01-11 12:13:08.000000000 -0500 ++++ mozilla/toolkit/library/Makefile.in 2010-01-11 12:15:05.000000000 -0500 +@@ -181,7 +181,7 @@ + export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS) + $(INSTALL) $^ . + +-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) ++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% + + ifdef MOZ_ENABLE_LIBXUL + include $(srcdir)/libxul-rules.mk + diff --git a/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in index 7dd5b80a1ced..e896cec90613 100644 --- a/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in +++ b/mail/thunderbird/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in @@ -1,8 +1,8 @@ ---- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2010-12-07 17:36:07.000000000 +0100 -+++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-02-26 21:30:36.000000000 +0100 -@@ -73,6 +73,9 @@ - DEFINES += -DKEEP_STACK_16_BYTE_ALIGNED - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp +--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-05-28 15:26:21.000000000 +0200 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-06-03 18:39:42.769434047 +0200 +@@ -74,6 +74,9 @@ + # NOTE: MODULE_OPTIMIZE_FLAGS must be set before including config.mk + MODULE_OPTIMIZE_FLAGS=-O3 endif +ifeq (x86_64,$(OS_TEST)) +CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp @@ -10,7 +10,7 @@ endif endif -@@ -96,7 +99,7 @@ +@@ -117,7 +120,7 @@ endif endif # IA64 Linux @@ -19,20 +19,20 @@ ifneq (,$(findstring ia64,$(OS_TEST))) CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -115,6 +118,12 @@ - CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp +@@ -129,6 +132,12 @@ + ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64) + CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp endif - # +# FreeBSD/amd64 +# +ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64) +CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp +endif +# - # BeOS/Intel (uses the same unixish_x86 code) # - ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC) -@@ -165,9 +174,15 @@ + # Neutrino/Intel (uses the same unixish_x86 code) + # +@@ -184,9 +193,15 @@ ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s endif # @@ -49,7 +49,7 @@ CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp endif # -@@ -322,7 +337,7 @@ +@@ -341,7 +356,7 @@ # # Linux/PPC # @@ -58,16 +58,7 @@ CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s AS := $(CC) -c -x assembler-with-cpp -@@ -331,7 +346,7 @@ - # - # Linux/PPC64 - # --ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc64) -+ifneq (,$(filter Linuxpowerpc64 FreeBSDpowerpc64,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_ppc64_linux.cpp xptcstubs_ppc64_linux.cpp - ASFILES := xptcinvoke_asm_ppc64_linux.s xptcstubs_asm_ppc64_linux.s - AS := $(CC) -c -x assembler-with-cpp -@@ -400,6 +415,15 @@ +@@ -419,6 +434,15 @@ ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s endif # diff --git a/mail/thunderbird/files/patch-nsprpub-pr-include-md_freebsd.cfg b/mail/thunderbird/files/patch-nsprpub-pr-include-md_freebsd.cfg new file mode 100644 index 000000000000..e98cce3e3d8f --- /dev/null +++ b/mail/thunderbird/files/patch-nsprpub-pr-include-md_freebsd.cfg @@ -0,0 +1,100 @@ +--- mozilla/nsprpub/pr/include/md/_freebsd.cfg.orig 2010-12-23 17:34:06.000000000 +0100 ++++ mozilla/nsprpub/pr/include/md/_freebsd.cfg 2010-12-23 17:34:44.000000000 +0100 +@@ -283,6 +283,97 @@ + #define PR_ALIGN_OF_POINTER 8 + #define PR_ALIGN_OF_WORD 8 + ++#elif defined(__powerpc64__) ++ ++#undef IS_LITTLE_ENDIAN ++#define IS_BIG_ENDIAN 1 ++#define IS_64 ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT 4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 8 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 8 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE 8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG 64 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD 64 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG2 5 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 6 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 6 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG 8 ++#define PR_ALIGN_OF_INT64 8 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 8 ++#define PR_ALIGN_OF_POINTER 8 ++#define PR_ALIGN_OF_WORD 8 ++ ++#define PR_BYTES_PER_WORD_LOG2 3 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ ++#elif defined(__powerpc__) ++ ++#undef IS_LITTLE_ENDIAN ++#define IS_BIG_ENDIAN 1 ++ ++#define PR_BYTES_PER_BYTE 1 ++#define PR_BYTES_PER_SHORT 2 ++#define PR_BYTES_PER_INT 4 ++#define PR_BYTES_PER_INT64 8 ++#define PR_BYTES_PER_LONG 4 ++#define PR_BYTES_PER_FLOAT 4 ++#define PR_BYTES_PER_DOUBLE 8 ++#define PR_BYTES_PER_WORD 4 ++#define PR_BYTES_PER_DWORD 8 ++ ++#define PR_BITS_PER_BYTE 8 ++#define PR_BITS_PER_SHORT 16 ++#define PR_BITS_PER_INT 32 ++#define PR_BITS_PER_INT64 64 ++#define PR_BITS_PER_LONG 32 ++#define PR_BITS_PER_FLOAT 32 ++#define PR_BITS_PER_DOUBLE 64 ++#define PR_BITS_PER_WORD 32 ++ ++#define PR_BITS_PER_BYTE_LOG2 3 ++#define PR_BITS_PER_SHORT_LOG2 4 ++#define PR_BITS_PER_INT_LOG2 5 ++#define PR_BITS_PER_INT64_LOG2 6 ++#define PR_BITS_PER_LONG_LOG2 5 ++#define PR_BITS_PER_FLOAT_LOG2 5 ++#define PR_BITS_PER_DOUBLE_LOG2 6 ++#define PR_BITS_PER_WORD_LOG2 5 ++ ++#define PR_ALIGN_OF_SHORT 2 ++#define PR_ALIGN_OF_INT 4 ++#define PR_ALIGN_OF_LONG 4 ++#define PR_ALIGN_OF_INT64 8 ++#define PR_ALIGN_OF_FLOAT 4 ++#define PR_ALIGN_OF_DOUBLE 8 ++#define PR_ALIGN_OF_POINTER 4 ++#define PR_ALIGN_OF_WORD 4 ++ ++#define PR_BYTES_PER_WORD_LOG2 2 ++#define PR_BYTES_PER_DWORD_LOG2 3 ++ + #else + + #error "Unknown CPU architecture" diff --git a/mail/thunderbird/files/patch-nsprpub-pr-include-md_freebsd.h b/mail/thunderbird/files/patch-nsprpub-pr-include-md_freebsd.h new file mode 100644 index 000000000000..2be831a3ec9c --- /dev/null +++ b/mail/thunderbird/files/patch-nsprpub-pr-include-md_freebsd.h @@ -0,0 +1,30 @@ +--- mozilla/nsprpub/pr/include/md/_freebsd.h.orig 2010-12-23 17:34:13.000000000 +0100 ++++ mozilla/nsprpub/pr/include/md/_freebsd.h 2010-12-23 17:34:46.000000000 +0100 +@@ -57,6 +57,10 @@ + #define _PR_SI_ARCHITECTURE "ia64" + #elif defined(__amd64__) + #define _PR_SI_ARCHITECTURE "amd64" ++#elif defined(__powerpc64__) ++#define _PR_SI_ARCHITECTURE "powerpc64" ++#elif defined(__powerpc__) ++#define _PR_SI_ARCHITECTURE "powerpc" + #else + #error "Unknown CPU architecture" + #endif +@@ -106,6 +110,16 @@ + #define _PR_IPV6_V6ONLY_PROBE + #endif + ++#if (__FreeBSD_version >= 700016) || (__FreeBSD_version < 700000 && __FreeBSD_version >= 601103) ++#if defined(_PR_PTHREADS) ++#define _PR_HAVE_GETPROTO_R ++#define _PR_HAVE_5_ARG_GETPROTO_R ++#define _PR_HAVE_GETHOST_R ++#define _PR_HAVE_GETHOST_R_INT ++#define _PR_HAVE_THREADSAFE_GETHOST ++#endif ++#endif ++ + #define USE_SETJMP + + #ifndef _PR_PTHREADS diff --git a/mail/thunderbird/files/releng6_pulseaudio b/mail/thunderbird/files/releng6_pulseaudio deleted file mode 100644 index 37203b52a5ee..000000000000 --- a/mail/thunderbird/files/releng6_pulseaudio +++ /dev/null @@ -1,66 +0,0 @@ ---- mozilla/media/libsydneyaudio/src/Makefile.in.orig 2009-08-20 21:43:41.000000000 +0200 -+++ mozilla/media/libsydneyaudio/src/Makefile.in 2009-08-20 21:44:17.000000000 +0200 -@@ -45,6 +45,12 @@ - LIBRARY_NAME = sydneyaudio - FORCE_STATIC_LIB= 1 - -+ifeq ($(OS_ARCH),FreeBSD) -+CSRCS = \ -+ sydney_audio_pulseaudio.c \ -+ $(NULL) -+endif -+ - ifeq ($(OS_ARCH),Linux) - CSRCS = \ - sydney_audio_alsa.c \ ---- mozilla/toolkit/library/Makefile.in.orig 2010-01-19 20:28:10.000000000 +0000 -+++ mozilla/toolkit/library/Makefile.in 2010-01-25 09:38:40.000000000 +0000 -@@ -235,12 +235,12 @@ - endif - - ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT)) --EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS) $(XCOMPOSITE_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread -lc - EXTRA_DSO_LDOPTS += $(FT2_LIBS) - endif - - ifeq (qt,$(MOZ_WIDGET_TOOLKIT)) --EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -lpulse -lpthread -lc - EXTRA_DSO_LDOPTS += $(FT2_LIBS) - endif - ---- mozilla/js/src/Makefile.in.orig 2009-08-21 00:34:43.000000000 +0200 -+++ mozilla/js/src/Makefile.in 2009-08-21 00:36:59.000000000 +0200 -@@ -427,7 +427,7 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) --EXTRA_LIBS += -pthread -+EXTRA_LIBS += -pthread -lpulse -lc - endif - ifeq ($(OS_ARCH),IRIX) - ifdef USE_N32 ---- config/rules.mk.orig 2009-08-22 15:30:16.000000000 +0200 -+++ config/rules.mk 2009-08-22 15:30:46.000000000 +0200 -@@ -583,6 +583,7 @@ - ifdef IS_COMPONENT - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic - endif -+EXTRA_LIBS += -pthread -lpulse -lc - endif - - ifeq ($(OS_ARCH),NetBSD) ---- mozilla/layout/build/Makefile.in.orig 2009-08-22 01:00:21.000000000 +0200 -+++ mozilla/layout/build/Makefile.in 2009-08-22 01:00:57.000000000 +0200 -@@ -269,6 +269,10 @@ - endif - endif - -+ifeq ($(OS_ARCH),FreeBSD) -+EXTRA_LIBS += -lpulse -+endif -+ - include $(topsrcdir)/config/rules.mk - - LOCAL_INCLUDES += -I$(srcdir)/../base \ |