Update to 0.12.2; also buildlink'ify and add buildlink.mk.

Changes since 0.11.2:
* Added a length parameter to many Pspell functions which should cut
  down on unnecessary copying of words with some programs that use
  Pspell. Unfortunately this also breaks sourcecode compatibility. But
  it is easy to fix, see section 2.3.4 for what to do.
* Added support for mapping the county code to a spelling for the
  English language. For example the language tag ``en_GB'' will now get
  the British dictionary if it is available.
* Rewrote the ``Usage'' section of the manual to use the C interface
  instead of the C++ one as I recommend using the C interface even in
  C++ code to avoid some of the nasty issues associated with C++
  linkage.
* Libltdl is now enabled by default.
* Switched to the multi-language branch of libtool.
* Added support for iso-8859-13 and 14.
And some of bugfixes.

4 files changed, 61 insertions, 21 deletions

diff --git a/textproc/libpspell/Makefile b/textproc/libpspell/Makefile
index a76e6d86b92..5584959e1ee 100644
--- a/textproc/libpspell/Makefile
+++ b/textproc/libpspell/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 17:37:31 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2002/01/15 01:05:14 wiz Exp $
 #
 
-DISTNAME=	pspell-.11.2
+DISTNAME=	pspell-.12.2
 PKGNAME=	lib${DISTNAME:S/-./-0./}
 CATEGORIES=	textproc devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pspell/}
@@ -16,5 +16,7 @@ USE_LIBTOOL=	YES
 
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 CONFIGURE_ARGS+=	--enable-doc-dir=${PREFIX}/share/doc/pspell
+USE_BUILDLINK_ONLY=	YES
 
+.include "../../devel/libtool/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/libpspell/PLIST b/textproc/libpspell/PLIST
index e46df57fc24..b282cbf26aa 100644
--- a/textproc/libpspell/PLIST
+++ b/textproc/libpspell/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:57:17 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/01/15 01:05:14 wiz Exp $
 bin/pspell-config
 include/pspell/app_string.hh
-include/pspell/conf.h
 include/pspell/config.h
 include/pspell/config_impl.hh
 include/pspell/convert.hh
@@ -28,8 +27,8 @@ include/pspell/wordlist.h
 lib/libpspell-impl.a
 lib/libpspell-impl.la
 lib/libpspell-impl.so
-lib/libpspell-impl.so.3
-lib/libpspell-impl.so.3.1
+lib/libpspell-impl.so.6
+lib/libpspell-impl.so.6.0
 lib/libpspell-modules.a
 lib/libpspell-modules.la
 lib/libpspell-modules.so
@@ -38,15 +37,16 @@ lib/libpspell-modules.so.1.1
 lib/libpspell.a
 lib/libpspell.la
 lib/libpspell.so
-lib/libpspell.so.2
-lib/libpspell.so.2.2
+lib/libpspell.so.4
+lib/libpspell.so.4.3
 share/doc/pspell/man-html/1_Introduction.html
 share/doc/pspell/man-html/2_Getting.html
-share/doc/pspell/man-html/3_Library.html
-share/doc/pspell/man-html/4_Status.html
-share/doc/pspell/man-html/5_Feedback.html
-share/doc/pspell/man-html/6_Changelog.html
-share/doc/pspell/man-html/7_Copyright.html
+share/doc/pspell/man-html/3_Keeping.html
+share/doc/pspell/man-html/4_Library.html
+share/doc/pspell/man-html/5_Status.html
+share/doc/pspell/man-html/6_Feedback.html
+share/doc/pspell/man-html/7_Changelog.html
+share/doc/pspell/man-html/8_Copyright.html
 share/doc/pspell/man-html/About_this.html
 share/doc/pspell/man-html/Contents.html
 share/doc/pspell/man-html/contents.png
@@ -61,11 +61,12 @@ share/doc/pspell/man-html/up.png
 share/doc/pspell/man-html/up_g.png
 share/doc/pspell/man-text/1_Introduction.txt
 share/doc/pspell/man-text/2_Getting.txt
