Update to version 0.50.3-1.1.

HEADS UP!

Note for aspell-slovak users: maintainer decided to change version to lower
number than the previous release has.  This decision was made to make this
package compliant with the official GNU Aspell packages.  I decided not to
bump version to 1.1.0.50.3.1.1 or the like and rather go with the flow and
update to the new numbering scheme instead and don't spread more confusion
as there already is.  This will affect probably very small amount of users
and it's consistent with other aspell packages.

Changes:

2003.01.11
0.50.3-1.1  This version is converted to official GNU Aspell packages format
            (thus the version change) and it's based on aspell-slovak-1.1.

            New words.

4 files changed, 65 insertions, 68 deletions

diff --git a/textproc/aspell-slovak/Makefile b/textproc/aspell-slovak/Makefile
index a6e3f733abf..f89f42ee3fa 100644
--- a/textproc/aspell-slovak/Makefile
+++ b/textproc/aspell-slovak/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2003/01/17 01:23:57 salo Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/20 09:55:08 salo Exp $
 #
 
-DISTNAME=	aspell-slovak-1.1
-PKGREVISION=	2
+DISTNAME=	aspell-sk-0.50.3-1.1
+PKGNAME=	${DISTNAME:C/sk-(.*)-(.*)$/slovak-\1.\2/}
 CATEGORIES=	textproc
 MASTER_SITES=	http://ispell.hq.sk/
 EXTRACT_SUFX=	.tar.bz2
@@ -12,6 +12,10 @@ HOMEPAGE=	http://ispell.hq.sk/homepage/
 COMMENT=	Slovak language support for aspell
 
 USE_BUILDLINK2=	YES
+HAS_CONFIGURE=	YES
+
+CONFIGURE_ENV+=	ASPELL=${PREFIX}/bin/aspell
+CONFIGURE_ENV+=	WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
 
 MAKE_ENV+=	SORT="${SORT}"
 
diff --git a/textproc/aspell-slovak/PLIST b/textproc/aspell-slovak/PLIST
index 0bbcd764a62..a2bbfcea1d0 100644
--- a/textproc/aspell-slovak/PLIST
+++ b/textproc/aspell-slovak/PLIST
@@ -1,13 +1,15 @@
-@comment $NetBSD: PLIST,v 1.3 2003/01/15 00:27:10 salo Exp $
-lib/aspell/slovak
-lib/aspell/slovak-extend
-lib/aspell/slovak.multi
-share/aspell/slovak.dat
-share/aspell/slovak_phonet.dat
+@comment $NetBSD: PLIST,v 1.4 2003/01/20 09:55:09 salo Exp $
+lib/aspell/sk-extend.rws
+lib/aspell/sk.multi
+lib/aspell/sk.rws
+lib/aspell/slovak.alias
+share/aspell/sk.dat
 share/doc/aspell-slovak/AUTHORS
 share/doc/aspell-slovak/CHANGELOG
+share/doc/aspell-slovak/COPYING
 share/doc/aspell-slovak/Copyright
 share/doc/aspell-slovak/README
-share/examples/aspell-slovak/aspell.conf.default
+share/doc/aspell-slovak/gnu.sk.txt
+share/examples/aspell-slovak/aspell.conf
 @dirrm share/examples/aspell-slovak
 @dirrm share/doc/aspell-slovak
diff --git a/textproc/aspell-slovak/distinfo b/textproc/aspell-slovak/distinfo
index df0d54a1aff..2168fb3133f 100644
--- a/textproc/aspell-slovak/distinfo
+++ b/textproc/aspell-slovak/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2003/01/15 00:27:10 salo Exp $
+$NetBSD: distinfo,v 1.4 2003/01/20 09:55:09 salo Exp $
 
