Moving ispell-* packages as discussed on tech-pkg@. Reasons being:

1) Shorter package name;
2) Be consistent with kde3-l18n-*, kde4-l10n-*, hunspell-*, aspell-*,
lang-* PKG_OPTIONS;
3) Simplify modifications to PKGNAME in some Makefiles;
4) Accordance with international language naming standards;

and rename the ispell-base package to ispell, to be consistent with aspell
and hunspell. Bump PKGREVISION where necessary.


(rodent)

Ispell is a fast screen-oriented spelling checker that shows you your
errors in the context of the original file, and suggests possible
corrections when it can figure them out.  Compared to UNIX spell, it
is faster and much easier to use.  Ispell can also handle languages
other than English.

@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:36 rodent Exp $
bin/buildhash
bin/defmt-c
bin/defmt-sh
bin/findaffix
bin/icombine
bin/ijoin
bin/ispell
bin/munchlist
bin/tryaffix
lib/american.hash
lib/americanmed+.hash
lib/english.aff
lib/english.hash
man/man1/buildhash.1
man/man1/findaffix.1
man/man1/ispell.1
man/man1/munchlist.1
man/man1/tryaffix.1
man/man5/english.5
man/man5/ispell.5

$NetBSD: distinfo,v 1.1 2013/04/24 02:20:36 rodent Exp $

SHA1 (ispell-3.3.02.tar.gz) = c0d98e1af3afb8e0b642717c03439ff8881e3d60
RMD160 (ispell-3.3.02.tar.gz) = 12edc94ebb7c1f4040bd8f5b0dbb8f40326aa781
Size (ispell-3.3.02.tar.gz) = 619813 bytes
SHA1 (patch-aa) = cf8e0863e62103526d75ba5f0f25c760d4ee8e32
SHA1 (patch-ab) = 0a0569521b73761e969794e64d8ba8822c705720
SHA1 (patch-ac) = 02b94c918164c19ec7cba5c9b88b7168a6f37925
SHA1 (patch-ad) = 86bcb4c4b34a970b5f3eba6d406a8b8204fccf39
SHA1 (patch-ae) = 0b19b5f4f2a0faf74ce130b7414bdf85b7588954
SHA1 (patch-ai) = 210d80ca55fc1d4fb5aa308205d8630a7f4bfb67
SHA1 (patch-ak) = aed34699d30d05a61bc2bd4d2ebf88e170ccd65c
SHA1 (patch-al) = 27d87b52dc5507e9dbab73bb9643fa490920216d
SHA1 (patch-ar) = 872cfc47e3652716afab9561fcf4a1bda2cee61a
SHA1 (patch-as) = fd3b2ec1788a7ffc4c871f5564742aad41fadda9

# $NetBSD: Makefile,v 1.25 2013/04/24 02:20:36 rodent Exp $
#

DISTNAME=	ispell-3.3.02
CATEGORIES=	textproc
MASTER_SITES=	http://fmg-www.cs.ucla.edu/geoff/tars/

MAINTAINER=	pkgsrc-users@NetBSD.org
HOMEPAGE=	http://ficus-www.cs.ucla.edu/geoff/ispell.html
COMMENT=	Interactive spelling checker

USE_TOOLS+=	mktemp:run yacc
INSTALLATION_DIRS=	bin lib ${PKGMANDIR}/man1 ${PKGMANDIR}/man5

MAKE_FLAGS+=	TMPDIR=${WRKDIR:Q}
MAKE_JOBS_SAFE=	no

.include "../../mk/bsd.prefs.mk"

.if exists(/usr/include/inttypes.h) && empty(MACHINE_PLATFORM:MIRIX-5.3-*)
CFLAGS+=	-DHAVE_INTTYPES_H
.endif


.if ${OPSYS} == "SunOS"
EXTRADICT=/usr/dict/words
.else
EXTRADICT=/usr/share/dict/words
.endif

.if !exists(${EXTRADICT})
EXTRADICT=
.endif

do-configure:
	cd ${WRKSRC};							\
	${SED} -e 's|/usr/local|${PREFIX}|g' <local.h.bsd >local.h;	\
	${ECHO} "#define LANGUAGES \"{american,MASTERDICTS=american.med+,HASHFILES=americanmed+.hash,EXTRADICT=${EXTRADICT}}\""  >>local.h; \
	${ECHO} "#define MASTERHASH \"americanmed+.hash\"" >>local.h;	\
	${ECHO} "#define MASKBITS 64" >>local.h;			\
	${ECHO} "#undef WORDS"  >> local.h ;				\
	${ECHO} '#define WORDS   "${EXTRADICT}"'  >> local.h ;		\
	${ECHO} "#define CFLAGS \"${CFLAGS}\"" >> local.h ;		\
	${ECHO} "#define LIBES \"${LDFLAGS}\"" >> local.h ;		\
	${ECHO} "#define MAN1DIR \"${PREFIX}/${PKGMANDIR}/man1\"" >> local.h ; \
	${ECHO} "#define MAN45DIR \"${PREFIX}/${PKGMANDIR}/man5\"" >> local.h ;
.if ${OPSYS} == "SunOS"
	cd ${WRKSRC};							\
	${ECHO} "#define USG" >> local.h;
.endif
.if ${OPSYS} == "Interix"
	cd ${WRKSRC};							\
	${ECHO} "#define SORTTMP \"\"" >> local.h;			\
	${ECHO} "#define MAKE_SORTTMP \"\"" >> local.h;
.endif

.include "../../mk/termcap.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

This package provides the Catalan-spelling dictionaries for ispell.
The dictionary is provided by Softcatala.

# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:37 rodent Exp $
#

DISTNAME=	ispell-sc-ca
PKGNAME=	ispell-catalan-1.0
CATEGORIES=	textproc
MASTER_SITES=	http://www.softcatala.org/cgi-bin/gaudi/contadorb/load.cgi?/fitxers/linux/
EXTRACT_SUFX=	.zip

MAINTAINER=	jmmv@NetBSD.org
HOMEPAGE=	http://www.softcatala.org/projectes/myspell/
COMMENT=	Catalan dictionary for interactive spelling checker

DEPENDS+=	ispell>=3.1.20:../../textproc/ispell

WRKSRC=		${WRKDIR}

INSTALLATION_DIRS=	lib

post-extract:
	( cd ${WRKSRC} 							\
		&& ${MV} catalan_i.dic catala.dic && 			\
		${MV} catalan_i.aff catala.aff )

do-build:
	( cd ${WRKSRC} && 						\
		${PREFIX}/bin/buildhash catala.dic catala.aff 		\
			catala.hash )

do-install:
	${INSTALL_DATA} ${WRKSRC}/catala.aff ${DESTDIR}${PREFIX}/lib
	${INSTALL_DATA} ${WRKSRC}/catala.hash ${DESTDIR}${PREFIX}/lib

.include "../../mk/bsd.pkg.mk"

@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:37 rodent Exp $
lib/catala.aff
lib/catala.hash

$NetBSD: distinfo,v 1.1 2013/04/24 02:20:37 rodent Exp $

