Revert last import as it went into the wrong directory.

7 files changed, 18 insertions, 31 deletions

diff --git a/fonts/font-jis-misc/DESCR b/fonts/font-jis-misc/DESCR
index d45e3ca2c03..3cc39741934 100644
--- a/fonts/font-jis-misc/DESCR
+++ b/fonts/font-jis-misc/DESCR
@@ -1,2 +1,2 @@
-This are the PCF versions of the ClearlyU fonts for 100dpi displays.
+This are the PCF versions of the JIS "fixed" fonts for 78dpi displays.
 This is from the modular Xorg project.
diff --git a/fonts/font-jis-misc/Makefile b/fonts/font-jis-misc/Makefile
index 30b11b18c0a..de14311b375 100644
--- a/fonts/font-jis-misc/Makefile
+++ b/fonts/font-jis-misc/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.1.1.2 2006/11/15 14:57:14 joerg Exp $
+# $NetBSD: Makefile,v 1.1.1.3 2006/11/15 15:00:00 joerg Exp $
 #
 
-DISTNAME=		font-mutt-misc-1.0.0
+DISTNAME=		font-jis-misc-1.0.0
 CATEGORIES=		fonts
 MASTER_SITES=		http://xorg.freedesktop.org/releases/individual/font/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		joerg@NetBSD.org
 HOMEPAGE=		http://xorg.freedesktop.org/
-COMMENT=		100dpi PCF versions of the ClearlyU fonts
+COMMENT=		78dpi PCF versions of the Japanese fixed fonts
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -17,11 +17,6 @@ USE_TOOLS+=		gmake pkg-config bdftopcf ucs2any
 
 FONTS_DIRS.x11=		lib/X11/fonts/misc
 
-INSTALLATION_DIRS=	share/doc/font-mutt-misc
-
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/font-mutt-misc
-
 .include "../../fonts/font-util/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/font-jis-misc/PLIST b/fonts/font-jis-misc/PLIST
index f410a2c8713..43390c5025e 100644
--- a/fonts/font-jis-misc/PLIST
+++ b/fonts/font-jis-misc/PLIST
@@ -1,14 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.2 2006/11/15 14:57:14 joerg Exp $
-lib/X11/fonts/misc/cu-alt12.pcf.gz
-lib/X11/fonts/misc/cu-arabic12.pcf.gz
-lib/X11/fonts/misc/cu-devnag12.pcf.gz
-lib/X11/fonts/misc/cu-lig12.pcf.gz
-lib/X11/fonts/misc/cu-pua12.pcf.gz
-lib/X11/fonts/misc/cu12.pcf.gz
-lib/X11/fonts/misc/cuarabic12.pcf.gz
-lib/X11/fonts/misc/cudevnag12.pcf.gz
-share/doc/font-mutt-misc/COPYING
-@dirrm share/doc/font-mutt-misc
+@comment $NetBSD: PLIST,v 1.1.1.3 2006/11/15 15:00:00 joerg Exp $
+lib/X11/fonts/misc/jiskan16.pcf.gz
+lib/X11/fonts/misc/jiskan24.pcf.gz
 @comment @dirrm lib/X11/fonts/misc
 @comment @dirrm lib/X11/fonts
 @comment @dirrm lib/X11
diff --git a/fonts/font-jis-misc/distinfo b/fonts/font-jis-misc/distinfo
index 39c54e2f030..dc5e15ed8a7 100644
--- a/fonts/font-jis-misc/distinfo
+++ b/fonts/font-jis-misc/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.2 2006/11/15 14:57:14 joerg Exp $
+$NetBSD: distinfo,v 1.1.1.3 2006/11/15 15:00:00 joerg Exp $
 
-SHA1 (font-mutt-misc-1.0.0.tar.bz2) = f65b7659d1abde092044349d3be996ab9a1e02c6
-RMD160 (font-mutt-misc-1.0.0.tar.bz2) = be37a2edfafb5f969f53e85e10aa2eab6fad62b6
-Size (font-mutt-misc-1.0.0.tar.bz2) = 203608 bytes
-SHA1 (patch-aa) = e8520f9d92a3938ef45b09698769c0a233fa543e
+SHA1 (font-jis-misc-1.0.0.tar.bz2) = 45c5034b5eb255ccdb0f2bb96bb0b0b9376cca4e
+RMD160 (font-jis-misc-1.0.0.tar.bz2) = 5a17c6fc987f0c4ed21fcf1fbf9248ec9211f0be
+Size (font-jis-misc-1.0.0.tar.bz2) = 564585 bytes
+SHA1 (patch-aa) = 7caedd27fc5ecb81cf8d85d93187e58b07c64984
 SHA1 (patch-ab) = 2cd773af858094c91abe832a8949e82c97f04449
 SHA1 (patch-ac) = 20a5fa0490ef9b67deb62d5c3bf5da5f7742b0c3
diff --git a/fonts/font-jis-misc/patches/patch-aa b/fonts/font-jis-misc/patches/patch-aa
index 4a143eb40f7..783139df857 100644
--- a/fonts/font-jis-misc/patches/patch-aa
+++ b/fonts/font-jis-misc/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.1.1.2 2006/11/15 14:57:14 joerg Exp $
+$NetBSD: patch-aa,v 1.1.1.3 2006/11/15 15:00:00 joerg Exp $
 
---- Makefile.am.orig	2005-11-24 06:21:16.000000000 +0100
+--- Makefile.am.orig	2005-11-24 06:21:15.000000000 +0100
 +++ Makefile.am
-@@ -45,8 +45,6 @@ CLEANFILES = $(font_DATA)
- EXTRA_DIST = $(BDF_FILES) autogen.sh README
+@@ -40,8 +40,6 @@ CLEANFILES = $(font_DATA)
+ EXTRA_DIST = $(BDF_FILES) autogen.sh
  
  install-data-hook:
 -	@rm -f $(DESTDIR)$(fontdir)/fonts.scale
diff --git a/fonts/font-jis-misc/patches/patch-ab b/fonts/font-jis-misc/patches/patch-ab
index 8393551440b..6dfcf18ae65 100644
--- a/fonts/font-jis-misc/patches/patch-ab
+++ b/fonts/font-jis-misc/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/11/15 14:56:38 joerg Exp $
+$NetBSD: patch-ab,v 1.1.1.2 2006/11/15 15:00:00 joerg Exp $
 
 --- Makefile.in.orig	2005-12-21 09:19:02.000000000 +0100
 +++ Makefile.in
diff --git a/fonts/font-jis-misc/patches/patch-ac b/fonts/font-jis-misc/patches/patch-ac
index fd463c1efde..929c18a5317 100644
--- a/fonts/font-jis-misc/patches/patch-ac
+++ b/fonts/font-jis-misc/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/11/15 14:56:38 joerg Exp $
+$NetBSD: patch-ac,v 1.1.1.2 2006/11/15 15:00:00 joerg Exp $
 
 --- configure.ac.orig	2005-12-15 01:24:24.000000000 +0100
 +++ configure.ac