On Mon, Mar 01, 2010 at 01:05:39PM +0100, Landry Breuil wrote:
> Hi,
>
> like lightning, here's the update for enigmail 1.0, ported to work with
> thunderbird 3. It builds and shows fine in TB3, but i don't really use
> it so didn't test its functionality itself. So i'm asking here for real
> testing from ppl really using it. Supposedly, it also works on top of
> Seamonkey 2.x branch but i didn't test it yet. It will supersede
> mail/enigmail-seamonkey.
>
> Thanks for testing it.
Bah, as soon as i make a diff there's a new upstream release..
Here is enigmail 1.0.1 diff.
Landry
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/enigmail/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile 27 Dec 2009 15:51:47 -0000 1.24
+++ Makefile 6 Mar 2010 20:14:47 -0000
@@ -4,12 +4,11 @@
COMMENT= GnuPG extension for Thunderbird
-VER= 0.96.0
+VER= 1.0.1
DISTNAME= enigmail-${VER}
-PKGNAME= ${DISTNAME}p1
CATEGORIES= mail security
-SHARED_LIBS= enigmime 14.0
+SHARED_LIBS= enigmime 15.0
HOMEPAGE= http://enigmail.mozdev.org/
@@ -26,20 +25,20 @@
::archivers/unzip
RUN_DEPENDS= ::security/gnupg
-LIB_DEPENDS=
mozilla-thunderbird/xpcom,mozilla-thunderbird/xpcom_compat,mozilla-thunderbird/xpcom_core:mozilla-thunderbird->=2.0.0.23p0:${THUNDERBIRD_DIR}
+LIB_DEPENDS=
mozilla-thunderbird/xpcom,mozilla-thunderbird/xpcom_core:mozilla-thunderbird->=3.0.1:${THUNDERBIRD_DIR}
WANTLIB= c m nspr4 plc4 plds4
USE_X11= Yes
USE_GMAKE= Yes
NO_REGRESS= Yes
-MOZBASE= ${WRKDIR}/${THUNDERBIRD_DIR}/mozilla
-MOZBIN= ${MOZBASE}/dist/bin
+MOZBASE= ${WRKDIR}/${THUNDERBIRD_DIR}/comm-1.9.1
+MOZBIN= ${MOZBASE}/mozilla/dist/bin
WRKDIST= ${WRKDIR}/enigmail
WRKSRC= ${MOZBASE}/mailnews/extensions/enigmail
GNU_ARCH= ${MACHINE_ARCH:S/amd64/x86_64/}
-ENIGMAIL_XPI= ${DISTNAME}-${OPSYS:L}-${GNU_ARCH}.xpi
+ENIGMAIL_XPI= ${DISTNAME:S/.1//}-${OPSYS:L}-${GNU_ARCH}.xpi
# unzip ${ENIGMAIL_XPI} and inspect install.rdf for GUID
GUID= {847b3a00-7ab1-11d4-8f02-006008948af5}
@@ -55,10 +54,10 @@
do-build:
@cd ${MOZBASE} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} export
- @cd ${MOZBASE}/modules/libreg && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
- @cd ${MOZBASE}/xpcom/string && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
- @cd ${MOZBASE}/xpcom && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
- @cd ${MOZBASE}/xpcom/obsolete && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+ @cd ${MOZBASE}/mozilla/modules/libreg && ${SETENV} ${MAKE_ENV}
${MAKE_PROGRAM}
+ @cd ${MOZBASE}/mozilla/xpcom/string && ${SETENV} ${MAKE_ENV}
${MAKE_PROGRAM}
+ @cd ${MOZBASE}/mozilla/xpcom && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+ @cd ${MOZBASE}/mozilla/xpcom/obsolete && ${SETENV} ${MAKE_ENV}
${MAKE_PROGRAM}
@cd ${WRKSRC} && ./makemake -r
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} xpi
@@ -68,5 +67,6 @@
unzip -q ${MOZBIN}/${ENIGMAIL_XPI} -d ${GLOBALDIR}
mv ${GLOBALDIR}/platform/OpenBSD*/components/libenigmime.so.* \
${GLOBALDIR}/components/
+ rm -Rf ${GLOBALDIR}/platform/
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/enigmail/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo 18 Sep 2009 20:33:50 -0000 1.10
+++ distinfo 6 Mar 2010 20:14:47 -0000
@@ -1,5 +1,5 @@
-MD5 (enigmail-0.96.0.tar.gz) = z4w46NM5ZXBt84OrM7OSPA==
-RMD160 (enigmail-0.96.0.tar.gz) = YvwfTYxaEsoLLknyqn3dKDYec28=
-SHA1 (enigmail-0.96.0.tar.gz) = rZooq2MqVIC9E4oPYOQ6XAelZkY=
-SHA256 (enigmail-0.96.0.tar.gz) = gK14Ejb0PZopEgXu/ZLPSedaWDaCYZj0bTy5C36uCdE=
-SIZE (enigmail-0.96.0.tar.gz) = 1231329
+MD5 (enigmail-1.0.1.tar.gz) = UIypqwOWr7Segu2ogBSSSw==
+RMD160 (enigmail-1.0.1.tar.gz) = Kr2OcPz80udecal6Wjx9HgwpJmY=
+SHA1 (enigmail-1.0.1.tar.gz) = M05wcj//wGMdrbb9REmv/96vw/I=
+SHA256 (enigmail-1.0.1.tar.gz) = e8hUHu9IPWckbz2DaCuhMmPwAfqUtZgsDPvlTlvf0yo=
+SIZE (enigmail-1.0.1.tar.gz) = 1201945
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/enigmail/pkg/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- pkg/PLIST 18 Sep 2009 20:33:50 -0000 1.6
+++ pkg/PLIST 6 Mar 2010 20:14:47 -0000
@@ -2,9 +2,6 @@
mozilla-thunderbird/extensions/${GUID}/
mozilla-thunderbird/extensions/${GUID}/chrome/
mozilla-thunderbird/extensions/${GUID}/chrome.manifest
-mozilla-thunderbird/extensions/${GUID}/chrome/enigmail-locale.jar
-mozilla-thunderbird/extensions/${GUID}/chrome/enigmail-skin-seamonkey.jar
-mozilla-thunderbird/extensions/${GUID}/chrome/enigmail-skin.jar
mozilla-thunderbird/extensions/${GUID}/chrome/enigmail.jar
mozilla-thunderbird/extensions/${GUID}/components/
mozilla-thunderbird/extensions/${GUID}/components/enigMsgCompFields.js
@@ -19,7 +16,7 @@
mozilla-thunderbird/extensions/${GUID}/defaults/pref/enigmail.js
mozilla-thunderbird/extensions/${GUID}/defaults/preferences/
mozilla-thunderbird/extensions/${GUID}/defaults/preferences/enigmail.js
-mozilla-thunderbird/extensions/${GUID}/install.js
mozilla-thunderbird/extensions/${GUID}/install.rdf
mozilla-thunderbird/extensions/${GUID}/wrappers/
+mozilla-thunderbird/extensions/${GUID}/wrappers/gpg-agent-wrapper.sh
mozilla-thunderbird/extensions/${GUID}/wrappers/gpg-wrapper.sh
