6 files changed, 120 insertions, 119 deletions

diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 6a5c10750000..b2d90c0f6608 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -6,22 +6,24 @@
 #
 
 PORTNAME=	aspell
-PORTVERSION=	0.32.5
+PORTVERSION=	0.33
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-.32.5
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/^0//}
 
 MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	pspell.4:${PORTSDIR}/textproc/pspell
 
 USE_NEWGCC=	yes
+USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-INSTALLS_SHLIB=	yes
-CONFIGURE_ENV+=	CXXFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-USE_GMAKE=	yes
-MAKE_ARGS+=	NOPORTDOCS=${NOPORTDOCS}
+CONFIGURE_ARGS=	--enable-dict-dir=${PREFIX}/share/aspell \
+		--enable-doc-dir=${PREFIX}/share/doc/aspell
+MAKE_ARGS=	NOPORTDOCS=${NOPORTDOCS}
+INSTALLS_SHLIB=	yes
 
 .include <bsd.port.mk>
diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo
index ffa20a9b1115..8d46afe9e369 100644
--- a/textproc/aspell/distinfo
+++ b/textproc/aspell/distinfo
@@ -1 +1 @@
-MD5 (aspell-.32.5.tar.gz) = 15723a7a0373977c21536a3134d5b7d8
+MD5 (aspell-.33.tar.gz) = 189073d9a29e924db41fc2aa8ac72ec7
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 
+ 
diff --git a/textproc/aspell/pkg-plist b/textproc/aspell/pkg-plist
index 3508fc3abde9..52da48dbaa56 100644
--- a/textproc/aspell/pkg-plist
+++ b/textproc/aspell/pkg-plist
@@ -45,6 +45,7 @@ include/aspell/leditdist.hh
 include/aspell/manager.hh
 include/aspell/map_repl.hh
 include/aspell/map_repl_read.hh
+include/aspell/matrix.hh
 include/aspell/object.hh
 include/aspell/phonet.hh
 include/aspell/phonetic.hh
@@ -73,6 +74,7 @@ include/aspell/tl_string_map.hh
 include/aspell/token.hh
 include/aspell/trim_space.hh
 include/aspell/try_hard.hh
+include/aspell/typo_editdist.hh
 include/aspell/urlskip-t.hh
 include/aspell/urlskip.hh
 include/aspell/utf8-t.hh
@@ -82,30 +84,26 @@ include/aspell/vector_hash.hh
 include/aspell/weights.hh
 lib/libaspell.a
 lib/libaspell.so
-lib/libaspell.so.8
+lib/libaspell.so.9
 lib/libpspell_aspell.a
 lib/libpspell_aspell.so
-lib/libpspell_aspell.so.1
+lib/libpspell_aspell.so.2
 share/aspell/ASCII.dat
 share/aspell/ASCII.map
 share/aspell/SGML.map
-share/aspell/american-lrg-only
-share/aspell/american-lrg.multi
 share/aspell/american-med-only
 share/aspell/american-med.multi
 share/aspell/american.multi
-share/aspell/british-lrg-only
-share/aspell/british-lrg.multi
 share/aspell/british-med-only
 share/aspell/british-med.multi
 share/aspell/british.multi
-share/aspell/canadian-lrg-only
-share/aspell/canadian-lrg.multi
 share/aspell/canadian-med-only
 share/aspell/canadian-med.multi
 share/aspell/canadian.multi
-share/aspell/english-lrg-only
 share/aspell/english-med-only
+share/aspell/english-variant-0
+share/aspell/english-variant-1
+share/aspell/english-variant-2
 share/aspell/english.dat
 share/aspell/english.multi
 share/aspell/english_phonet.dat
@@ -133,65 +131,78 @@ share/aspell/ispell
 share/aspell/koi8-f.dat
 share/aspell/koi8-r.dat
 share/aspell/spell
+share/aspell/standard.kbd
 share/aspell/unicode.dat
 share/aspell/viscii.dat
 share/aspell/viscii.map
