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

6 files changed, 17 insertions, 58 deletions

diff --git a/fonts/font-mutt-misc/Makefile b/fonts/font-mutt-misc/Makefile
index 3786b509b49..8f5f101b035 100644
--- a/fonts/font-mutt-misc/Makefile
+++ b/fonts/font-mutt-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:44:31 joerg Exp $
 #
 
-DISTNAME=		font-mutt-misc-1.0.0
+DISTNAME=		font-mutt-misc-1.0.1
 CATEGORIES=		fonts
 MASTER_SITES=		${MASTER_SITE_XORG:=font/}
 EXTRACT_SUFX=		.tar.bz2
@@ -13,9 +13,9 @@ COMMENT=		100dpi PCF versions of the ClearlyU 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
 
 INSTALLATION_DIRS=	share/doc/font-mutt-misc
 
diff --git a/fonts/font-mutt-misc/PLIST b/fonts/font-mutt-misc/PLIST
index 186e39d47ac..abaf9cc9601 100644
--- a/fonts/font-mutt-misc/PLIST
+++ b/fonts/font-mutt-misc/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:54:13 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
+@comment $NetBSD: PLIST,v 1.3 2010/09/09 18:44:31 joerg Exp $
+share/fonts/X11/misc/cu-alt12.pcf.gz
+share/fonts/X11/misc/cu-arabic12.pcf.gz
+share/fonts/X11/misc/cu-devnag12.pcf.gz
+share/fonts/X11/misc/cu-lig12.pcf.gz
+share/fonts/X11/misc/cu-pua12.pcf.gz
+share/fonts/X11/misc/cu12.pcf.gz
+share/fonts/X11/misc/cuarabic12.pcf.gz
+share/fonts/X11/misc/cudevnag12.pcf.gz
 share/doc/font-mutt-misc/COPYING
diff --git a/fonts/font-mutt-misc/distinfo b/fonts/font-mutt-misc/distinfo
index 52c113cc77f..04397bcad6c 100644
--- a/fonts/font-mutt-misc/distinfo
+++ b/fonts/font-mutt-misc/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/11/15 14:57:54 joerg Exp $
+$NetBSD: distinfo,v 1.2 2010/09/09 18:44:31 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 (patch-ab) = 2cd773af858094c91abe832a8949e82c97f04449
-SHA1 (patch-ac) = 20a5fa0490ef9b67deb62d5c3bf5da5f7742b0c3
+SHA1 (font-mutt-misc-1.0.1.tar.bz2) = b677831b477027f56ad3f35c95ef3cd6711f87ac
+RMD160 (font-mutt-misc-1.0.1.tar.bz2) = 1b3adad4ecf324d34adb6c6851f8848c7763c239
+Size (font-mutt-misc-1.0.1.tar.bz2) = 256990 bytes
diff --git a/fonts/font-mutt-misc/patches/patch-aa b/fonts/font-mutt-misc/patches/patch-aa
deleted file mode 100644
index 239e4328391..00000000000
--- a/fonts/font-mutt-misc/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/11/15 14:57:54 joerg Exp $
-
---- Makefile.am.orig	2005-11-24 06:21:16.000000000 +0100
-+++ Makefile.am
-@@ -45,8 +45,6 @@ CLEANFILES = $(font_DATA)
- EXTRA_DIST = $(BDF_FILES) autogen.sh README
- 
- 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-mutt-misc/patches/patch-ab b/fonts/font-mutt-misc/patches/patch-ab
deleted file mode 100644
index 6a2ff9f4ebc..00000000000
--- a/fonts/font-mutt-misc/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/11/15 14:57:54 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-mutt-misc/patches/patch-ac b/fonts/font-mutt-misc/patches/patch-ac
deleted file mode 100644
index 11238b9498e..00000000000
--- a/fonts/font-mutt-misc/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/11/15 14:57:54 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]))])