3 files changed, 39 insertions, 51 deletions

diff --git a/textproc/aspell/files/patch-aa b/textproc/aspell/files/patch-aa
deleted file mode 100644
index 5d38107e6922..000000000000
--- a/textproc/aspell/files/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
---- manual/Makefile.in.orig	Tue Jul 27 19:07:44 1999
-+++ manual/Makefile.in	Thu Aug 19 11:03:13 1999
-@@ -85,7 +85,9 @@
- 
- MAINTAINERCLEANFILES =  manual.dvi manual.log manual.aux
- 
-+ifndef NOPORTDOCS
- SUBDIRS = man-html man-text
-+endif
- 
- EXTRA_DIST = ${pkgdoc_DATA}              html.sty html2txt.pl edit-man manual.per man-proc.pl
- 
-@@ -260,7 +262,11 @@
- install-data: install-data-recursive
- 
- install-am: all-am
-+ifndef NOPORTDOCS
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+else
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am
-+endif
- install: install-recursive
- uninstall-am: uninstall-pkgdocDATA
- uninstall: uninstall-recursive
diff --git a/textproc/aspell/files/patch-ah b/textproc/aspell/files/patch-ah
index 3ca671510ee3..a1886a062e02 100644
--- a/textproc/aspell/files/patch-ah
+++ b/textproc/aspell/files/patch-ah
@@ -1,29 +1,26 @@
---- configure.orig	Sat Jun 10 16:20:16 2000
-+++ configure	Tue Jun 13 13:57:08 2000
-@@ -862,7 +862,7 @@
-   enableval="$enable_dict_dir"
-   dictdir=$enable_dict_dir
- else
--  dictdir=${libdir}/aspell 
-+  dictdir=${datadir}/aspell 
- fi
+--- configure.orig	Thu Jan 25 09:42:03 2001
++++ configure	Sat Feb 17 06:18:28 2001
+@@ -2276,7 +2276,7 @@
+ deplibs_check_method="$deplibs_check_method" \
+ file_magic_cmd="$file_magic_cmd" \
+ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \
+---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \
++--build="$build" $ac_aux_dir/ltmain.sh $host \
+ || { echo "configure: error: libtool tag configuration failed" 1>&2; exit 1; }
+ CC="$lt_save_CC"
+ CFLAGS="$lt_save_CFLAGS"
+@@ -2798,10 +2798,10 @@
+     top_srcdir="$ac_dots$ac_given_srcdir" ;;
+   esac
  
+-  case "$ac_given_INSTALL" in
+-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
+-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+-  esac
++#  case "$ac_given_INSTALL" in
++#  [/$]*) INSTALL="$ac_given_INSTALL" ;;
++#  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
++#  esac
  
-@@ -872,7 +872,7 @@
-   enableval="$enable_doc_dir"
-   pkgdocdir=$enable_doc_dir
- else
--  pkgdocdir=\${prefix}/doc/aspell 
-+  pkgdocdir=\${prefix}/share/doc/aspell 
- fi
- 
- 
-@@ -2197,7 +2197,7 @@
- objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \
- deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \
- ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $lt_target \
-+$libtool_flags --build="$build" $ac_aux_dir/ltmain.sh $lt_target \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
- 
- # Reload cache, that may have been modified by ltconfig
+   echo creating "$ac_file"
+   rm -f "$ac_file"
diff --git a/textproc/aspell/files/patch-ak b/textproc/aspell/files/patch-ak
new file mode 100644
index 000000000000..28c00c58c95f
--- /dev/null
+++ b/textproc/aspell/files/patch-ak
@@ -0,0 +1,15 @@
+--- Makefile.in.orig	Mon Jan 29 10:13:57 2001
++++ Makefile.in	Fri Feb 16 19:58:25 2001
+@@ -84,7 +84,11 @@
+ 
+ AUTOMAKE_OPTIONS = foreign
+ 
+-SUBDIRS = util filter lib src data scripts manual pspell-module
++ifndef NOPORTDOCS
++MANUALSUBDIR = manual
++endif
++
++SUBDIRS = util filter lib src data scripts $(MANUALSUBDIR) pspell-module
+ 
+ EXTRA_DIST = TODO misc/* README-bin        mkbindist.sh long_name_test.hh        ltcf-c.sh ltcf-cxx.sh 
+