Update to version 0.50.3.

- added buildlink2.mk for applications using aspell and pspell
- updated DESCR

Changes:

Aspell has undergone an extremely large number of changes since the previous
Aspell/Pspell release. For one thing Pspell has been merged with Aspell so
there in no longer two separate libraries you have to worry about.

Because of the massive changes between Aspell/Pspell and Aspell 0.50 you may
want to clean out the old files before installing the the new Aspell.  To do
so do a "make uninstall" in the original Aspell and Pspell source directories.

The way dictionaries are handled has also changed. This includes a change in
the naming conventions of both language names and dictionaries. Due to the
language name change, your old personal dictionaries will not be recognized.
However, you can import the old dictionaries by running the "aspell-import"
script. This also means that dictionaries designed to work with older versions
of Aspell are not likely to function correctly.  Fortunately new dictionary
packages are available for most languages. You can find them off of the Aspell
home page at http://aspell.net.

The Pspell ABI is now part of Aspell except that the name of everything has
changed due to the renaming of Pspell to Aspell. In particular please note the
following name changes:

    pspell -> aspell
    manager -> speller
    emulation -> enumeration
    master_word_list -> main_word_list

Please also note that the name of the language-tag option has changed to lang.
However, for backward compatible the language-tag option will still work.

However, you should also be able to build applications that require Pspell
with the new Aspell as a backward compatibility header file is provided.

Due to a change in the way dictionaries are handled, scanning for .pwli files
in order to get find out which dictionaries are available will no longer work.
This means that programs that relied on this technique may have problems
finding dictionaries. Fortunately, GNU Aspell now provided a uniform way to
list all installed dictionaries via the C API. See the file "list-dicts.c" in
the examples/ directory for an example of how to due this. Unfortunately there
is isn't any simply way to find out which dictionaries are installed which
will work with both the old Aspell/Pspell and the new GNU Aspell.

5 files changed, 89 insertions, 170 deletions

diff --git a/textproc/aspell/DESCR b/textproc/aspell/DESCR
index 6c9b6baed95..6b5de9943d2 100644
--- a/textproc/aspell/DESCR
+++ b/textproc/aspell/DESCR
@@ -1,8 +1,8 @@
-Aspell is an Open Source spell checker designed to eventually replace
-Ispell. Its main feature is that it does a much better job of coming up
-with possible suggestions than Ispell does. In fact recent tests shows
-that it even does better than Microsoft Word 97's spell checker in some
-cases. In addition it has both compile time and run time support for other
-non English languages. Aspell is also a library however the recommend way
-to use aspell is through the Pspell library as the actual interface to the
-aspell library is constantly changing.
+GNU Aspell is a Free and Open Source spell checker designed to eventually
+replace Ispell. It can either be used as a library or as an independent spell
+checker. Its main feature is that it does a much better job of coming up with
+possible suggestions than just about any other spell checker out there for the
+English language, including Ispell and Microsoft Word. It also has many other
+technical enhancements over Ispell such as using shared memory for dictionaries
+and intelligently handling personal dictionaries when more than one Aspell
+process is open at once.
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 183838af266..0f2c1fa0382 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,24 +1,19 @@
-# $NetBSD: Makefile,v 1.3 2002/12/25 03:47:36 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/15 00:23:55 salo Exp $
 #
 
-DISTNAME=		aspell-.33.7.1
-PKGNAME=		${DISTNAME:S/-./-0./}
-PKGREVISION=		1
+DISTNAME=		aspell-0.50.3
 CATEGORIES=		textproc
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=aspell/}
-
-PATCHFILES=		aspell-.33-fix2.diff
-PATCH_SITES=		${MASTER_SITES}
+MASTER_SITES=		${MASTER_SITE_GNU:=aspell/}
 
 MAINTAINER=		wiz@netbsd.org
