Import font-bitstream-75dpi-1.0.0:

This are the PCF versions of the following Bitstream fonts for 75dpi
displays:
- Charter
- Terminal

This is from the modular Xorg project.

11 files changed, 155 insertions, 43 deletions

diff --git a/fonts/font-bitstream-100dpi/DESCR b/fonts/font-bitstream-100dpi/DESCR
index da2d3820064..8ababf28406 100644
--- a/fonts/font-bitstream-100dpi/DESCR
+++ b/fonts/font-bitstream-100dpi/DESCR
@@ -1,4 +1,4 @@
-This are the PCF versions of the following Bitstream fonts for 100dpi displays:
+This are the PCF versions of the following Bitstream fonts for 75dpi displays:
 - Charter
 - Terminal
 
diff --git a/fonts/font-bitstream-100dpi/Makefile b/fonts/font-bitstream-100dpi/Makefile
index 13a3e53d2c0..7119ad6ad82 100644
--- a/fonts/font-bitstream-100dpi/Makefile
+++ b/fonts/font-bitstream-100dpi/Makefile
@@ -1,26 +1,26 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/11/15 13:34:48 joerg Exp $
+# $NetBSD: Makefile,v 1.1.1.2 2006/11/15 13:35:28 joerg Exp $
 #
 
-DISTNAME=		font-bitstream-100dpi-1.0.0
+DISTNAME=		font-bitstream-75dpi-1.0.0
 CATEGORIES=		fonts
 MASTER_SITES=		http://xorg.freedesktop.org/releases/individual/font/
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		joerg@NetBSD.org
 HOMEPAGE=		http://xorg.freedesktop.org/
-COMMENT=		Standard 100dpi Bitstream PCF fonts
+COMMENT=		Standard 75dpi Bitstream PCF fonts
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake pkg-config bdftopcf ucs2any
 
-FONTS_DIRS.x11=		lib/X11/fonts/100dpi
+FONTS_DIRS.x11=		lib/X11/fonts/75dpi
 
-INSTALLATION_DIRS=	share/doc/font-bitstream-100dpi
+INSTALLATION_DIRS=	share/doc/font-bitstream-75dpi
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/font-bitstream-100dpi
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/font-bitstream-75dpi
 
 .include "../../fonts/font-util/buildlink3.mk"
 
diff --git a/fonts/font-bitstream-100dpi/PLIST b/fonts/font-bitstream-100dpi/PLIST
index 1c979e4f392..82a1d1a6cfd 100644
--- a/fonts/font-bitstream-100dpi/PLIST
+++ b/fonts/font-bitstream-100dpi/PLIST
@@ -1,34 +1,34 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/11/15 13:34:48 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
-share/doc/font-bitstream-100dpi/COPYING
-@dirrm share/doc/font-bitstream-100dpi
-@comment @dirrm lib/X11/fonts/100dpi
+@comment $NetBSD: PLIST,v 1.1.1.2 2006/11/15 13:35:28 joerg Exp $
+lib/X11/fonts/75dpi/charB08.pcf.gz
+lib/X11/fonts/75dpi/charB10.pcf.gz
+lib/X11/fonts/75dpi/charB12.pcf.gz
+lib/X11/fonts/75dpi/charB14.pcf.gz
+lib/X11/fonts/75dpi/charB18.pcf.gz
+lib/X11/fonts/75dpi/charB24.pcf.gz
+lib/X11/fonts/75dpi/charBI08.pcf.gz
+lib/X11/fonts/75dpi/charBI10.pcf.gz
+lib/X11/fonts/75dpi/charBI12.pcf.gz
+lib/X11/fonts/75dpi/charBI14.pcf.gz
+lib/X11/fonts/75dpi/charBI18.pcf.gz
+lib/X11/fonts/75dpi/charBI24.pcf.gz
+lib/X11/fonts/75dpi/charI08.pcf.gz
+lib/X11/fonts/75dpi/charI10.pcf.gz
+lib/X11/fonts/75dpi/charI12.pcf.gz
+lib/X11/fonts/75dpi/charI14.pcf.gz
+lib/X11/fonts/75dpi/charI18.pcf.gz
+lib/X11/fonts/75dpi/charI24.pcf.gz
+lib/X11/fonts/75dpi/charR08.pcf.gz
+lib/X11/fonts/75dpi/charR10.pcf.gz
+lib/X11/fonts/75dpi/charR12.pcf.gz
+lib/X11/fonts/75dpi/charR14.pcf.gz
+lib/X11/fonts/75dpi/charR18.pcf.gz
+lib/X11/fonts/75dpi/charR24.pcf.gz
+lib/X11/fonts/75dpi/tech14.pcf.gz
+lib/X11/fonts/75dpi/techB14.pcf.gz
+lib/X11/fonts/75dpi/term14.pcf.gz
+lib/X11/fonts/75dpi/termB14.pcf.gz
+share/doc/font-bitstream-75dpi/COPYING
+@dirrm share/doc/font-bitstream-75dpi
+@comment @dirrm lib/X11/fonts/75dpi
 @comment @dirrm lib/X11/fonts
 @comment @dirrm lib/X11
