summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--UPDATING18
-rw-r--r--mail/thunderbird-esr/Makefile32
-rw-r--r--mail/thunderbird-esr/files/pkg-message.in10
-rw-r--r--mail/thunderbird/Makefile32
-rw-r--r--mail/thunderbird/files/pkg-message.in10
-rw-r--r--www/seamonkey/Makefile30
-rw-r--r--www/seamonkey/files/pkg-message.in10
7 files changed, 83 insertions, 59 deletions
diff --git a/UPDATING b/UPDATING
index f9305f1be417..827e10a7badc 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,24 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20111019:
+ AFFECTS: users of mail/thunderbird or www/seamonkey with lightning
+ plugin installed.
+ AUTHOR: gecko@FreeBSD.org
+
+ To get an up to date version of lightning you should use the new
+ LIGHTNING option in mail/thunderbird or www/seamonkey. This option
+ is not enabled by default so you have to run "make config" prior
+ to the build. The old deskutils/lightning-thunderbird and
+ deskutils/lightning ports should no longer be used and will be
+ removed very soon.
+
+ Like other XPIs ports, lightning now registers itself as a global
+ extension and doesn't create the XPI to be installed manually.
+ Upgrading users should remove lightning from their profile before
+ installing Thunderbird or SeaMonkey the first time with the new
+ LIGHTNING option enabled.
+
20111018:
AFFECTS: users of mail/postfix-current
AUTHOR: Sahil Tandon <sahil@FreeBSD.org>
diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile
index d37f297dce6f..78580a4698a8 100644
--- a/mail/thunderbird-esr/Makefile
+++ b/mail/thunderbird-esr/Makefile
@@ -91,10 +91,12 @@ BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm
.if defined(WITH_LIGHTNING)
MOZ_OPTIONS+= --enable-calendar
-MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar
+MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar
LIGHTNING_DIR= share/lightning
-SUB_FILES+= pkg-message
-PKGMESSAGE= ${WRKDIR}/pkg-message
+XPI_FILE= ${MOZSRC}/dist/xpi-stage/lightning.xpi
+XPI_LIBDIR= ${PREFIX}/lib/xpi
+XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103}
+XPI_ID= lightning@thunderbird.mozilla.org
.else
MOZ_OPTIONS+= --disable-calendar
.endif
@@ -133,19 +135,29 @@ pre-install:
@${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
@${ECHO_CMD} 'share/pixmaps/${PORTNAME_ICON}' >> ${PLIST}
@${ECHO_CMD} '@dirrmtry share/applications' >> ${PLIST}
-.if defined(WITH_LIGHTNING)
- @${PRINTF} '%s/lightning-${PORTNAME}.xpi\n@dirrmtry %s\n' \
- ${LIGHTNING_DIR} ${LIGHTNING_DIR} >> ${PLIST}
-.endif
post-install:
${MKDIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${PREFIX}/share/applications
${LN} -sf ${PORTNAME_ICON_SRC} ${PREFIX}/share/pixmaps/${PORTNAME_ICON}
.if defined(WITH_LIGHTNING)
- ${MKDIR} ${PREFIX}/${LIGHTNING_DIR}
- ${INSTALL_DATA} ${MOZSRC}/dist/xpi-stage/lightning.xpi ${PREFIX}/${LIGHTNING_DIR}/lightning-${PORTNAME}.xpi
- @${CAT} ${PKGMESSAGE}
+ @${MKDIR} ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/thunderbird
+ @(cd ${XPI_LIBDIR}/${XPI_ID}; ${TAR} -xf ${XPI_FILE})
+ @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${XPI_ID}
+ @${REINPLACE_CMD} -i "" "s/${XPI_ORIG_ID}/${XPI_ID}/" ${XPI_LIBDIR}/${XPI_ID}/install.rdf
+ @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${XPI_ID}
+ @${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${LOCALBASE}/lib/thunderbird/extensions 2>/dev/null || true
+ @${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/thunderbird 2>/dev/null || true
+ @(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -not -type d) | ${SORT} | \
+ ${SED} -ne 's,^,lib/xpi/,p' >> ${TMPPLIST}
+ @${ECHO_CMD} 'lib/xpi/symlinks/thunderbird/${XPI_ID}' >> ${TMPPLIST}
+ @${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${XPI_ID} ${LOCALBASE}/lib/thunderbird/extensions 2>/dev/null || true' >> ${TMPPLIST}
+ @${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/thunderbird/extensions/${XPI_ID}' >> ${TMPPLIST}
+ @(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -type d) | ${SORT} -r | \
+ ${SED} -ne 's,^,@dirrm lib/xpi/,p' >> ${TMPPLIST}
+ @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks/thunderbird 2>/dev/null || true' >> ${TMPPLIST}
+ @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks 2>/dev/null || true' >> ${TMPPLIST}
+ @${ECHO_CMD} '@unexec rmdir %D/lib/xpi 2>/dev/null || true' >> ${TMPPLIST}
.endif
.include <bsd.port.post.mk>
diff --git a/mail/thunderbird-esr/files/pkg-message.in b/mail/thunderbird-esr/files/pkg-message.in
deleted file mode 100644
index d602afe8ecbb..000000000000
--- a/mail/thunderbird-esr/files/pkg-message.in
+++ /dev/null
@@ -1,10 +0,0 @@
-*****************************************************************************
-In order to activate the Lightning extension, every user should install the
-XPI file into his own profile via the menu:
-
-Tools -> Add-ons -> Extensions -> Icon left of the search field
- -> Install From File
-
-The XPI file was installed as:
-%%PREFIX%%/share/lightning/lightning-thunderbird.xpi
-*****************************************************************************
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index d37f297dce6f..78580a4698a8 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -91,10 +91,12 @@ BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm
.if defined(WITH_LIGHTNING)
MOZ_OPTIONS+= --enable-calendar
-MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar
+MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar
LIGHTNING_DIR= share/lightning
-SUB_FILES+= pkg-message
-PKGMESSAGE= ${WRKDIR}/pkg-message
+XPI_FILE= ${MOZSRC}/dist/xpi-stage/lightning.xpi
+XPI_LIBDIR= ${PREFIX}/lib/xpi
+XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103}
+XPI_ID= lightning@thunderbird.mozilla.org
.else
MOZ_OPTIONS+= --disable-calendar
.endif
@@ -133,19 +135,29 @@ pre-install:
@${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST}
@${ECHO_CMD} 'share/pixmaps/${PORTNAME_ICON}' >> ${PLIST}
@${ECHO_CMD} '@dirrmtry share/applications' >> ${PLIST}
-.if defined(WITH_LIGHTNING)
- @${PRINTF} '%s/lightning-${PORTNAME}.xpi\n@dirrmtry %s\n' \
- ${LIGHTNING_DIR} ${LIGHTNING_DIR} >> ${PLIST}
-.endif
post-install:
${MKDIR} ${PREFIX}/share/applications
${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${PREFIX}/share/applications
${LN} -sf ${PORTNAME_ICON_SRC} ${PREFIX}/share/pixmaps/${PORTNAME_ICON}
.if defined(WITH_LIGHTNING)
- ${MKDIR} ${PREFIX}/${LIGHTNING_DIR}
- ${INSTALL_DATA} ${MOZSRC}/dist/xpi-stage/lightning.xpi ${PREFIX}/${LIGHTNING_DIR}/lightning-${PORTNAME}.xpi
- @${CAT} ${PKGMESSAGE}
+ @${MKDIR} ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/thunderbird
+ @(cd ${XPI_LIBDIR}/${XPI_ID}; ${TAR} -xf ${XPI_FILE})
+ @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${XPI_ID}
+ @${REINPLACE_CMD} -i "" "s/${XPI_ORIG_ID}/${XPI_ID}/" ${XPI_LIBDIR}/${XPI_ID}/install.rdf
+ @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${XPI_ID}
+ @${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${LOCALBASE}/lib/thunderbird/extensions 2>/dev/null || true
+ @${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/thunderbird 2>/dev/null || true
+ @(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -not -type d) | ${SORT} | \
+ ${SED} -ne 's,^,lib/xpi/,p' >> ${TMPPLIST}
+ @${ECHO_CMD} 'lib/xpi/symlinks/thunderbird/${XPI_ID}' >> ${TMPPLIST}
+ @${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${XPI_ID} ${LOCALBASE}/lib/thunderbird/extensions 2>/dev/null || true' >> ${TMPPLIST}
+ @${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/thunderbird/extensions/${XPI_ID}' >> ${TMPPLIST}
+ @(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -type d) | ${SORT} -r | \
+ ${SED} -ne 's,^,@dirrm lib/xpi/,p' >> ${TMPPLIST}
+ @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks/thunderbird 2>/dev/null || true' >> ${TMPPLIST}
+ @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks 2>/dev/null || true' >> ${TMPPLIST}
+ @${ECHO_CMD} '@unexec rmdir %D/lib/xpi 2>/dev/null || true' >> ${TMPPLIST}
.endif
.include <bsd.port.post.mk>
diff --git a/mail/thunderbird/files/pkg-message.in b/mail/thunderbird/files/pkg-message.in
deleted file mode 100644
index d602afe8ecbb..000000000000
--- a/mail/thunderbird/files/pkg-message.in
+++ /dev/null
@@ -1,10 +0,0 @@
-*****************************************************************************
-In order to activate the Lightning extension, every user should install the
-XPI file into his own profile via the menu:
-
-Tools -> Add-ons -> Extensions -> Icon left of the search field
- -> Install From File
-
-The XPI file was installed as:
-%%PREFIX%%/share/lightning/lightning-thunderbird.xpi
-*****************************************************************************
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 0f676ff6e111..98eea04b42ca 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -116,8 +116,10 @@ BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm
MOZ_OPTIONS+= --enable-calendar
MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar
LIGHTNING_DIR= share/lightning
-SUB_FILES+= pkg-message
-PKGMESSAGE= ${WRKDIR}/pkg-message
+XPI_FILE= ${MOZSRC}/dist/xpi-stage/lightning.xpi
+XPI_LIBDIR= ${PREFIX}/lib/xpi
+XPI_ORIG_ID= {e2fda1a4-762b-4020-b5ad-a41df1933103}
+XPI_ID= lightning@seamonkey.mozilla.org
.else
MOZ_OPTIONS+= --disable-calendar
.endif
@@ -163,10 +165,6 @@ pre-install:
${ECHO_CMD} share/applications/${MOZILLA}.desktop >> ${PLIST}
${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST}
${ECHO_CMD} 'share/pixmaps/${MOZILLA}.png' >> ${PLIST}
-.if defined(WITH_LIGHTNING)
- @${PRINTF} '%s/lightning-${PORTNAME}.xpi\n@dirrmtry %s\n' \
- ${LIGHTNING_DIR} ${LIGHTNING_DIR} >> ${PLIST}
-.endif
do-install:
${MKDIR} ${PREFIX}/share/applications
@@ -176,9 +174,23 @@ do-install:
post-install:
.if defined(WITH_LIGHTNING)
- ${MKDIR} ${PREFIX}/${LIGHTNING_DIR}
- ${INSTALL_DATA} ${MOZSRC}/dist/xpi-stage/lightning.xpi ${PREFIX}/${LIGHTNING_DIR}/lightning-${PORTNAME}.xpi
- @${CAT} ${PKGMESSAGE}
+ @${MKDIR} ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/seamonkey
+ @(cd ${XPI_LIBDIR}/${XPI_ID}; ${TAR} -xf ${XPI_FILE})
+ @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XPI_LIBDIR}/${XPI_ID}
+ @${REINPLACE_CMD} -i "" "s/${XPI_ORIG_ID}/${XPI_ID}/" ${XPI_LIBDIR}/${XPI_ID}/install.rdf
+ @${CHMOD} -R a+rX,go-w ${XPI_LIBDIR}/${XPI_ID}
+ @${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${LOCALBASE}/lib/seamonkey/extensions 2>/dev/null || true
+ @${LN} -sf ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/seamonkey 2>/dev/null || true
+ @(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -not -type d) | ${SORT} | \
+ ${SED} -ne 's,^,lib/xpi/,p' >> ${TMPPLIST}
+ @${ECHO_CMD} 'lib/xpi/symlinks/seamonkey/${XPI_ID}' >> ${TMPPLIST}
+ @${ECHO_CMD} '@exec ${LN} -sf %D/lib/xpi/${XPI_ID} ${LOCALBASE}/lib/seamonkey/extensions 2>/dev/null || true' >> ${TMPPLIST}
+ @${ECHO_CMD} '@unexec ${RM} -f ${LOCALBASE}/lib/seamonkey/extensions/${XPI_ID}' >> ${TMPPLIST}
+ @(cd ${XPI_LIBDIR}; ${FIND} ${XPI_ID} -type d) | ${SORT} -r | \
+ ${SED} -ne 's,^,@dirrm lib/xpi/,p' >> ${TMPPLIST}
+ @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks/seamonkey 2>/dev/null || true' >> ${TMPPLIST}
+ @${ECHO_CMD} '@unexec rmdir %D/lib/xpi/symlinks 2>/dev/null || true' >> ${TMPPLIST}
+ @${ECHO_CMD} '@unexec rmdir %D/lib/xpi 2>/dev/null || true' >> ${TMPPLIST}
.endif
.include <bsd.port.post.mk>
diff --git a/www/seamonkey/files/pkg-message.in b/www/seamonkey/files/pkg-message.in
deleted file mode 100644
index 1b3721f5b9b9..000000000000
--- a/www/seamonkey/files/pkg-message.in
+++ /dev/null
@@ -1,10 +0,0 @@
-*****************************************************************************
-In order to activate the Lightning extension, every user should install the
-XPI file into his own profile via the menu:
-
-Tools -> Add-ons -> Extensions -> Icon left of the search field
- -> Install From File
-
-The XPI file was installed as:
-%%PREFIX%%/share/lightning/lightning-seamonkey.xpi
-*****************************************************************************
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-21 02:14:43 +0000