Update the ISPELL_NO part to version 2.0

Bump PORTREVISON.

4 files changed, 66 insertions, 50 deletions

diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile
index 984d9966827d..db720650dc2f 100644
--- a/textproc/ispell/Makefile
+++ b/textproc/ispell/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME?=	ispell
 PORTVERSION?=	3.1.20c
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES+=	textproc elisp
 MASTER_SITES=	ftp://ftp.cs.ucla.edu/pub/ispell-3.1/ \
 		ftp://ftp.kiarchive.ru/pub/unix/text/ispell/
@@ -29,8 +29,10 @@ EXTRACT_ONLY=	${ISPELL_FILES}
 EXTRA_DICT=
 MAKE_FLAGS=	TMPDIR=${WRKDIR} -f
 ALL_TARGET=
+
 BUILDHASH=	${WRKSRC}/buildhash
 UNSQ=		${WRKSRC}/unsq
+MUNCHLIST=	${WRKSRC}/munchlist
 DATADIR=	${PREFIX}/share/ispell
 
 .if (!defined(ISPELL_FR) && !defined(ISPELL_SE) && !defined(ISPELL_BR) && !defined(ISPELL_DENEU) && !defined(ISPELL_DEALT) && !defined(ISPELL_BRITISH) && !defined(ISPELL_NO) && !defined(ISPELL_NL) && !defined(ISPELL_DA) && !defined(ISPELL_AF))
@@ -81,10 +83,12 @@ EXTRA_DICT+=	${DEALTDISTFILE}
 MASTER_SITES+=	ftp://ftp.informatik.uni-kiel.de/pub/kiel/dicts/
 .endif
 .if defined(ISPELL_NO)
-NODISTFILE=	ispell-norsk-1.1a.tar.gz
-MASTER_SITES+=	http://www.uio.no/~runekl/
+NODISTFILE=	ispell-norsk-2.0.tar.gz
+MASTER_SITES+=	ftp://ftp.ntnu.no/store/store/stash/ispell/
 EXTRA_DICT+=	${NODISTFILE}
+EXTRACT_ONLY+=	${NODISTFILE}
 MASKBITS?=	64
+USE_GMAKE=	yes
 .endif
 .if defined(ISPELL_NL)
 NLDISTFILE=	ispell-nl-1.0.0.tar.gz
@@ -111,7 +115,6 @@ EXTRA_DICT+=	${AFDISTFILE}
 EXTRACT_ONLY+=	${AFDISTFILE}
 .endif
 
-
 DISTFILES+=	${EXTRA_DICT}
 .endif
 
@@ -127,10 +130,6 @@ post-extract:
 .if defined(ISPELL_DENEU)
 	@${TAR} -C ${WRKDIR}/ -yxf ${DISTDIR}/${DENEUDISTFILE}
 .endif
-.if defined(ISPELL_NO)
-	@${MKDIR} ${WRKDIR}/inorsk
-	@${TAR} -C ${WRKDIR}/inorsk/ -zxf ${PORTSDIR}/distfiles/${NODISTFILE}
-.endif
 
 post-patch:
 .if defined(ISPELL_FR)
@@ -146,7 +145,7 @@ post-patch:
 	@cd ${WRKDIR} && ${PATCH} < ${FILESDIR}/SE.patch 2>/dev/null
 .endif
 .if defined(ISPELL_NO)
-	@cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/NO.patch 2>/dev/null
+	cd ${WRKDIR} && ${PATCH} < ${FILESDIR}/NO.patch 2>/dev/null
 .endif
 .if defined(ISPELL_NL)
 	@cd ${WRKDIR} && ${PATCH} < ${FILESDIR}/NL.patch 2>/dev/null
@@ -195,10 +194,9 @@ post-build:
 		${MAKE} ${MAKEFLAGS} BUILDHASH=${BUILDHASH}
 .endif
 .if defined(ISPELL_NO)
-	@cd ${WRKDIR}/inorsk && \
-		${CP} norsk.7bit norsk.aff && \
-		${CAT} norsk.base > norsk.sml && \
-		${BUILDHASH} norsk.sml norsk.aff norsk.hash
+	@cd ${WRKDIR}/norsk && \
+		${GMAKE} ${MAKEFLAGS} UNSQ=${UNSQ} BUILDHASH=${BUILDHASH} \
+			MUNCHLIST=${MUNCHLIST}
 .endif
 .if defined(ISPELL_NL)
 	@cd ${WRKDIR}/${NLDISTFILE:S=.tar.gz==} && \
diff --git a/textproc/ispell/distinfo b/textproc/ispell/distinfo
index 81b649c71c0a..72dc349623da 100644
--- a/textproc/ispell/distinfo
+++ b/textproc/ispell/distinfo
@@ -4,7 +4,7 @@ MD5 (iswedish-1.2.1.tar.gz) = b546aeb88d7614c32e541488d55f32fe
 MD5 (hk-deutsch.tar.gz) = 0fb468159f7f0ba5b8a02c1fe111ac2d
 MD5 (ispell-html-mode.patch) = 1b44441a3748e55b3d509fcff21af4b7
 MD5 (br.ispell-2.4.tar.gz) = 241d9e2fefb92ea74f13c1e07d0b4e7b
-MD5 (ispell-norsk-1.1a.tar.gz) = d096dce5003b4e221e96fbf34f523c4c
+MD5 (ispell-norsk-2.0.tar.gz) = 7dd200f749459a42f7ded937ee72bb05
 MD5 (ispell-nl-1.0.0.tar.gz) = d9f8c68f28053e71792053e34201a28b
 MD5 (ispell-da-1.4.7.tar.gz) = 767ee1ce66b1213c45b086b59bf44312
 MD5 (ispell-sa-1.0.0.tar.gz) = b70889894d1427e5b78c0a6ecc4f8235