SHA1 (ispell-sc-ca.zip) = 8b9afbf6df125d3cca72271929727db1c2484da2
RMD160 (ispell-sc-ca.zip) = f3ad88e16efa5e87e1854643e78b7527ebefce4c
Size (ispell-sc-ca.zip) = 1998440 bytes

This package contains the German (german) dictionary for the
interactive spelling checker ispell.
Use with 'ispell -d german filename'; you probably also need
the '-Tlatin1' option.

# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:38 rodent Exp $
#

DISTNAME=	igerman98-20120607
PKGNAME=	ispell-german-20120607
CATEGORIES=	textproc
MASTER_SITES=	http://j3e.de/ispell/igerman98/dict/
EXTRACT_SUFX=	.tar.bz2

MAINTAINER=	pkgsrc-users@NetBSD.org
HOMEPAGE=	http://j3e.de/ispell/igerman98/
COMMENT=	German dictionary for interactive spelling checker

DEPENDS+=	ispell>=3.1.20nb1:../../textproc/ispell

BUILD_TARGET=	ispell/de_DE.aff ispell/de_DE.hash ispell/de_AT.aff ispell/de_AT.hash ispell/de_CH.aff ispell/de_CH.hash
USE_TOOLS+=	gmake perl
REPLACE_PERL=	bin/dic2iso.pl bin/grepl bin/sq.pl bin/myspellfixprefix.pl \
		bin/clear_affix.pl bin/unsq.pl bin/uniqflag.pl

INSTALLATION_DIRS=	lib

