From e48139e6a2ad01fabc8747fd60baeea319bf107f Mon Sep 17 00:00:00 2001 From: joerg Date: Thu, 9 Sep 2010 18:18:03 +0000 Subject: Update to font-bitstream-100dpi-1.0.1: Move to share/fonts --- fonts/font-bitstream-100dpi/Makefile | 8 ++-- fonts/font-bitstream-100dpi/PLIST | 58 ++++++++++++++-------------- fonts/font-bitstream-100dpi/distinfo | 11 ++---- fonts/font-bitstream-100dpi/patches/patch-aa | 13 ------- fonts/font-bitstream-100dpi/patches/patch-ab | 13 ------- fonts/font-bitstream-100dpi/patches/patch-ac | 12 ------ 6 files changed, 37 insertions(+), 78 deletions(-) delete mode 100644 fonts/font-bitstream-100dpi/patches/patch-aa delete mode 100644 fonts/font-bitstream-100dpi/patches/patch-ab delete mode 100644 fonts/font-bitstream-100dpi/patches/patch-ac diff --git a/fonts/font-bitstream-100dpi/Makefile b/fonts/font-bitstream-100dpi/Makefile index a716ea6e48a..5c57d8a9ac5 100644 --- a/fonts/font-bitstream-100dpi/Makefile +++ b/fonts/font-bitstream-100dpi/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:18:03 joerg Exp $ # -DISTNAME= font-bitstream-100dpi-1.0.0 +DISTNAME= font-bitstream-100dpi-1.0.1 CATEGORIES= fonts MASTER_SITES= ${MASTER_SITE_XORG:=font/} EXTRACT_SUFX= .tar.bz2 @@ -13,9 +13,9 @@ COMMENT= Standard 100dpi Bitstream 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/100dpi +FONTS_DIRS.x11= share/fonts/X11/100dpi INSTALLATION_DIRS= share/doc/font-bitstream-100dpi diff --git a/fonts/font-bitstream-100dpi/PLIST b/fonts/font-bitstream-100dpi/PLIST index f455381f2e6..0775c258002 100644 --- a/fonts/font-bitstream-100dpi/PLIST +++ b/fonts/font-bitstream-100dpi/PLIST @@ -1,30 +1,30 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:54:12 joerg Exp $ -lib/X11/fonts/100dpi/charB08.pcf.gz -lib/X11/fonts/100dpi/charB10.pcf.gz -lib/X11/fonts/100dpi/charB12.pcf.gz -lib/X11/fonts/100dpi/charB14.pcf.gz -lib/X11/fonts/100dpi/charB18.pcf.gz -lib/X11/fonts/100dpi/charB24.pcf.gz -lib/X11/fonts/100dpi/charBI08.pcf.gz -lib/X11/fonts/100dpi/charBI10.pcf.gz -lib/X11/fonts/100dpi/charBI12.pcf.gz -lib/X11/fonts/100dpi/charBI14.pcf.gz -lib/X11/fonts/100dpi/charBI18.pcf.gz -lib/X11/fonts/100dpi/charBI24.pcf.gz -lib/X11/fonts/100dpi/charI08.pcf.gz -lib/X11/fonts/100dpi/charI10.pcf.gz -lib/X11/fonts/100dpi/charI12.pcf.gz -lib/X11/fonts/100dpi/charI14.pcf.gz -lib/X11/fonts/100dpi/charI18.pcf.gz -lib/X11/fonts/100dpi/charI24.pcf.gz -lib/X11/fonts/100dpi/charR08.pcf.gz -lib/X11/fonts/100dpi/charR10.pcf.gz -lib/X11/fonts/100dpi/charR12.pcf.gz -lib/X11/fonts/100dpi/charR14.pcf.gz -lib/X11/fonts/100dpi/charR18.pcf.gz -lib/X11/fonts/100dpi/charR24.pcf.gz -lib/X11/fonts/100dpi/tech14.pcf.gz -lib/X11/fonts/100dpi/techB14.pcf.gz -lib/X11/fonts/100dpi/term14.pcf.gz -lib/X11/fonts/100dpi/termB14.pcf.gz +@comment $NetBSD: PLIST,v 1.3 2010/09/09 18:18:03 joerg Exp $ +share/fonts/X11/100dpi/charB08.pcf.gz +share/fonts/X11/100dpi/charB10.pcf.gz +share/fonts/X11/100dpi/charB12.pcf.gz +share/fonts/X11/100dpi/charB14.pcf.gz +share/fonts/X11/100dpi/charB18.pcf.gz +share/fonts/X11/100dpi/charB24.pcf.gz +share/fonts/X11/100dpi/charBI08.pcf.gz +share/fonts/X11/100dpi/charBI10.pcf.gz +share/fonts/X11/100dpi/charBI12.pcf.gz +share/fonts/X11/100dpi/charBI14.pcf.gz +share/fonts/X11/100dpi/charBI18.pcf.gz +share/fonts/X11/100dpi/charBI24.pcf.gz +share/fonts/X11/100dpi/charI08.pcf.gz +share/fonts/X11/100dpi/charI10.pcf.gz +share/fonts/X11/100dpi/charI12.pcf.gz +share/fonts/X11/100dpi/charI14.pcf.gz +share/fonts/X11/100dpi/charI18.pcf.gz +share/fonts/X11/100dpi/charI24.pcf.gz +share/fonts/X11/100dpi/charR08.pcf.gz +share/fonts/X11/100dpi/charR10.pcf.gz +share/fonts/X11/100dpi/charR12.pcf.gz +share/fonts/X11/100dpi/charR14.pcf.gz +share/fonts/X11/100dpi/charR18.pcf.gz +share/fonts/X11/100dpi/charR24.pcf.gz +share/fonts/X11/100dpi/tech14.pcf.gz +share/fonts/X11/100dpi/techB14.pcf.gz +share/fonts/X11/100dpi/term14.pcf.gz +share/fonts/X11/100dpi/termB14.pcf.gz share/doc/font-bitstream-100dpi/COPYING diff --git a/fonts/font-bitstream-100dpi/distinfo b/fonts/font-bitstream-100dpi/distinfo index 3236fcdf08b..b06ca917f37 100644 --- a/fonts/font-bitstream-100dpi/distinfo +++ b/fonts/font-bitstream-100dpi/distinfo @@ -1,8 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.3 2006/11/15 13:37:08 joerg Exp $ +$NetBSD: distinfo,v 1.2 2010/09/09 18:18:03 joerg Exp $ -SHA1 (font-bitstream-100dpi-1.0.0.tar.bz2) = 6aa6ccc3d7a28a0ae3618613fc7b78d4b1e9b4d7 -RMD160 (font-bitstream-100dpi-1.0.0.tar.bz2) = ce7304b7d65d3bec9a75eafd07106858d06ced85 -Size (font-bitstream-100dpi-1.0.0.tar.bz2) = 135530 bytes -SHA1 (patch-aa) = c9180bce8f2fed4fe91eeae680da1dbdaaa413db -SHA1 (patch-ab) = 77064ac1f0e01a1cc4439e71a14b88d33c6da3b8 -SHA1 (patch-ac) = a27449b0cc6c6ed91681e3bff3f1826c28119f30 +SHA1 (font-bitstream-100dpi-1.0.1.tar.bz2) = ba163df365a591de5eb9e45fa302059d572dd171 +RMD160 (font-bitstream-100dpi-1.0.1.tar.bz2) = 46d19355f5ce392f70ab623929cf8f874a3f4d1b +Size (font-bitstream-100dpi-1.0.1.tar.bz2) = 191682 bytes diff --git a/fonts/font-bitstream-100dpi/patches/patch-aa b/fonts/font-bitstream-100dpi/patches/patch-aa deleted file mode 100644 index 7057bbbeffb..00000000000 --- a/fonts/font-bitstream-100dpi/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2006/11/15 13:34:48 joerg Exp $ - ---- Makefile.am.orig 2006-11-15 14:23:59.000000000 +0100 -+++ Makefile.am -@@ -65,8 +65,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-bitstream-100dpi/patches/patch-ab b/fonts/font-bitstream-100dpi/patches/patch-ab deleted file mode 100644 index 23944ad7b5e..00000000000 --- a/fonts/font-bitstream-100dpi/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2006/11/15 13:34:48 joerg Exp $ - ---- Makefile.in.orig 2006-11-15 14:24:06.000000000 +0100 -+++ Makefile.in -@@ -416,8 +416,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-bitstream-100dpi/patches/patch-ac b/fonts/font-bitstream-100dpi/patches/patch-ac deleted file mode 100644 index ccf9c3ec788..00000000000 --- a/fonts/font-bitstream-100dpi/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2006/11/15 13:34:48 joerg Exp $ - ---- configure.ac.orig 2006-11-15 14: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]))]) -- cgit v1.2.3