diff options
| author | joerg <joerg> | 2006-09-22 21:53:56 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2006-09-22 21:53:56 +0000 |
| commit | 7aa23c38fbfb630e27447c795e9b80ff226e174c (patch) | |
| tree | db83b25b7768e178196b801eef79294cee44fa06 /fonts/xorg-fontsTruetype | |
| parent | 5d7aca5a0076185f8999bd30b93e38c92e38fc38 (diff) | |
| download | pkgsrc-7aa23c38fbfb630e27447c795e9b80ff226e174c.tar.gz | |
- 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.
Diffstat (limited to 'fonts/xorg-fontsTruetype')
| -rw-r--r-- | fonts/xorg-fontsTruetype/Makefile | 7 | ||||
| -rw-r--r-- | fonts/xorg-fontsTruetype/PLIST | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/fonts/xorg-fontsTruetype/Makefile b/fonts/xorg-fontsTruetype/Makefile index 4eab64854c8..a56855e59d4 100644 --- a/fonts/xorg-fontsTruetype/Makefile +++ b/fonts/xorg-fontsTruetype/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2006/06/19 12:23:02 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2006/09/22 21:53:57 joerg Exp $ DISTNAME= X11R${XORG_VER}-src1 PKGNAME= xorg-fontsTruetype-${XORG_VER} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= fonts x11 MASTER_SITES= ${MASTER_SITE_XORG} @@ -30,5 +30,8 @@ SUBST_STAGE.TTF= post-configure SUBST_FILES.TTF= fonts/scaled/TTF/Makefile SUBST_SED.TTF= -e "s,/usr/X11R6,${LOCALBASE},g" +FONTS_DIRS.ttf= ${X11ROOT_PREFIX}/lib/X11/fonts/TTF +FONTS_DIRS.x11= ${X11ROOT_PREFIX}/lib/X11/fonts/TTF + .include "../../fonts/xorg-fontsEncodings/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/fonts/xorg-fontsTruetype/PLIST b/fonts/xorg-fontsTruetype/PLIST index 7c4c47e0783..ea29a720d00 100644 --- a/fonts/xorg-fontsTruetype/PLIST +++ b/fonts/xorg-fontsTruetype/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2004/09/21 17:38:53 xtraeme Exp $ +@comment $NetBSD: PLIST,v 1.3 2006/09/22 21:53:57 joerg Exp $ ${X11ROOT_PREFIX}/lib/X11/fonts/TTF/Vera.ttf ${X11ROOT_PREFIX}/lib/X11/fonts/TTF/VeraIt.ttf ${X11ROOT_PREFIX}/lib/X11/fonts/TTF/VeraBI.ttf @@ -9,10 +9,6 @@ ${X11ROOT_PREFIX}/lib/X11/fonts/TTF/VeraMoIt.ttf ${X11ROOT_PREFIX}/lib/X11/fonts/TTF/VeraMono.ttf ${X11ROOT_PREFIX}/lib/X11/fonts/TTF/VeraSe.ttf ${X11ROOT_PREFIX}/lib/X11/fonts/TTF/VeraSeBd.ttf -${X11ROOT_PREFIX}/lib/X11/fonts/TTF/encodings.dir -${X11ROOT_PREFIX}/lib/X11/fonts/TTF/fonts.cache-1 -${X11ROOT_PREFIX}/lib/X11/fonts/TTF/fonts.dir -${X11ROOT_PREFIX}/lib/X11/fonts/TTF/fonts.scale ${X11ROOT_PREFIX}/lib/X11/fonts/TTF/luximb.ttf ${X11ROOT_PREFIX}/lib/X11/fonts/TTF/luximbi.ttf ${X11ROOT_PREFIX}/lib/X11/fonts/TTF/luximr.ttf @@ -25,4 +21,3 @@ ${X11ROOT_PREFIX}/lib/X11/fonts/TTF/luxisb.ttf ${X11ROOT_PREFIX}/lib/X11/fonts/TTF/luxisbi.ttf ${X11ROOT_PREFIX}/lib/X11/fonts/TTF/luxisr.ttf ${X11ROOT_PREFIX}/lib/X11/fonts/TTF/luxisri.ttf -@dirrm ${X11ROOT_PREFIX}/lib/X11/fonts/TTF |