do-install:
	${INSTALL_DATA} ${WRKSRC}/ispell/*.aff ${DESTDIR}${PREFIX}/lib
	${INSTALL_DATA} ${WRKSRC}/ispell/*.hash ${DESTDIR}${PREFIX}/lib

.include "../../mk/bsd.pkg.mk"

@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:38 rodent Exp $
lib/de_AT.aff
lib/de_AT.hash
lib/de_CH.aff
lib/de_CH.hash
lib/de_DE.aff
lib/de_DE.hash

$NetBSD: distinfo,v 1.1 2013/04/24 02:20:38 rodent Exp $

SHA1 (igerman98-20120607.tar.bz2) = 2cb42608727a13c877db98f19fe43b5cae2d4e73
RMD160 (igerman98-20120607.tar.bz2) = 0756833bcda3b67f430b6b5dbfc5db9956960eae
Size (igerman98-20120607.tar.bz2) = 475390 bytes
SHA1 (patch-aa) = 5c14e2484a9a775b59ce84da1d2d3c2b4a8c9809

$NetBSD: patch-aa,v 1.1 2013/04/24 02:20:38 rodent Exp $

--- Makefile.orig	2010-01-18 09:07:38.000000000 +0000
+++ Makefile
@@ -81,8 +81,8 @@ HUNSPELL_BIN = hunspell
 HUNSPELL = $(HUNSPELL_BIN) `$(HUNSPELL_BIN) -h 2>&1 | grep -q "hunspell \\-i" && echo "-i latin1"`
 
 
-SQ = sq
-UNSQ = unsq
+SQ = ../bin/sq.pl
+UNSQ = ../bin/unsq.pl
 #   if for some reason you don't have Ispell's unsq use my Perl sq/unsq
 #  and put it into a directory known by your PATH variable!
 #UNSQ = unsq.pl

This package provides the British-spelling dictionaries for ispell.

# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:38 rodent Exp $
#

DISTNAME=	ispell-3.3.02
PKGNAME=	ispell-${DICT_LANG}-3.3.02
CATEGORIES=	textproc
MASTER_SITES=	http://fmg-www.cs.ucla.edu/geoff/tars/

MAINTAINER=	pkgsrc-users@NetBSD.org
HOMEPAGE=	http://ficus-www.cs.ucla.edu/geoff/ispell.html
COMMENT=	British dictionary for interactive spelling checker

DEPENDS+=	ispell>=3.3.02:../../textproc/ispell

BUILD_TARGET=	config.sh all-languages

DICT_LANG=	british

MAKE_FLAGS+=	TMPDIR=${WRKDIR:Q}

INSTALLATION_DIRS=	lib
MAKE_JOBS_SAFE=		no

.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS"
WORDS=		/usr/dict/words
.else
WORDS=		/usr/share/dict/words
.endif

do-configure:
	cd ${WRKSRC};							\
	${SED} -e 's|/usr/local|${PREFIX}|g' <local.h.bsd >local.h;	\
	${ECHO} "#define LANGUAGES \"{${DICT_LANG},MASTERDICTS=${DICT_LANG}.xlg,HASHFILES=${DICT_LANG}xlg.hash,EXTRADICT=}\""  >>local.h; \
	${ECHO} '#define MASTERHASH "${DICT_LANG}xlg.hash"'  >> local.h ;	\
	${ECHO} "#undef WORDS"  >> local.h ;				\
	${ECHO} '#define WORDS   "${WORDS}"'  >> local.h

do-install:
	${CP} ${WRKSRC}/languages/${DICT_LANG}/${DICT_LANG}xlg.hash ${DESTDIR}${PREFIX}/lib
	cd ${DESTDIR}${PREFIX}/lib;					\
	${RM} -f ${DICT_LANG}.hash;					\
	${LN} ${DICT_LANG}xlg.hash ${DICT_LANG}.hash

.include "../../mk/bsd.pkg.mk"

@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:38 rodent Exp $
lib/britishxlg.hash
lib/british.hash

$NetBSD: distinfo,v 1.1 2013/04/24 02:20:38 rodent Exp $

SHA1 (ispell-3.3.02.tar.gz) = c0d98e1af3afb8e0b642717c03439ff8881e3d60
RMD160 (ispell-3.3.02.tar.gz) = 12edc94ebb7c1f4040bd8f5b0dbb8f40326aa781
Size (ispell-3.3.02.tar.gz) = 619813 bytes
SHA1 (patch-aa) = cf8e0863e62103526d75ba5f0f25c760d4ee8e32
SHA1 (patch-ab) = 210d80ca55fc1d4fb5aa308205d8630a7f4bfb67
SHA1 (patch-ac) = a3474192676a326f33e10266e57ace5dfb1ba7eb
SHA1 (patch-ad) = b3edb0466b306ecf1d59cfba46ec3f74e01db6ff

$NetBSD: patch-aa,v 1.1 2013/04/24 02:20:38 rodent Exp $

--- languages/english/english.2-orig	Mon Jan 23 19:28:44 1995
+++ languages/english/english.2	Thu Apr 16 14:34:21 1998
@@ -1867,7 +1867,6 @@
 auxotroph
 auxotrophic
 auxotrophy
-avaliable
 avast
 avatar
 avaunt

$NetBSD: patch-ab,v 1.1 2013/04/24 02:20:38 rodent Exp $
--- languages/english/english.3.orig	Tue Oct 27 22:26:48 1998
+++ languages/english/english.3	Tue Oct 27 22:27:35 1998
@@ -5202,6 +5202,7 @@
 dirndl
 disaccredit
 disafforest
+disappear
 disbranch
 disbud
 discalced
@@ -5236,7 +5237,6 @@
 dispersoid
 displayable
 disproven
-dissappear
 disseminule
 dissentious
 dissepiment

$NetBSD: patch-ac,v 1.1 2013/04/24 02:20:38 rodent Exp $

Use the buildhash program from the base installation

--- languages/british/Makefile	1995/01/08 23:24:18	1.4
+++ languages/british/Makefile	2001/03/14 10:56:42
@@ -63,7 +63,7 @@
 
 CONFIG		=	../../config.sh
 PATHADDER	=	../..
-BUILDHASH	=	../../buildhash
+BUILDHASH	=	${PREFIX}/bin/buildhash
 
 # The following variables should be set by the superior Makefile,
 # based on the LANGUAGES variable in config.X.

$NetBSD: patch-ad,v 1.1 2013/04/24 02:20:38 rodent Exp $

Don't build the programs - use the ones from the base system.

--- Makefile.orig	2005-05-26 01:57:02.000000000 +1200
+++ Makefile
@@ -287,7 +287,7 @@ showversion:	ispell
 	  mv y_tab.o $@; \
 	  rm -f y_tab.c
 
-all-languages:	munchable
+all-languages:
 	$(MAKE) LANGUAGE_TARGET=all SHELLDEBUG=$(SHELLDEBUG) language-subdirs
 
 install: config.sh all install-basic install-deformatters

This package provides the Spanish-spelling dictionaries for ispell.
The dictionary is provided by the COES project at LUCAS.

# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:39 rodent Exp $
#

DISTNAME=	espa~nol-1.7
PKGNAME=	ispell-spanish-1.7
CATEGORIES=	textproc
MASTER_SITES=	http://www.datsi.fi.upm.es/~coes/

MAINTAINER=	jmmv@NetBSD.org
HOMEPAGE=	http://es.tldp.org/htmls/coes.html
COMMENT=	Spanish dictionary for interactive spelling checker

DEPENDS+=	ispell>=3.1.20:../../textproc/ispell

MAKE_FLAGS+=	TMPDIR=${WRKDIR:Q}

INSTALLATION_DIRS=	lib

do-install:
	${INSTALL_DATA} ${WRKSRC}/espa~nol.aff \
	    ${DESTDIR}${PREFIX}/lib/castellano.aff
	${INSTALL_DATA} ${WRKSRC}/espa~nol.hash \
	    ${DESTDIR}${PREFIX}/lib/castellano.hash

.include "../../mk/bsd.pkg.mk"

@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:39 rodent Exp $
lib/castellano.aff
lib/castellano.hash

$NetBSD: distinfo,v 1.1 2013/04/24 02:20:39 rodent Exp $

SHA1 (espa~nol-1.7.tar.gz) = de8a2f2dbab0d3658aecd7ef109e91773da23dd7
RMD160 (espa~nol-1.7.tar.gz) = be9692aa6c97f0ecefc1143bffd8edc5ac22f019
Size (espa~nol-1.7.tar.gz) = 424599 bytes

This package contains the French (francais) dictionary for the
interactive spelling checker ispell.

# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:39 rodent Exp $
#

DISTNAME=	francais-IREQ-1.4
PKGNAME=	ispell-francais-1.4
CATEGORIES=	textproc
MASTER_SITES=	ftp://ftp.robot.ireq.ca/pub/ispell/

MAINTAINER=	pkgsrc-users@NetBSD.org
HOMEPAGE=	http://www.gnu.org/software/ispell/ispell.html
COMMENT=	French dictionary for interactive spelling checker

DEPENDS+=	ispell>=3.1.20:../../textproc/ispell

INSTALLATION_DIRS=	lib

WRKSRC=		${WRKDIR}

.include "../../mk/bsd.pkg.mk"

@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:39 rodent Exp $
lib/francais.aff
lib/francais.hash

$NetBSD: distinfo,v 1.1 2013/04/24 02:20:39 rodent Exp $

SHA1 (francais-IREQ-1.4.tar.gz) = 940712167cd2d40c27e673246b8ce9f99595a309
RMD160 (francais-IREQ-1.4.tar.gz) = 9f11a627d84488c9cbbd37b75fbeae9060803f3d
Size (francais-IREQ-1.4.tar.gz) = 326207 bytes
SHA1 (patch-aa) = 1aafea8a058e1eddb5f64e0f2788ba11e6bf81b9

$NetBSD: patch-aa,v 1.1 2013/04/24 02:20:39 rodent Exp $

Use the buildhash program from the base installation

--- Makefile	2001/03/14 11:39:01	1.1
+++ Makefile	2001/03/14 11:41:48
@@ -13,10 +13,12 @@
 #------------------------------------------------------------------------------
 
 # Prendre soin de bien définir cette variable:
-LIBDIR	= /depot/public/lib/ispell
+LIBDIR	= ${PREFIX}/lib
+
+RM= 	/bin/rm -f
 
 # Il peut être requis de changer celle-ci aussi:
-HASH = $(LIBDIR)/buildhash
+HASH = ${PREFIX}/bin/buildhash
 
 # buildict n'est pas requis pour l'utilisation de francais-IREQ,
 # mais si vous décidez de modifier le dictionnaire, la variable suivante
@@ -52,8 +54,8 @@
 	$(HASH) francais.dico $(AFFIXES) francais.hash
 
 install: francais.hash
-	install francais.hash $(LIBDIR)
-	install $(AFFIXES) $(LIBDIR)
+	${BSD_INSTALL_DATA} francais.hash ${DESTDIR}$(LIBDIR)
+	${BSD_INSTALL_DATA} $(AFFIXES) ${DESTDIR}$(LIBDIR)
 
 # Ne pas faire ceci sans buildict!
 # francais.dico requiert buildict et d'importantes ressources informatiques

Irish language support for ispell, e.g. `ispell -d gaeilge $myfile'.

# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:39 rodent Exp $

DISTNAME=	ispell-gaeilge-2.0
CATEGORIES=	textproc
MASTER_SITES=	http://borel.slu.edu/~kps/ispell/

MAINTAINER=	pkgsrc-users@NetBSD.org
HOMEPAGE=	http://borel.slu.edu/~kps/ispell/
COMMENT=	Irish language support for ispell

DEPENDS+=	ispell>=3.1.20:../../textproc/ispell

INSTALLATION_DIRS=	lib

MAKE_ENV+=	INSTALL=${TOOLS_PATH.install}

.include "../../mk/bsd.pkg.mk"

@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:39 rodent Exp $
lib/gaeilge.aff
lib/gaeilge.hash

$NetBSD: distinfo,v 1.1 2013/04/24 02:20:39 rodent Exp $

SHA1 (ispell-gaeilge-2.0.tar.gz) = 66091937e88ceff648d5cb15752ec2a25b989ea7
RMD160 (ispell-gaeilge-2.0.tar.gz) = c9c690c617b874037cdf3c365896af68b73c1396
Size (ispell-gaeilge-2.0.tar.gz) = 267946 bytes
SHA1 (patch-aa) = fc134f50891e44217fda3a8cd31c31df3a9e8fa4

$NetBSD: patch-aa,v 1.1 2013/04/24 02:20:40 rodent Exp $

--- Makefile.orig	2002-07-31 16:37:34.000000000 +0000
+++ Makefile
@@ -1,13 +1,13 @@
 # Makefile ispell-gaeilge
 # INSTALLATION=gaeilgemor
 INSTALLATION=gaeilge
-ISPELLDIR=/usr/local/lib
-ISPELLBIN=/usr/local/bin
+ISPELLDIR=${PREFIX}/lib
+ISPELLBIN=${PREFIX}/bin
 MAKE=/usr/ccs/bin/make
 ASPELLDATA=/usr/local/aspell
 ASPELLFLAGS=--dict-dir=$(ASPELLDATA)/dict --data-dir=$(ASPELLDATA)/data
 ASPELL=/usr/local/bin/aspell $(ASPELLFLAGS)
-INSTALL=/usr/local/bin/install
+#INSTALL=/usr/local/bin/install
 
 #   Shouldn't have to change anything below here
 SHELL=/bin/sh
@@ -172,14 +172,14 @@ sounds.txt: FORCE
 	$(ASPELL) --lang=gaeilge soundslike < aspell.txt > sounds.txt
 
 install: $(INSTALLATION).hash
-	$(INSTALL_DATA) $(INSTALLATION).hash $(ISPELLDIR)
-	$(INSTALL_DATA) $(INSTALLATION).aff $(ISPELLDIR)
+	$(BSD_INSTALL_DATA) $(INSTALLATION).hash ${DESTDIR}$(ISPELLDIR)
+	$(BSD_INSTALL_DATA) $(INSTALLATION).aff ${DESTDIR}$(ISPELLDIR)
 
 installall: gaeilge.hash gaeilgemor.hash
-	$(INSTALL_DATA) gaeilge.hash $(ISPELLDIR)
-	$(INSTALL_DATA) gaeilge.aff $(ISPELLDIR)
-	$(INSTALL_DATA) gaeilgemor.hash $(ISPELLDIR)
-	$(INSTALL_DATA) gaeilgemor.aff $(ISPELLDIR)
+	$(BSD_INSTALL_DATA) gaeilge.hash $(ISPELLDIR)
+	$(BSD_INSTALL_DATA) gaeilge.aff $(ISPELLDIR)
+	$(BSD_INSTALL_DATA) gaeilgemor.hash $(ISPELLDIR)
+	$(BSD_INSTALL_DATA) gaeilgemor.aff $(ISPELLDIR)
 
 seiceail:
 	@cat ../bearla/tcht

This package contains the Polish (polski) dictionary for the
interactive spelling checker ispell.

# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:40 rodent Exp $
#

DISTNAME=	ispell-pl-20021127
PKGNAME=	${DISTNAME:S/-pl-/-polski-/}
CATEGORIES=	textproc
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ispell-pl/}

MAINTAINER=	adam@NetBSD.org
HOMEPAGE=	http://ispell-pl.sourceforge.net/
COMMENT=	Polish dictionary for interactive spelling checker

DEPENDS+=	ispell>=3.1.20:../../textproc/ispell

INSTALLATION_DIRS=	lib

do-build:
	cd ${WRKSRC} && ${SH} ./zbuduj.slownik.sh

do-install:
	${INSTALL_DATA} ${WRKSRC}/polish.aff ${DESTDIR}${PREFIX}/lib
	${INSTALL_DATA} ${WRKSRC}/polish.hash ${DESTDIR}${PREFIX}/lib

.include "../../mk/bsd.pkg.mk"

@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:40 rodent Exp $
lib/polish.aff
lib/polish.hash

$NetBSD: distinfo,v 1.1 2013/04/24 02:20:40 rodent Exp $

SHA1 (ispell-pl-20021127.tar.gz) = 9e5efd7656f6f0747130380750fc93c9ab4b1e3e
RMD160 (ispell-pl-20021127.tar.gz) = 010031d0c9b57c8c8bbb759886d1e13b377a644c
Size (ispell-pl-20021127.tar.gz) = 1019831 bytes

Romanian dictionary for ispell.

# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:41 rodent Exp $
#

DISTNAME=	rom-spell
PKGNAME=	ispell-romanian-20031216
CATEGORIES=	textproc
MASTER_SITES=	http://www.cs.cmu.edu/~mihaib/ftp/

MAINTAINER=	pkgsrc-users@NetBSD.org
HOMEPAGE=	http://fmg-www.cs.ucla.edu/fmg-members/geoff/ispell-dictionaries.html#Romanian-dicts
COMMENT=	Romanian dictionary for ispell

DEPENDS+=	ispell>=3.1.20:../../textproc/ispell

DIST_SUBDIR=	${PKGNAME_NOREV}

INSTALLATION_DIRS=	lib

do-install:
	${INSTALL_DATA} ${WRKSRC}/rom.aff ${DESTDIR}${PREFIX}/lib/romanian.aff
	${INSTALL_DATA} ${WRKSRC}/rom.hash ${DESTDIR}${PREFIX}/lib/romanian.hash
	${INSTALL_DATA} ${WRKSRC}/rom.signs.aff ${DESTDIR}${PREFIX}/lib/romanian-signs.aff
	${INSTALL_DATA} ${WRKSRC}/rom.signs.hash ${DESTDIR}${PREFIX}/lib/romanian-signs.hash

.include "../../mk/bsd.pkg.mk"

@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:41 rodent Exp $
lib/romanian.aff
lib/romanian.hash
lib/romanian-signs.aff
lib/romanian-signs.hash

$NetBSD: distinfo,v 1.1 2013/04/24 02:20:41 rodent Exp $

SHA1 (ispell-romanian-20031216/rom-spell.tar.gz) = 9a500dff38a2628d8cd945bdb03b4b6b5fda24c4
RMD160 (ispell-romanian-20031216/rom-spell.tar.gz) = 8b557981dd6388ef32216f65563ff7a18ef30e68
Size (ispell-romanian-20031216/rom-spell.tar.gz) = 279888 bytes

This is a new Russian (KOI8-R) dictionaries for ispell.

The word list is based on the early one collected by Neal Dalton.
After removing illegal words and adding many new rules and words,
the dictionaries contain now over 116,200 basic words and produce
over 1,116,000 related words (compared to 52,000 words in Neal's
version and 952,000 words in the dictionary by K. Knizhnik).

Also, this package seems to be the only one that supports the right
spelling of words with the Russian letter 'yo' (other dictionaries
simply replace the letter 'yo' by 'ye').

# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:41 rodent Exp $

PKGNAME=	ispell-russian-${RUS_ISPELL_VERSION}

.include "../../textproc/ispell-russian/Makefile.common"

# $NetBSD: Makefile.common,v 1.1 2013/04/24 02:20:41 rodent Exp $

RUS_ISPELL_VERSION=	0.99g4

DISTNAME=	rus-ispell-${RUS_ISPELL_VERSION}
CATEGORIES=	textproc
MASTER_SITES=	ftp://scon155.phys.msu.su/pub/russian/ispell/

MAINTAINER=	mishka@NetBSD.org
COMMENT=	Russian (KOI8-R) ispell dictonary from Alexander Lebedev

DEPENDS+=	ispell>=3.1.20:../../textproc/ispell

FILESDIR=	${.CURDIR}/../../textproc/ispell-russian/files
PATCHDIR=	${.CURDIR}/../../textproc/ispell-russian/patches
DISTINFO_FILE=	${.CURDIR}/../../textproc/ispell-russian/distinfo

WRKSRC=		${WRKDIR}
MAKE_ENV+=	CAT=${CAT:Q} RM=${RM:Q} SED=${SED:Q} TR=${TR:Q} UNIQ="uniq"

INSTALLATION_DIRS=	lib

.include "../../mk/bsd.pkg.mk"

@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:41 rodent Exp $
lib/russian.aff
lib/russian.hash

$NetBSD: distinfo,v 1.1 2013/04/24 02:20:41 rodent Exp $

SHA1 (rus-ispell-0.99g4.tar.gz) = a1f178b8e51abe812a69209f58e4f583e4e7bc39
RMD160 (rus-ispell-0.99g4.tar.gz) = 6c2d74b22c488e6372615b98c727f84011dea1be
Size (rus-ispell-0.99g4.tar.gz) = 521972 bytes
SHA1 (patch-aa) = 79cf6e28c3076a324e0f5b9b1228192bc470be6e

This is a new Russian (KOI8-R) dictionaries for ispell.

The word list is based on the early one collected by Neal Dalton.
After removing illegal words and adding many new rules and words,
the dictionaries contain now over 116,200 basic words and produce
over 1,116,000 related words (compared to 52,000 words in Neal's
version and 952,000 words in the dictionary by K. Knizhnik).

Also, this package seems to be the only one that supports the right
spelling of words with the Russian letter 'io' (other dictionaries
simply replace the letter 'io' by 'ye').

# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:41 rodent Exp $

PKGNAME=	ispell-russian-io-${RUS_ISPELL_VERSION}

MAKE_ENV+=	IO="defined"

.include "../../textproc/ispell-russian/Makefile.common"

@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:41 rodent Exp $
lib/russian-io.aff
lib/russian-io.hash

$NetBSD: patch-aa,v 1.1 2013/04/24 02:20:41 rodent Exp $

--- Makefile.orig	2002-10-09 23:35:54.000000000 +0100
+++ Makefile	2004-01-23 14:49:03.000000000 +0000
@@ -1,40 +1,49 @@
 # Makefile for Russian ispell dictionary
 
-LIB=/usr/lib/ispell
+INSTALLDIR=	${PREFIX}/lib
+BUILDHASH=	${PREFIX}/bin/buildhash
+SORTKOI8=	./sortkoi8
 
-DICT = base.koi abbrev.koi computer.koi for_name.koi geography.koi \
+ENC?=		koi
+DICT= 		base.koi abbrev.koi computer.koi for_name.koi geography.koi \
 	science.koi # rare.koi
 
-ifdef YO
-PATT=y
-else
-PATT=e
-YO2E=| tr '\243\263' '\305\345'
-endif
-
-koi iso alt win mac: russian.aff.koi russian.dict.koi
-	sed -e "s/^\#$(PATT)//;s/^\#$@/wordchars/" $< | \
-	./trans koi $@ > russian.aff
-	cat russian.dict.koi | ./trans koi $@ > russian.dict
-	rm russian.dict.koi
-	buildhash ./russian.dict ./russian.aff ./russian.hash
+# The following 'if' tries speedup the make process
+.ifdef ${ENC} == "koi"
+TRANSKOI= # null
+.else
+TRANSKOI= | ./trans koi ${ENC}
+.endif
+
+.ifdef IO
+PATT= y
+DICTNAME=-io
+.else
+PATT= e
+YO2E= | ${TR} '\243\263' '\305\345'
+.endif
+
+all:		russian${DICTNAME}.hash
 
 install:
-	cp russian.hash russian.aff $(LIB)
+	${BSD_INSTALL_DATA} russian${DICTNAME}.hash ${DESTDIR}${INSTALLDIR}
+	${BSD_INSTALL_DATA} russian${DICTNAME}.aff ${DESTDIR}${INSTALLDIR}
+
+russian${DICTNAME}.hash:	russian${DICTNAME}.aff russian${DICTNAME}.dict
+	${BUILDHASH} russian${DICTNAME}.dict russian${DICTNAME}.aff $@
 
-russian.dict.koi: $(DICT)
-	cat $^ $(YO2E) | ./sortkoi8 | uniq > $@
+russian${DICTNAME}.aff:	russian.aff.koi
+	${SED} -e "s/^\#${PATT}//;s/^\#${ENC}/wordchars/" $> \
+		${TRANSKOI} > $@
+
+russian${DICTNAME}.dict:	${DICT}
+	${CAT} $> ${YO2E} | ${SORTKOI8} | ${UNIQ} \
+		${TRANSKOI} > $@
 
 check_dict: $(DICT)
 	for i in `cat $(DICT) | sed 's,/.*$$,,' | sort | uniq -d`; do \
 		grep "^$$i/\|^$$i$$" $(DICT); \
 	done > .temp
 
-sort_dict: $(DICT)
-	for i in $(DICT); do \
-		cat $$i | ./sortkoi8 > $$i.temp; \
-		mv -f $$i.temp $$i; \
-	done
-
 clean:
-	rm -f russian.dict* russian.hash russian.aff .temp
+	rm -f russian${DICTNAME}.dict* russian${DICTNAME}.hash russian${DICTNAME}.aff .temp

Slovak dictionary for ispell.

# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:42 rodent Exp $
#

DISTNAME=	ispell-sk-0.2.2
PKGNAME=	${DISTNAME:S/sk/slovak/}
CATEGORIES=	textproc
MASTER_SITES=	http://sk-spell.sk.cx/

MAINTAINER=	salo@NetBSD.org
HOMEPAGE=	http://sk-spell.sk.cx/?id=4
COMMENT=	Slovak dictionary for ispell

DEPENDS+=	ispell>=3.1.20:../../textproc/ispell

MAKE_ENV+=	CAT=${CAT:Q} SORT=${SORT:Q}

.include "../../mk/bsd.pkg.mk"

@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:42 rodent Exp $
lib/slovak.aff
lib/slovak.hash

$NetBSD: distinfo,v 1.1 2013/04/24 02:20:42 rodent Exp $

SHA1 (ispell-sk-0.2.2.tar.gz) = e30fe88dd7cc0d0b318e20870649bc24245624f3
RMD160 (ispell-sk-0.2.2.tar.gz) = 55ba2884e5f4b644672fee23635d8b5fd48c3b96
Size (ispell-sk-0.2.2.tar.gz) = 611006 bytes
SHA1 (patch-aa) = cfc3c03c69d5bd50d8f92907100fcb4c9e97684b

$NetBSD: patch-aa,v 1.1 2013/04/24 02:20:42 rodent Exp $

--- Makefile.orig	2004-02-27 14:50:43.000000000 +0100
+++ Makefile	2004-09-12 22:50:13.000000000 +0200
@@ -1,17 +1,18 @@
-DESTDIR=/usr/lib/ispell
+INSTALLDIR=${PREFIX}/lib/
+BUILDHASH=${PREFIX}/bin/buildhash
 
 all: slovak.hash
 
 install: slovak.hash slovak.aff
-	mkdir -p $(DESTDIR)
-	install -o root -g bin -m 0444 slovak.hash $(DESTDIR)
-	install -o root -g bin -m 0444 slovak.aff $(DESTDIR)
+	${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(INSTALLDIR)
+	${BSD_INSTALL_DATA} slovak.hash ${DESTDIR}$(INSTALLDIR)
+	${BSD_INSTALL_DATA} slovak.aff ${DESTDIR}$(INSTALLDIR)
 
 slovak.words:
-	cat *.words | sort -u -f > slovak.words
+	${CAT} *.words | ${SORT} -u -f > slovak.words
 
 slovak.hash: slovak.aff slovak.words
-	buildhash slovak.words slovak.aff slovak.hash
+	${BUILDHASH} slovak.words slovak.aff slovak.hash
 
 clean:
 	rm -f slovak.words slovak.words.cnt slovak.words.stat slovak.hash *~

This package contains the Swedish (svenska) dictionary for the
interactive spelling checker ispell.

# $NetBSD: Makefile,v 1.1 2013/04/24 02:20:43 rodent Exp $
#

DISTNAME=	iswedish-1.2.1
PKGNAME=	ispell-svenska-1.2.1
CATEGORIES=	textproc
MASTER_SITES=	http://sv.sslug.dk/locale/ispell/iswedish/

MAINTAINER=	pkgsrc-users@NetBSD.org
HOMEPAGE=	http://www.gnu.org/software/ispell/ispell.html
COMMENT=	Swedish dictionary for interactive spelling checker

INSTALLATION_DIRS=	lib

DEPENDS+=	ispell>=3.1.20:../../textproc/ispell

.include "../../mk/bsd.pkg.mk"

@comment $NetBSD: PLIST,v 1.1 2013/04/24 02:20:43 rodent Exp $
lib/svenska.aff
lib/svenska.hash

$NetBSD: distinfo,v 1.1 2013/04/24 02:20:43 rodent Exp $

SHA1 (iswedish-1.2.1.tar.gz) = c26c851123a427b495ca9ac10c443ec23efa8e3a
RMD160 (iswedish-1.2.1.tar.gz) = 4d5a040018b12d06f4d8f45f89eb775ba6f88aab
Size (iswedish-1.2.1.tar.gz) = 122346 bytes
SHA1 (patch-aa) = 861c839dc85072d52f5239f41628b598b4930067

$NetBSD: patch-aa,v 1.1 2013/04/24 02:20:43 rodent Exp $

--- Makefile.orig	Thu Jan 29 16:06:32 1998
+++ Makefile	Sat Apr 28 17:21:54 2001
@@ -1,13 +1,14 @@
-installdir=/usr/lib/ispell
+installdir=${PREFIX}/lib
+buildhash=${PREFIX}/bin/buildhash
 
 all: svenska.hash
 
 install: svenska.hash svenska.aff
-	install -o root -g root -m 0644 svenska.hash $(installdir)
-	install -o root -g root -m 0644 svenska.aff $(installdir)
+	${BSD_INSTALL_DATA} svenska.hash ${DESTDIR}$(installdir)
+	${BSD_INSTALL_DATA} svenska.aff ${DESTDIR}$(installdir)
 
 svenska.hash: svenska.aff svenska.datalista
-	buildhash svenska.datalista svenska.aff svenska.hash
+	${buildhash} svenska.datalista svenska.aff svenska.hash
 
 clean:
 	rm -f svenska.datalista.stat svenska.hash svenska.datalista.cnt *~

$NetBSD: patch-aa,v 1.4 2013/04/24 02:20:36 rodent Exp $

--- languages/english/english.2-orig	Mon Jan 23 19:28:44 1995
+++ languages/english/english.2	Thu Apr 16 14:34:21 1998
@@ -1867,7 +1867,6 @@
 auxotroph
 auxotrophic
 auxotrophy
-avaliable
 avast
 avatar
 avaunt

$NetBSD: patch-ab,v 1.8 2013/04/24 02:20:36 rodent Exp $

--- Makefile.orig	2005-05-25 15:57:02.000000000 +0200
+++ Makefile
@@ -373,13 +373,10 @@ install-dictbuild:
 	    rm -f fixispell-a$$MAN1EXT
 	@. ./config.sh; \
 	  set -x; \
-	  $$INSTALL sq.1 $$MAN1DIR/sq$$MAN1EXT; \
 	  for m in buildhash munchlist findaffix tryaffix; do \
 	    echo ".so `basename $$MAN1DIR`/ispell$$MAN1EXT" \
 	      > $$MAN1DIR/$$m$$MAN1EXT; \
-	  done; \
-	  echo ".so `basename $$MAN1DIR`/sq$$MAN1EXT" \
-	    > $$MAN1DIR/unsq$$MAN1EXT 
+	  done
 	@. ./config.sh; \
 	  set -x; \
 	  cd $$MAN1DIR; \
@@ -506,10 +503,10 @@ defhash.h:  config.X local.h Makefile
 
 config.sh:  config.X defhash.h local.h Makefile
 	set $(SHELLDEBUG); \
-	for var in BAKEXT BINDIR CC CFLAGS COUNTSUFFIX DEFDICT DEFHASH \
+	for var in BAKEXT CC CFLAGS COUNTSUFFIX DEFDICT DEFHASH \
 	  DEFLANG EXEEXT HASHSUFFIX INSTALL \
-	  LANGUAGES LIBDIR LIBES LINK LINT LINTFLAGS LOOK_XREF \
-	  MAKE_SORTTMP MAN1DIR MAN1EXT MAN45DIR MAN45EXT MAN45SECT MASTERHASH \
+	  LANGUAGES LIBES LINK LINT LINTFLAGS LOOK_XREF \
+	  MAKE_SORTTMP MAN1EXT MAN45EXT MAN45SECT MASTERHASH \
 	  MSGLANG POUNDBANG REGLIB STATSUFFIX \
 	  SPELL_XREF TERMLIB TIB_XREF WORDS YACC \
 	  ; do \
@@ -518,6 +515,12 @@ config.sh:  config.X defhash.h local.h M
 	      | sed -e 's/"[^"]*$$/'"'/" -e "s/=/='/" -e 's/\\"/"/g' \
 	      | sed -n -e '$$p'; \
 	  done > config.sh; \
+	for var in BINDIR LIBDIR MAN1DIR MAN45DIR; do \
+	    cat config.X defhash.h local.h \
+	      | sed -n -e "s/^#define[ 	]*$$var[ 	]*"'"'"/$$var=/p" \
+	      | sed -e 's/"[^"]*$$/'"'/" -e "s/=/=\$${DESTDIR}'/" -e 's/\\"/"/g' \
+	      | sed -n -e '$$p'; \
+	  done >> config.sh; \
 	echo 'case "$$MAKE_SORTTMP" in "") \
 	  SORTTMP="-e /!!SORTTMP!!/s/=.*$$/=/";; *) SORTTMP=;; esac' \
 	  >> config.sh
@@ -636,7 +639,7 @@ local.h:
 	set +e; \
 	  [ -r local.h ]  ||  (cp local.h.generic local.h; chmod u+w local.h)
 
-msgs.h:	config.sh FRC
+msgs.h:	config.sh
 	@. ./config.sh; \
 	  set $(SHELLDEBUG); \
 	  set +e; \
@@ -650,7 +653,8 @@ msgs.h:	config.sh FRC
 	  else \
 	    set -x; \
 	    rm -f msgs.h; $$LINK $$msgs msgs.h  ||  cp $$msgs msgs.h; \
-	  fi
+	  fi; \
+	touch msgs.h
 
 FRC:
 

$NetBSD: patch-ac,v 1.3 2013/04/24 02:20:36 rodent Exp $

--- ispell.h.orig	2005-04-29 02:46:51.000000000 +1200
+++ ispell.h
@@ -144,6 +144,16 @@
 #include "config.h"
 #include <stdio.h>
 
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#define PTRSIZE intptr_t
+#else
+#define PTRSIZE unsigned int
+#endif
+#if !defined(HAVE_INTTYPES_H) && defined(__alpha) && defined(__NetBSD__)
+#define PTRSIZE unsigned long
+#endif /* hack for 1.3 */
+
 #ifdef __STDC__
 #define P(x)	x
 #define VOID	void
