From 6708ffd3bd2c666e5f99055dee07e740bfe26c2a Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Sat, 13 Jul 2002 15:17:38 +0000
Subject: Fix DISTNAME. Noted in i386 bulk build.

---
 fonts/cyr-rfx-iso10646_0400/Makefile | 5 +++--
 fonts/cyr-rfx-iso8859_15/Makefile    | 5 +++--
 fonts/cyr-rfx-iso8859_5/Makefile     | 5 +++--
 fonts/cyr-rfx-koi8_1/Makefile        | 5 +++--
 fonts/cyr-rfx-windows_1251/Makefile  | 5 +++--
 fonts/cyr-rfx-winlatin_1/Makefile    | 5 +++--
 6 files changed, 18 insertions(+), 12 deletions(-)

(limited to 'fonts')

diff --git a/fonts/cyr-rfx-iso10646_0400/Makefile b/fonts/cyr-rfx-iso10646_0400/Makefile
index 4fac2311391..9150033a423 100644
--- a/fonts/cyr-rfx-iso10646_0400/Makefile
+++ b/fonts/cyr-rfx-iso10646_0400/Makefile
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/10 18:14:52 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/07/13 15:17:38 wiz Exp $
 
-CYR_RFX_ENCODING=iso10646_0400
+CYR_RFX_ENCODING=iso10646-0400
+PKGNAME=	${DISTNAME:S/6-0/6_0/}
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-iso8859_15/Makefile b/fonts/cyr-rfx-iso8859_15/Makefile
index ef850b38c79..f543ffc4b1f 100644
--- a/fonts/cyr-rfx-iso8859_15/Makefile
+++ b/fonts/cyr-rfx-iso8859_15/Makefile
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/10 18:14:51 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/07/13 15:17:39 wiz Exp $
 
-CYR_RFX_ENCODING=iso8859_15
+CYR_RFX_ENCODING=iso8859-15
+PKGNAME=	${DISTNAME:S/9-1/9_1/}
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-iso8859_5/Makefile b/fonts/cyr-rfx-iso8859_5/Makefile
index 60ebb4e4c4e..d90aeb7792f 100644
--- a/fonts/cyr-rfx-iso8859_5/Makefile
+++ b/fonts/cyr-rfx-iso8859_5/Makefile
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/10 18:14:51 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/07/13 15:17:39 wiz Exp $
 
-CYR_RFX_ENCODING=iso8859_5
+CYR_RFX_ENCODING=iso8859-5
+PKGNAME=	${DISTNAME:S/9-5/9_5/}
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-koi8_1/Makefile b/fonts/cyr-rfx-koi8_1/Makefile
index 7ab53720fd6..37d95d48d6f 100644
--- a/fonts/cyr-rfx-koi8_1/Makefile
+++ b/fonts/cyr-rfx-koi8_1/Makefile
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/10 18:14:50 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/07/13 15:17:39 wiz Exp $
 
-CYR_RFX_ENCODING=koi8_1
+CYR_RFX_ENCODING=koi8-1
+PKGNAME=	${DISTNAME:S/8-1/8_1/}
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-windows_1251/Makefile b/fonts/cyr-rfx-windows_1251/Makefile
index 03f0729444e..e1e1c005903 100644
--- a/fonts/cyr-rfx-windows_1251/Makefile
+++ b/fonts/cyr-rfx-windows_1251/Makefile
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/10 18:14:55 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/07/13 15:17:40 wiz Exp $
 
-CYR_RFX_ENCODING=windows_1251
+CYR_RFX_ENCODING=windows-1251
+PKGNAME=	${DISTNAME:S/s-1/s_1/}
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"
diff --git a/fonts/cyr-rfx-winlatin_1/Makefile b/fonts/cyr-rfx-winlatin_1/Makefile
index e300cc3888e..b83c78a943c 100644
--- a/fonts/cyr-rfx-winlatin_1/Makefile
+++ b/fonts/cyr-rfx-winlatin_1/Makefile
@@ -1,5 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/07/10 18:14:48 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2002/07/13 15:17:40 wiz Exp $
 
-CYR_RFX_ENCODING=winlatin_1
+CYR_RFX_ENCODING=winlatin-1
+PKGNAME=	${DISTNAME:S/n-1/n_1/}
 
 .include "../../fonts/cyr-rfx-share/Makefile.common"
-- 
cgit v1.2.3