From 7545d135e658977a2b769208086732dd248245b8 Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 22 Sep 2006 21:53:56 +0000 Subject: - Compute CHEKCK_FILES filter on the entries requested and keep it as tight as possible. Files we don't handle shouldn't be skipped. - fonts.alias is not created automatically, so don't remove it. - create fonts.encoding with mkfontdir using -e X11_ENCODINGSDIR. On platforms not following the X11R6 loayout this might need to be overriden. - Fix type1inst calls. - Modify packages which installed fonts.alias before to actually include it in the PLIST and bump the revisions accordingly. - Modify xorg-fonts* packages to use FONTS_DIRS.* to build indices at run time. Discussed with wiz and jlam. --- fonts/sgi-fonts/Makefile | 7 +++++-- fonts/sgi-fonts/PLIST | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'fonts/sgi-fonts') diff --git a/fonts/sgi-fonts/Makefile b/fonts/sgi-fonts/Makefile index dd4d43c3bbb..86f78eb162a 100644 --- a/fonts/sgi-fonts/Makefile +++ b/fonts/sgi-fonts/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.10 2006/03/04 21:29:40 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2006/09/22 21:53:57 joerg Exp $ # DISTNAME= sgi-fonts-1.0-457.src PKGNAME= sgi-fonts-1.0.457 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= fonts MASTER_SITES= http://public.planetmirror.com/pub/suse/i386/8.2/suse/src/ EXTRACT_SUFX= .rpm @@ -25,4 +25,7 @@ do-extract: ${LOCALBASE}/sbin/rpm2pkg -d ${WRKDIR} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} cd ${WRKDIR} && bzcat sgi-fonts.tar.bz2 | ${GTAR} xf - +post-install: + ${RM} ${PREFIX}/lib/X11/fonts/misc/sgi/fonts.scale + .include "../../mk/bsd.pkg.mk" diff --git a/fonts/sgi-fonts/PLIST b/fonts/sgi-fonts/PLIST index 90b995f7f0c..394579fa8a7 100644 --- a/fonts/sgi-fonts/PLIST +++ b/fonts/sgi-fonts/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2006/02/17 19:36:46 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2006/09/22 21:53:57 joerg Exp $ lib/X11/fonts/misc/sgi/Scr10.pcf.gz lib/X11/fonts/misc/sgi/Scr11.pcf.gz lib/X11/fonts/misc/sgi/Scr12.pcf.gz @@ -21,6 +21,7 @@ lib/X11/fonts/misc/sgi/ScrB18.pcf.gz lib/X11/fonts/misc/sgi/ScrB7.pcf.gz lib/X11/fonts/misc/sgi/ScrB8.pcf.gz lib/X11/fonts/misc/sgi/ScrB9.pcf.gz +lib/X11/fonts/misc/sgi/fonts.alias lib/X11/fonts/misc/sgi/haeberli12.pcf.gz lib/X11/fonts/misc/sgi/haeberli24.pcf.gz lib/X11/fonts/misc/sgi/haeberli36.pcf.gz -- cgit v1.2.3