@@ -380,8 +390,8 @@ struct hashheader
     unsigned short maxstringcharlen;		/* Max strchr len supported */
     unsigned short compoundmin;			/* Min lth of compound parts */
     short compoundbit;				/* Flag 4 compounding roots */
-    unsigned int stringsize;			/* Size of string table */
-    unsigned int lstringsize;			/* Size of lang. str tbl */
+    PTRSIZE stringsize;				/* Size of string table */
+    PTRSIZE lstringsize;			/* Size of lang. str tbl */
     unsigned int tblsize;			/* No. entries in hash tbl */
     unsigned int stblsize;			/* No. entries in sfx tbl */
     unsigned int ptblsize;			/* No. entries in pfx tbl */

$NetBSD: patch-ad,v 1.3 2013/04/24 02:20:36 rodent Exp $

--- buildhash.c.orig	2005-04-28 12:26:06.000000000 +1200
+++ buildhash.c
@@ -248,7 +248,7 @@ static void output ()
     {
     register FILE *		houtfile;
     register struct dent *	dp;
-    unsigned long		strptr;
+    PTRSIZE			strptr;
     int				n;
     unsigned int		i;
     int				maxplen;
@@ -375,7 +375,7 @@ static void output ()
 	{
 	if (dp->next != 0)
 	    {
-	    unsigned long	x;
+	    PTRSIZE	x;
 	    x = dp->next - hashtbl;
 	    dp->next = (struct dent *)x;
 	    }

$NetBSD: patch-ae,v 1.3 2013/04/24 02:20:36 rodent Exp $

--- lookup.c.orig	2005-04-15 09:25:52.000000000 +1200
+++ lookup.c
@@ -247,11 +247,11 @@ int linit ()
 	    if (dp->word == (unsigned char *) -1)
 		dp->word = NULL;
 	    else
-		dp->word = &hashstrings[(unsigned long) dp->word];
+		dp->word = &hashstrings[(PTRSIZE) dp->word];
 	    if (dp->next == (struct dent *) -1)
 		dp->next = NULL;
 	    else
-		dp->next = &hashtbl[(unsigned long) dp->next];
+		dp->next = &hashtbl[(PTRSIZE) dp->next];
 	    }
 	}
 