diff --git a/textproc/ispell/files/NO.patch b/textproc/ispell/files/NO.patch
index 841a55bd1b39..6cd6cae772c8 100644
--- a/textproc/ispell/files/NO.patch
+++ b/textproc/ispell/files/NO.patch
@@ -1,36 +1,51 @@
-*** inorsk/parse.y.org	Sun Feb  6 19:41:49 2000
---- inorsk/parse.y	Sun Feb  6 19:42:58 2000
-***************
-*** 870,876 ****
-  				flagbit = toupper (flagbit);
-  #endif /* MASKBITS */
-  #if MASKBITS <= 64
-! 			    if (!isalpha (flagbit))
-  				yyerror (PARSE_Y_BAD_FLAG);
-  #endif /* MASKBITS */
-  			    flagbit = CHARTOBIT (flagbit);
---- 870,876 ----
-  				flagbit = toupper (flagbit);
-  #endif /* MASKBITS */
-  #if MASKBITS <= 64
-! 			    if (flagbit < 'A' || flagbit > 'z')
-  				yyerror (PARSE_Y_BAD_FLAG);
-  #endif /* MASKBITS */
-  			    flagbit = CHARTOBIT (flagbit);
-***************
-*** 902,908 ****
-  				flagbit = toupper (flagbit);
-  #endif /* MASKBITS */
-  #if MASKBITS <= 64
-! 			    if (!isalpha (flagbit))
-  				yyerror (PARSE_Y_BAD_FLAG);
-  #endif /* MASKBITS */
-  			    flagbit = CHARTOBIT (flagbit);
---- 902,908 ----
-  				flagbit = toupper (flagbit);
-  #endif /* MASKBITS */
-  #if MASKBITS <= 64
-! 			    if (flagbit < 'A' || flagbit > 'z')
-  				yyerror (PARSE_Y_BAD_FLAG);
-  #endif /* MASKBITS */
-  			    flagbit = CHARTOBIT (flagbit);
+--- norsk/Makefile.orig	Tue Sep  5 23:50:30 2000
++++ norsk/Makefile	Sat Jan 13 15:23:30 2001
+@@ -8,9 +8,9 @@
+ SHELL = /bin/sh
+ MAKE = make
+ 
+-CONFIG		=	../../config.sh
+-PATHADDER	=	../..
+-BUILDHASH	=	../../buildhash
++CONFIG		=	../ispell-3.1/config.sh
++PATHADDER	=	../ispell-3.1
++BUILDHASH	?=	../ispell-3.1/buildhash
+ 
+ # The following variables make it easy to adapt this Makefile to
+ # numerous languages.
+@@ -269,7 +269,7 @@
+ 	echo -e 'suffixes\nflag *z:\nY Y Y Y Y   >   YYYYYY' >> $@
+ 
+ norsk.words: norsk.words.sq
+-	unsq < norsk.words.sq > norsk.words
++	$(UNSQ) < norsk.words.sq > norsk.words
+ 
+ # The following ugly code munches a part of the base file, keeping the
+ # indications of the frequency of the words.  It also removes some
+@@ -296,7 +296,7 @@
+ 	  | grep -e '$(subst munched.,,$@)$$' \
+ 	  | sed -e 's/ .*//' -e 's/-/î/g' -e 's/ \*//' \
+ 	  | grep '^[${UCH}]' \
+-	  | munchlist -v -l ${AFFIXES}.munch \
++	  | $(MUNCHLIST) -v -l ${AFFIXES}.munch \
+ 	  > munch1.tmp
+ 	PATH=$(PATHADDER):$$PATH; \
+ 	export PATH; \
+@@ -304,7 +304,7 @@
+ 	  | grep -e '$(subst munched.,,$@)$$' \
+ 	  | sed -e 's/ .*//' -e 's/-/î/g' -e 's/ \*//' \
+ 	  | grep -v '^[${UCH}]' \
+-	  | munchlist -v -l ${AFFIXES}.munch \
++	  | $(MUNCHLIST) -v -l ${AFFIXES}.munch \
+ 	  >> munch1.tmp
+ 	cat munch1.tmp \
+ 	  | sed -e 's/\(zyzyzy\|ZYZYZY\)/\1\/\` /' \
+@@ -463,7 +463,7 @@
+ 	  | grep '\*' \
+ 	  | sed -e 's/ .*//' \
+ 	  | tr -d '-' \
+-	  | munchlist -v -l ny${AFFIXES}.munch \
++	  | $(MUNCHLIST) -v -l ny${AFFIXES}.munch \
+ 	  | sed -e N -e 's/^\(\([-${CH}]\)*\)er\/\(.*F.*\)\n\1rar\/M$$/\1er\/\3D/' \
+ 		-e '$$ p' -e '$$ d' -e P -e D \
+ 	  > $@ 
diff --git a/textproc/ispell/pkg-plist.no b/textproc/ispell/pkg-plist.no
index 17d77e252c0f..4f90c95bd08a 100644
--- a/textproc/ispell/pkg-plist.no
+++ b/textproc/ispell/pkg-plist.no
@@ -1,2 +1,5 @@
 share/ispell/norsk.aff
 share/ispell/norsk.hash
+share/ispell/norsk.munch.hash
+share/ispell/nynorsk.hash
+share/ispell/nynorsk.aff