Workaround failure with aspell build seen with clang. Upstream devel tree

has a different workaround which requires regenerating some files, so using
the one from FreeBSD for now.

textproc/aspell/core/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.37 2017/04/10 11:46:34 sthen Exp $
+# $OpenBSD: Makefile,v 1.38 2017/04/17 21:19:22 sthen Exp $
 
 COMMENT=	spell checker designed to eventually replace Ispell
 
 DISTNAME=	aspell-0.60.6.1
-REVISION=	3
+REVISION=	4
 SHARED_LIBS +=  aspell               17.0     # .16.4
 SHARED_LIBS +=  pspell               17.0     # .16.4
 DIST_SUBDIR=	aspell

textproc/aspell/core/patches/patch-interfaces_cc_aspell_h

@@ -0,0 +1,27 @@
+$OpenBSD: patch-interfaces_cc_aspell_h,v 1.1 2017/04/17 21:19:22 sthen Exp $
+
+fix with clang; from https://svnweb.freebsd.org/ports?view=revision&revision=343830
+
+should be obsoleted by upstream patch targetted for 0.60.7
+https://github.com/GNUAspell/aspell/commit/502e8f99a9c7c63344f5acdcb96ddecd30ee32f1
+
+--- interfaces/cc/aspell.h.orig	Sat Jul  2 22:53:27 2011
++++ interfaces/cc/aspell.h	Mon Apr 17 22:05:44 2017
+@@ -236,7 +236,7 @@ void delete_aspell_can_have_error(struct AspellCanHave
+ 
+ /******************************** 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 * const   aerror_m
+ 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 *******************************/
+ 

textproc/aspell/core/patches/patch-prog_aspell_cpp

@@ -0,0 +1,25 @@
+$OpenBSD: patch-prog_aspell_cpp,v 1.1 2017/04/17 21:19:22 sthen Exp $
+
+fix with clang; from https://svnweb.freebsd.org/ports?view=revision&revision=343830
+
+should be obsoleted by upstream patch targetted for 0.60.7
+https://github.com/GNUAspell/aspell/commit/502e8f99a9c7c63344f5acdcb96ddecd30ee32f1
+
+--- prog/aspell.cpp.orig	Mon Jul  4 10:13:58 2011
++++ prog/aspell.cpp	Mon Apr 17 22:06:01 2017
+@@ -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"

textproc/aspell/core/patches/patch-prog_checker_string_hpp

@@ -0,0 +1,17 @@
+$OpenBSD: patch-prog_checker_string_hpp,v 1.1 2017/04/17 21:19:22 sthen Exp $
+
+fix with clang; from https://svnweb.freebsd.org/ports?view=revision&revision=343830
+
+should be obsoleted by upstream patch targetted for 0.60.7
+https://github.com/GNUAspell/aspell/commit/502e8f99a9c7c63344f5acdcb96ddecd30ee32f1
+
+--- prog/checker_string.hpp.orig	Sat Jul  2 22:09:09 2011
++++ prog/checker_string.hpp	Mon Apr 17 22:06:23 2017
+@@ -6,6 +6,7 @@
+ 
+ #include <stdio.h>
+ 
++#include "errors.hpp"
+ #include "aspell.h"
+ 
+ #include "vector.hpp"