On Sat, Mar 06, 2010 at 09:15:24PM +0100, Landry Breuil wrote:
> 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.
And here's a new diff that makes mail/enigmail supersede
mail/enigmail-seamonkey. It's built once, and two packages are created,
one for TB and one for SM. Both working/appearing fine here. Oh btw, if
you want to try it, you'd better bump SO_VERSION for seamonkey 2.0.3 to
15.0 so that it's in sync with Tb.. i'll do that when updating seamonkey.
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 30 Mar 2010 12:14:31 -0000
@@ -2,14 +2,18 @@
SHARED_ONLY= Yes
-COMMENT= GnuPG extension for Thunderbird
+COMMENT-main= GnuPG extension for Thunderbird
+COMMENT-seamonkey= GnuPG extension for Seamonkey
-VER= 0.96.0
+VER= 1.0.1
DISTNAME= enigmail-${VER}
-PKGNAME= ${DISTNAME}p1
+PKGNAME-main= enigmail-${VER}
+PKGNAME-seamonkey= enigmail-seamonkey-${VER}
CATEGORIES= mail security
-SHARED_LIBS= enigmime 14.0
+MULTI_PACKAGES= -main -seamonkey
+
+SHARED_LIBS= enigmime 15.0
HOMEPAGE= http://enigmail.mozdev.org/
@@ -26,24 +30,26 @@
::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-main=
mozilla-thunderbird/xpcom,mozilla-thunderbird/xpcom_core:mozilla-thunderbird->=3.0.3:${THUNDERBIRD_DIR}
+LIB_DEPENDS-seamonkey=
seamonkey/xpcom,seamonkey/xpcom_core:seamonkey->=2.0.3:www/seamonkey
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}
GLOBALDIR= ${PREFIX}/mozilla-thunderbird/extensions/${GUID}
+SEAMONKEYDIR= ${PREFIX}/seamonkey/extensions/${GUID}
SUBST_VARS= GUID
@@ -55,10 +61,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
@@ -66,7 +72,12 @@
do-install:
${INSTALL_DATA_DIR} ${GLOBALDIR}
unzip -q ${MOZBIN}/${ENIGMAIL_XPI} -d ${GLOBALDIR}
- mv ${GLOBALDIR}/platform/OpenBSD*/components/libenigmime.so.* \
+ ${INSTALL_DATA_DIR} ${SEAMONKEYDIR}
+ unzip -q ${MOZBIN}/${ENIGMAIL_XPI} -d ${SEAMONKEYDIR}
+ cp ${GLOBALDIR}/platform/OpenBSD*/components/libenigmime.so.* \
${GLOBALDIR}/components/
+ mv ${GLOBALDIR}/platform/OpenBSD*/components/libenigmime.so.* \
+ ${SEAMONKEYDIR}/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 30 Mar 2010 12:14:31 -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/DESCR
===================================================================
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- pkg/DESCR 30 Apr 2007 22:41:52 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,3 +0,0 @@
-Enigmail is an extension to the mail client of Mozilla/Netscape and
-Mozilla Thunderbird which allows users to access the authentication
-and encryption features provided by GnuPG.
Index: pkg/DESCR-main
===================================================================
RCS file: pkg/DESCR-main
diff -N pkg/DESCR-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-main 30 Mar 2010 12:14:31 -0000
@@ -0,0 +1,2 @@
+Enigmail is an extension to Mozilla Thunderbird which allows users to
+access the authentication and encryption features provided by GnuPG.
Index: pkg/DESCR-seamonkey
===================================================================
RCS file: pkg/DESCR-seamonkey
diff -N pkg/DESCR-seamonkey
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-seamonkey 30 Mar 2010 12:14:31 -0000
@@ -0,0 +1,2 @@
+Enigmail is an extension to Mozilla Seamonkey which allows users to
+access the authentication and encryption features provided by GnuPG.
Index: pkg/PLIST
===================================================================
RCS file: pkg/PLIST
diff -N pkg/PLIST
--- pkg/PLIST 18 Sep 2009 20:33:50 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-...@comment $OpenBSD: PLIST,v 1.6 2009/09/18 20:33:50 martynas Exp $
-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
-mozilla-thunderbird/extensions/${GUID}/components/enigmail.js
-mozilla-thunderbird/extensions/${GUID}/components/enigmail.xpt
-mozilla-thunderbird/extensions/${GUID}/components/enigmime.xpt
-mozilla-thunderbird/extensions/${GUID}/components/enigprefs-service.js
-mozilla-thunderbird/extensions/${GUID}/components/ipc.xpt
-...@lib
mozilla-thunderbird/extensions/${GUID}/components/libenigmime.so.${LIBenigmime_VERSION}
-mozilla-thunderbird/extensions/${GUID}/defaults/
-mozilla-thunderbird/extensions/${GUID}/defaults/pref/
-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-wrapper.sh
Index: pkg/PLIST-main
===================================================================
RCS file: pkg/PLIST-main
diff -N pkg/PLIST-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-main 30 Mar 2010 12:14:31 -0000
@@ -0,0 +1,23 @@
+...@comment $OpenBSD: PLIST,v 1.6 2009/09/18 20:33:50 martynas Exp $
+...@pkgpath mail/enigmail
+mozilla-thunderbird/extensions/${GUID}/
+mozilla-thunderbird/extensions/${GUID}/chrome/
+mozilla-thunderbird/extensions/${GUID}/chrome.manifest
+mozilla-thunderbird/extensions/${GUID}/chrome/enigmail.jar
+mozilla-thunderbird/extensions/${GUID}/components/
+mozilla-thunderbird/extensions/${GUID}/components/enigMsgCompFields.js
+mozilla-thunderbird/extensions/${GUID}/components/enigmail.js
+mozilla-thunderbird/extensions/${GUID}/components/enigmail.xpt
+mozilla-thunderbird/extensions/${GUID}/components/enigmime.xpt
+mozilla-thunderbird/extensions/${GUID}/components/enigprefs-service.js
+mozilla-thunderbird/extensions/${GUID}/components/ipc.xpt
+...@lib
mozilla-thunderbird/extensions/${GUID}/components/libenigmime.so.${LIBenigmime_VERSION}
+mozilla-thunderbird/extensions/${GUID}/defaults/
+mozilla-thunderbird/extensions/${GUID}/defaults/pref/
+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.rdf
+mozilla-thunderbird/extensions/${GUID}/wrappers/
+mozilla-thunderbird/extensions/${GUID}/wrappers/gpg-agent-wrapper.sh
+mozilla-thunderbird/extensions/${GUID}/wrappers/gpg-wrapper.sh
Index: pkg/PLIST-seamonkey
===================================================================
RCS file: pkg/PLIST-seamonkey
diff -N pkg/PLIST-seamonkey
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-seamonkey 30 Mar 2010 12:14:31 -0000
@@ -0,0 +1,24 @@
+...@comment $OpenBSD: PLIST,v 1.6 2009/09/18 20:33:50 martynas Exp $
+...@conflict enigmail-seamonkey-<1.0
+...@pkgpath mail/enigmail-seamonkey
+seamonkey/extensions/${GUID}/
+seamonkey/extensions/${GUID}/chrome/
+seamonkey/extensions/${GUID}/chrome.manifest
+seamonkey/extensions/${GUID}/chrome/enigmail.jar
+seamonkey/extensions/${GUID}/components/
+seamonkey/extensions/${GUID}/components/enigMsgCompFields.js
+seamonkey/extensions/${GUID}/components/enigmail.js
+seamonkey/extensions/${GUID}/components/enigmail.xpt
+seamonkey/extensions/${GUID}/components/enigmime.xpt
+seamonkey/extensions/${GUID}/components/enigprefs-service.js
+seamonkey/extensions/${GUID}/components/ipc.xpt
+...@lib
seamonkey/extensions/${GUID}/components/libenigmime.so.${LIBenigmime_VERSION}
+seamonkey/extensions/${GUID}/defaults/
+seamonkey/extensions/${GUID}/defaults/pref/
+seamonkey/extensions/${GUID}/defaults/pref/enigmail.js
+seamonkey/extensions/${GUID}/defaults/preferences/
+seamonkey/extensions/${GUID}/defaults/preferences/enigmail.js
+seamonkey/extensions/${GUID}/install.rdf
+seamonkey/extensions/${GUID}/wrappers/
+seamonkey/extensions/${GUID}/wrappers/gpg-agent-wrapper.sh
+seamonkey/extensions/${GUID}/wrappers/gpg-wrapper.sh