diff --git a/fonts/font-bitstream-100dpi/distinfo b/fonts/font-bitstream-100dpi/distinfo
index 23d08587abb..d19c05b3d77 100644
--- a/fonts/font-bitstream-100dpi/distinfo
+++ b/fonts/font-bitstream-100dpi/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/11/15 13:34:48 joerg Exp $
+$NetBSD: distinfo,v 1.1.1.2 2006/11/15 13:35:28 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 (font-bitstream-75dpi-1.0.0.tar.bz2) = ad534d1eaf758f743bcafc6ba30d3169774c672b
+RMD160 (font-bitstream-75dpi-1.0.0.tar.bz2) = b8218eb4bf25a5bda69a5034f8b582824b0b13f4
+Size (font-bitstream-75dpi-1.0.0.tar.bz2) = 103852 bytes
 SHA1 (patch-aa) = c9180bce8f2fed4fe91eeae680da1dbdaaa413db
 SHA1 (patch-ab) = 77064ac1f0e01a1cc4439e71a14b88d33c6da3b8
 SHA1 (patch-ac) = a27449b0cc6c6ed91681e3bff3f1826c28119f30
diff --git a/fonts/font-bitstream-75dpi/DESCR b/fonts/font-bitstream-75dpi/DESCR
new file mode 100644
index 00000000000..8ababf28406
--- /dev/null
+++ b/fonts/font-bitstream-75dpi/DESCR
@@ -0,0 +1,5 @@
+This are the PCF versions of the following Bitstream fonts for 75dpi displays:
+- Charter
+- Terminal
+
+This is from the modular Xorg project.
diff --git a/fonts/font-bitstream-75dpi/Makefile b/fonts/font-bitstream-75dpi/Makefile
new file mode 100644
index 00000000000..e105a845880
--- /dev/null
+++ b/fonts/font-bitstream-75dpi/Makefile
@@ -0,0 +1,27 @@
+# $NetBSD: Makefile,v 1.1.1.1 2006/11/15 13:36:12 joerg Exp $
+#
+
+DISTNAME=		font-bitstream-75dpi-1.0.0
+CATEGORIES=		fonts
+MASTER_SITES=		http://xorg.freedesktop.org/releases/individual/font/
+EXTRACT_SUFX=		.tar.bz2
+
+MAINTAINER=		joerg@NetBSD.org
+HOMEPAGE=		http://xorg.freedesktop.org/
+COMMENT=		Standard 75dpi Bitstream PCF fonts
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+GNU_CONFIGURE=		yes
+USE_TOOLS+=		gmake pkg-config bdftopcf ucs2any
+
+FONTS_DIRS.x11=		lib/X11/fonts/75dpi
+
+INSTALLATION_DIRS=	share/doc/font-bitstream-75dpi
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/font-bitstream-75dpi
+
+.include "../../fonts/font-util/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/fonts/font-bitstream-75dpi/PLIST b/fonts/font-bitstream-75dpi/PLIST
new file mode 100644
index 00000000000..132bcb81da2
--- /dev/null
+++ b/fonts/font-bitstream-75dpi/PLIST
@@ -0,0 +1,34 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2006/11/15 13:36:12 joerg Exp $
+lib/X11/fonts/75dpi/charB08.pcf.gz
+lib/X11/fonts/75dpi/charB10.pcf.gz
+lib/X11/fonts/75dpi/charB12.pcf.gz
+lib/X11/fonts/75dpi/charB14.pcf.gz
+lib/X11/fonts/75dpi/charB18.pcf.gz
+lib/X11/fonts/75dpi/charB24.pcf.gz
+lib/X11/fonts/75dpi/charBI08.pcf.gz
+lib/X11/fonts/75dpi/charBI10.pcf.gz
+lib/X11/fonts/75dpi/charBI12.pcf.gz
+lib/X11/fonts/75dpi/charBI14.pcf.gz
+lib/X11/fonts/75dpi/charBI18.pcf.gz
+lib/X11/fonts/75dpi/charBI24.pcf.gz
+lib/X11/fonts/75dpi/charI08.pcf.gz
+lib/X11/fonts/75dpi/charI10.pcf.gz
+lib/X11/fonts/75dpi/charI12.pcf.gz
+lib/X11/fonts/75dpi/charI14.pcf.gz
+lib/X11/fonts/75dpi/charI18.pcf.gz
+lib/X11/fonts/75dpi/charI24.pcf.gz
+lib/X11/fonts/75dpi/charR08.pcf.gz
+lib/X11/fonts/75dpi/charR10.pcf.gz
+lib/X11/fonts/75dpi/charR12.pcf.gz
+lib/X11/fonts/75dpi/charR14.pcf.gz
+lib/X11/fonts/75dpi/charR18.pcf.gz
+lib/X11/fonts/75dpi/charR24.pcf.gz
+lib/X11/fonts/75dpi/tech14.pcf.gz
+lib/X11/fonts/75dpi/techB14.pcf.gz
+lib/X11/fonts/75dpi/term14.pcf.gz
+lib/X11/fonts/75dpi/termB14.pcf.gz
+share/doc/font-bitstream-75dpi/COPYING
+@dirrm share/doc/font-bitstream-75dpi
+@comment @dirrm lib/X11/fonts/75dpi
+@comment @dirrm lib/X11/fonts
+@comment @dirrm lib/X11
diff --git a/fonts/font-bitstream-75dpi/distinfo b/fonts/font-bitstream-75dpi/distinfo
new file mode 100644
index 00000000000..bfe4c0487f4
--- /dev/null
+++ b/fonts/font-bitstream-75dpi/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1.1.1 2006/11/15 13:36:12 joerg Exp $
+
+SHA1 (font-bitstream-75dpi-1.0.0.tar.bz2) = ad534d1eaf758f743bcafc6ba30d3169774c672b
+RMD160 (font-bitstream-75dpi-1.0.0.tar.bz2) = b8218eb4bf25a5bda69a5034f8b582824b0b13f4
+Size (font-bitstream-75dpi-1.0.0.tar.bz2) = 103852 bytes
+SHA1 (patch-aa) = c9180bce8f2fed4fe91eeae680da1dbdaaa413db
+SHA1 (patch-ab) = 77064ac1f0e01a1cc4439e71a14b88d33c6da3b8
+SHA1 (patch-ac) = a27449b0cc6c6ed91681e3bff3f1826c28119f30
diff --git a/fonts/font-bitstream-75dpi/patches/patch-aa b/fonts/font-bitstream-75dpi/patches/patch-aa
new file mode 100644
index 00000000000..a03cf502fae
--- /dev/null
+++ b/fonts/font-bitstream-75dpi/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2006/11/15 13:36:12 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-75dpi/patches/patch-ab b/fonts/font-bitstream-75dpi/patches/patch-ab
new file mode 100644
index 00000000000..f4f0630d1c8
--- /dev/null
+++ b/fonts/font-bitstream-75dpi/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2006/11/15 13:36:12 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-75dpi/patches/patch-ac b/fonts/font-bitstream-75dpi/patches/patch-ac
new file mode 100644
index 00000000000..54d40c0702f
--- /dev/null
+++ b/fonts/font-bitstream-75dpi/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1.1.1 2006/11/15 13:36:12 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]))])