Re: [update] enigmail 1.2
On 07/22/11 06:33, Landry Breuil wrote: Hi, if you use rely on enigmail, please test this update, which targets thunderbird 5.0 and seamonkey 2.2. It works in my light testing on amd64. Check ports@ archive for the corresponding tb/sm updates. If i don't hear from anyone, this will probably be commited this weekend, along sm/tb. Landry I applied diff, this failed. I went back to an earlier version of enigmail from CVS and then applied diff, that worked fine. Building finished for enigmail-seamonkey. enigmail for thunderbird build failed, expected an enigmail flavor of thunderbird. We also renamed mozilla-thunderbird to just thunderbird, mail/enigmail/thunderbird/Makefile - after patch.. # $OpenBSD: Makefile,v 1.4 2011/01/14 22:58:49 landry Exp $ COMMENT = GnuPG extension for Thunderbird VERSION = 1.2 # must be in sync with SO_VERSION in # mail/mozilla-thunderbird SHARED_LIBS = enigmime18.0 \ ipc 18.0 MOZAPP_PKGSTEM =mozilla-thunderbird-=5.0 MOZAPP_PKGPATH =mail/mozilla-thunderbird,enigmail MOZAPP_DIR =lib/thunderbird-5.0 MOZAPP_BRANCH = miramar ENIGMAIL_XPI = ${DISTNAME}-openbsd-${GNU_ARCH}.xpi .include bsd.port.mk I am trying these two changes, it's in process of building... MOZAPP_PKGSTEM =thunderbird-=5.0 MOZAPP_PKGPATH =mail/mozilla-thunderbird Was there a thunderbird-i18n update also? Regards Nigel Taylor
Re: [update] enigmail 1.2
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 07/22/11 14:21, Landry Breuil wrote: On Fri, Jul 22, 2011 at 01:33:43PM +0100, Nigel Taylor wrote: On 07/22/11 06:33, Landry Breuil wrote: Hi, if you use rely on enigmail, please test this update, which targets thunderbird 5.0 and seamonkey 2.2. It works in my light testing on amd64. Check ports@ archive for the corresponding tb/sm updates. If i don't hear from anyone, this will probably be commited this weekend, along sm/tb. Landry I applied diff, this failed. I went back to an earlier version of enigmail from CVS and then applied diff, that worked fine. Building finished for enigmail-seamonkey. enigmail for thunderbird build failed, expected an enigmail flavor of thunderbird. We also renamed mozilla-thunderbird to just thunderbird, yeah; sorry, fubared that. Here's a new diff against current, and withtout the dep on an enigmail flavor(that was a local try). i've updated the git repo for tb5 to reflect the rename.. MOZAPP_PKGSTEM =thunderbird-=5.0 MOZAPP_PKGPATH = mail/mozilla-thunderbird Built and enigmail working fine with limited test on amd64. That's looking good to go. That should be it. Was there a thunderbird-i18n update also? Yes, here it is. Thanks, will try that, hoping this version finally the dates work correctly, I will see. Landry -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (OpenBSD) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAk4piOAACgkQJrZXkxEbJYmJ8ACfVZIPzqvgAauLAlJ4Hg8G+sya OdcAnAz0jKoTWNsVqVEhJJ+wrai1Izkx =5uO4 -END PGP SIGNATURE-
[update] enigmail 1.2
Hi, if you use rely on enigmail, please test this update, which targets thunderbird 5.0 and seamonkey 2.2. It works in my light testing on amd64. Check ports@ archive for the corresponding tb/sm updates. If i don't hear from anyone, this will probably be commited this weekend, along sm/tb. Landry Index: Makefile.inc === RCS file: /cvs/ports/mail/enigmail/Makefile.inc,v retrieving revision 1.5 diff -u -r1.5 Makefile.inc --- Makefile.inc26 Nov 2010 07:51:00 - 1.5 +++ Makefile.inc22 Jul 2011 05:15:39 - @@ -15,11 +15,11 @@ MASTER_SITES = http://www.mozilla-enigmail.org/download/source/ -BUILD_DEPENDS =${MOZAPP_PKGPATH}:configure \ +BUILD_DEPENDS =${MOZAPP_PKGSTEM}:${MOZAPP_PKGPATH}:configure \ archivers/unzip RUN_DEPENDS = security/gnupg LIB_DEPENDS = ${MOZAPP_PKGPATH},-main -WANTLIB = c m nspr4 plc4 plds4 stdc++ ${MOZAPP_DIR}/xpcom ${MOZAPP_DIR}/xpcom_core +WANTLIB = c m nspr4 plc4 plds4 stdc++ ${MOZAPP_DIR}/xpcom ${MOZAPP_DIR}/xul ${MOZAPP_DIR}/mozalloc USE_GMAKE =Yes NO_REGRESS = Yes @@ -37,23 +37,26 @@ SUBST_VARS = GUID post-extract: - @perl -pi -e 's|(genxpi.*) (\$$\(TARGET_XPCOM_ABI\))|\1 \2|g' \ + # strip off the TARGET_XPCOM_ABI variable part + perl -pi -e 's|(genxpi.*) (\$$\(TARGET_XPCOM_ABI\))|\1 \2|g' \ ${WRKDIST}/Makefile.in - @perl -pi -e 's|[-_]?\$${xpcomAbi}||g' ${WRKDIST}/genxpi - @mv ${WRKDIST} ${MOZBASE}/mailnews/extensions + # strip xpcomABI from platform and ABI in chrome.manifest + perl -pi -e 's|[-_]?\$${xpcomAbi}||g ; s| ABI=.\$${platform}.||g' ${WRKDIST}/genxpi + mv ${WRKDIST} ${MOZBASE}/mailnews/extensions do-build: - @cd ${MOZBASE} ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} export - @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 + cd ${MOZBASE}/mozilla ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} tier_base + cd ${MOZBASE}/mozilla ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} tier_js + cd ${MOZBASE}/mozilla ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} tier_platform + cd ${MOZBASE} ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} export + cd ${WRKSRC} ./makemake -r + # hax: switch to jar format to generate enigmail.jar + perl -pi -e 's|MOZ_CHROME_FILE_FORMAT.*|MOZ_CHROME_FILE_FORMAT=jar|' ${MOZBASE}/config/autoconf.mk + cd ${WRKSRC} ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} + cd ${WRKSRC} ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} xpi do-install: ${INSTALL_DATA_DIR} ${GLOBALDIR} unzip -q ${MOZBIN}/${ENIGMAIL_XPI} -d ${GLOBALDIR} - cp ${GLOBALDIR}/platform/OpenBSD*/components/lib*.so.* \ - ${GLOBALDIR}/components/ + # enigmail 1.2 works in seamonkey 2.2 so adjust install.rdf + perl -pi -e 's|em:maxVersion2.1.*/em:maxVersion|em:maxVersion2.2.*/em:maxVersion|' ${GLOBALDIR}/install.rdf Index: seamonkey/Makefile === RCS file: /cvs/ports/mail/enigmail/seamonkey/Makefile,v retrieving revision 1.4 diff -u -r1.4 Makefile --- seamonkey/Makefile 14 Jan 2011 22:58:49 - 1.4 +++ seamonkey/Makefile 22 Jul 2011 05:15:39 - @@ -2,18 +2,19 @@ COMMENT = GnuPG extension for Seamonkey -VERSION = 1.0.1 +VERSION = 1.2 PKGNAME = enigmail-seamonkey-${VERSION} -REVISION = 4 # must be in sync with SO_VERSION in # www/seamonkey -SHARED_LIBS = enigmime16.1 +SHARED_LIBS = enigmime18.0 \ + ipc 18.0 +MOZAPP_PKGSTEM = seamonkey-=2.2 MOZAPP_PKGPATH = www/seamonkey -MOZAPP_DIR = seamonkey -MOZAPP_BRANCH =1.9.1 +MOZAPP_DIR = lib/seamonkey-2.2 +MOZAPP_BRANCH =release -ENIGMAIL_XPI= ${DISTNAME:S/.1//}-openbsd-${GNU_ARCH}.xpi +ENIGMAIL_XPI = ${DISTNAME}-openbsd-${GNU_ARCH}.xpi .include bsd.port.mk Index: seamonkey/distinfo === RCS file: /cvs/ports/mail/enigmail/seamonkey/distinfo,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 distinfo --- seamonkey/distinfo 27 Jul 2010 20:18:24 - 1.1.1.1 +++ seamonkey/distinfo 22 Jul 2011 05:15:39 - @@ -1,5 +1,5 @@ -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) =