@@ -259,12 +259,12 @@ int linit ()
 	{
 	if (entry->stripl)
 	    entry->strip =
-	      (ichar_t *) &hashstrings[(unsigned long) entry->strip];
+	      (ichar_t *) &hashstrings[(PTRSIZE) entry->strip];
 	else
 	    entry->strip = NULL;
 	if (entry->affl)
 	    entry->affix =
-	      (ichar_t *) &hashstrings[(unsigned long) entry->affix];
+	      (ichar_t *) &hashstrings[(PTRSIZE) entry->affix];
 	else
 	    entry->affix = NULL;
 	}

$NetBSD: patch-ai,v 1.3 2013/04/24 02:20:36 rodent Exp $
--- languages/english/english.3.orig	Tue Oct 27 22:26:48 1998
+++ languages/english/english.3	Tue Oct 27 22:27:35 1998
@@ -5202,6 +5202,7 @@
 dirndl
 disaccredit
 disafforest
+disappear
 disbranch
 disbud
 discalced
@@ -5236,7 +5237,6 @@
 dispersoid
 displayable
 disproven
-dissappear
 disseminule
 dissentious
 dissepiment

$NetBSD: patch-ak,v 1.1 2013/04/24 02:20:36 rodent Exp $

--- term.c.orig	2005-04-15 11:11:36.000000000 +1200
+++ term.c
@@ -86,7 +86,10 @@ static char Rcs_Id[] =
 #include "ispell.h"
 #include "proto.h"
 #include "msgs.h"
