From owner-svn-ports-all@FreeBSD.ORG Thu Aug 9 08:27:13 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3C947106566C; Thu, 9 Aug 2012 08:27:13 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1DB288FC08; Thu, 9 Aug 2012 08:27:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q798RChM086773; Thu, 9 Aug 2012 08:27:12 GMT (envelope-from ale@svn.freebsd.org) Received: (from ale@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q798RCNV086769; Thu, 9 Aug 2012 08:27:12 GMT (envelope-from ale@svn.freebsd.org) Message-Id: <201208090827.q798RCNV086769@svn.freebsd.org> From: Alex Dupre Date: Thu, 9 Aug 2012 08:27:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302331 - in head/mail: enigmail enigmail-thunderbird-esr X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Aug 2012 08:27:13 -0000 Author: ale Date: Thu Aug 9 08:27:12 2012 New Revision: 302331 URL: http://svn.freebsd.org/changeset/ports/302331 Log: Update to unified 1.4.3 release and greatly simplify the port. Modified: head/mail/enigmail-thunderbird-esr/Makefile head/mail/enigmail/Makefile head/mail/enigmail/distinfo Modified: head/mail/enigmail-thunderbird-esr/Makefile ============================================================================== --- head/mail/enigmail-thunderbird-esr/Makefile Thu Aug 9 08:22:10 2012 (r302330) +++ head/mail/enigmail-thunderbird-esr/Makefile Thu Aug 9 08:27:12 2012 (r302331) @@ -5,7 +5,6 @@ # $FreeBSD$ # -PORTVERSION= 1.4 PKGNAMEPREFIX= ${GECKO}-esr- COMMENT= A GnuPG extension for the Thunderbird mail client Modified: head/mail/enigmail/Makefile ============================================================================== --- head/mail/enigmail/Makefile Thu Aug 9 08:22:10 2012 (r302330) +++ head/mail/enigmail/Makefile Thu Aug 9 08:27:12 2012 (r302331) @@ -6,7 +6,7 @@ # PORTNAME= enigmail -PORTVERSION?= 1.4.2 +PORTVERSION?= 1.4.3 PORTREVISION?= 0 CATEGORIES= mail security MASTER_SITES= http://www.mozilla-enigmail.org/download/source/ @@ -29,49 +29,34 @@ GECKO_PORTDIR= www/${GECKO} IGNORE= is an abstract port: use one of the slave ports .endif -GECKO_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/${GECKO_PORTDIR}:${GECKO_TARGET} \ +GECKO_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/${GECKO_PORTDIR}:build \ ${GECKO}:${PORTSDIR}/${GECKO_PORTDIR} \ autoconf-2.13:${PORTSDIR}/devel/autoconf213 \ gmake:${PORTSDIR}/devel/gmake \ intltool-extract:${PORTSDIR}/textproc/intltool \ - ${LOCALBASE}/libdata/pkgconfig/printproto.pc:${PORTSDIR}/x11/printproto - -.if ${PORTVERSION} == "1.1.2" -GECKO_TARGET= configure -.else -GECKO_TARGET= build -GECKO_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip \ + ${LOCALBASE}/libdata/pkgconfig/printproto.pc:${PORTSDIR}/x11/printproto \ + unzip:${PORTSDIR}/archivers/unzip \ yasm:${PORTSDIR}/devel/yasm -.endif -.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 +.if ${GECKO_PORTDIR:N*-esr} +MOZOBJ= ${WRKSRC}/obj-${CONFIGURE_TARGET:S/amd64/x86_64/} .else -GECKO_WRKSRC= ${WRKDIR}/../../../${GECKO_PORTDIR}/work/mozilla -WRKSRC= ${WRKDIR}/mozilla -MOZSRC= ${WRKSRC} +MOZOBJ= ${WRKSRC} .endif USE_GMAKE= yes .include -XPI_FILE= ${MOZSRC}/dist/bin/${DISTNAME}-freebsd-${ARCH:S/amd64/x86_64/}.xpi +XPI_FILE= ${MOZOBJ}/mozilla/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 -XPI_ID_RFILES= ${XPI_LIBDIR}/${XPI_ID}/install.rdf -.if ${PORTVERSION} == "1.1.2" -XPI_ID_RFILES+= ${XPI_LIBDIR}/${XPI_ID}/components/enigmail.js -.else -XPI_ID_RFILES+= ${XPI_LIBDIR}/${XPI_ID}/components/enigmail.js ${XPI_LIBDIR}/${XPI_ID}/modules/enigmailCommon.jsm -.endif +XPI_ID_RFILES= ${XPI_LIBDIR}/${XPI_ID}/install.rdf \ + ${XPI_LIBDIR}/${XPI_ID}/components/enigmail.js \ + ${XPI_LIBDIR}/${XPI_ID}/modules/enigmailCommon.jsm do-extract: @${RM} -rf ${WRKDIR} @@ -88,29 +73,20 @@ pre-patch: post-patch: ${REINPLACE_CMD} "s/^XPI_MODULE_VERS = [0-9.]*/XPI_MODULE_VERS = ${PORTVERSION}/" \ ${WRKSRC}/mailnews/extensions/enigmail/Makefile.in + ${REINPLACE_CMD} "s,[0-9.a-z]*,${PORTVERSION}," \ + ${WRKSRC}/mailnews/extensions/enigmail/package/install.rdf +.if ${GECKO_PORTDIR:M*-esr} + ${REINPLACE_CMD} "s,12.0,10.0," \ + ${WRKSRC}/mailnews/extensions/enigmail/package/install.rdf +.endif do-build: -.if ${GECKO_TARGET} == "configure" - ${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 ${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} \ - -C $$objdir/mailnews/extensions/enigmail; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} 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 + cd ${WRKSRC}/mailnews/extensions/enigmail && \ + ./makemake -r -o ${MOZOBJ} && \ + ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} \ + -C ${MOZOBJ}/mailnews/extensions/enigmail && \ + ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} xpi \ + -C ${MOZOBJ}/mailnews/extensions/enigmail do-install: @${MKDIR} ${XPI_LIBDIR}/${XPI_ID} ${XPI_LIBDIR}/symlinks/${GECKO} Modified: head/mail/enigmail/distinfo ============================================================================== --- head/mail/enigmail/distinfo Thu Aug 9 08:22:10 2012 (r302330) +++ head/mail/enigmail/distinfo Thu Aug 9 08:27:12 2012 (r302331) @@ -1,6 +1,2 @@ -SHA256 (enigmail-1.1.2.tar.gz) = dd6206f6622081b595d7bde7aaa8f63ca2c3f9db2acd13c751c7dd941def9e41 -SIZE (enigmail-1.1.2.tar.gz) = 1280923 -SHA256 (enigmail-1.4.tar.gz) = c63990dad45d6bce3e691f75aa226a203f6fbbc2397415df72b289230e2c982a -SIZE (enigmail-1.4.tar.gz) = 1323467 -SHA256 (enigmail-1.4.2.tar.gz) = df463620f47a30d2a0e1634793b41a285e1a2c861b024e1a57c9d91cf6bf3581 -SIZE (enigmail-1.4.2.tar.gz) = 1319995 +SHA256 (enigmail-1.4.3.tar.gz) = 440035f19a22e8e234c530a0e78fb9ee74bb934fcf721777868de79324636d27 +SIZE (enigmail-1.4.3.tar.gz) = 1337811