-HOMEPAGE=		http://aspell.sourceforge.net/
+HOMEPAGE=		http://aspell.net/
 COMMENT=		spell checker with good multi-language support
 
+USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-USE_BUILDLINK2=		yes
 
 # halfdelay()
 USE_NCURSES=		yes
@@ -26,7 +21,10 @@ USE_NCURSES=		yes
 CONFIGURE_ARGS+=	--enable-doc-dir=${PREFIX}/share/doc/aspell
 CONFIGURE_ARGS+=	--enable-curses=ncurses
 
-.include "../../devel/libtool/buildlink2.mk"
+# Create directory for dictionaries.
+#
+post-install:
+	${MKDIR} ${PREFIX}/lib/aspell
+
 .include "../../devel/ncurses/buildlink2.mk"
-.include "../../textproc/libpspell/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell/PLIST b/textproc/aspell/PLIST
index a8fdde88e50..01ac0bebb87 100644
--- a/textproc/aspell/PLIST
+++ b/textproc/aspell/PLIST
@@ -1,167 +1,72 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/15 01:07:24 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/15 00:23:55 salo Exp $
 bin/aspell
+bin/aspell-import
+bin/pspell-config
 bin/run-with-aspell
 bin/word-list-compress
-include/aspell/amanager.hh
-include/aspell/app_string.hh
-include/aspell/as_config.h
-include/aspell/asuggest.hh
-include/aspell/bad_value.hh
-include/aspell/basic_list.hh
-include/aspell/block_slist-t.hh
-include/aspell/block_slist.hh
-include/aspell/block_vector.hh
-include/aspell/bskip-t.hh
-include/aspell/bskip.hh
-include/aspell/check.hh
-include/aspell/clone_ptr-t.hh
-include/aspell/clone_ptr.hh
-include/aspell/config.hh
-include/aspell/config_data.hh
-include/aspell/const_string.hh
-include/aspell/copy_ptr-t.hh
-include/aspell/copy_ptr.hh
-include/aspell/data.hh
-include/aspell/editdist.hh
-include/aspell/editdist2.hh
-include/aspell/email-t.hh
-include/aspell/email.hh
-include/aspell/emulation.hh
-include/aspell/exception.hh
-include/aspell/file_exceps.hh
-include/aspell/file_util.hh
-include/aspell/filter.hh
-include/aspell/generic_copy_ptr-t.hh
-include/aspell/generic_copy_ptr.hh
-include/aspell/hash-t.hh
-include/aspell/hash.hh
-include/aspell/hash_const_string.hh
-include/aspell/hash_repl-p.hh
-include/aspell/hash_repl-t.hh
-include/aspell/hash_repl.hh
-include/aspell/hash_simple_string.hh
-include/aspell/hash_string.hh
-include/aspell/hash_string_s.hh
-include/aspell/invalid_flag.hh
-include/aspell/invalid_word.hh
-include/aspell/itr_equal.hh
-include/aspell/language.hh
-include/aspell/language_exceps.hh
-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
-include/aspell/primes.hh
-include/aspell/refcount.hh
-include/aspell/repl-t.hh
-include/aspell/repl.hh
-include/aspell/repl_func.hh
-include/aspell/repl_util.hh
-include/aspell/sgml-t.hh
-include/aspell/sgml.hh
-include/aspell/simple_fstream.hh
-include/aspell/simple_string.hh
-include/aspell/single_repl.hh
-include/aspell/skip-t.hh
-include/aspell/skip.hh
-include/aspell/split.hh
-include/aspell/str_repl.hh
-include/aspell/string_buffer.hh
-include/aspell/string_map.hh
-include/aspell/substr_repl-t.hh
-include/aspell/substr_repl.hh
-include/aspell/suggest.hh
-include/aspell/tex-t.hh
-include/aspell/tex.hh
-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
-include/aspell/utf8.hh
-include/aspell/vector_hash-t.hh
-include/aspell/vector_hash.hh
-include/aspell/weights.hh
-lib/aspell/american-med-only
-lib/aspell/american-med.multi
-lib/aspell/american.multi
-lib/aspell/british-med-only
-lib/aspell/british-med.multi
-lib/aspell/british.multi
-lib/aspell/canadian-med-only
-lib/aspell/canadian-med.multi
-lib/aspell/canadian.multi
-lib/aspell/english-med-only
-lib/aspell/english-variant-0
-lib/aspell/english-variant-1
-lib/aspell/english-variant-2
-lib/aspell/english.multi
+include/aspell.h
+include/pspell/pspell.h
 lib/libaspell.a
 lib/libaspell.la
 lib/libaspell.so