-#ifdef USG
+#if defined(__NetBSD__) || defined(linux) || defined(__sgi) || defined(__INTERIX)
+#define USE_TERMIOS
+#include <termios.h>
+#elif defined(USG)
 #include <termio.h>
 #else
 #ifndef __DJGPP__
@@ -165,7 +168,10 @@ static int iputch (c)
     return putchar (c);
     }
 
-#ifdef USG
+#ifdef USE_TERMIOS
+static struct termios	sbuf;
+static struct termios	osbuf;
+#elif defined(USG)
 static struct termio	sbuf;
 static struct termio	osbuf;
 #else
@@ -292,8 +298,31 @@ retry:
 
 #endif
 
+#ifdef USE_TERMIOS
+    if (!isatty (0))
+	{
+	(void) fprintf (stderr, TERM_C_NO_BATCH);
+	exit (1);
+	}
+    tcgetattr(0, &osbuf);
+    termchanged = 1;
+
+    sbuf = osbuf;
+    sbuf.c_lflag &= ~(ECHO | ECHOK | ECHONL | ICANON);
+    sbuf.c_oflag &= ~(OPOST);
+    sbuf.c_iflag &= ~(INLCR | IGNCR | ICRNL);
+    sbuf.c_lflag |= ISIG;
+    sbuf.c_cc[VMIN] = 1;
+    sbuf.c_cc[VTIME] = 0;
+    tcsetattr(0, TCSANOW, &sbuf);
+
+    uerasechar = osbuf.c_cc[VERASE];
+    ukillchar = osbuf.c_cc[VKILL];
+
+#endif
+
 #ifdef SIGTSTP