-share/doc/aspell/man-html/1_Introduction.html
-share/doc/aspell/man-html/2_Getting.html
-share/doc/aspell/man-html/3_Aspell.html
-share/doc/aspell/man-html/4_Library.html
-share/doc/aspell/man-html/5_International.html
-share/doc/aspell/man-html/6_How.html
-share/doc/aspell/man-html/A_Changelog.html
-share/doc/aspell/man-html/About_this.html
-share/doc/aspell/man-html/B_Do.html
-share/doc/aspell/man-html/C_Support.html
-share/doc/aspell/man-html/Contents.html
-share/doc/aspell/man-html/D_Credits.html
-share/doc/aspell/man-html/E_Glossary.html
-share/doc/aspell/man-html/F_Copyright.html
-share/doc/aspell/man-html/contents.png
-share/doc/aspell/man-html/index.html
-share/doc/aspell/man-html/manual.css
-share/doc/aspell/man-html/manual.html
-share/doc/aspell/man-html/next.png
-share/doc/aspell/man-html/next_g.png
-share/doc/aspell/man-html/prev.png
-share/doc/aspell/man-html/prev_g.png
-share/doc/aspell/man-html/up.png
-share/doc/aspell/man-html/up_g.png
-share/doc/aspell/man-text/1_Introduction.txt
-share/doc/aspell/man-text/2_Getting.txt
-share/doc/aspell/man-text/3_Aspell.txt
-share/doc/aspell/man-text/4_Library.txt
-share/doc/aspell/man-text/5_International.txt
-share/doc/aspell/man-text/6_How.txt
-share/doc/aspell/man-text/A_Changelog.txt
-share/doc/aspell/man-text/About_this.txt
-share/doc/aspell/man-text/B_Do.txt
-share/doc/aspell/man-text/C_Support.txt
-share/doc/aspell/man-text/Contents.txt
-share/doc/aspell/man-text/D_Credits.txt
-share/doc/aspell/man-text/E_Glossary.txt
-share/doc/aspell/man-text/F_Copyright.txt
-share/doc/aspell/man-text/index.txt
-share/doc/aspell/man-text/manual.txt
-share/doc/aspell/manual.aux
-share/doc/aspell/manual.dvi
-share/doc/aspell/manual.tex
-share/doc/aspell/manual2.lyx
+%%PORTDOCS%%share/doc/aspell/man-html/1_Introduction.html
+%%PORTDOCS%%share/doc/aspell/man-html/2_Getting.html
+%%PORTDOCS%%share/doc/aspell/man-html/3_Aspell.html
+%%PORTDOCS%%share/doc/aspell/man-html/3_Basic.html
+%%PORTDOCS%%share/doc/aspell/man-html/4_Advanced.html
+%%PORTDOCS%%share/doc/aspell/man-html/4_Library.html
+%%PORTDOCS%%share/doc/aspell/man-html/4_Managing.html
+%%PORTDOCS%%share/doc/aspell/man-html/5_Customizing.html
+%%PORTDOCS%%share/doc/aspell/man-html/5_International.html
+%%PORTDOCS%%share/doc/aspell/man-html/6_How.html
+%%PORTDOCS%%share/doc/aspell/man-html/6_Writing.html
+%%PORTDOCS%%share/doc/aspell/man-html/7_International.html
+%%PORTDOCS%%share/doc/aspell/man-html/8_How.html
+%%PORTDOCS%%share/doc/aspell/man-html/A_Changelog.html
+%%PORTDOCS%%share/doc/aspell/man-html/About_this.html
+%%PORTDOCS%%share/doc/aspell/man-html/B_Do.html
+%%PORTDOCS%%share/doc/aspell/man-html/C_Support.html
+%%PORTDOCS%%share/doc/aspell/man-html/Contents.html
+%%PORTDOCS%%share/doc/aspell/man-html/D_Credits.html
+%%PORTDOCS%%share/doc/aspell/man-html/E_Glossary.html
+%%PORTDOCS%%share/doc/aspell/man-html/F_Copyright.html
+%%PORTDOCS%%share/doc/aspell/man-html/contents.png
+%%PORTDOCS%%share/doc/aspell/man-html/crossref.png
+%%PORTDOCS%%share/doc/aspell/man-html/index.html
+%%PORTDOCS%%share/doc/aspell/man-html/manual.css
+%%PORTDOCS%%share/doc/aspell/man-html/manual.html
+%%PORTDOCS%%share/doc/aspell/man-html/next.png
+%%PORTDOCS%%share/doc/aspell/man-html/next_g.png
+%%PORTDOCS%%share/doc/aspell/man-html/prev.png
+%%PORTDOCS%%share/doc/aspell/man-html/prev_g.png
+%%PORTDOCS%%share/doc/aspell/man-html/up.png
+%%PORTDOCS%%share/doc/aspell/man-html/up_g.png
+%%PORTDOCS%%share/doc/aspell/man-text/1_Introduction.txt
+%%PORTDOCS%%share/doc/aspell/man-text/2_Getting.txt
+%%PORTDOCS%%share/doc/aspell/man-text/3_Aspell.txt
+%%PORTDOCS%%share/doc/aspell/man-text/3_Basic.txt
+%%PORTDOCS%%share/doc/aspell/man-text/4_Advanced.txt
+%%PORTDOCS%%share/doc/aspell/man-text/4_Library.txt
+%%PORTDOCS%%share/doc/aspell/man-text/4_Managing.txt
+%%PORTDOCS%%share/doc/aspell/man-text/5_Customizing.txt
+%%PORTDOCS%%share/doc/aspell/man-text/5_International.txt
+%%PORTDOCS%%share/doc/aspell/man-text/6_How.txt
+%%PORTDOCS%%share/doc/aspell/man-text/6_Writing.txt
+%%PORTDOCS%%share/doc/aspell/man-text/7_International.txt
+%%PORTDOCS%%share/doc/aspell/man-text/8_How.txt
+%%PORTDOCS%%share/doc/aspell/man-text/A_Changelog.txt
+%%PORTDOCS%%share/doc/aspell/man-text/About_this.txt
+%%PORTDOCS%%share/doc/aspell/man-text/B_Do.txt
+%%PORTDOCS%%share/doc/aspell/man-text/C_Support.txt
+%%PORTDOCS%%share/doc/aspell/man-text/Contents.txt
+%%PORTDOCS%%share/doc/aspell/man-text/D_Credits.txt
+%%PORTDOCS%%share/doc/aspell/man-text/E_Glossary.txt
+%%PORTDOCS%%share/doc/aspell/man-text/F_Copyright.txt
+%%PORTDOCS%%share/doc/aspell/man-text/index.txt
+%%PORTDOCS%%share/doc/aspell/man-text/manual.txt
+%%PORTDOCS%%share/doc/aspell/manual.aux
+%%PORTDOCS%%share/doc/aspell/manual.dvi
+%%PORTDOCS%%share/doc/aspell/manual.tex
+%%PORTDOCS%%share/doc/aspell/manual2.lyx
 share/pspell/en-american-aspell.pwli
-share/pspell/en-american-lrg-aspell.pwli
 share/pspell/en-american-med-aspell.pwli
 share/pspell/en-aspell.pwli
 share/pspell/en-british-aspell.pwli
-share/pspell/en-british-lrg-aspell.pwli
 share/pspell/en-british-med-aspell.pwli
 share/pspell/en-canadian-aspell.pwli
-share/pspell/en-canadian-lrg-aspell.pwli 
-share/pspell/en-canadian-med-aspell.pwli 
-@dirrm include/aspell
+share/pspell/en-canadian-med-aspell.pwli
+%%PORTDOCS%%@dirrm share/doc/aspell/man-text
+%%PORTDOCS%%@dirrm share/doc/aspell/man-html
+%%PORTDOCS%%@dirrm share/doc/aspell
 @dirrm share/aspell
-@dirrm share/doc/aspell/man-html
-@dirrm share/doc/aspell/man-text
-@dirrm share/doc/aspell
+@dirrm include/aspell