On 28.07.12 11:57, Florian Smeets wrote: > On 27.07.12 19:00, Doug Barton wrote: >> First let me say a big thank you to the gecko@ team. It's obvious that >> the latest round of updates includes an enormous amount of work, and >> both the thunderbird build and the firefox PGO build went flawlessly. >> I've been using the new firefox and it is great so far. :) >> >> The problem comes in with the enigmail-thunderbird build. After >> re-building thunderbird and starting the enigmail build I get this: >> > >> >> I looked in that directory and the autoconf.mk.in file is there, but the >> .mk file has not been built. Given the complexity of the enigmail build >> process it isn't obvious to me what the solution is. >> >> Sorry to be the bearer of bad news, > > Yes, we are already aware of this, and actively working on it. > > My fault for not thinking about the enigmail ports earlier, i should > have known by now... but with all the changes we concentrated on getting > "our" stuff right. > > We hope to fix this asap. >
This is the patch i intend to commit. I could successfully build enigmail-thunderbird, enigmail-thunderbird-esr and enigmail-seamonkey with this patch applied to mail/enigmail Florian
Index: Makefile
===================================================================
--- Makefile (revision 301636)
+++ Makefile (working copy)
@@ -47,7 +47,11 @@
.if defined(GECKO_EXTDIR)
GECKO_WRKSRC= ${WRKDIR}/../../../${GECKO_PORTDIR}/work/${GECKO_EXTDIR}
WRKSRC= ${WRKDIR}/${GECKO_EXTDIR}
+. if ${GECKO_PORTDIR:N*-esr}
+MOZSRC=
${WRKSRC}/obj-${CONFIGURE_TARGET:S/amd64/x86_64/}/mozilla
+. else
MOZSRC= ${WRKSRC}/mozilla
+. endif
.else
GECKO_WRKSRC= ${WRKDIR}/../../../${GECKO_PORTDIR}/work/mozilla
WRKSRC= ${WRKDIR}/mozilla
@@ -58,7 +62,7 @@
.include <bsd.port.pre.mk>
-XPI_FILE= ${MOZSRC}/dist/bin/${DISTNAME}-freebsd-${ARCH}.xpi
+XPI_FILE=
${MOZSRC}/dist/bin/${DISTNAME}-freebsd-${ARCH:S/amd64/x86_64/}.xpi
XPI_LIBDIR= ${PREFIX}/lib/xpi
XPI_ORIG_ID= {847b3a00-7ab1-11d4-8f02-006008948af5}
XPI_ID= ${GECKO}@mozilla-enigmail.org
@@ -90,14 +94,21 @@
${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC} tier_base
${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC} tier_nspr
${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC} tier_js
- ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC} export
+ ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC}/.. export
${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC}/modules/libreg
${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC}/xpcom/string
${SETENV} ${MAKE_ENV} ${GMAKE} -C ${MOZSRC}/xpcom
.endif
+.if ${GECKO_PORTDIR:N*-esr}
+ cd ${WRKSRC}/mailnews/extensions/enigmail; \
+ ./makemake -r -o
$${objdir=${WRKSRC}/obj-${CONFIGURE_TARGET:S/amd64/x86_64/}}; \
+ ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} all xpi \
+ -C $$objdir/mailnews/extensions/enigmail
+.else
cd ${WRKSRC}/mailnews/extensions/enigmail && ./makemake -r
cd ${WRKSRC}/mailnews/extensions/enigmail && ${SETENV} ${MAKE_ENV}
${GMAKE}
cd ${WRKSRC}/mailnews/extensions/enigmail && ${SETENV} ${MAKE_ENV}
${GMAKE} xpi
+.endif
do-install:
@${MKDIR} ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/${GECKO}
signature.asc
Description: OpenPGP digital signature
