Update to font-cursor-misc-1.0.1: move to share/fonts.

6 files changed, 9 insertions, 55 deletions

diff --git a/fonts/font-cursor-misc/Makefile b/fonts/font-cursor-misc/Makefile
index 364e5a07734..4b3c1605029 100644
--- a/fonts/font-cursor-misc/Makefile
+++ b/fonts/font-cursor-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:26:20 joerg Exp $
 #
 
-DISTNAME=		font-cursor-misc-1.0.0
+DISTNAME=		font-cursor-misc-1.0.1
 CATEGORIES=		fonts x11
 MASTER_SITES=		${MASTER_SITE_XORG:=font/}
 EXTRACT_SUFX=		.tar.bz2
@@ -15,6 +15,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		bdftopcf gzip
 
-FONTS_DIRS.x11=		lib/X11/fonts/misc
+FONTS_DIRS.x11=		share/fonts/X11/misc
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/font-cursor-misc/PLIST b/fonts/font-cursor-misc/PLIST
index 6e67517e83e..4bfddd2a465 100644
--- a/fonts/font-cursor-misc/PLIST
+++ b/fonts/font-cursor-misc/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:54:12 joerg Exp $
-lib/X11/fonts/misc/cursor.pcf.gz
+@comment $NetBSD: PLIST,v 1.3 2010/09/09 18:26:20 joerg Exp $
+share/fonts/X11/misc/cursor.pcf.gz
diff --git a/fonts/font-cursor-misc/distinfo b/fonts/font-cursor-misc/distinfo
index de5ba6d56ee..7318b5c89c7 100644
--- a/fonts/font-cursor-misc/distinfo
+++ b/fonts/font-cursor-misc/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/11/14 20:54:15 joerg Exp $
+$NetBSD: distinfo,v 1.2 2010/09/09 18:26:20 joerg Exp $
 
-SHA1 (font-cursor-misc-1.0.0.tar.bz2) = 3fe0f1015c15444169d2b28cdb138b2d49481f78
-RMD160 (font-cursor-misc-1.0.0.tar.bz2) = f42933e4ed9194f6a9c7c1f8bfe793ed7b3341be
-Size (font-cursor-misc-1.0.0.tar.bz2) = 42656 bytes
+SHA1 (font-cursor-misc-1.0.1.tar.bz2) = 5087a94e74f8157cb6989f71fb3b4815b236065a
+RMD160 (font-cursor-misc-1.0.1.tar.bz2) = c8c4d9a319eb97aa4b43290d739660947900dac8
+Size (font-cursor-misc-1.0.1.tar.bz2) = 92547 bytes
 SHA1 (patch-aa) = f8448e082b3cfd00785d1b42f938af1e68131811
 SHA1 (patch-ab) = a227610e2cd622716a341a7db73e0fb1874b5bf9
 SHA1 (patch-ac) = 89488891ba7ca2ce6582eba407c71e5f4cdec38a
diff --git a/fonts/font-cursor-misc/patches/patch-aa b/fonts/font-cursor-misc/patches/patch-aa
deleted file mode 100644
index 263b7fbf946..00000000000
--- a/fonts/font-cursor-misc/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/11/14 20:54:15 joerg Exp $
-
---- configure.ac.orig	2006-11-14 21:40:18.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-cursor-misc/patches/patch-ab b/fonts/font-cursor-misc/patches/patch-ab
deleted file mode 100644
index 7b0667126a0..00000000000
--- a/fonts/font-cursor-misc/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/11/14 20:54:15 joerg Exp $
-
---- Makefile.am.orig	2006-11-14 21:41:34.000000000 +0100
-+++ Makefile.am
-@@ -38,8 +38,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-cursor-misc/patches/patch-ac b/fonts/font-cursor-misc/patches/patch-ac
deleted file mode 100644
index ab1774b7052..00000000000
--- a/fonts/font-cursor-misc/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/11/14 20:54:15 joerg Exp $
-
---- Makefile.in.orig	2006-11-14 21:41:51.000000000 +0100
-+++ Makefile.in
-@@ -81,7 +81,6 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE
- MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MKFONTDIR = @MKFONTDIR@
--MKFONTSCALE = @MKFONTSCALE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -389,8 +388,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)
-