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

6 files changed, 13 insertions, 54 deletions

diff --git a/fonts/font-sony-misc/Makefile b/fonts/font-sony-misc/Makefile
index ec4d9e2a3ed..a729362f6d0 100644
--- a/fonts/font-sony-misc/Makefile
+++ b/fonts/font-sony-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:48:52 joerg Exp $
 #
 
-DISTNAME=		font-sony-misc-1.0.0
+DISTNAME=		font-sony-misc-1.0.1
 CATEGORIES=		fonts
 MASTER_SITES=		${MASTER_SITE_XORG:=font/}
 EXTRACT_SUFX=		.tar.bz2
@@ -13,9 +13,9 @@ COMMENT=		Standard X11 "sony" PCF 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-sony-misc/PLIST b/fonts/font-sony-misc/PLIST
index 0112290d5c1..b0227186f0c 100644
--- a/fonts/font-sony-misc/PLIST
+++ b/fonts/font-sony-misc/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/07/17 19:06:47 drochner Exp $
-lib/X11/fonts/misc/12x24.pcf.gz
-lib/X11/fonts/misc/12x24rk.pcf.gz
-lib/X11/fonts/misc/8x16.pcf.gz
-lib/X11/fonts/misc/8x16rk.pcf.gz
+@comment $NetBSD: PLIST,v 1.2 2010/09/09 18:48:52 joerg Exp $
+share/fonts/X11/misc/12x24.pcf.gz
+share/fonts/X11/misc/12x24rk.pcf.gz
+share/fonts/X11/misc/8x16.pcf.gz
+share/fonts/X11/misc/8x16rk.pcf.gz
diff --git a/fonts/font-sony-misc/distinfo b/fonts/font-sony-misc/distinfo
index 2a4189dbe1b..d6b98ab61c9 100644
--- a/fonts/font-sony-misc/distinfo
+++ b/fonts/font-sony-misc/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/07/17 19:06:47 drochner Exp $
+$NetBSD: distinfo,v 1.2 2010/09/09 18:48:52 joerg Exp $
 
-SHA1 (font-sony-misc-1.0.0.tar.bz2) = 8f8dbf44a03725d8769ebaae4a61575c5b948464
-RMD160 (font-sony-misc-1.0.0.tar.bz2) = a4c3e12f27ad2b9c8bc7876244a1568dd5c2760f
-Size (font-sony-misc-1.0.0.tar.bz2) = 48480 bytes
-SHA1 (patch-aa) = d644e603a9c6534339a9fb8e33c22ddd03affcc2
-SHA1 (patch-ab) = 2d4870e1738d909e2f117c48042906005c76c9ff
-SHA1 (patch-ac) = 30644be1fe73ca98516a65a74aff81367b010c8e
+SHA1 (font-sony-misc-1.0.1.tar.bz2) = e9717546682382ebf3e6e7039766fe52bdb8846c
+RMD160 (font-sony-misc-1.0.1.tar.bz2) = 4c87d664847fb735e095e5c0f37cdf1d2d21b76d
+Size (font-sony-misc-1.0.1.tar.bz2) = 98394 bytes
diff --git a/fonts/font-sony-misc/patches/patch-aa b/fonts/font-sony-misc/patches/patch-aa
deleted file mode 100644
index ce251897c8a..00000000000
--- a/fonts/font-sony-misc/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/07/17 19:06:47 drochner Exp $
-
---- Makefile.am.orig	2005-11-24 06:21:16.000000000 +0100
-+++ Makefile.am
-@@ -41,8 +41,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-sony-misc/patches/patch-ab b/fonts/font-sony-misc/patches/patch-ab
deleted file mode 100644
index b550d7b8977..00000000000
--- a/fonts/font-sony-misc/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/07/17 19:06:47 drochner Exp $
-
---- configure.ac.orig	2005-12-15 01:24:26.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]))])
diff --git a/fonts/font-sony-misc/patches/patch-ac b/fonts/font-sony-misc/patches/patch-ac
deleted file mode 100644
index 1813e94fac0..00000000000
--- a/fonts/font-sony-misc/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2007/07/17 19:06:47 drochner Exp $
-
---- Makefile.in.orig	2005-12-21 09:20:48.000000000 +0100
-+++ Makefile.in
-@@ -392,8 +392,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)
-