aspell-0.60.6.diff

   1 diff -uraN aspell-0.60.6.orig/debian/patches/10_autotools.dpatch aspell-0.60.6/debian/patches/10_autotools.dpatch
   2 --- aspell-0.60.6.orig/debian/patches/10_autotools.dpatch       2008-09-28 05:47:05.000000000 -0400
   3 +++ aspell-0.60.6/debian/patches/10_autotools.dpatch    2008-09-28 05:48:37.783958820 -0400
   4 @@ -6,8 +6,8 @@
   5
   6  @DPATCH@
   7  diff -urNad aspell-0.60.6~/Makefile.in aspell-0.60.6/Makefile.in
   8 ---- aspell-0.60.6~/Makefile.in 2008-06-22 23:56:12.000000000 -0400
   9 -+++ aspell-0.60.6/Makefile.in  2008-06-24 13:45:16.000000000 -0400
  10 +--- aspell-0.60.6~/Makefile.in 2008-04-07 00:56:53.000000000 -0400
  11 ++++ aspell-0.60.6/Makefile.in  2008-09-28 05:47:35.353601608 -0400
  12  @@ -44,6 +44,7 @@
  13   ### starting with file containing filter class definition followed by
  14   ### file containing filter member implementation.
  15 @@ -228,8 +228,8 @@
  16   @AMDEP_TRUE@@am__include@ @am__quote@modules/filter/$(DEPDIR)/nroff.Plo@am__quote@
  17   @AMDEP_TRUE@@am__include@ @am__quote@modules/filter/$(DEPDIR)/sgml.Plo@am__quote@
  18  diff -urNad aspell-0.60.6~/aclocal.m4 aspell-0.60.6/aclocal.m4
  19 ---- aspell-0.60.6~/aclocal.m4  2008-06-22 23:58:26.000000000 -0400
  20 -+++ aspell-0.60.6/aclocal.m4   2008-06-24 13:45:16.000000000 -0400
  21 +--- aspell-0.60.6~/aclocal.m4  2008-04-07 00:25:00.000000000 -0400
  22 ++++ aspell-0.60.6/aclocal.m4   2008-09-28 05:48:18.192720891 -0400
  23  @@ -19,6 +19,8877 @@
  24   If you have problems, you may need to regenerate the build system entirely.
  25   To do so, use the procedure documented by the package, typically `autoreconf'.])])
  26 @@ -1416,7 +1416,7 @@
  27  +                if test "X$additional_includedir" = "X/usr/local/include"; then
  28  +                  if test -n "$GCC"; then
  29  +                    case $host_os in
  30 -+                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
  31 ++                      linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu) haveit=yes;;
  32  +                    esac
  33  +                  fi
  34  +                fi
  35 @@ -1465,7 +1465,7 @@
  36  +                      if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
  37  +                        if test -n "$GCC"; then
  38  +                          case $host_os in
  39 -+                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
  40 ++                            linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu) haveit=yes;;
  41  +                          esac
  42  +                        fi
  43  +                      fi
  44 @@ -1764,7 +1764,7 @@
  45  +        if test "X$additional_includedir" = "X/usr/local/include"; then
  46  +          if test -n "$GCC"; then
  47  +            case $host_os in
  48 -+              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
  49 ++              linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu) haveit=yes;;
  50  +            esac
  51  +          fi
  52  +        fi
  53 @@ -3553,7 +3553,7 @@
  54  +  ;;
  55  +
  56  +# This must be Linux ELF.
  57 -+linux* | k*bsd*-gnu)
  58 ++linux* | k*bsd*-gnu | kopensolaris*-gnu)
  59  +  version_type=linux
  60  +  need_lib_prefix=no
  61  +  need_version=no
  62 @@ -4371,7 +4371,7 @@
  63  +  ;;
  64  +
  65  +# This must be Linux ELF.
  66 -+linux* | k*bsd*-gnu)
  67 ++linux* | k*bsd*-gnu | kopensolaris*-gnu)
  68  +  lt_cv_deplibs_check_method=pass_all
  69  +  ;;
  70  +
  71 @@ -5257,7 +5257,7 @@
  72  +    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  73  +    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
  74  +    ;;
  75 -+  linux* | k*bsd*-gnu)
  76 ++  linux* | k*bsd*-gnu | kopensolaris*-gnu)
  77  +    case $cc_basename in
  78  +      KCC*)
  79  +      # Kuck and Associates, Inc. (KAI) C++ Compiler
  80 @@ -6704,7 +6704,7 @@
  81  +  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  82  +  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
  83  +  ;;
  84 -+linux* | k*bsd*-gnu)
  85 ++linux* | k*bsd*-gnu | kopensolaris*-gnu)
  86  +  if test "$host_cpu" = ia64; then
  87  +    symcode='[[ABCDGIRSTW]]'
  88  +    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
  89 @@ -7023,7 +7023,7 @@
  90  +          ;;
  91  +      esac
  92  +      ;;
  93 -+      linux* | k*bsd*-gnu)
  94 ++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
  95  +      case $cc_basename in
  96  +        KCC*)
  97  +          # KAI C++ Compiler
  98 @@ -7289,7 +7289,7 @@
  99  +      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 100  +      ;;
 101  +
 102 -+    linux* | k*bsd*-gnu)
 103 ++    linux* | k*bsd*-gnu | kopensolaris*-gnu)
 104  +      case $cc_basename in
 105  +      icc* | ecc*)
 106  +      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 107 @@ -7451,7 +7451,7 @@
 108  +  cygwin* | mingw*)
 109  +    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
 110  +  ;;
 111 -+  linux* | k*bsd*-gnu)
 112 ++  linux* | k*bsd*-gnu | kopensolaris*-gnu)
 113  +    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
 114  +  ;;
 115  +  *)
 116 @@ -7627,7 +7627,7 @@
 117  +      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 118  +      ;;
 119  +
 120 -+    gnu* | linux* | k*bsd*-gnu)
 121 ++    gnu* | linux* | k*bsd*-gnu | kopensolaris*-gnu)
 122  +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 123  +      tmp_addflag=
 124  +      case $cc_basename,$host_cpu in
 125 @@ -9127,8 +9127,8 @@
 126  -m4_include([m4/po.m4])
 127  -m4_include([m4/progtest.m4])
 128  diff -urNad aspell-0.60.6~/config.guess aspell-0.60.6/config.guess
 129 ---- aspell-0.60.6~/config.guess        2008-06-22 23:56:16.000000000 -0400
 130 -+++ aspell-0.60.6/config.guess 2008-06-24 13:45:16.000000000 -0400
 131 +--- aspell-0.60.6~/config.guess        2008-04-07 00:21:16.000000000 -0400
 132 ++++ aspell-0.60.6/config.guess 2008-09-28 05:47:35.362683869 -0400
 133  @@ -4,7 +4,7 @@
 134   #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 135   #   Free Software Foundation, Inc.
 136 @@ -9151,8 +9151,8 @@
 137   If the version you run ($0) is already up to date, please
 138   send the following data and any information you think might be
 139  diff -urNad aspell-0.60.6~/configure aspell-0.60.6/configure
 140 ---- aspell-0.60.6~/configure   2008-06-22 23:56:10.000000000 -0400
 141 -+++ aspell-0.60.6/configure    2008-06-24 13:45:16.000000000 -0400
 142 +--- aspell-0.60.6~/configure   2008-04-07 00:31:31.000000000 -0400
 143 ++++ aspell-0.60.6/configure    2008-09-28 05:47:49.866324768 -0400
 144  @@ -553,22 +553,22 @@
 145   # Check that we are running under the correct shell.
 146   SHELL=${CONFIG_SHELL-/bin/sh}
 147 @@ -10266,7 +10266,12 @@
 148       case $host_cpu in
 149       i*86 )
 150         # Not sure whether the presence of OpenBSD here was a mistake.
 151 -@@ -5508,8 +5045,8 @@
 152 +@@ -5504,12 +5041,12 @@
 153 +   ;;
 154 +
 155 + # This must be Linux ELF.
 156 +-linux* | k*bsd*-gnu)
 157 ++linux* | k*bsd*-gnu | kopensolaris*-gnu)
 158     lt_cv_deplibs_check_method=pass_all
 159     ;;
 160
 161 @@ -11920,7 +11925,7 @@
 162
 163  -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 164  -   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 165 - fi
 166 +-fi
 167  -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
 168  -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
 169  -if test "$ac_test_CXXFLAGS" = set; then
 170 @@ -11937,7 +11942,7 @@
 171  -  else
 172  -    CXXFLAGS=
 173  -  fi
 174 --fi
 175 + fi
 176  -ac_ext=cpp
 177  -ac_cpp='$CXXCPP $CPPFLAGS'
 178  -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 179 @@ -12578,7 +12583,7 @@
 180  +  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 181  +  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
 182  +  ;;
 183 -+linux* | k*bsd*-gnu)
 184 ++linux* | k*bsd*-gnu | kopensolaris*-gnu)
 185  +  if test "$host_cpu" = ia64; then
 186  +    symcode='[ABCDGIRSTW]'
 187  +    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 188 @@ -13759,12 +13764,13 @@
 189         lt_prog_compiler_static='-non_shared'
 190         ;;
 191
 192 +-    linux* | k*bsd*-gnu)
 193  +    newsos6)
 194  +      lt_prog_compiler_pic='-KPIC'
 195  +      lt_prog_compiler_static='-Bstatic'
 196  +      ;;
 197  +
 198 -     linux* | k*bsd*-gnu)
 199 ++    linux* | k*bsd*-gnu | kopensolaris*-gnu)
 200         case $cc_basename in
 201  -      icc* | ecc* | ifort*)
 202  +      icc* | ecc*)
 203 @@ -14212,7 +14218,7 @@
 204  -      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
 205  -       && test "$tmp_diet" = no
 206  -      then
 207 -+    gnu* | linux* | k*bsd*-gnu)
 208 ++    gnu* | linux* | k*bsd*-gnu | kopensolaris*-gnu)
 209  +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 210         tmp_addflag=
 211  -      tmp_sharedflag='-shared'
 212 @@ -15223,6 +15229,15 @@
 213       shrext_cmds='.sl'
 214       dynamic_linker="$host_os dld.sl"
 215       shlibpath_var=SHLIB_PATH
 216 +@@ -10721,7 +9636,7 @@
 217 +   ;;
 218 +
 219 + # This must be Linux ELF.
 220 +-linux* | k*bsd*-gnu)
 221 ++linux* | k*bsd*-gnu | kopensolaris*-gnu)
 222 +   version_type=linux
 223 +   need_lib_prefix=no
 224 +   need_version=no
 225  @@ -10730,60 +9645,6 @@
 226     finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 227     shlibpath_var=LD_LIBRARY_PATH
 228 @@ -17228,7 +17243,7 @@
 229  +    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 230  +    hardcode_libdir_separator_CXX=:
 231  +    ;;
 232 -+  linux* | k*bsd*-gnu)
 233 ++  linux* | k*bsd*-gnu | kopensolaris*-gnu)
 234  +    case $cc_basename in
 235  +      KCC*)
 236  +      # Kuck and Associates, Inc. (KAI) C++ Compiler
 237 @@ -18330,10 +18345,10 @@
 238  -
 239  -
 240  -
 241 -
 242  -
 243  -
 244  -
 245 +
 246  -
 247  -
 248  -
 249 @@ -18403,7 +18418,15 @@
 250         dgux*)
 251         case $cc_basename in
 252           ec++*)
 253 -@@ -13638,14 +12865,14 @@
 254 +@@ -13631,21 +12858,21 @@
 255 +           ;;
 256 +       esac
 257 +       ;;
 258 +-      linux* | k*bsd*-gnu)
 259 ++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
 260 +       case $cc_basename in
 261 +         KCC*)
 262 +           # KAI C++ Compiler
 263             lt_prog_compiler_wl_CXX='--backend -Wl,'
 264             lt_prog_compiler_pic_CXX='-fPIC'
 265             ;;
 266 @@ -18733,7 +18756,7 @@
 267  -    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
 268  +    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 269  +  ;;
 270 -+  linux* | k*bsd*-gnu)
 271 ++  linux* | k*bsd*-gnu | kopensolaris*-gnu)
 272  +    link_all_deplibs_CXX=no
 273     ;;
 274     *)
 275 @@ -19129,7 +19152,7 @@
 276  +  ;;
 277  +
 278  +# This must be Linux ELF.
 279 -+linux* | k*bsd*-gnu)
 280 ++linux* | k*bsd*-gnu | kopensolaris*-gnu)
 281  +  version_type=linux
 282  +  need_lib_prefix=no
 283  +  need_version=no
 284 @@ -19593,7 +19616,7 @@
 285
 286  +# Old archive suffix (normally "a").
 287  +libext="$libext"
 288 -+
 289 +
 290  +# Shared library suffix (normally ".so").
 291  +shrext_cmds='$shrext_cmds'
 292  +
 293 @@ -19636,7 +19659,7 @@
 294  +
 295  +# Compiler flag to allow reflexive dlopens.
 296  +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
 297 -
 298 ++
 299  +# Compiler flag to generate shared objects directly from archives.
 300  +whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
 301
 302 @@ -20111,7 +20134,7 @@
 303  +      lt_prog_compiler_static_F77='-Bstatic'
 304  +      ;;
 305  +
 306 -+    linux* | k*bsd*-gnu)
 307 ++    linux* | k*bsd*-gnu | kopensolaris*-gnu)
 308  +      case $cc_basename in
 309  +      icc* | ecc*)
 310  +      lt_prog_compiler_wl_F77='-Wl,'
 311 @@ -20571,7 +20594,7 @@
 312  +      archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 313  +      ;;
 314  +
 315 -+    gnu* | linux* | k*bsd*-gnu)
 316 ++    gnu* | linux* | k*bsd*-gnu | kopensolaris*-gnu)
 317  +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 318  +      tmp_addflag=
 319  +      case $cc_basename,$host_cpu in
 320 @@ -21548,6 +21571,15 @@
 321       shrext_cmds='.sl'
 322       dynamic_linker="$host_os dld.sl"
 323       shlibpath_var=SHLIB_PATH
 324 +@@ -14538,7 +16248,7 @@
 325 +   ;;
 326 +
 327 + # This must be Linux ELF.
 328 +-linux* | k*bsd*-gnu)
 329 ++linux* | k*bsd*-gnu | kopensolaris*-gnu)
 330 +   version_type=linux
 331 +   need_lib_prefix=no
 332 +   need_version=no
 333  @@ -14547,12 +16257,1651 @@
 334     finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 335     shlibpath_var=LD_LIBRARY_PATH
 336 @@ -22509,7 +22541,7 @@
 337  +      lt_prog_compiler_static_GCJ='-Bstatic'
 338  +      ;;
 339  +
 340 -+    linux* | k*bsd*-gnu)
 341 ++    linux* | k*bsd*-gnu | kopensolaris*-gnu)
 342  +      case $cc_basename in
 343  +      icc* | ecc*)
 344  +      lt_prog_compiler_wl_GCJ='-Wl,'
 345 @@ -22969,7 +23001,7 @@
 346  +      archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 347  +      ;;
 348  +
 349 -+    gnu* | linux* | k*bsd*-gnu)
 350 ++    gnu* | linux* | k*bsd*-gnu | kopensolaris*-gnu)
 351  +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 352  +      tmp_addflag=
 353  +      case $cc_basename,$host_cpu in
 354 @@ -23228,7 +23260,7 @@
 355  +else
 356  +  echo "$as_me: failed program was:" >&5
 357  +sed 's/^/| /' conftest.$ac_ext >&5
 358 -
 359 ++
 360  +
 361  +fi
 362  +
 363 @@ -23278,7 +23310,7 @@
 364  +       test ! -s conftest.err
 365  +       } && test -s conftest$ac_exeext &&
 366  +       $as_test_x conftest$ac_exeext; then
 367 -+
 368 +
 369  +lt_aix_libpath_sed='
 370  +    /Import File Strings/,/^$/ {
 371  +      /^0/ {
 372 @@ -23301,7 +23333,7 @@
 373  -  LDFLAGS=$save_LDFLAGS
 374  -  libdir=$save_libdir
 375  +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 376 -+
 377 +
 378  +       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
 379  +        # Warning - without using the other run time loading flags,
 380  +        # -berok will link without error, but may produce a broken library.
 381 @@ -23939,7 +23971,7 @@
 382  +      dlpath=$dir/\$dldll~
 383  +       $rm \$dlpath'
 384  +    shlibpath_overrides_runpath=yes
 385 -
 386 ++
 387  +    case $host_os in
 388  +    cygwin*)
 389  +      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
 390 @@ -24160,7 +24192,7 @@
 391  +  ;;
 392  +
 393  +# This must be Linux ELF.
 394 -+linux* | k*bsd*-gnu)
 395 ++linux* | k*bsd*-gnu | kopensolaris*-gnu)
 396  +  version_type=linux
 397  +  need_lib_prefix=no
 398  +  need_version=no
 399 @@ -24409,7 +24441,7 @@
 400  +    fix_srcfile_path_GCJ \
 401  +    exclude_expsyms_GCJ \
 402  +    include_expsyms_GCJ; do
 403 -
 404 ++
 405  +    case $var in
 406  +    old_archive_cmds_GCJ | \
 407  +    old_archive_from_new_cmds_GCJ | \
 408 @@ -24431,7 +24463,7 @@
 409  +      ;;
 410  +    esac
 411  +  done
 412 -
 413 ++
 414  +  case $lt_echo in
 415  +  *'\$0 --fallback-echo"')
 416  +    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
 417 @@ -24534,10 +24566,10 @@
 418
 419  +# Old archive suffix (normally "a").
 420  +libext="$libext"
 421 -+
 422 +
 423  +# Shared library suffix (normally ".so").
 424  +shrext_cmds='$shrext_cmds'
 425 -+
 426 +
 427  +# Executable file suffix (normally "").
 428  +exeext="$exeext"
 429  +
 430 @@ -25573,6 +25605,24 @@
 431                   additional_includedir="$basedir/include"
 432                   ;;
 433               esac
 434 +@@ -16090,7 +21325,7 @@
 435 +                 if test "X$additional_includedir" = "X/usr/local/include"; then
 436 +                   if test -n "$GCC"; then
 437 +                     case $host_os in
 438 +-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
 439 ++                      linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu) haveit=yes;;
 440 +                     esac
 441 +                   fi
 442 +                 fi
 443 +@@ -16134,7 +21369,7 @@
 444 +                       if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
 445 +                         if test -n "$GCC"; then
 446 +                           case $host_os in
 447 +-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
 448 ++                            linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu) haveit=yes;;
 449 +                           esac
 450 +                         fi
 451 +                       fi
 452  @@ -16231,21 +21466,21 @@
 453       done
 454     done
 455 @@ -25906,6 +25956,24 @@
 456                   additional_includedir="$basedir/include"
 457                   ;;
 458               esac
 459 +@@ -16890,7 +22293,7 @@
 460 +                 if test "X$additional_includedir" = "X/usr/local/include"; then
 461 +                   if test -n "$GCC"; then
 462 +                     case $host_os in
 463 +-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
 464 ++                      linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu) haveit=yes;;
 465 +                     esac
 466 +                   fi
 467 +                 fi
 468 +@@ -16934,7 +22337,7 @@
 469 +                       if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
 470 +                         if test -n "$GCC"; then
 471 +                           case $host_os in
 472 +-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
 473 ++                            linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu) haveit=yes;;
 474 +                           esac
 475 +                         fi
 476 +                       fi
 477  @@ -17031,21 +22434,21 @@
 478       done
 479     done
 480 @@ -27127,8 +27195,8 @@
 481       for ac_file in $CONFIG_FILES; do
 482         # Support "outfile[:infile[:infile...]]"
 483  diff -urNad aspell-0.60.6~/examples/Makefile.in aspell-0.60.6/examples/Makefile.in
 484 ---- aspell-0.60.6~/examples/Makefile.in        2008-06-22 23:58:26.000000000 -0400
 485 -+++ aspell-0.60.6/examples/Makefile.in 2008-06-24 13:45:16.000000000 -0400
 486 +--- aspell-0.60.6~/examples/Makefile.in        2008-04-07 00:56:26.000000000 -0400
 487 ++++ aspell-0.60.6/examples/Makefile.in 2008-09-28 05:47:35.382531101 -0400
 488  @@ -35,14 +35,7 @@
 489   subdir = examples
 490   DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 491 @@ -27204,8 +27272,8 @@
 492   mkdir_p = @mkdir_p@
 493   oldincludedir = @oldincludedir@
 494  diff -urNad aspell-0.60.6~/gen/settings.h.in aspell-0.60.6/gen/settings.h.in
 495 ---- aspell-0.60.6~/gen/settings.h.in   2008-06-22 23:56:51.000000000 -0400
 496 -+++ aspell-0.60.6/gen/settings.h.in    2008-06-24 13:45:16.000000000 -0400
 497 +--- aspell-0.60.6~/gen/settings.h.in   2008-04-07 00:25:02.000000000 -0400
 498 ++++ aspell-0.60.6/gen/settings.h.in    2008-09-28 05:47:35.382795295 -0400
 499  @@ -53,7 +53,7 @@
 500   /* Define if the GNU gettext() function is already present or preinstalled. */
 501   #undef HAVE_GETTEXT
 502 @@ -27227,8 +27295,8 @@
 503   #undef NO_MINUS_C_MINUS_O
 504
 505  diff -urNad aspell-0.60.6~/lib5/Makefile.in aspell-0.60.6/lib5/Makefile.in
 506 ---- aspell-0.60.6~/lib5/Makefile.in    2008-06-22 23:58:18.000000000 -0400
 507 -+++ aspell-0.60.6/lib5/Makefile.in     2008-06-24 13:45:16.000000000 -0400
 508 +--- aspell-0.60.6~/lib5/Makefile.in    2008-04-07 00:56:26.000000000 -0400
 509 ++++ aspell-0.60.6/lib5/Makefile.in     2008-09-28 05:47:35.383181362 -0400
 510  @@ -35,14 +35,7 @@
 511   subdir = lib5
 512   DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 513 @@ -27304,8 +27372,8 @@
 514   mkdir_p = @mkdir_p@
 515   oldincludedir = @oldincludedir@
 516  diff -urNad aspell-0.60.6~/ltmain.sh aspell-0.60.6/ltmain.sh
 517 ---- aspell-0.60.6~/ltmain.sh   2008-06-22 23:56:21.000000000 -0400
 518 -+++ aspell-0.60.6/ltmain.sh    2008-06-24 13:45:16.000000000 -0400
 519 +--- aspell-0.60.6~/ltmain.sh   2008-04-07 00:24:11.000000000 -0400
 520 ++++ aspell-0.60.6/ltmain.sh    2008-09-28 05:47:35.391531087 -0400
 521  @@ -1,83 +1,52 @@
 522  -# Generated from ltmain.m4sh.
 523  -
 524 @@ -36966,9 +37034,99 @@
 525   # End:
 526  -# vi:sw=2
 527  -
 528 +diff -urNad aspell-0.60.6~/m4/lib-link.m4 aspell-0.60.6/m4/lib-link.m4
 529 +--- aspell-0.60.6~/m4/lib-link.m4      2006-12-19 06:03:29.000000000 -0500
 530 ++++ aspell-0.60.6/m4/lib-link.m4       2008-09-28 05:48:16.308820016 -0400
 531 +@@ -367,7 +367,7 @@
 532 +                 if test "X$additional_includedir" = "X/usr/local/include"; then
 533 +                   if test -n "$GCC"; then
 534 +                     case $host_os in
 535 +-                      linux* | gnu* | k*bsd*-gnu) haveit=yes;;
 536 ++                      linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu) haveit=yes;;
 537 +                     esac
 538 +                   fi
 539 +                 fi
 540 +@@ -416,7 +416,7 @@
 541 +                       if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
 542 +                         if test -n "$GCC"; then
 543 +                           case $host_os in
 544 +-                            linux* | gnu* | k*bsd*-gnu) haveit=yes;;
 545 ++                            linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu) haveit=yes;;
 546 +                           esac
 547 +                         fi
 548 +                       fi
 549 +diff -urNad aspell-0.60.6~/m4/lib-prefix.m4 aspell-0.60.6/m4/lib-prefix.m4
 550 +--- aspell-0.60.6~/m4/lib-prefix.m4    2006-11-12 00:58:37.000000000 -0500
 551 ++++ aspell-0.60.6/m4/lib-prefix.m4     2008-09-28 05:48:29.768193654 -0400
 552 +@@ -70,7 +70,7 @@
 553 +         if test "X$additional_includedir" = "X/usr/local/include"; then
 554 +           if test -n "$GCC"; then
 555 +             case $host_os in
 556 +-              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
 557 ++              linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu) haveit=yes;;
 558 +             esac
 559 +           fi
 560 +         fi
 561 +diff -urNad aspell-0.60.6~/m4/libtool.m4 aspell-0.60.6/m4/libtool.m4
 562 +--- aspell-0.60.6~/m4/libtool.m4       2008-04-07 00:24:11.000000000 -0400
 563 ++++ aspell-0.60.6/m4/libtool.m4        2008-09-28 05:48:15.132367660 -0400
 564 +@@ -2435,7 +2435,7 @@
 565 +   ;;
 566 +
 567 + # This must be Linux ELF.
 568 +-linux* | k*bsd*-gnu)
 569 ++linux* | k*bsd*-gnu | kopensolaris*-gnu)
 570 +   version_type=linux
 571 +   need_lib_prefix=no
 572 +   need_version=no
 573 +@@ -3055,7 +3055,7 @@
 574 +   ;;
 575 +
 576 + # This must be Linux ELF.
 577 +-linux* | k*bsd*-gnu)
 578 ++linux* | k*bsd*-gnu | kopensolaris*-gnu)
 579 +   lt_cv_deplibs_check_method=pass_all
 580 +   ;;
 581 +
 582 +@@ -3675,7 +3675,7 @@
 583 +           ;;
 584 +       esac
 585 +       ;;
 586 +-      linux* | k*bsd*-gnu)
 587 ++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
 588 +       case $cc_basename in
 589 +         KCC*)
 590 +           # KAI C++ Compiler
 591 +@@ -3951,7 +3951,7 @@
 592 +       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 593 +       ;;
 594 +
 595 +-    linux* | k*bsd*-gnu)
 596 ++    linux* | k*bsd*-gnu | kopensolaris*-gnu)
 597 +       case $cc_basename in
 598 +       icc* | ecc* | ifort*)
 599 +       _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 600 +@@ -4318,7 +4318,7 @@
 601 +       _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 602 +       ;;
 603 +
 604 +-    gnu* | linux* | tpf* | k*bsd*-gnu)
 605 ++    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
 606 +       tmp_diet=no
 607 +       if test "$host_os" = linux-dietlibc; then
 608 +       case $cc_basename in
 609 +@@ -5796,7 +5796,7 @@
 610 +         _LT_TAGVAR(inherit_rpath, $1)=yes
 611 +         ;;
 612 +
 613 +-      linux* | k*bsd*-gnu)
 614 ++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
 615 +         case $cc_basename in
 616 +           KCC*)
 617 +           # Kuck and Associates, Inc. (KAI) C++ Compiler
 618  diff -urNad aspell-0.60.6~/manual/Makefile.in aspell-0.60.6/manual/Makefile.in
 619 ---- aspell-0.60.6~/manual/Makefile.in  2008-06-22 23:58:18.000000000 -0400
 620 -+++ aspell-0.60.6/manual/Makefile.in   2008-06-24 13:45:16.000000000 -0400
 621 +--- aspell-0.60.6~/manual/Makefile.in  2008-04-07 00:56:27.000000000 -0400
 622 ++++ aspell-0.60.6/manual/Makefile.in   2008-09-28 05:47:35.392031399 -0400
 623  @@ -34,14 +34,7 @@
 624   DIST_COMMON = $(aspell_TEXINFOS) $(aspell_dev_TEXINFOS) \
 625         $(srcdir)/Makefile.am $(srcdir)/Makefile.in texinfo.tex
 626 @@ -37044,8 +37202,8 @@
 627   mkdir_p = @mkdir_p@
 628   oldincludedir = @oldincludedir@
 629  diff -urNad aspell-0.60.6~/myspell/Makefile.in aspell-0.60.6/myspell/Makefile.in
 630 ---- aspell-0.60.6~/myspell/Makefile.in 2008-06-22 23:58:17.000000000 -0400
 631 -+++ aspell-0.60.6/myspell/Makefile.in  2008-06-24 13:45:16.000000000 -0400
 632 +--- aspell-0.60.6~/myspell/Makefile.in 2008-04-07 00:56:27.000000000 -0400
 633 ++++ aspell-0.60.6/myspell/Makefile.in  2008-09-28 05:47:35.392391560 -0400
 634  @@ -35,14 +35,7 @@
 635   subdir = myspell
 636   DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 637 @@ -37122,7 +37280,7 @@
 638   oldincludedir = @oldincludedir@
 639  diff -urNad aspell-0.60.6~/po/Makevars.template aspell-0.60.6/po/Makevars.template
 640  --- aspell-0.60.6~/po/Makevars.template        1969-12-31 19:00:00.000000000 -0500
 641 -+++ aspell-0.60.6/po/Makevars.template 2008-06-24 13:45:16.000000000 -0400
 642 ++++ aspell-0.60.6/po/Makevars.template 2008-09-28 05:47:35.392654175 -0400
 643  @@ -0,0 +1,41 @@
 644  +# Makefile variables for PO directory in any package using GNU gettext.
 645  +