Update to version 1.1.

Changes:
- new words
- words cleanup
- added new dictionary with common abbreviations - slovak-extend

5 files changed, 74 insertions, 52 deletions

diff --git a/textproc/aspell-slovak/Makefile b/textproc/aspell-slovak/Makefile
index 3f6e983a0df..4e711e82c74 100644
--- a/textproc/aspell-slovak/Makefile
+++ b/textproc/aspell-slovak/Makefile
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/08/06 03:55:52 jschauma Exp $
+# $NetBSD: Makefile,v 1.2 2003/01/02 12:21:46 salo Exp $
 #
 
-DISTNAME=	aspell-slovak-1.0
+DISTNAME=	aspell-slovak-1.1
 CATEGORIES=	textproc
 MASTER_SITES=	http://ispell.hq.sk/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	salo@Xtrmntr.org
+MAINTAINER=	salo@netbsd.org
 HOMEPAGE=	http://ispell.hq.sk/homepage/
 COMMENT=	Slovak language support for aspell
 
 DEPENDS+=	aspell>=0.33.7.1:../../textproc/aspell
 
+MAKE_ENV+=	ECHO="${ECHO}" SORT="${SORT}"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-slovak/PLIST b/textproc/aspell-slovak/PLIST
index 31d51cb784b..56df669cdce 100644
--- a/textproc/aspell-slovak/PLIST
+++ b/textproc/aspell-slovak/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/08/06 03:55:52 jschauma Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/02 12:21:46 salo Exp $
 lib/aspell/slovak
+lib/aspell/slovak-extend
 lib/aspell/slovak.multi
 share/aspell/slovak.dat
 share/aspell/slovak_phonet.dat
@@ -7,9 +8,7 @@ share/doc/aspell-slovak/AUTHORS
 share/doc/aspell-slovak/CHANGELOG
 share/doc/aspell-slovak/Copyright
 share/doc/aspell-slovak/README
-share/doc/aspell-slovak/sample.aspell.conf
+share/examples/aspell-slovak/aspell.conf.default
 share/pspell/sk-slovak-aspell.pwli
+@dirrm share/examples/aspell-slovak
 @dirrm share/doc/aspell-slovak
-@unexec ${RMDIR} %D/share/aspell 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/pspell 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/lib/aspell 2>/dev/null || ${TRUE}
diff --git a/textproc/aspell-slovak/distinfo b/textproc/aspell-slovak/distinfo
index 70ee74806c8..0f84caa3948 100644
--- a/textproc/aspell-slovak/distinfo
+++ b/textproc/aspell-slovak/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/08/06 03:55:52 jschauma Exp $
+$NetBSD: distinfo,v 1.2 2003/01/02 12:21:46 salo Exp $
 
-SHA1 (aspell-slovak-1.0.tar.bz2) = 2b518c78cf7b9fa573ed52330d4aa5dcb9b3d38b
-Size (aspell-slovak-1.0.tar.bz2) = 306315 bytes
-SHA1 (patch-aa) = d7763203ef02930ca514f5f4865a0c540c7f403e
-SHA1 (patch-ab) = 41dc93ea7a352182dc7d13df68cbd773d135a53e
+SHA1 (aspell-slovak-1.1.tar.bz2) = 1ce4b1c714bca05f2d5ad25207f9e33d59a2fd9d
+Size (aspell-slovak-1.1.tar.bz2) = 310214 bytes
+SHA1 (patch-aa) = 8faf762dd516b07029f319f285cbc0ac8f8aa8c8
+SHA1 (patch-ab) = 4fd4cdf54ab64333b2ffde27d28ca17b8946a9b5
diff --git a/textproc/aspell-slovak/patches/patch-aa b/textproc/aspell-slovak/patches/patch-aa
index 45ad7a481d1..619d189824f 100644
--- a/textproc/aspell-slovak/patches/patch-aa
+++ b/textproc/aspell-slovak/patches/patch-aa
@@ -1,39 +1,59 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/08/06 03:55:52 jschauma Exp $
+$NetBSD: patch-aa,v 1.2 2003/01/02 12:21:47 salo Exp $
 
---- /dev/null	Mon Aug  5 16:01:01 2002
-+++ Makefile	Mon Aug  5 16:25:02 2002
-@@ -0,0 +1,34 @@
-+ASPELLDATA=${PREFIX}/share/aspell
-+ASPELLDICT=${PREFIX}/lib/aspell
-+ASPELLDOC=${PREFIX}/share/doc/aspell-slovak
+--- Makefile.orig	Mon Dec 23 18:25:39 2002
++++ Makefile	Thu Jan  2 12:47:18 2003
+@@ -1,27 +1,25 @@
+-PREFIX=/usr
+-
+ ASPELLDATA=${PREFIX}/share/aspell
+ ASPELLDICT=${PREFIX}/lib/aspell
+ ASPELLDOC=${PREFIX}/share/doc/aspell-slovak
+ PSPELLDATA=${PREFIX}/share/pspell
+ 
+-ASPELL=aspell
+-WORD_LIST_COMPRESS=word-list-compress
+-INSTALL_DATA=install -c -m 644
+-INSTALL_DATA_DIR=mkdir -p
 +ASPELL=${PREFIX}/bin/aspell
