Date: Wed, 19 Oct 2011 15:35:27 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r655 - branches/experimental/mail/thunderbird branches/experimental/mail/thunderbird-beta branches/experimental/mail/thunderbird-beta/files branches/experimental/mail/thunderbird/files branches/experimental/www/seamonkey branches/experimental/www/seamonkey-beta branches/experimental/www/seamonkey-beta/files branches/experimental/www/seamonkey/files trunk/mail/thunderbird trunk/mail/thunderbird/files trunk/www/seamonkey trunk/www/seamonkey/files Message-ID: <201110191535.p9JFZRWg048623@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat
Date: Wed Oct 19 15:35:26 2011
New Revision: 655
Log:
- Register lightning as a global extension and doesn't create the XPI to
be installed manually.
Discussed with: flo@ at EuroBSDCon DevSummit
Obtained from: mail/enigmail port by ale@
Deleted:
branches/experimental/mail/thunderbird-beta/files/pkg-message.in
branches/experimental/mail/thunderbird/files/pkg-message.in
branches/experimental/www/seamonkey-beta/files/pkg-message.in
branches/experimental/www/seamonkey/files/pkg-message.in
trunk/mail/thunderbird/files/pkg-message.in
trunk/www/seamonkey/files/pkg-message.in
Modified:
branches/experimental/mail/thunderbird-beta/Makefile
branches/experimental/mail/thunderbird/Makefile
branches/experimental/www/seamonkey-beta/Makefile
branches/experimental/www/seamonkey/Makefile
trunk/mail/thunderbird/Makefile
trunk/www/seamonkey/Makefile
Modified: branches/experimental/mail/thunderbird-beta/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird-beta/Makefile Fri Oct 7 21:03:10 2011 (r654)
+++ branches/experimental/mail/thunderbird-beta/Makefile Wed Oct 19 15:35:26 2011 (r655)
@@ -92,10 +92,12 @@
.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
@@ -134,19 +136,29 @@
@${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>
Deleted: branches/experimental/mail/thunderbird-beta/files/pkg-message.in
==============================================================================
--- branches/experimental/mail/thunderbird-beta/files/pkg-message.in Wed Oct 19 15:35:26 2011 (r654)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -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
-*****************************************************************************
Modified: branches/experimental/mail/thunderbird/Makefile
==============================================================================
--- branches/experimental/mail/thunderbird/Makefile Fri Oct 7 21:03:10 2011 (r654)
+++ branches/experimental/mail/thunderbird/Makefile Wed Oct 19 15:35:26 2011 (r655)
@@ -2,7 +2,7 @@
# Date created: 4 September 2003
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
-# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.138 2011/10/01 14:27:20 beat Exp $
+# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.139 2011/10/19 15:05:41 beat Exp $
#
PORTNAME= thunderbird
@@ -91,10 +91,12 @@
.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 @@
@${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>
Deleted: branches/experimental/mail/thunderbird/files/pkg-message.in
==============================================================================
--- branches/experimental/mail/thunderbird/files/pkg-message.in Wed Oct 19 15:35:26 2011 (r654)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -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
-*****************************************************************************
Modified: branches/experimental/www/seamonkey-beta/Makefile
==============================================================================
--- branches/experimental/www/seamonkey-beta/Makefile Fri Oct 7 21:03:10 2011 (r654)
+++ branches/experimental/www/seamonkey-beta/Makefile Wed Oct 19 15:35:26 2011 (r655)
@@ -2,7 +2,7 @@
# Date created: 31 Mar 1998
# Whom: eivind/dima/jseger
#
-# $FreeBSD: ports/www/seamonkey/Makefile,v 1.311 2011/09/30 15:27:01 beat Exp $
+# $FreeBSD: ports/www/seamonkey/Makefile,v 1.312 2011/10/19 15:05:41 beat Exp $
#
PORTNAME= seamonkey
@@ -117,8 +117,10 @@
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
@@ -164,10 +166,6 @@
${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
@@ -177,9 +175,23 @@
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>
Deleted: branches/experimental/www/seamonkey-beta/files/pkg-message.in
==============================================================================
--- branches/experimental/www/seamonkey-beta/files/pkg-message.in Wed Oct 19 15:35:26 2011 (r654)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -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
-*****************************************************************************
Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile Fri Oct 7 21:03:10 2011 (r654)
+++ branches/experimental/www/seamonkey/Makefile Wed Oct 19 15:35:26 2011 (r655)
@@ -2,7 +2,7 @@
# Date created: 31 Mar 1998
# Whom: eivind/dima/jseger
#
-# $FreeBSD: ports/www/seamonkey/Makefile,v 1.311 2011/09/30 15:27:01 beat Exp $
+# $FreeBSD: ports/www/seamonkey/Makefile,v 1.312 2011/10/19 15:05:41 beat Exp $
#
PORTNAME= seamonkey
@@ -116,8 +116,10 @@
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 @@
${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 @@
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>
Deleted: branches/experimental/www/seamonkey/files/pkg-message.in
==============================================================================
--- branches/experimental/www/seamonkey/files/pkg-message.in Wed Oct 19 15:35:26 2011 (r654)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -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
-*****************************************************************************
Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile Fri Oct 7 21:03:10 2011 (r654)
+++ trunk/mail/thunderbird/Makefile Wed Oct 19 15:35:26 2011 (r655)
@@ -2,7 +2,7 @@
# Date created: 4 September 2003
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
-# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.138 2011/10/01 14:27:20 beat Exp $
+# $FreeBSD: ports/mail/thunderbird/Makefile,v 1.139 2011/10/19 15:05:41 beat Exp $
#
PORTNAME= thunderbird
@@ -91,10 +91,12 @@
.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 @@
@${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>
Deleted: trunk/mail/thunderbird/files/pkg-message.in
==============================================================================
--- trunk/mail/thunderbird/files/pkg-message.in Wed Oct 19 15:35:26 2011 (r654)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -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
-*****************************************************************************
Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile Fri Oct 7 21:03:10 2011 (r654)
+++ trunk/www/seamonkey/Makefile Wed Oct 19 15:35:26 2011 (r655)
@@ -2,7 +2,7 @@
# Date created: 31 Mar 1998
# Whom: eivind/dima/jseger
#
-# $FreeBSD: ports/www/seamonkey/Makefile,v 1.311 2011/09/30 15:27:01 beat Exp $
+# $FreeBSD: ports/www/seamonkey/Makefile,v 1.312 2011/10/19 15:05:41 beat Exp $
#
PORTNAME= seamonkey
@@ -116,8 +116,10 @@
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 @@
${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 @@
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>
Deleted: trunk/www/seamonkey/files/pkg-message.in
==============================================================================
--- trunk/www/seamonkey/files/pkg-message.in Wed Oct 19 15:35:26 2011 (r654)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -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
-*****************************************************************************
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110191535.p9JFZRWg048623>