-#ifndef USG
+#if !(defined(USG) || defined(USE_TERMIOS))
     (void) sigsetmask (1<<(SIGTSTP-1) | 1<<(SIGTTIN-1) | 1<<(SIGTTOU-1));
 #endif
 #endif
@@ -319,7 +348,7 @@ retry:
 #endif
 #endif
 
-#ifndef USG
+#if !(defined(USG) || defined(USE_TERMIOS))
     (void) ioctl (0, TIOCGETP, (char *) &osbuf);
 #ifdef TIOCGLTC
     (void) ioctl (0, TIOCGLTC, (char *) &oltc);
@@ -372,7 +401,9 @@ SIGNAL_TYPE done (signo)
 	{
 	if (te)
 	    tputs (te, 1, iputch);
-#ifdef USG
+#ifdef USE_TERMIOS
+	tcsetattr(0, TCSANOW, &osbuf);
+#elif defined(USG)
 	(void) ioctl (0, TCSETAW, (char *) &osbuf);
 #else
 	(void) ioctl (0, TIOCSETP, (char *) &osbuf);
@@ -393,7 +424,9 @@ static SIGNAL_TYPE onstop (signo)
 	imove (li - 1, 0);
 	if (te)
 	    tputs (te, 1, iputch);
-#ifdef USG
+#ifdef USE_TERMIOS
+	tcsetattr(0, TCSANOW, &osbuf);
+#elif defined(USG)
 	(void) ioctl (0, TCSETAW, (char *) &osbuf);
 #else
 	(void) ioctl (0, TIOCSETP, (char *) &osbuf);
@@ -412,7 +445,9 @@ static SIGNAL_TYPE onstop (signo)
     (void) signal (signo, onstop);
     if (termchanged)
 	{
-#ifdef USG
+#ifdef USE_TERMIOS
+	  tcsetattr(0, TCSANOW, &sbuf);
+#elif defined(USG)
 	(void) ioctl (0, TCSETAW, (char *) &sbuf);
 #else
 	(void) ioctl (0, TIOCSETP, (char *) &sbuf);
@@ -480,7 +515,9 @@ int shellescape	(buf)
 	}
     argv[i] = NULL;
 
-#ifdef USG
+#ifdef USE_TERMIOS
+    tcsetattr(0, TCSANOW, &osbuf);
+#elif defined(USG)
     (void) ioctl (0, TCSETAW, (char *) &osbuf);
 #else
     (void) ioctl (0, TIOCSETP, (char *) &osbuf);
@@ -526,7 +563,9 @@ int shellescape	(buf)
 	(void) signal (SIGTSTP, onstop);
 #endif
 
-#ifdef USG
+#ifdef USE_TERMIOS
+    tcsetattr(0, TCSANOW, &sbuf);
+#elif defined(USG)
     (void) ioctl (0, TCSETAW, (char *) &sbuf);
 #else
     (void) ioctl (0, TIOCSETP, (char *) &sbuf);
@@ -562,7 +601,9 @@ void shescape (buf)
     char	curdir[MAXPATHLEN];
 #endif
 
-#ifdef USG
+#ifdef USE_TERMIOS
+    tcsetattr(0, TCSANOW, &osbuf);
+#elif defined(USG)
     (void) ioctl (0, TCSETAW, (char *) &osbuf);
 #else
     (void) ioctl (0, TIOCSETP, (char *) &osbuf);
@@ -610,7 +651,9 @@ void shescape (buf)
     chdir (curdir);
 #endif
 
-#ifdef USG
+#ifdef USE_TERMIOS
+    tcsetattr(0, TCSANOW, &sbuf);
+#elif defined(USG)
     (void) ioctl (0, TCSETAW, (char *) &sbuf);
 #else
     (void) ioctl (0, TIOCSETP, (char *) &sbuf);

$NetBSD: patch-al,v 1.1 2013/04/24 02:20:36 rodent Exp $

--- config.X.orig	2005-05-26 02:13:53.000000000 +1200
+++ config.X
@@ -274,7 +274,7 @@
 ** -lcurses, or -lncurses on most systems.
 */
 #ifndef TERMLIB
-#define TERMLIB	"-lncurses"
+#define TERMLIB	"-ltermcap"
 #endif
 
 /*

$NetBSD: patch-ar,v 1.1 2013/04/24 02:20:37 rodent Exp $

--- ijoin.c.orig	Fri Mar 19 15:00:19 2004
+++ ijoin.c	Fri Mar 19 15:01:51 2004
@@ -133,8 +133,6 @@
 static int		unpairable1 = 0; /* NZ if -a1 */
 static int		unpairable2 = 0; /* NZ if -a2 */
 
-extern int	strcmp ();
-
 int main (argc, argv)			/* Join files */
     int			argc;		/* Argument count */
     char *		argv[];		/* Argument vector */

$NetBSD: patch-as,v 1.1 2013/04/24 02:20:37 rodent Exp $

Avoid conflit with system getline.
Fixes PR pkg/41746, thanks to Tom Stejskal.

--- correct.c.orig	2009-07-17 09:14:29.000000000 +0100
+++ correct.c	2009-07-17 09:14:46.000000000 +0100
@@ -245,7 +245,7 @@
 		  struct flagent * sufent,
 		  ichar_t savearea[MAX_CAPS][INPUTWORDLEN + MAXAFFIXLEN],
 		  int * nsaved));
