Hi,
thunderbird 60 is finally released, cf
https://www.thunderbird.net/en-US/thunderbird/60.0/releasenotes/ and
https://support.mozilla.org/en-US/kb/new-thunderbird-60
The gdata-provider addon is temporarly gone but there's no binary
component in our build so one should be able to install it from the
addons manager. The lightning addon can run as an .xpi file so that also
simplifies packaging.
i have no plans *yet* to update it (will probably wait for .0.1 or
.1.0) but i'd be happy to have actual users dogfood it. I've been using
the beta branch since it was opened after 52 without issues, but i dont
use many addons and have a casual usage (ie heavy calendaring, big imap
account but nothing much).
To build it, either grab the port from
https://cgit.rhaalovely.net/mozilla-thunderbird/?h=release, the signed
package from https://packages.rhaalovely.net/snapshots/amd64/ or build
the port yourself from the attached diff (which should apply on current)
Landry
? 54.0b1-clangbase.log
? f87c98a8bb92efc0eb490d9721983315e920a396
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/Makefile,v
retrieving revision 1.270
diff -u -r1.270 Makefile
--- Makefile 11 Jul 2018 06:11:45 -0000 1.270
+++ Makefile 6 Aug 2018 20:03:05 -0000
@@ -1,24 +1,25 @@
# $OpenBSD: Makefile,v 1.270 2018/07/11 06:11:45 landry Exp $
+ONLY_FOR_ARCHS = amd64 i386
COMMENT-main = Mozilla e-mail, rss and usenet client
COMMENT-lightning = Mozilla Thunderbird calendar extension
# Don't forget to bump mail/thunderbird-i18n after updates.
-MOZILLA_VERSION = 52.9.1
+MOZILLA_VERSION = 60.0
MOZILLA_BRANCH = release
MOZILLA_PROJECT = thunderbird
-MOZILLA_CODENAME = mail
+MOZILLA_CODENAME = comm/mail
EXTRACT_SUFX = .tar.xz
MULTI_PACKAGES = -main -lightning
PKGNAME-main = ${PKGNAME}
-PKGNAME-lightning = lightning-5.4.9.1
+PKGNAME-lightning = lightning-6.2
EPOCH-lightning = 0
HOMEPAGE = http://www.mozilla.org/thunderbird/
-SO_VERSION = 32.0
+SO_VERSION = 33.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
@@ -40,11 +41,15 @@
MOZILLA_USE_GTK3 = Yes
# use bundled sqlite which has SQLITE_ENABLE_FTS3_TOKENIZER (#1252937)
MOZILLA_USE_BUNDLED_SQLITE = Yes
+# 56 requires 59.1
+MOZILLA_USE_BUNDLED_ICU = Yes
+# 59 is broken with system cairo and the option is being dropped
+MOZILLA_USE_BUNDLED_CAIRO = Yes
-NO_TEST = Yes
+WRKDIST = ${WRKDIR}/${MOZILLA_DIST}-${MOZILLA_DIST_VERSION:C/b[0-9]*//}
+PATCH_STRIP= -p1
-WANTLIB-lightning =
-WANTLIB-main += ${WANTLIB} X11-xcb intl pixman-1 xcb xcb-shm
+NO_TEST = Yes
CONFIGURE_STYLE = simple
CONFIGURE_ARGS += --prefix=${PREFIX}
@@ -55,14 +60,14 @@
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include"
RUN_DEPENDS-lightning =
STEM->=${MOZILLA_VERSION:S/b/beta/}:${BUILD_PKGPATH},-main
+WANTLIB-lightning =
+WANTLIB-main += ${WANTLIB} X11-xcb Xcursor Xi intl xcb xcb-shm
# build lightning xpi
CONFIGURE_ARGS += --enable-calendar
-# to be able to link when building with clang on i386
-.if ${MACHINE_ARCH} == "i386"
-CONFIGURE_ARGS += --disable-debug-symbols
-.endif
+# bug 1341234
+CONFIGURE_ARGS += --disable-stylo
# bug 857628
CONFIGURE_ARGS += --enable-pie
@@ -74,38 +79,30 @@
GUIDS = gdata-provider {a62ef8ec-5fdc-40c2-873c-223b8a6925cc} #\
# lightning {e2fda1a4-762b-4020-b5ad-a41df1933103}
-EXTDIR = ${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/
-
-CONFIGURE_ENV+=MOZCONFIG=${WRKSRC}/mozilla/.mozconfig
-# MOZCONFIG is mandatory now even if empty ?
-post-patch:
- touch ${WRKSRC}/mozilla/.mozconfig
+EXTDIR = ${PREFIX}/lib/${MOZILLA_PROJECT}/extensions/
post-install:
-.for xpi guid in ${GUIDS}
- cp ${WRKBUILD}/dist/xpi-stage/${xpi}*.xpi ${EXTDIR}/${guid}.xpi
-.endfor
+#.for xpi guid in ${GUIDS}
+# cp ${WRKBUILD}/dist/xpi-stage/${xpi}*.xpi ${EXTDIR}/${guid}.xpi
+#.endfor
- mv
${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}
\
+ mv
${PREFIX}/lib/${MOZILLA_PROJECT}/distribution/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi
\
${EXTDIR}
- rmdir
${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/distribution/extensions/
+ rmdir ${PREFIX}/lib/${MOZILLA_PROJECT}/distribution/extensions/
# install prefs
${SUBST_DATA} ${FILESDIR}/all-openbsd.js \
-
${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/defaults/pref/all-openbsd.js
+ ${PREFIX}/lib/${MOZILLA_PROJECT}/defaults/pref/all-openbsd.js
# install distribution.ini file
- ${INSTALL_DATA_DIR}
${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/distribution
+ ${INSTALL_DATA_DIR} ${PREFIX}/lib/${MOZILLA_PROJECT}/distribution
echo "[Global]\nid=OpenBSD\nversion=${OSREV}\nabout=Packaged by
${MAINTAINER}\n" > \
-
${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/distribution/distribution.ini
+ ${PREFIX}/lib/${MOZILLA_PROJECT}/distribution/distribution.ini
# install desktop file
${INSTALL_DATA_DIR} ${PREFIX}/share/applications/ ; \
${SUBST_DATA} ${FILESDIR}/${MOZILLA_PROJECT}.desktop \
${PREFIX}/share/applications/${MOZILLA_PROJECT}.desktop ; \
# install icon for desktop file
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/
- ${INSTALL_DATA}
${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/chrome/icons/default/default256.png
\
+ ${INSTALL_DATA}
${PREFIX}/lib/${MOZILLA_PROJECT}/chrome/icons/default/default128.png \
${PREFIX}/share/pixmaps/${MOZILLA_PROJECT}.png
-
- # remove useless empty dirs ?
- rm -Rf ${PREFIX}/lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/modules/
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/distinfo,v
retrieving revision 1.124
diff -u -r1.124 distinfo
--- distinfo 11 Jul 2018 06:11:45 -0000 1.124
+++ distinfo 6 Aug 2018 20:03:05 -0000
@@ -1,2 +1,2 @@
-SHA256 (mozilla/thunderbird-52.9.1.source.tar.xz) =
KG+nFQTnGE86Qby96/WRvr6OBNzLrRyTpHxucqcSXE0=
-SIZE (mozilla/thunderbird-52.9.1.source.tar.xz) = 230475264
+SHA256 (mozilla/thunderbird-60.0.source.tar.xz) =
vX2ojcwDxEik6XW1odPpv0ZuyRUbEFk5K821CVWiIFY=
+SIZE (mozilla/thunderbird-60.0.source.tar.xz) = 282494428
Index: patches/patch-mozilla_js_src_jit_ProcessExecutableMemory_h
===================================================================
RCS file:
/cvs/ports/mail/mozilla-thunderbird/patches/patch-mozilla_js_src_jit_ProcessExecutableMemory_h,v
retrieving revision 1.3
diff -u -r1.3 patch-mozilla_js_src_jit_ProcessExecutableMemory_h
--- patches/patch-mozilla_js_src_jit_ProcessExecutableMemory_h 19 May 2018
14:47:11 -0000 1.3
+++ patches/patch-mozilla_js_src_jit_ProcessExecutableMemory_h 6 Aug 2018
20:03:05 -0000
@@ -5,12 +5,12 @@
Index: mozilla/js/src/jit/ProcessExecutableMemory.h
--- mozilla/js/src/jit/ProcessExecutableMemory.h.orig
+++ mozilla/js/src/jit/ProcessExecutableMemory.h
-@@ -19,7 +19,7 @@ static const size_t ExecutableCodePageSize = 64 * 1024
+@@ -14,7 +14,7 @@ namespace jit {
// Limit on the number of bytes of executable memory to prevent JIT spraying
// attacks.
-#if JS_BITS_PER_WORD == 32
-+#if JS_BITS_PER_WORD == 32 || defined(__OpenBSD__)
- static const size_t MaxCodeBytesPerProcess = 128 * 1024 * 1024;
++#if JS_BITS_PER_WORD == 32 || defined (__OpenBSD__)
+ static const size_t MaxCodeBytesPerProcess = 140 * 1024 * 1024;
#else
static const size_t MaxCodeBytesPerProcess = 1 * 1024 * 1024 * 1024;
Index:
patches/patch-mozilla_security_manager_pki_resources_content_exceptionDialog_js
===================================================================
RCS file:
/cvs/ports/mail/mozilla-thunderbird/patches/patch-mozilla_security_manager_pki_resources_content_exceptionDialog_js,v
retrieving revision 1.7
diff -u -r1.7
patch-mozilla_security_manager_pki_resources_content_exceptionDialog_js
---
patches/patch-mozilla_security_manager_pki_resources_content_exceptionDialog_js
5 Apr 2017 09:46:18 -0000 1.7
+++
patches/patch-mozilla_security_manager_pki_resources_content_exceptionDialog_js
6 Aug 2018 20:03:05 -0000
@@ -1,7 +1,8 @@
$OpenBSD:
patch-mozilla_security_manager_pki_resources_content_exceptionDialog_js,v 1.7
2017/04/05 09:46:18 landry Exp $
---- mozilla/security/manager/pki/resources/content/exceptionDialog.js.orig
Fri Sep 2 00:56:51 2016
-+++ mozilla/security/manager/pki/resources/content/exceptionDialog.js Sat Sep
3 12:23:12 2016
-@@ -239,6 +239,7 @@ function updateCertStatus() {
+Index: mozilla/security/manager/pki/resources/content/exceptionDialog.js
+--- mozilla/security/manager/pki/resources/content/exceptionDialog.js.orig
++++ mozilla/security/manager/pki/resources/content/exceptionDialog.js
+@@ -220,6 +220,7 @@ function updateCertStatus() {
// In these cases, we do want to enable the "Add Exception" button
gDialog.getButton("extra1").disabled = false;
Index: patches/patch-mozilla_storage_mozStorageConnection_cpp
===================================================================
RCS file:
/cvs/ports/mail/mozilla-thunderbird/patches/patch-mozilla_storage_mozStorageConnection_cpp,v
retrieving revision 1.2
diff -u -r1.2 patch-mozilla_storage_mozStorageConnection_cpp
--- patches/patch-mozilla_storage_mozStorageConnection_cpp 5 Apr 2017
09:46:18 -0000 1.2
+++ patches/patch-mozilla_storage_mozStorageConnection_cpp 6 Aug 2018
20:03:05 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-mozilla_storage_mozStorageConnection_cpp,v 1.2 2017/04/05
09:46:18 landry Exp $
---- mozilla/storage/mozStorageConnection.cpp.orig Wed Feb 15 17:34:47 2017
-+++ mozilla/storage/mozStorageConnection.cpp Sun Feb 19 15:08:41 2017
-@@ -782,6 +782,13 @@ Connection::initializeInternal()
+Index: mozilla/storage/mozStorageConnection.cpp
+--- mozilla/storage/mozStorageConnection.cpp.orig
++++ mozilla/storage/mozStorageConnection.cpp
+@@ -839,6 +839,13 @@ Connection::initializeInternal()
return convertResultCode(srv);
}
Index: pkg/PLIST-lightning
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/pkg/PLIST-lightning,v
retrieving revision 1.21
diff -u -r1.21 PLIST-lightning
--- pkg/PLIST-lightning 5 Apr 2017 09:46:18 -0000 1.21
+++ pkg/PLIST-lightning 6 Aug 2018 20:03:05 -0000
@@ -1,101 +1,4 @@
@comment $OpenBSD: PLIST-lightning,v 1.21 2017/04/05 09:46:18 landry Exp $
@conflict lightning-<=1.0b1
@pkgpath productivity/sunbird,-lightning
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}.xpi
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/app.ini
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calAlarm.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calAlarmMonitor.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calAlarmService.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calAttachment.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calAttendee.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calCachedCalendar.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calCalendarManager.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calCalendarSearchService.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calDateTime.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calDateTimeFormatter.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calDavRequestHandlers.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calDeletedItems.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calDuration.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calEvent.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calFilter.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calFreeBusyService.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calHtmlExport.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calICSService-worker.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calICSService.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calIcsImportExport.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calIcsParser.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calIcsSerializer.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calItemBase.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calItipItem.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calListFormatter.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calMonthGridPrinter.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calOutlookCSVImportExport.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calPeriod.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calProtocolHandler.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calRecurrenceDate.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calRecurrenceInfo.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calRecurrenceRule.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calRelation.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calStartupService.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calTimezone.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calTodo.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calTransactionManager.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calUtils.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWcapCalendar.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWcapCalendarItems.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWcapErrors.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWcapRequest.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWcapSession.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWcapUtils.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWeekInfoService.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/calendar-js/calWeekPrinter.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.jar
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/chrome.manifest
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calBackendLoader.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calCompositeCalendar.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calDavCalendar.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calDefaultACLManager.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calICALJSComponents.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calICSCalendar.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calImportExportModule.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calItemModule.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calItipEmailTransport.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calItipProtocolHandler.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calMemoryCalendar.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calSleepMonitor.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calStorageCalendar.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calTimezoneService.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/calWcapCalendarModule.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/components.manifest
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/icaljs-manifest
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/interfaces.xpt
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/components/lightningTextCalendarConverter.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/defaults/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/defaults/preferences/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/defaults/preferences/lightning.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/install.rdf
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calAlarmUtils.jsm
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calAsyncUtils.jsm
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calAuthUtils.jsm
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calExtract.jsm
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calHashedArray.jsm
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calItemUtils.jsm
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calIteratorUtils.jsm
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calItipUtils.jsm
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calPrintUtils.jsm
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calProviderUtils.jsm
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calRecurrenceUtils.jsm
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calStorageHelpers.jsm
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calStorageUpgrade.jsm
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calUtils.jsm
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calViewUtils.jsm
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/calXMLUtils.jsm
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/ical.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/ltnInvitationUtils.jsm
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/modules/ltnUtils.jsm
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/timezones/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}/timezones/zones.json
+lib/${MOZILLA_PROJECT}/extensions/{e2fda1a4-762b-4020-b5ad-a41df1933103}.xpi
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/mail/mozilla-thunderbird/pkg/PLIST-main,v
retrieving revision 1.24
diff -u -r1.24 PLIST-main
--- pkg/PLIST-main 27 Jun 2018 21:03:56 -0000 1.24
+++ pkg/PLIST-main 6 Aug 2018 20:03:05 -0000
@@ -2,57 +2,56 @@
@conflict mozilla-thunderbird-<=3.1.11
@pkgpath mail/mozilla-thunderbird
bin/${MOZILLA_PROJECT}
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/application.ini
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/blocklist.xml
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/chrome/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/chrome.manifest
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/chrome/icons/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/chrome/icons/default/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/chrome/icons/default/default16.png
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/chrome/icons/default/default22.png
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/chrome/icons/default/default24.png
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/chrome/icons/default/default256.png
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/chrome/icons/default/default32.png
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/chrome/icons/default/default48.png
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/defaults/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/defaults/messenger/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/defaults/messenger/mailViews.dat
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/defaults/pref/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/defaults/pref/all-openbsd.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/defaults/pref/channel-prefs.js
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/dependentlibs.list
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/dictionaries/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/dictionaries/en-US.aff
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/dictionaries/en-US.dic
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/distribution/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/distribution/distribution.ini
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/gtk2/
-@lib
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/gtk2/libmozgtk.so.${LIBmozgtk_VERSION}
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/isp/
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/isp/Bogofilter.sfd
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/isp/DSPAM.sfd
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/isp/POPFile.sfd
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/isp/SpamAssassin.sfd
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/isp/SpamPal.sfd
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/isp/movemail.rdf
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/isp/rss.rdf
-@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/libldap60.so.${LIBldap60_VERSION}
-@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/libldif60.so.${LIBldif60_VERSION}
-@lib
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/liblgpllibs.so.${LIBlgpllibs_VERSION}
-@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/libmozgtk.so.${LIBmozgtk_VERSION}
-@lib
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/libmozsqlite3.so.${LIBmozsqlite3_VERSION}
-@lib
lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/libprldap60.so.${LIBprldap60_VERSION}
-@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/libxul.so.${LIBxul_VERSION}
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/omni.ja
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/platform.ini
-@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/plugin-container
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/removed-files
-lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/run-mozilla.sh
-@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/${MOZILLA_PROJECT}
-@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VER}/${MOZILLA_PROJECT}-bin
+lib/${MOZILLA_PROJECT}/
+lib/${MOZILLA_PROJECT}/application.ini
+lib/${MOZILLA_PROJECT}/blocklist.xml
+lib/${MOZILLA_PROJECT}/chrome/
+lib/${MOZILLA_PROJECT}/chrome.manifest
+lib/${MOZILLA_PROJECT}/chrome/icons/
+lib/${MOZILLA_PROJECT}/chrome/icons/default/
+lib/${MOZILLA_PROJECT}/chrome/icons/default/default128.png
+lib/${MOZILLA_PROJECT}/chrome/icons/default/default16.png
+lib/${MOZILLA_PROJECT}/chrome/icons/default/default22.png
+lib/${MOZILLA_PROJECT}/chrome/icons/default/default24.png
+lib/${MOZILLA_PROJECT}/chrome/icons/default/default32.png
+lib/${MOZILLA_PROJECT}/chrome/icons/default/default48.png
+lib/${MOZILLA_PROJECT}/chrome/icons/default/default64.png
+lib/${MOZILLA_PROJECT}/defaults/
+lib/${MOZILLA_PROJECT}/defaults/messenger/
+lib/${MOZILLA_PROJECT}/defaults/messenger/mailViews.dat
+lib/${MOZILLA_PROJECT}/defaults/pref/
+lib/${MOZILLA_PROJECT}/defaults/pref/all-openbsd.js
+lib/${MOZILLA_PROJECT}/defaults/pref/channel-prefs.js
+lib/${MOZILLA_PROJECT}/dependentlibs.list
+lib/${MOZILLA_PROJECT}/dictionaries/
+lib/${MOZILLA_PROJECT}/dictionaries/en-US.aff
+lib/${MOZILLA_PROJECT}/dictionaries/en-US.dic
+lib/${MOZILLA_PROJECT}/distribution/
+lib/${MOZILLA_PROJECT}/distribution/distribution.ini
+lib/${MOZILLA_PROJECT}/extensions/
+lib/${MOZILLA_PROJECT}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
+lib/${MOZILLA_PROJECT}/gtk2/
+@lib lib/${MOZILLA_PROJECT}/gtk2/libmozgtk.so.${LIBmozgtk_VERSION}
+lib/${MOZILLA_PROJECT}/isp/
+lib/${MOZILLA_PROJECT}/isp/Bogofilter.sfd
+lib/${MOZILLA_PROJECT}/isp/DSPAM.sfd
+lib/${MOZILLA_PROJECT}/isp/POPFile.sfd
+lib/${MOZILLA_PROJECT}/isp/SpamAssassin.sfd
+lib/${MOZILLA_PROJECT}/isp/SpamPal.sfd
+@lib lib/${MOZILLA_PROJECT}/libldap60.so.${LIBldap60_VERSION}
+@lib lib/${MOZILLA_PROJECT}/libldif60.so.${LIBldif60_VERSION}
+@lib lib/${MOZILLA_PROJECT}/liblgpllibs.so.${LIBlgpllibs_VERSION}
+@lib lib/${MOZILLA_PROJECT}/libmozgtk.so.${LIBmozgtk_VERSION}
+@lib lib/${MOZILLA_PROJECT}/libmozsqlite3.so.${LIBmozsqlite3_VERSION}
+@lib lib/${MOZILLA_PROJECT}/libprldap60.so.${LIBprldap60_VERSION}
+@lib lib/${MOZILLA_PROJECT}/libxul.so.${LIBxul_VERSION}
+lib/${MOZILLA_PROJECT}/omni.ja
+@bin lib/${MOZILLA_PROJECT}/pingsender
+lib/${MOZILLA_PROJECT}/platform.ini
+@bin lib/${MOZILLA_PROJECT}/plugin-container
+lib/${MOZILLA_PROJECT}/removed-files
+@bin lib/${MOZILLA_PROJECT}/${MOZILLA_PROJECT}
+@bin lib/${MOZILLA_PROJECT}/${MOZILLA_PROJECT}-bin
share/applications/${MOZILLA_PROJECT}.desktop
share/doc/pkg-readmes/${FULLPKGNAME}
share/pixmaps/