CVS commit: pkgsrc/mail/thunderbird

["Thomas Klausner" <wiz%netbsd.org@localhost>]

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.

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<nsIFile> 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);