Update to font-jis-misc-1.0.1: move to share/fonts

6 files changed, 11 insertions, 52 deletions

diff --git a/fonts/font-jis-misc/Makefile b/fonts/font-jis-misc/Makefile
index 69fdf6fe1d4..18c1c9722d5 100644
--- a/fonts/font-jis-misc/Makefile
+++ b/fonts/font-jis-misc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2008/05/24 21:45:21 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2010/09/09 18:39:33 joerg Exp $
 #
 
-DISTNAME=		font-jis-misc-1.0.0
+DISTNAME=		font-jis-misc-1.0.1
 CATEGORIES=		fonts
 MASTER_SITES=		${MASTER_SITE_XORG:=font/}
 EXTRACT_SUFX=		.tar.bz2
@@ -13,9 +13,9 @@ COMMENT=		78dpi PCF versions of the Japanese fixed fonts
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake pkg-config bdftopcf ucs2any gzip
+USE_TOOLS+=		pkg-config bdftopcf ucs2any gzip
 
-FONTS_DIRS.x11=		lib/X11/fonts/misc
+FONTS_DIRS.x11=		share/fonts/X11/misc
 
 .include "../../fonts/font-util/buildlink3.mk"
 
diff --git a/fonts/font-jis-misc/PLIST b/fonts/font-jis-misc/PLIST
index 1db5727b1bc..88f4407c970 100644
--- a/fonts/font-jis-misc/PLIST
+++ b/fonts/font-jis-misc/PLIST
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:54:13 joerg Exp $
-lib/X11/fonts/misc/jiskan16.pcf.gz
-lib/X11/fonts/misc/jiskan24.pcf.gz
+@comment $NetBSD: PLIST,v 1.3 2010/09/09 18:39:33 joerg Exp $
+share/fonts/X11/misc/jiskan16.pcf.gz
+share/fonts/X11/misc/jiskan24.pcf.gz
diff --git a/fonts/font-jis-misc/distinfo b/fonts/font-jis-misc/distinfo
index dc5e15ed8a7..907dd688652 100644
--- a/fonts/font-jis-misc/distinfo
+++ b/fonts/font-jis-misc/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.3 2006/11/15 15:00:00 joerg Exp $
+$NetBSD: distinfo,v 1.2 2010/09/09 18:39:33 joerg Exp $
 
-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
+SHA1 (font-jis-misc-1.0.1.tar.bz2) = adb3275d19e71e9553aa8a5fdc3b2c647277d8d4
+RMD160 (font-jis-misc-1.0.1.tar.bz2) = 087be1cb7c266a08435fa17fa5b26c81fc55886c
+Size (font-jis-misc-1.0.1.tar.bz2) = 625454 bytes
diff --git a/fonts/font-jis-misc/patches/patch-aa b/fonts/font-jis-misc/patches/patch-aa
deleted file mode 100644
index 783139df857..00000000000
--- a/fonts/font-jis-misc/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.3 2006/11/15 15:00:00 joerg Exp $
-
---- Makefile.am.orig	2005-11-24 06:21:15.000000000 +0100
-+++ Makefile.am
-@@ -40,8 +40,6 @@ CLEANFILES = $(font_DATA)
- EXTRA_DIST = $(BDF_FILES) autogen.sh
- 
- install-data-hook:
--	@rm -f $(DESTDIR)$(fontdir)/fonts.scale
--	$(MKFONTSCALE) $(DESTDIR)$(fontdir)
- 	@rm -f $(DESTDIR)$(fontdir)/font.dir
- 	$(MKFONTDIR) $(DESTDIR)$(fontdir)
- 
diff --git a/fonts/font-jis-misc/patches/patch-ab b/fonts/font-jis-misc/patches/patch-ab
deleted file mode 100644
index 6dfcf18ae65..00000000000
--- a/fonts/font-jis-misc/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$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
-@@ -391,8 +391,6 @@ uninstall-am: uninstall-fontDATA uninsta
- 	$(BDFTOPCF) -t $< | gzip > $@
- 
- install-data-hook:
--	@rm -f $(DESTDIR)$(fontdir)/fonts.scale
--	$(MKFONTSCALE) $(DESTDIR)$(fontdir)
- 	@rm -f $(DESTDIR)$(fontdir)/font.dir
- 	$(MKFONTDIR) $(DESTDIR)$(fontdir)
- 
diff --git a/fonts/font-jis-misc/patches/patch-ac b/fonts/font-jis-misc/patches/patch-ac
deleted file mode 100644
index 929c18a5317..00000000000
--- a/fonts/font-jis-misc/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$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
-@@ -29,7 +29,6 @@ AM_MAINTAINER_MODE
- AC_PROG_INSTALL
- 
- AC_PATH_PROG(BDFTOPCF, bdftopcf)
--AC_PATH_PROG(MKFONTSCALE, mkfontscale)
- AC_PATH_PROG(MKFONTDIR, mkfontdir)
- 
- m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])