Clang now validates that two declarations that end up mapped to the same

name due to extern "C" are consistent. Work around this by hiding the
parts of <aspell.h> as necessary.

4 files changed, 58 insertions, 1 deletions

diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo
index 186e2d922c2..509cab92a3b 100644
--- a/textproc/aspell/distinfo
+++ b/textproc/aspell/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2011/07/12 14:06:02 wiz Exp $
+$NetBSD: distinfo,v 1.27 2013/08/17 11:19:03 joerg Exp $
 
 SHA1 (aspell-0.60.6.1.tar.gz) = ff1190db8de279f950c242c6f4c5d5cdc2cbdc49
 RMD160 (aspell-0.60.6.1.tar.gz) = 6d4e29228e5c47cd4dbd780a73dbc1d2222e8266
@@ -11,3 +11,6 @@ SHA1 (patch-af) = b34d98280c83f270f86ad3cf0f31e48688f53138
 SHA1 (patch-ag) = 5aabf8d9a9a28db9dee073bdfcd62fbc3e2f38c0
 SHA1 (patch-ai) = 4fbb25e3f09aa97bdcb12f325ef615e5a6f9f626
 SHA1 (patch-an) = 687cf83ad9be083da0a53e7a7b5cbaefe88f63a5
+SHA1 (patch-interfaces_cc_aspell.h) = f824d0bb1e3c55faaf6ecae10b44169d91b41517
+SHA1 (patch-prog_aspell.cpp) = 5caf4556a48db8219e95d1ec0034efc81c4f7e34
+SHA1 (patch-prog_checker__string.hpp) = b070e776a0998f17e4ff30cd004179585f70f3df
diff --git a/textproc/aspell/patches/patch-interfaces_cc_aspell.h b/textproc/aspell/patches/patch-interfaces_cc_aspell.h
new file mode 100644
index 00000000000..8c2e362a9eb
--- /dev/null
+++ b/textproc/aspell/patches/patch-interfaces_cc_aspell.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-interfaces_cc_aspell.h,v 1.1 2013/08/17 11:19:03 joerg Exp $
+
+--- interfaces/cc/aspell.h.orig	2011-07-02 21:53:27.000000000 +0000
++++ interfaces/cc/aspell.h
+@@ -236,7 +236,7 @@ void delete_aspell_can_have_error(struct
+ 
+ /******************************** errors ********************************/
+ 
+-
++#ifndef ASPELL_ERRORS__HPP
+ extern const struct AspellErrorInfo * const aerror_other;
+ extern const struct AspellErrorInfo * const aerror_operation_not_supported;
+ extern const struct AspellErrorInfo * const   aerror_cant_copy;
+@@ -322,7 +322,7 @@ extern const struct AspellErrorInfo * co
+ extern const struct AspellErrorInfo * const   aerror_bad_magic;
+ extern const struct AspellErrorInfo * const aerror_expression;
+ extern const struct AspellErrorInfo * const   aerror_invalid_expression;
+-
++#endif
+ 
+ /******************************* speller *******************************/
+ 
diff --git a/textproc/aspell/patches/patch-prog_aspell.cpp b/textproc/aspell/patches/patch-prog_aspell.cpp
new file mode 100644
index 00000000000..da9127909f6
--- /dev/null
+++ b/textproc/aspell/patches/patch-prog_aspell.cpp
@@ -0,0 +1,20 @@
+$NetBSD: patch-prog_aspell.cpp,v 1.1 2013/08/17 11:19:03 joerg Exp $
+
+--- prog/aspell.cpp.orig	2013-08-16 12:16:40.000000000 +0000
++++ prog/aspell.cpp
+@@ -25,6 +25,7 @@
+ # include <langinfo.h>
+ #endif
+ 
++#include "errors.hpp"
+ #include "aspell.h"
+ 
+ #ifdef USE_FILE_INO
+@@ -40,7 +41,6 @@
+ #include "convert.hpp"
+ #include "document_checker.hpp"
+ #include "enumeration.hpp"
+-#include "errors.hpp"
+ #include "file_util.hpp"
+ #include "fstream.hpp"
+ #include "info.hpp"
diff --git a/textproc/aspell/patches/patch-prog_checker__string.hpp b/textproc/aspell/patches/patch-prog_checker__string.hpp
new file mode 100644
index 00000000000..298557611fa
--- /dev/null
+++ b/textproc/aspell/patches/patch-prog_checker__string.hpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-prog_checker__string.hpp,v 1.1 2013/08/17 11:19:03 joerg Exp $
+
+--- prog/checker_string.hpp.orig	2013-08-16 12:18:48.000000000 +0000
++++ prog/checker_string.hpp
+@@ -6,6 +6,7 @@
+ 
+ #include <stdio.h>
+ 
++#include "errors.hpp"
+ #include "aspell.h"
+ 
+ #include "vector.hpp"