Split the ispell-russian packages into two separate packages,

ispell-russian and ispell-russian-io.

4 files changed, 41 insertions, 43 deletions

diff --git a/textproc/ispell-russian/Makefile b/textproc/ispell-russian/Makefile
index c74cac3aea6..4d16a622203 100644
--- a/textproc/ispell-russian/Makefile
+++ b/textproc/ispell-russian/Makefile
@@ -1,28 +1,5 @@
-# $NetBSD: Makefile,v 1.4 2004/01/20 12:26:50 agc Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/23 15:02:07 agc Exp $
 
-DISTNAME=	rus-ispell-0.99f5
-PKGNAME=	ispell-russian-0.99.5
-CATEGORIES=	textproc
-MASTER_SITES=	ftp://scon155.phys.msu.su/pub/russian/ispell/
+PKGNAME=	ispell-russian-0.99f5
 
-MAINTAINER=	mishka@terabyte.com.ua
-COMMENT=	Russian (KOI8-R) ispell dictonary from Alexander Lebedev
-
-DEPENDS+=	ispell-base>=3.1.20:../../textproc/ispell-base
-
-WRKSRC=		${WRKDIR}
-MAKE_ENV+=	CAT=${CAT} RM=${RM} SED=${SED} TR=${TR} UNIQ="uniq"
-
-.ifdef YO
-MAKE_ENV+=	YO="defined"
-.endif
-
-post-configure:
-		@${ECHO} '===================================================='
-		@${ECHO} ''
-		@${ECHO} '  To enable native "YO" letter support please use'
-		@${ECHO} '  "make YO=yes" when building this package.'
-		@${ECHO} ''
-		@${ECHO} '===================================================='
-
-.include "../../mk/bsd.pkg.mk"
+.include "../../textproc/ispell-russian/Makefile.common"
diff --git a/textproc/ispell-russian/Makefile.common b/textproc/ispell-russian/Makefile.common
new file mode 100644
index 00000000000..33190b119c5
--- /dev/null
+++ b/textproc/ispell-russian/Makefile.common
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile.common,v 1.1 2004/01/23 15:02:07 agc Exp $
+
+DISTNAME=	rus-ispell-0.99f5
+CATEGORIES=	textproc
+MASTER_SITES=	ftp://scon155.phys.msu.su/pub/russian/ispell/
+
+MAINTAINER=	mishka@terabyte.com.ua
+COMMENT=	Russian (KOI8-R) ispell dictonary from Alexander Lebedev
+
+DEPENDS+=	ispell-base>=3.1.20:../../textproc/ispell-base
+
+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} RM=${RM} SED=${SED} TR=${TR} UNIQ="uniq"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/ispell-russian/distinfo b/textproc/ispell-russian/distinfo
index 6e8249827b9..7cefba226ca 100644
--- a/textproc/ispell-russian/distinfo
+++ b/textproc/ispell-russian/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2003/09/25 17:45:35 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/01/23 15:02:07 agc Exp $
 
 SHA1 (rus-ispell-0.99f5.tar.gz) = c6c8c0305dd7be9bc0e181bce91e74a6287708f0
 Size (rus-ispell-0.99f5.tar.gz) = 473507 bytes
-SHA1 (patch-aa) = 341837cb81ba27b8e7ff472a8dcf842ff049536e
+SHA1 (patch-aa) = 6152418a092707c768ffa0112ae01c42f246415c
diff --git a/textproc/ispell-russian/patches/patch-aa b/textproc/ispell-russian/patches/patch-aa
index 8302786fe45..351bb7e7514 100644
--- a/textproc/ispell-russian/patches/patch-aa
+++ b/textproc/ispell-russian/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/11/19 15:53:26 jschauma Exp $
+$NetBSD: patch-aa,v 1.2 2004/01/23 15:02:07 agc Exp $
 
---- Makefile.orig	Tue Nov 19 10:43:06 2002
-+++ Makefile	Tue Nov 19 10:47:30 2002
-@@ -1,40 +1,48 @@
+--- 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
@@ -35,30 +35,31 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/11/19 15:53:26 jschauma Exp $
 +TRANSKOI= | ./trans koi ${ENC}
 +.endif
 +
-+.ifdef YO
++.ifdef IO
 +PATT= y
++DICTNAME=-io
 +.else
 +PATT= e
 +YO2E= | ${TR} '\243\263' '\305\345'
 +.endif
 +
-+all:		russian.hash
++all:		russian${DICTNAME}.hash
  
  install:
 -	cp russian.hash russian.aff $(LIB)
-+	${BSD_INSTALL_DATA} russian.hash ${INSTALLDIR}
-+	${BSD_INSTALL_DATA} russian.aff ${INSTALLDIR}
++	${BSD_INSTALL_DATA} russian${DICTNAME}.hash ${INSTALLDIR}
++	${BSD_INSTALL_DATA} russian${DICTNAME}.aff ${INSTALLDIR}
 +
-+russian.hash:	russian.aff russian.dict
-+	${BUILDHASH} russian.dict russian.aff $@
++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.aff:	russian.aff.koi
++russian${DICTNAME}.aff:	russian.aff.koi
 +	${SED} -e "s/^\#${PATT}//;s/^\#${ENC}/wordchars/" $> \
 +		${TRANSKOI} > $@
 +
-+russian.dict:	${DICT}
++russian${DICTNAME}.dict:	${DICT}
 +	${CAT} $> ${YO2E} | ${SORTKOI8} | ${UNIQ} \
 +		${TRANSKOI} > $@
  
@@ -66,12 +67,13 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/11/19 15:53:26 jschauma Exp $
  	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.dict* russian.hash russian.aff .temp
++	rm -f russian${DICTNAME}.dict* russian${DICTNAME}.hash russian${DICTNAME}.aff .temp