From owner-freebsd-ports@FreeBSD.ORG Sat Jul 28 18:47:43 2012 Return-Path: Delivered-To: freebsd-ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1E915106566C; Sat, 28 Jul 2012 18:47:43 +0000 (UTC) (envelope-from flo@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id F24658FC0C; Sat, 28 Jul 2012 18:47:42 +0000 (UTC) Received: from nibbler-osx-wlan.fritz.box (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q6SIleir094614; Sat, 28 Jul 2012 18:47:40 GMT (envelope-from flo@FreeBSD.org) Message-ID: <501433CB.6010108@FreeBSD.org> Date: Sat, 28 Jul 2012 20:47:39 +0200 From: Florian Smeets User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:14.0) Gecko/20120713 Thunderbird/14.0 MIME-Version: 1.0 To: Doug Barton References: <5013B795.9030705@smeets.im> In-Reply-To: <5013B795.9030705@smeets.im> X-Enigmail-Version: 1.4.3 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enigBCDE1FB9309255F5D8F9B12A" Cc: gecko@FreeBSD.org, ale@FreeBSD.org, freebsd-ports@FreeBSD.org Subject: Re: mail/enigmail-thunderbird broken with the latest thunderbird update X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Jul 2012 18:47:43 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigBCDE1FB9309255F5D8F9B12A Content-Type: multipart/mixed; boundary="------------030809080502080607070506" This is a multi-part message in MIME format. --------------030809080502080607070506 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable 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= =20 >> the latest round of updates includes an enormous amount of work, and=20 >> 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=20 >> re-building thunderbird and starting the enigmail build I get this: >> >=20 >> >> I looked in that directory and the autoconf.mk.in file is there, but t= he=20 >> .mk file has not been built. Given the complexity of the enigmail buil= d=20 >> process it isn't obvious to me what the solution is. >> >> Sorry to be the bearer of bad news, >=20 > Yes, we are already aware of this, and actively working on it. >=20 > My fault for not thinking about the enigmail ports earlier, i should > have known by now... but with all the changes we concentrated on gettin= g > "our" stuff right. >=20 > We hope to fix this asap. >=20 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 --------------030809080502080607070506 Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0"; name="enigmail.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="enigmail.diff" Index: Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- Makefile (revision 301636) +++ Makefile (working copy) @@ -47,7 +47,11 @@ .if defined(GECKO_EXTDIR) GECKO_WRKSRC=3D ${WRKDIR}/../../../${GECKO_PORTDIR}/work/${GECKO_EXTDIR}= WRKSRC=3D ${WRKDIR}/${GECKO_EXTDIR} +. if ${GECKO_PORTDIR:N*-esr} +MOZSRC=3D ${WRKSRC}/obj-${CONFIGURE_TARGET:S/amd64/x86_64/}/mozilla +. else MOZSRC=3D ${WRKSRC}/mozilla +. endif .else GECKO_WRKSRC=3D ${WRKDIR}/../../../${GECKO_PORTDIR}/work/mozilla WRKSRC=3D ${WRKDIR}/mozilla @@ -58,7 +62,7 @@ =20 .include =20 -XPI_FILE=3D ${MOZSRC}/dist/bin/${DISTNAME}-freebsd-${ARCH}.xpi +XPI_FILE=3D ${MOZSRC}/dist/bin/${DISTNAME}-freebsd-${ARCH:S/amd64/x86_64= /}.xpi XPI_LIBDIR=3D ${PREFIX}/lib/xpi XPI_ORIG_ID=3D {847b3a00-7ab1-11d4-8f02-006008948af5} XPI_ID=3D ${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=3D${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} ${GM= AKE} cd ${WRKSRC}/mailnews/extensions/enigmail && ${SETENV} ${MAKE_ENV} ${GM= AKE} xpi +.endif =20 do-install: @${MKDIR} ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/${GECKO} --------------030809080502080607070506-- --------------enigBCDE1FB9309255F5D8F9B12A Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iEYEARECAAYFAlAUM8wACgkQapo8P8lCvwm5lQCcDcD14V+17SH8KgWbCI4sEdct x5cAn1nVakkYAWSbqCOkHkuSHaXAgPwR =9sr5 -----END PGP SIGNATURE----- --------------enigBCDE1FB9309255F5D8F9B12A--