Import of pkgsrc-2014Q1

This commit is contained in:
2014-11-05 12:41:07 +01:00
parent 785076ae39
commit 9a8c06dafb
19365 changed files with 828089 additions and 278039 deletions
@@ -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 *******************************/
@@ -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"
@@ -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"