openpkg-packages/aspell/aspell.patch

Index: Makefile.in
--- Makefile.in.orig	2008-04-07 06:56:53 +0200
+++ Makefile.in	2010-01-29 20:12:00 +0100
@@ -481,7 +481,7 @@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign subdir-objects
 SUBDIRS = . po manual
-DIST_SUBDIRS = ${SUBDIRS} examples myspell lib5
+DIST_SUBDIRS = ${SUBDIRS} myspell lib5
 filterdir = ${pkglibdir}
 optdir = ${pkgdatadir}
 
Index: aspell6-de-20030222-1/configure
--- aspell6-de-20030222-1/configure.orig	2004-11-04 03:46:10 +0100
+++ aspell6-de-20030222-1/configure	2010-01-29 20:12:00 +0100
@@ -66,9 +66,9 @@
 
 #echo $ASPELL
 if test x = "x$ASPELL"
-  then ASPELL=aspell; fi
+  then ASPELL=`which aspell`; fi
 if test x = "x$PREZIP"
-  then PREZIP=prezip-bin; fi
+  then PREZIP=`which prezip-bin`; fi
 #echo $ASPELL
 
 echo $ECHO_N "Finding Dictionary file location ... $ECHO_C"
@@ -79,9 +79,9 @@
 datadir=`$ASPELL dump config data-dir`
 echo $datadir
 
-echo "ASPELL = `which $ASPELL`" > Makefile
+echo "ASPELL = $ASPELL" > Makefile
 echo "ASPELL_FLAGS = $ASPELL_FLAGS" >> Makefile
-echo "PREZIP = `which $PREZIP`" >> Makefile
+echo "PREZIP = $PREZIP" >> Makefile
 echo "DESTDIR = $DESTDIR" >> Makefile
 echo "dictdir = $dictdir" >> Makefile
 echo "datadir = $datadir" >> Makefile
Index: aspell6-de-alt-2.1-1/configure
--- aspell6-de-alt-2.1-1/configure.orig	2004-11-04 03:48:55 +0100
+++ aspell6-de-alt-2.1-1/configure	2010-01-29 20:12:00 +0100
@@ -66,9 +66,9 @@
 
 #echo $ASPELL
 if test x = "x$ASPELL"
-  then ASPELL=aspell; fi
+  then ASPELL=`which aspell`; fi
 if test x = "x$PREZIP"
-  then PREZIP=prezip-bin; fi
+  then PREZIP=`which prezip-bin`; fi
 #echo $ASPELL
 
 echo $ECHO_N "Finding Dictionary file location ... $ECHO_C"
@@ -79,9 +79,9 @@
 datadir=`$ASPELL dump config data-dir`
 echo $datadir
 
-echo "ASPELL = `which $ASPELL`" > Makefile
+echo "ASPELL = $ASPELL" > Makefile
 echo "ASPELL_FLAGS = $ASPELL_FLAGS" >> Makefile
-echo "PREZIP = `which $PREZIP`" >> Makefile
+echo "PREZIP = $PREZIP" >> Makefile
 echo "DESTDIR = $DESTDIR" >> Makefile
 echo "dictdir = $dictdir" >> Makefile
 echo "datadir = $datadir" >> Makefile
Index: aspell6-en-7.1-0/configure
--- aspell6-en-7.1-0/configure.orig	2004-08-10 11:01:33 +0200
+++ aspell6-en-7.1-0/configure	2010-01-29 20:12:00 +0100
@@ -66,9 +66,9 @@
 
 #echo $ASPELL
 if test x = "x$ASPELL"
-  then ASPELL=aspell; fi
+  then ASPELL=`which aspell`; fi
 if test x = "x$PREZIP"
-  then PREZIP=prezip-bin; fi
+  then PREZIP=`which prezip-bin`; fi
 #echo $ASPELL
 
 echo $ECHO_N "Finding Dictionary file location ... $ECHO_C"
@@ -79,9 +79,9 @@
 datadir=`$ASPELL dump config data-dir`
 echo $datadir
 
-echo "ASPELL = `which $ASPELL`" > Makefile
+echo "ASPELL = $ASPELL" > Makefile
 echo "ASPELL_FLAGS = $ASPELL_FLAGS" >> Makefile
-echo "PREZIP = `which $PREZIP`" >> Makefile
+echo "PREZIP = $PREZIP" >> Makefile
 echo "DESTDIR = $DESTDIR" >> Makefile
 echo "dictdir = $dictdir" >> Makefile
 echo "datadir = $datadir" >> Makefile
Index: gen/mk-static-filter.pl
--- gen/mk-static-filter.pl.orig	2007-12-03 07:43:09 +0100
+++ gen/mk-static-filter.pl	2010-01-29 20:12:00 +0100
@@ -159,7 +159,7 @@
   printf STATICFILTERS "\n  const KeyInfo * ".${$filter}{"NAME"}."_options_begin = ".
                                               ${$filter}{"NAME"}."_options;\n";
   # If structure is empty, set options_end to same as options_begin.
-  if (%{$filter}) {
+  if ($firstopt) {
     printf STATICFILTERS "\n  const KeyInfo * ".${$filter}{"NAME"}."_options_end = ".
                                                 ${$filter}{"NAME"}."_options;\n";
   } else {
Index: prog/checker_string.cpp
--- prog/checker_string.cpp.orig	2006-11-25 16:07:15 +0100
+++ prog/checker_string.cpp	2010-01-29 20:12:00 +0100
@@ -6,6 +6,7 @@
 
 #include <assert.h>
 
+#include <assert.h>
 #include "checker_string.hpp"
 #include "speller.hpp"
 #include "document_checker.hpp"