-static char *	getline P ((char * buf, int bufsize));
+static char *	get_line P ((char * buf, int bufsize));
 void		askmode P ((void));
 void		copyout P ((unsigned char ** cc, int cnt));
 static void	lookharder P ((unsigned char * string));
@@ -571,7 +571,7 @@
 
 		imove (li - 1, 0);
 		(void) putchar ('!');
-		if (getline ((char *) buf, sizeof buf) == NULL)
+		if (get_line ((char *) buf, sizeof buf) == NULL)
 		    {
 		    (void) putchar (7);
 		    ierase ();
@@ -596,7 +596,7 @@
 		    (void) printf ("%s ", CORR_C_READONLY);
 		    }
 		(void) printf (CORR_C_REPLACE_WITH);
-		if (getline ((char *) ctok, ctokl) == NULL)
+		if (get_line ((char *) ctok, ctokl) == NULL)
 		    {
 		    (void) putchar (7);
 		    /* Put it back */
@@ -664,7 +664,7 @@
 		unsigned char	buf[100];
 		imove (li - 1, 0);
 		(void) printf (CORR_C_LOOKUP_PROMPT);
-		if (getline ((char *) buf, sizeof buf) == NULL)
+		if (get_line ((char *) buf, sizeof buf) == NULL)
 		    {
 		    (void) putchar (7);
 		    ierase ();
@@ -1583,7 +1583,7 @@
     return;
     }
 
-static char * getline (s, len)
+static char * get_line (s, len)
     register char *	s;
     register int	len;
     {