Update to 0.2.24, changes undocumented.

4 files changed, 44 insertions, 36 deletions

diff --git a/textproc/aspell-faroese/Makefile b/textproc/aspell-faroese/Makefile
index 7c69ec21222..e2faf13cf7c 100644
--- a/textproc/aspell-faroese/Makefile
+++ b/textproc/aspell-faroese/Makefile
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:32 tv Exp $
+# $NetBSD: Makefile,v 1.11 2006/01/29 01:59:02 wiz Exp $
 #
 
-DISTNAME=	aspell5-fo-0.2.16-1
-PKGNAME=	${DISTNAME:C/5-fo-(.*)-(.*)$/-faroese-\1.\2/}
+DISTNAME=	aspell-fo-0.2.24
+PKGNAME=	${DISTNAME:C/-fo-/-faroese-/}
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GNU:=aspell/dict/fo/}
+MASTER_SITES=	http://fo.speling.org/filer/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://aspell.net/
+HOMEPAGE=	http://fo.speling.org/
 COMMENT=	Faroese language support for aspell
 
-HAS_CONFIGURE=	YES
+USE_TOOLS+=	perl
+REPLACE_PERL=	unsq
 
 .include "../../textproc/aspell/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell-faroese/PLIST b/textproc/aspell-faroese/PLIST
index b558a0e2098..975fb0834c4 100644
--- a/textproc/aspell-faroese/PLIST
+++ b/textproc/aspell-faroese/PLIST
@@ -1,7 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2004/12/24 03:07:34 wiz Exp $
-lib/aspell/faroese.alias
-lib/aspell/fo.multi
-lib/aspell/fo.rws
-lib/aspell/føroyskt.alias
-share/aspell/fo.dat
-share/aspell/fo_phonet.dat
+@comment $NetBSD: PLIST,v 1.3 2006/01/29 01:59:02 wiz Exp $
+lib/aspell/faroese
+lib/aspell/fo_FO
+lib/aspell/føroyskt
+share/aspell/faroese.dat
+share/aspell/faroese_phonet.dat
+share/aspell/fo_FO.dat
+share/aspell/fo_FO_phonet.dat
+share/aspell/føroyskt.dat
+share/aspell/føroyskt_phonet.dat
diff --git a/textproc/aspell-faroese/distinfo b/textproc/aspell-faroese/distinfo
index 550b7b42de8..acecfb7bd06 100644
--- a/textproc/aspell-faroese/distinfo
+++ b/textproc/aspell-faroese/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 14:48:39 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/01/29 01:59:02 wiz Exp $
 
-SHA1 (aspell5-fo-0.2.16-1.tar.bz2) = da3dab3261df65df6765ad7fb7a9078f1a33d0ee
-RMD160 (aspell5-fo-0.2.16-1.tar.bz2) = e2a2b2c2a21d01a85f4fff74341a410f594de66e
-Size (aspell5-fo-0.2.16-1.tar.bz2) = 165901 bytes
-SHA1 (patch-aa) = e22211d1b77a79d16e2334630dc171245bb15677
+SHA1 (aspell-fo-0.2.24.tar.bz2) = fb9da90644a39434ba4ac070aa6049bac855976e
+RMD160 (aspell-fo-0.2.24.tar.bz2) = 43b8cfeb40bbfb5c11fb90a68599ebf5c1e49fa6
+Size (aspell-fo-0.2.24.tar.bz2) = 180736 bytes
+SHA1 (patch-aa) = 82fd679bcaad49f7e8af6ed23f16c67de66803a1
diff --git a/textproc/aspell-faroese/patches/patch-aa b/textproc/aspell-faroese/patches/patch-aa
index f2f944f7bb3..9395b71dd3b 100644
--- a/textproc/aspell-faroese/patches/patch-aa
+++ b/textproc/aspell-faroese/patches/patch-aa
@@ -1,21 +1,25 @@
-$NetBSD: patch-aa,v 1.2 2003/01/19 06:35:48 salo Exp $
+$NetBSD: patch-aa,v 1.3 2006/01/29 01:59:02 wiz Exp $
 
---- Makefile.pre.orig	Fri Jan  3 18:39:33 2003
-+++ Makefile.pre	Wed Jan 15 00:48:39 2003
-@@ -16,12 +16,10 @@
- all: ${rws_files} ${data_files}
+--- Makefile.orig	2005-12-22 14:56:50.000000000 +0000
++++ Makefile
+@@ -9,16 +9,14 @@ landekode=FO
+ lang = fo
+ version = 0.2.24
  
- install: all
--	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}
-+	${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}/
+-dictdir=`aspell dump config | grep '^\# dict-dir current: ' | cut -d' ' -f4`
+-datadir=`aspell dump config | grep '^\# data-dir current: ' | cut -d' ' -f4`
++dictdir=`aspell config dict-dir`
++datadir=`aspell config data-dir`
  
- clean:
- 	rm -f ${rws_files}
+ all: $(sprog) $(sprog).dat $(sprog)_phonet.dat
+ 
+ install: $(sprog).dat $(sprog)_phonet.dat $(sprog)
+-	chown root.root $(sprog).dat $(sprog)_phonet.dat $(sprog)
+-	chmod 0644      $(sprog).dat $(sprog)_phonet.dat $(sprog)
+-	mv $(sprog).dat $(sprog)_phonet.dat $(datadir)
+-	mv $(sprog)                         $(dictdir)
++	${BSD_INSTALL_DATA} $(sprog).dat $(sprog)_phonet.dat $(datadir)
++	${BSD_INSTALL_DATA} $(sprog)                         $(dictdir)
+ 	ln -fs $(datadir)/$(sprog).dat        $(datadir)/$(sprogkode)_$(landekode).dat || true
+ 	ln -fs $(datadir)/$(sprog)_phonet.dat $(datadir)/$(sprogkode)_$(landekode)_phonet.dat || true
+ 	ln -fs $(dictdir)/$(sprog)            $(dictdir)/$(sprogkode)_$(landekode) || true