From owner-freebsd-gecko@FreeBSD.ORG Thu May 26 04:18:04 2011 Return-Path: Delivered-To: gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ACC17106564A for ; Thu, 26 May 2011 04:18:04 +0000 (UTC) (envelope-from mi+thun@aldan.algebra.com) Received: from smtp02.lnh.mail.rcn.net (smtp02.lnh.mail.rcn.net [207.172.157.102]) by mx1.freebsd.org (Postfix) with ESMTP id 4C5DB8FC14 for ; Thu, 26 May 2011 04:18:03 +0000 (UTC) Received: from mr16.lnh.mail.rcn.net ([207.172.157.36]) by smtp02.lnh.mail.rcn.net with ESMTP; 26 May 2011 00:15:56 -0400 Received: from smtp01.lnh.mail.rcn.net (smtp01.lnh.mail.rcn.net [207.172.4.11]) by mr16.lnh.mail.rcn.net (MOS 4.2.3-GA) with ESMTP id BCJ20267; Thu, 26 May 2011 00:15:55 -0400 Received-SPF: None identity=pra; client-ip=209.6.61.133; receiver=smtp01.lnh.mail.rcn.net; envelope-from="mi+thun@aldan.algebra.com"; x-sender="mi+thun@aldan.algebra.com"; x-conformance=sidf_compatible Received-SPF: None identity=mailfrom; client-ip=209.6.61.133; receiver=smtp01.lnh.mail.rcn.net; envelope-from="mi+thun@aldan.algebra.com"; x-sender="mi+thun@aldan.algebra.com"; x-conformance=sidf_compatible Received-SPF: None identity=helo; client-ip=209.6.61.133; receiver=smtp01.lnh.mail.rcn.net; envelope-from="mi+thun@aldan.algebra.com"; x-sender="postmaster@[192.168.1.8]"; x-conformance=sidf_compatible X-Auth-ID: anat Received: from 209-6-61-133.c3-0.sbo-ubr1.sbo.ma.cable.rcn.com (HELO [192.168.1.8]) ([209.6.61.133]) by smtp01.lnh.mail.rcn.net with ESMTP; 26 May 2011 00:15:49 -0400 Message-ID: <4DDDD3EF.9040907@aldan.algebra.com> Date: Thu, 26 May 2011 00:15:43 -0400 From: "Mikhail T." User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; uk-UA; rv:1.9.2.17) Gecko/20110525 Lightning/1.0b3pre Thunderbird/3.1.10 MIME-Version: 1.0 To: gecko@freebsd.org, beat@FreeBSD.org Content-Type: multipart/mixed; boundary="------------020000040008050704080209" X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: Subject: building lightning as part of thunderbird X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 May 2011 04:18:04 -0000 This is a multi-part message in MIME format. --------------020000040008050704080209 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit It turns out, Lightning can already be built together with the rest of thunderbird with the simple --enable-calendar configure-option. The attached patch does that unconditionally, but adding the OPTION (WITH_LIGHTNING?) is easy too. The patch installs the lightning.xpi into the same location, where deskutils/lightning-thunderbird installs it --- deliberately. With this addition, the lightning-thunderbird port (which currently rebuilds vast amounts of C and C++ code for just one shared library) can be removed. But, of course, the location can changed --- to something underneath lib/thunderbird, for example... Yours, -mi --------------020000040008050704080209 Content-Type: text/plain; name="thunderbird-lightning.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="thunderbird-lightning.patch" Index: Makefile =================================================================== RCS file: /home/pcvs/ports/mail/thunderbird/Makefile,v retrieving revision 1.125 diff -U 2 -r1.125 Makefile --- Makefile 29 Apr 2011 06:37:41 -0000 1.125 +++ Makefile 26 May 2011 04:06:11 -0000 @@ -30,4 +31,6 @@ MAKE_ENV= PTHREAD_LDFLAGS="${PTHREAD_LIBS}" HAS_CONFIGURE= yes +CONFIGURE_ARGS+=--enable-calendar +LIGHTNING_DIR= share/lightning USE_BZIP2= yes USE_GMAKE= yes @@ -119,4 +124,6 @@ @${ECHO_CMD} 'share/pixmaps/${PORTNAME_ICON}' >> ${PLIST} @${ECHO_CMD} '@dirrmtry share/applications' >> ${PLIST} + @${PRINTF} '%s/lightning.xpi\n@dirrmtry %s\n' \ + ${LIGHTNING_DIR} ${LIGHTNING_DIR} >> ${PLIST} post-install: @@ -124,4 +131,6 @@ ${INSTALL_DATA} ${WRKDIR}/${MOZILLA_EXEC_NAME}.desktop ${PREFIX}/share/applications ${LN} -sf ${PORTNAME_ICON_SRC} ${PREFIX}/share/pixmaps/${PORTNAME_ICON} + ${MKDIR} ${PREFIX}/${LIGHTNING_DIR} + ${INSTALL_DATA} ${MOZSRC}/dist/xpi-stage/lightning.xpi ${PREFIX}/${LIGHTNING_DIR} .include --------------020000040008050704080209--