-+PSPELLDATA=${PREFIX}/share/pspell
 +WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
-+
-+
-+all: slovak
-+
-+slovak: decompress
-+	$(ASPELL) --lang=slovak create master ./slovak < slovak.raw
-+	echo $(ASPELLDICT)/slovak > sk-slovak-aspell.pwli
-+
-+decompress: aswc.dat
-+	$(WORD_LIST_COMPRESS) decompress < aswc.dat > slovak.raw
-+
-+install: install-data install-doc
-+
-+install-data:
-+	${BSD_INSTALL_DATA} slovak.dat $(ASPELLDATA)
-+	${BSD_INSTALL_DATA} slovak_phonet.dat $(ASPELLDATA)
-+	${BSD_INSTALL_DATA} sk-slovak-aspell.pwli $(PSPELLDATA)
-+	${BSD_INSTALL_DATA} slovak $(ASPELLDICT)
-+	${BSD_INSTALL_DATA} slovak.multi $(ASPELLDICT)
-+
-+install-doc:
-+	${BSD_INSTALL_DATA_DIR} $(ASPELLDOC)
-+	${BSD_INSTALL_DATA} AUTHORS $(ASPELLDOC)
-+	${BSD_INSTALL_DATA} CHANGELOG $(ASPELLDOC)
-+	${BSD_INSTALL_DATA} Copyright $(ASPELLDOC)
-+	${BSD_INSTALL_DATA} README $(ASPELLDOC)
-+	${BSD_INSTALL_DATA} sample.aspell.conf $(ASPELLDOC)
-+
++INSTALL_DATA=${BSD_INSTALL_DATA}
++INSTALL_DATA_DIR=${BSD_INSTALL_DATA_DIR}
+ 
+ all: slovak
+ 
+ slovak: decompress
+ 	$(ASPELL) --lang=slovak create master ./slovak-master < slovak-master.raw
+ 	$(ASPELL) --lang=slovak create master ./slovak-extend < slovak-extend.raw
+-	echo $(ASPELLDICT) > sk-slovak-aspell.pwli
++	${ECHO} $(ASPELLDICT) > sk-slovak-aspell.pwli
+ 
+ decompress: aspell.dat
+ 	$(WORD_LIST_COMPRESS) decompress < aspell.dat > slovak-master.raw
+ 	$(WORD_LIST_COMPRESS) decompress < aspell-misc.dat > tmp.raw
+ 	$(WORD_LIST_COMPRESS) decompress < aspell-skratky.dat >> tmp.raw
+-	sort -uf <tmp.raw >  slovak-extend.raw
++	${SORT} -uf < tmp.raw >  slovak-extend.raw
+ 
+ install: install-data install-doc
+ 
+@@ -29,17 +27,18 @@
+ 	${INSTALL_DATA} slovak.dat $(ASPELLDATA)
+ 	${INSTALL_DATA} slovak_phonet.dat $(ASPELLDATA)
+ 	${INSTALL_DATA} sk-slovak-aspell.pwli $(PSPELLDATA)
+-	${INSTALL_DATA} slovak-master $(ASPELLDICT)
++	${INSTALL_DATA} slovak-master $(ASPELLDICT)/slovak
+ 	${INSTALL_DATA} slovak-extend $(ASPELLDICT)
+ 	${INSTALL_DATA} slovak.multi $(ASPELLDICT)
+ 
+ install-doc:
+ 	${INSTALL_DATA_DIR} $(ASPELLDOC)
++	${INSTALL_DATA_DIR} $(PREFIX)/share/examples/aspell-slovak
+ 	${INSTALL_DATA} AUTHORS $(ASPELLDOC)
+ 	${INSTALL_DATA} CHANGELOG $(ASPELLDOC)
+ 	${INSTALL_DATA} Copyright $(ASPELLDOC)
+ 	${INSTALL_DATA} README $(ASPELLDOC)
+-	${INSTALL_DATA} sample.aspell.conf $(ASPELLDOC)
++	${INSTALL_DATA} sample.aspell.conf $(PREFIX)/share/examples/aspell-slovak/aspell.conf.default
+ 
+ uninstall:
+ 	rm $(ASPELLDOC)/AUTHORS
diff --git a/textproc/aspell-slovak/patches/patch-ab b/textproc/aspell-slovak/patches/patch-ab
index afab4e4ca30..4efc86b2edc 100644
--- a/textproc/aspell-slovak/patches/patch-ab
+++ b/textproc/aspell-slovak/patches/patch-ab
@@ -1,9 +1,10 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/08/06 03:55:52 jschauma Exp $
+$NetBSD: patch-ab,v 1.2 2003/01/02 12:21:47 salo Exp $
 
 --- slovak.multi.orig	Fri Jul  5 21:27:34 2002
-+++ slovak.multi	Mon Aug  5 16:23:14 2002
-@@ -1,3 +1,3 @@
++++ slovak.multi	Tue Dec 31 11:14:15 2002
+@@ -1,3 +1,4 @@
  strip-accents false
 -add slovak-master
 +add slovak
++add-extra-dicts slovak-extend