-share/doc/pspell/man-text/3_Library.txt
-share/doc/pspell/man-text/4_Status.txt
-share/doc/pspell/man-text/5_Feedback.txt
-share/doc/pspell/man-text/6_Changelog.txt
-share/doc/pspell/man-text/7_Copyright.txt
+share/doc/pspell/man-text/3_Keeping.txt
+share/doc/pspell/man-text/4_Library.txt
+share/doc/pspell/man-text/5_Status.txt
+share/doc/pspell/man-text/6_Feedback.txt
+share/doc/pspell/man-text/7_Changelog.txt
+share/doc/pspell/man-text/8_Copyright.txt
 share/doc/pspell/man-text/About_this.txt
 share/doc/pspell/man-text/Contents.txt
 share/doc/pspell/man-text/index.txt
@@ -77,6 +78,8 @@ share/doc/pspell/manual.tex
 share/pspell/cp1252.map
 share/pspell/iso8859-1.map
 share/pspell/iso8859-10.map
+share/pspell/iso8859-13.map
+share/pspell/iso8859-14.map
 share/pspell/iso8859-15.map
 share/pspell/iso8859-2.map
 share/pspell/iso8859-3.map
@@ -87,6 +90,7 @@ share/pspell/iso8859-7.map
 share/pspell/iso8859-8.map
 share/pspell/iso8859-9.map
 share/pspell/koi8-r.map
+share/pspell/region-to-spelling.map
 share/pspell/viscii.map
 @dirrm share/pspell
 @dirrm share/doc/pspell/man-text
diff --git a/textproc/libpspell/buildlink.mk b/textproc/libpspell/buildlink.mk
new file mode 100644
index 00000000000..79783102486
--- /dev/null
+++ b/textproc/libpspell/buildlink.mk
@@ -0,0 +1,34 @@
+# $NetBSD: buildlink.mk,v 1.1 2002/01/15 01:05:14 wiz Exp $
+#
+# This Makefile fragment is included by packages that use libpspell.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.libpspell to the dependency pattern
+#     for the version of libpspell desired.
+# (2) Include this Makefile fragment in the package Makefile,
+# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header
+#     search path, and
+# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search
+#     path.
+
+.if !defined(LIBPSPELL_BUILDLINK_MK)
+LIBPSPELL_BUILDLINK_MK=	# defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.libpspell?=	libpspell>=0.12.2
+DEPENDS+=	${BUILDLINK_DEPENDS.libpspell}:../../textproc/libpspell
+
+EVAL_PREFIX+=			BUILDLINK_PREFIX.libpspell=libpspell
+BUILDLINK_PREFIX.libpspell_DEFAULT=	${LOCALBASE}
+BUILDLINK_FILES.libpspell=		include/pspell/*
+BUILDLINK_FILES.libpspell+=		lib/libpspell*
+
+BUILDLINK_TARGETS.libpspell=	libpspell-buildlink
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.libpspell}
+
+pre-configure: ${BUILDLINK_TARGETS.libpspell}
+libpspell-buildlink: _BUILDLINK_USE
+
+.endif	# LIBPSPELL_BUILDLINK_MK
diff --git a/textproc/libpspell/distinfo b/textproc/libpspell/distinfo
index e4d990290e0..f7da6fc5b4d 100644
--- a/textproc/libpspell/distinfo
+++ b/textproc/libpspell/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/04/26 14:42:32 skrll Exp $
+$NetBSD: distinfo,v 1.4 2002/01/15 01:05:14 wiz Exp $
 
-SHA1 (pspell-.11.2.tar.gz) = 733f41994ff0091bb454067168f0bab15d71b8de
-Size (pspell-.11.2.tar.gz) = 384312 bytes
+SHA1 (pspell-.12.2.tar.gz) = dc3f2757433d5e79d7bf024f55111e00f91905b7
+Size (pspell-.12.2.tar.gz) = 434193 bytes