Received: by mail.netbsd.org (Postfix, from userid 605) id 1B09984D75; Thu, 29 Mar 2018 10:19:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2C96184D73 for ; Thu, 29 Mar 2018 10:19:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id t00ro5CxTyHR for ; Thu, 29 Mar 2018 10:19:31 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 4AEEE84C86 for ; Thu, 29 Mar 2018 10:19:31 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3D39DFB40; Thu, 29 Mar 2018 10:19:31 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1522318771129160" MIME-Version: 1.0 Date: Thu, 29 Mar 2018 10:19:31 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/mail/thunderbird To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20180329101931.3D39DFB40@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1522318771129160 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Thu Mar 29 10:19:31 UTC 2018 Modified Files: pkgsrc/mail/thunderbird: Makefile distinfo pkgsrc/mail/thunderbird/patches: patch-mozilla_extensions_spellcheck_hunspell_glue_mozHunspell.cpp Log Message: thunderbird: fix SUBST* and patch so it actually does something. To generate a diff of this commit: cvs rdiff -u -r1.207 -r1.208 pkgsrc/mail/thunderbird/Makefile cvs rdiff -u -r1.198 -r1.199 pkgsrc/mail/thunderbird/distinfo cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/mail/thunderbird/patches/patch-mozilla_extensions_spellcheck_hunspell_glue_mozHunspell.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1522318771129160 Content-Disposition: inline Content-Length: 3748 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/thunderbird/Makefile diff -u pkgsrc/mail/thunderbird/Makefile:1.207 pkgsrc/mail/thunderbird/Makefile:1.208 --- pkgsrc/mail/thunderbird/Makefile:1.207 Wed Mar 28 20:13:55 2018 +++ pkgsrc/mail/thunderbird/Makefile Thu Mar 29 10:19:30 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.207 2018/03/28 20:13:55 wiz Exp $ +# $NetBSD: Makefile,v 1.208 2018/03/29 10:19:30 wiz Exp $ DISTNAME= thunderbird-${TB_VER}.source PKGNAME= thunderbird-${TB_VER} @@ -42,7 +42,7 @@ SUBST_CLASSES+= sys-dic SUBST_STAGE.sys-dic= pre-configure SUBST_MESSAGE.sys-dic= Reference to system hunspell dictionaries. SUBST_FILES.sys-dic= mozilla/extensions/spellcheck/hunspell/glue/mozHunspell.cpp -SUBST_VARS.sys-dic= PREFIX +SUBST_VARS.sys-dic= LOCALBASE CHECK_INTERPRETER_SKIP+=lib/thunderbird-sdk/sdk/bin/header.py CHECK_INTERPRETER_SKIP+=lib/thunderbird-sdk/sdk/bin/typelib.py Index: pkgsrc/mail/thunderbird/distinfo diff -u pkgsrc/mail/thunderbird/distinfo:1.198 pkgsrc/mail/thunderbird/distinfo:1.199 --- pkgsrc/mail/thunderbird/distinfo:1.198 Wed Mar 28 13:34:19 2018 +++ pkgsrc/mail/thunderbird/distinfo Thu Mar 29 10:19:30 2018 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.198 2018/03/28 13:34:19 ryoon Exp $ +$NetBSD: distinfo,v 1.199 2018/03/29 10:19:30 wiz Exp $ SHA1 (thunderbird-52.7.0.source.tar.xz) = 9030278d1fb4cd28a3a5e8830cfb98a8f0d45523 RMD160 (thunderbird-52.7.0.source.tar.xz) = 5a10590da00d39da4cc3849d33f68fafc136f505 @@ -36,7 +36,7 @@ SHA1 (patch-mozilla_dom_media_platforms_ SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp) = 375a2ebda12bd4633c7ae3d5c0e0b6de6a61bb0f SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.h) = 7009f9f2d01ca96f0ef6ca6f412485a4576f3072 SHA1 (patch-mozilla_dom_system_OSFileConstants.cpp) = cff51ad6909e0ceaa401c2825ca538f4271ac786 -SHA1 (patch-mozilla_extensions_spellcheck_hunspell_glue_mozHunspell.cpp) = bd81d7b2b9e5517924ed515d31150893472dc770 +SHA1 (patch-mozilla_extensions_spellcheck_hunspell_glue_mozHunspell.cpp) = 07a8e9f7ea6ec5f667877ba78cf2c0b80c87f3f1 SHA1 (patch-mozilla_gfx_cairo_libpixman_src_pixman-arm-neon-asm.S) = 14b213eff89b78ecfe3ff74a4daca13138defd2e SHA1 (patch-mozilla_gfx_gl_GLContextProviderGLX.cpp) = f8b7ad2c1d1b8f0a4492fc49d1e5884ec4bdf4c4 SHA1 (patch-mozilla_gfx_graphite2_moz-gr-update.sh) = a74a7dd83de0d04aeb8694db5b49803f8db58235 Index: pkgsrc/mail/thunderbird/patches/patch-mozilla_extensions_spellcheck_hunspell_glue_mozHunspell.cpp diff -u pkgsrc/mail/thunderbird/patches/patch-mozilla_extensions_spellcheck_hunspell_glue_mozHunspell.cpp:1.2 pkgsrc/mail/thunderbird/patches/patch-mozilla_extensions_spellcheck_hunspell_glue_mozHunspell.cpp:1.3 --- pkgsrc/mail/thunderbird/patches/patch-mozilla_extensions_spellcheck_hunspell_glue_mozHunspell.cpp:1.2 Thu Apr 27 13:32:40 2017 +++ pkgsrc/mail/thunderbird/patches/patch-mozilla_extensions_spellcheck_hunspell_glue_mozHunspell.cpp Thu Mar 29 10:19:31 2018 @@ -1,4 +1,4 @@ -$NetBSD: patch-mozilla_extensions_spellcheck_hunspell_glue_mozHunspell.cpp,v 1.2 2017/04/27 13:32:40 ryoon Exp $ +$NetBSD: patch-mozilla_extensions_spellcheck_hunspell_glue_mozHunspell.cpp,v 1.3 2018/03/29 10:19:31 wiz Exp $ --- mozilla/extensions/spellcheck/hunspell/glue/mozHunspell.cpp.orig 2017-04-14 04:53:08.000000000 +0000 +++ mozilla/extensions/spellcheck/hunspell/glue/mozHunspell.cpp @@ -8,7 +8,7 @@ $NetBSD: patch-mozilla_extensions_spellc + // load system hunspell dictionaries + nsCOMPtr hunDir; -+ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), ++ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("@LOCALBASE@/share/hunspell"), + true, getter_AddRefs(hunDir)); + if (hunDir) { + LoadDictionariesFromDir(hunDir); --_----------=_1522318771129160--