-SHA1 (aspell-slovak-1.1.tar.bz2) = 1ce4b1c714bca05f2d5ad25207f9e33d59a2fd9d
-Size (aspell-slovak-1.1.tar.bz2) = 310214 bytes
-SHA1 (patch-aa) = f1ddcbd70ef73aedfb65f51ca86bba04ebec2088
-SHA1 (patch-ab) = 4fd4cdf54ab64333b2ffde27d28ca17b8946a9b5
+SHA1 (aspell-sk-0.50.3-1.1.tar.bz2) = d890fcad2f0d36dda650f9ba2295341caca1d937
+Size (aspell-sk-0.50.3-1.1.tar.bz2) = 315780 bytes
+SHA1 (patch-aa) = cb98632e453d7f87019a01289f3f557f3ab34dda
diff --git a/textproc/aspell-slovak/patches/patch-aa b/textproc/aspell-slovak/patches/patch-aa
index b02e9d88ba2..4e590c4f287 100644
--- a/textproc/aspell-slovak/patches/patch-aa
+++ b/textproc/aspell-slovak/patches/patch-aa
@@ -1,58 +1,50 @@
-$NetBSD: patch-aa,v 1.3 2003/01/15 00:27:11 salo Exp $
+$NetBSD: patch-aa,v 1.4 2003/01/20 09:55:10 salo Exp $
 
---- Makefile.orig	Mon Dec 23 18:25:39 2002
-+++ Makefile	Wed Jan 15 00:53:08 2003
-@@ -1,27 +1,24 @@
--PREFIX=/usr
+--- Makefile.pre.orig	Sat Jan 11 22:07:22 2003
++++ Makefile.pre	Mon Jan 20 09:35:21 2003
+@@ -5,7 +5,7 @@
+ 
+ cwl_files = sk.cwl sk-misc.cwl  sk-skratky.cwl
+ data_files = sk.dat 
+-doc_files = AUTHORS CHANGELOG COPYING Copyright gnu.sk.txt README sample.aspell.conf
++doc_files = AUTHORS CHANGELOG COPYING Copyright gnu.sk.txt README
+ extra_files = configure info Makefile.pre
+ multi_files = sk.multi slovak.alias
+ rws_files = sk.rws sk-extend.rws
+@@ -16,21 +16,16 @@
+ all: ${rws_files} ${data_files}
+ 
+ install: all install-doc
+-	mkdir -p ${DESTDIR}${dictdir}/
+-	cp ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
+-	cd ${DESTDIR}${dictdir}/ && chmod 644 ${rws_files} ${multi_files}
+-	mkdir -p ${DESTDIR}${datadir}/
+-	cp ${data_files} ${DESTDIR}${datadir}/
+-	cd ${DESTDIR}${datadir}/ && chmod 644 ${data_files}
+-	rm -f ${DESTDIR}${datadir}/slovak.dat
+-	rm -f ${DESTDIR}${dictdir}/slovak.multi
+-	ln -s ${DESTDIR}${datadir}/sk.dat ${DESTDIR}${datadir}/slovak.dat
+-	ln -s ${DESTDIR}${dictdir}/sk.multi  ${DESTDIR}${dictdir}/slovak.multi 
 -
- 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
-+WORD_LIST_COMPRESS=${PREFIX}/bin/word-list-compress
-+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
- 
- 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 +26,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)
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA} ${rws_files} ${multi_files} ${DESTDIR}${dictdir}/
++	${BSD_INSTALL_DATA_DIR} ${DESTDIR}${datadir}/
++	${BSD_INSTALL_DATA} ${data_files} ${DESTDIR}${datadir}/
  
  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
+-	mkdir -p ${docdir}/${distdir}/
+-	cp -f ${doc_files} $(docdir)/${distdir}/
++	${BSD_INSTALL_DATA_DIR} ${docdir}/aspell-slovak
++	${BSD_INSTALL_DATA} ${doc_files} $(docdir)/aspell-slovak
++	${BSD_INSTALL_DATA_DIR} ${PREFIX}/share/examples/aspell-slovak
++	${BSD_INSTALL_DATA} sample.aspell.conf ${PREFIX}/share/examples/aspell-slovak/aspell.conf
+ 
+ clean:
+ 	rm -f ${rws_files}
+@@ -72,5 +67,5 @@
+ sk-extend.rws: sk-misc.cwl  sk-skratky.cwl
+ 	${WORD_LIST_COMPRESS} d < sk-misc.cwl >tmp.dat
+ 	${WORD_LIST_COMPRESS} d < sk-skratky.cwl >>tmp.dat
+-	sort -uf <tmp.dat | ${ASPELL} ${ASPELL_FLAGS} --lang=sk create master ./sk-extend.rws
++	${SORT} -uf <tmp.dat | ${ASPELL} ${ASPELL_FLAGS} --lang=sk create master ./sk-extend.rws
  
- uninstall:
- 	rm $(ASPELLDOC)/AUTHORS