-lib/libaspell.so.11
-lib/libaspell.so.11.1
-lib/libpspell_aspell.a
-lib/libpspell_aspell.la
-lib/libpspell_aspell.so
-lib/libpspell_aspell.so.2
-lib/libpspell_aspell.so.2.1
+lib/libaspell.so.15
+lib/libaspell.so.15.2
+lib/libpspell.a
+lib/libpspell.la
+lib/libpspell.so
+lib/libpspell.so.15
+lib/libpspell.so.15.2
 share/aspell/ASCII.dat
-share/aspell/ASCII.map
-share/aspell/SGML.map
-share/aspell/english.dat
-share/aspell/english_phonet.dat
+share/aspell/dvorak.kbd
 share/aspell/iso8859-1.dat
-share/aspell/iso8859-1.map
 share/aspell/iso8859-10.dat
-share/aspell/iso8859-10.map
+share/aspell/iso8859-13.dat
+share/aspell/iso8859-14.dat
+share/aspell/iso8859-15.dat
 share/aspell/iso8859-2.dat
-share/aspell/iso8859-2.map
 share/aspell/iso8859-3.dat
-share/aspell/iso8859-3.map
 share/aspell/iso8859-4.dat
-share/aspell/iso8859-4.map
 share/aspell/iso8859-5.dat
-share/aspell/iso8859-5.map
 share/aspell/iso8859-6.dat
-share/aspell/iso8859-6.map
 share/aspell/iso8859-7.dat
-share/aspell/iso8859-7.map
 share/aspell/iso8859-8.dat
-share/aspell/iso8859-8.map
 share/aspell/iso8859-9.dat
-share/aspell/iso8859-9.map
 share/aspell/ispell
 share/aspell/koi8-f.dat
 share/aspell/koi8-r.dat
+share/aspell/koi8-u.dat
 share/aspell/spell
 share/aspell/standard.kbd
-share/aspell/unicode.dat
 share/aspell/viscii.dat
-share/aspell/viscii.map
+share/doc/aspell/dev-html/devel.css
+share/doc/aspell/dev-html/devel.html
+share/doc/aspell/dev-html/img1.png
+share/doc/aspell/dev-html/img2.png
+share/doc/aspell/dev-html/index.html
+share/doc/aspell/dev-html/nx_grp_g.png
+share/doc/aspell/dev-html/prev_g.png
+share/doc/aspell/dev-html/up_g.png
+share/doc/aspell/dev-text/devel.txt
+share/doc/aspell/dev-text/index.txt
+share/doc/aspell/devel.aux
+share/doc/aspell/devel.dvi
+share/doc/aspell/devel.tex
+share/doc/aspell/devel2.lyx
 share/doc/aspell/man-html/1_Introduction.html
 share/doc/aspell/man-html/2_Getting.html
 share/doc/aspell/man-html/3_Basic.html
-share/doc/aspell/man-html/4_Managing.html
-share/doc/aspell/man-html/5_Customizing.html
+share/doc/aspell/man-html/4_Customizing.html
+share/doc/aspell/man-html/5_Working.html
 share/doc/aspell/man-html/6_Writing.html
 share/doc/aspell/man-html/7_Adding.html
 share/doc/aspell/man-html/8_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/C_Credits.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/D_Glossary.html
