Sync with new aspell, fix PLIST, include aspell buildlink2.mk. Bump

PKGREVISION.

4 files changed, 11 insertions, 13 deletions

diff --git a/textproc/aspell-slovak/Makefile b/textproc/aspell-slovak/Makefile
index 4e711e82c74..ded33e6dfaf 100644
--- a/textproc/aspell-slovak/Makefile
+++ b/textproc/aspell-slovak/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/01/02 12:21:46 salo Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/15 00:27:10 salo Exp $
 #
 
 DISTNAME=	aspell-slovak-1.1
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	http://ispell.hq.sk/
 EXTRACT_SUFX=	.tar.bz2
@@ -10,8 +11,7 @@ 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}"
+MAKE_ENV+=	SORT="${SORT}"
 
+.include "../../textproc/aspell/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-slovak/PLIST b/textproc/aspell-slovak/PLIST
index 56df669cdce..0bbcd764a62 100644
--- a/textproc/aspell-slovak/PLIST
+++ b/textproc/aspell-slovak/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/01/02 12:21:46 salo Exp $
+@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
@@ -9,6 +9,5 @@ share/doc/aspell-slovak/CHANGELOG
 share/doc/aspell-slovak/Copyright
 share/doc/aspell-slovak/README
 share/examples/aspell-slovak/aspell.conf.default
-share/pspell/sk-slovak-aspell.pwli
 @dirrm share/examples/aspell-slovak
 @dirrm share/doc/aspell-slovak
diff --git a/textproc/aspell-slovak/distinfo b/textproc/aspell-slovak/distinfo
index 0f84caa3948..df0d54a1aff 100644
--- a/textproc/aspell-slovak/distinfo
+++ b/textproc/aspell-slovak/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2003/01/02 12:21:46 salo Exp $
+$NetBSD: distinfo,v 1.3 2003/01/15 00:27:10 salo Exp $
 
 SHA1 (aspell-slovak-1.1.tar.bz2) = 1ce4b1c714bca05f2d5ad25207f9e33d59a2fd9d
 Size (aspell-slovak-1.1.tar.bz2) = 310214 bytes
-SHA1 (patch-aa) = 8faf762dd516b07029f319f285cbc0ac8f8aa8c8
+SHA1 (patch-aa) = f1ddcbd70ef73aedfb65f51ca86bba04ebec2088
 SHA1 (patch-ab) = 4fd4cdf54ab64333b2ffde27d28ca17b8946a9b5
diff --git a/textproc/aspell-slovak/patches/patch-aa b/textproc/aspell-slovak/patches/patch-aa
index 619d189824f..b02e9d88ba2 100644
--- a/textproc/aspell-slovak/patches/patch-aa
+++ b/textproc/aspell-slovak/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2003/01/02 12:21:47 salo Exp $
+$NetBSD: patch-aa,v 1.3 2003/01/15 00:27:11 salo Exp $
 
 --- Makefile.orig	Mon Dec 23 18:25:39 2002
-+++ Makefile	Thu Jan  2 12:47:18 2003
-@@ -1,27 +1,25 @@
++++ Makefile	Wed Jan 15 00:53:08 2003
+@@ -1,27 +1,24 @@
 -PREFIX=/usr
 -
  ASPELLDATA=${PREFIX}/share/aspell
@@ -25,7 +25,6 @@ $NetBSD: patch-aa,v 1.2 2003/01/02 12:21:47 salo Exp $
  	$(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
@@ -36,7 +35,7 @@ $NetBSD: patch-aa,v 1.2 2003/01/02 12:21:47 salo Exp $
  
  install: install-data install-doc
  
-@@ -29,17 +27,18 @@
+@@ -29,17 +26,18 @@
  	${INSTALL_DATA} slovak.dat $(ASPELLDATA)
  	${INSTALL_DATA} slovak_phonet.dat $(ASPELLDATA)
  	${INSTALL_DATA} sk-slovak-aspell.pwli $(PSPELLDATA)