+share/doc/aspell/man-html/E_Copyright.html
 share/doc/aspell/man-html/contents.png
 share/doc/aspell/man-html/crossref.png
 share/doc/aspell/man-html/index.html
@@ -176,35 +81,29 @@ 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_Basic.txt
-share/doc/aspell/man-text/4_Managing.txt
-share/doc/aspell/man-text/5_Customizing.txt
+share/doc/aspell/man-text/4_Customizing.txt
+share/doc/aspell/man-text/5_Working.txt
 share/doc/aspell/man-text/6_Writing.txt
 share/doc/aspell/man-text/7_Adding.txt
 share/doc/aspell/man-text/8_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/C_Credits.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/D_Glossary.txt
+share/doc/aspell/man-text/E_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
-share/pspell/en-american-aspell.pwli
-share/pspell/en-american-med-aspell.pwli
-share/pspell/en-aspell.pwli
-share/pspell/en-british-aspell.pwli
-share/pspell/en-british-med-aspell.pwli
-share/pspell/en-canadian-aspell.pwli
-share/pspell/en-canadian-med-aspell.pwli
 @dirrm share/doc/aspell/man-text
 @dirrm share/doc/aspell/man-html
+@dirrm share/doc/aspell/dev-text
+@dirrm share/doc/aspell/dev-html
 @dirrm share/doc/aspell
 @dirrm share/aspell
 @dirrm lib/aspell
-@dirrm include/aspell
+@dirrm include/pspell
diff --git a/textproc/aspell/buildlink2.mk b/textproc/aspell/buildlink2.mk
new file mode 100644
index 00000000000..0c32ea994f8
--- /dev/null
+++ b/textproc/aspell/buildlink2.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink2.mk,v 1.1 2003/01/15 00:23:55 salo Exp $
+#
+# This Makefile fragment is included by packages that use aspell.
+#
+
+.if !defined(ASPELL_BUILDLINK2_MK)
+ASPELL_BUILDLINK2_MK=	# defined
+
+BUILDLINK_PACKAGES+=			aspell
+BUILDLINK_DEPENDS.aspell?=		aspell>=0.50.3
+BUILDLINK_PKGSRCDIR.aspell?=		../../textproc/aspell
+
+EVAL_PREFIX+=	BUILDLINK_PREFIX.aspell=aspell
+BUILDLINK_PREFIX.aspell_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.aspell+=	include/aspell.h
+BUILDLINK_FILES.aspell+=	include/pspell/pspell.h
+BUILDLINK_FILES.aspell+=	lib/libaspell.*
+BUILDLINK_FILES.aspell+=	lib/libpspell.*
+
+BUILDLINK_TARGETS+=	aspell-buildlink
+
+aspell-buildlink: _BUILDLINK_USE
+
+.endif	# ASPELL_BUILDLINK2_MK
diff --git a/textproc/aspell/distinfo b/textproc/aspell/distinfo
index a5947eb167d..960428a65e0 100644
--- a/textproc/aspell/distinfo
+++ b/textproc/aspell/distinfo
@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/12/25 03:47:36 wiz Exp $
+$NetBSD: distinfo,v 1.4 2003/01/15 00:23:55 salo Exp $
 
-SHA1 (aspell-.33.7.1.tar.gz) = 050f7736b5a162fc717d203905ecee9981666aff
-Size (aspell-.33.7.1.tar.gz) = 1647417 bytes
-SHA1 (aspell-.33-fix2.diff) = b9a711f7194ddd2099c9bcfbd05c246a66dcc3ad
-Size (aspell-.33-fix2.diff) = 1421 bytes
+SHA1 (aspell-0.50.3.tar.gz) = aea3c1e47c10bf2f189dbff91c3c137170af6a72
+Size (aspell-0.50.3.tar.gz) = 939063 bytes