kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Compute CHEKCK_FILES filter on the entries requested and keep it

Browse source 
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.
This commit is contained in:
joerg 2006-09-22 21:53:56 +00:00
parent 68d3dff32d
commit 7545d135e6
40 changed files with 217 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fonts/biznet-iso8859_2/Makefile
View file

@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.11 2006/03/04 21:29:38 jlam Exp $
# $NetBSD: Makefile,v 1.12 2006/09/22 21:53:56 joerg Exp $
#
DISTNAME= ISO8859-2-pcf
PKGNAME= biznet-iso8859_2-1.0
PKGREVISION= 3
PKGREVISION= 4
CATEGORIES= fonts x11
MASTER_SITES= http://www.biz.net.pl/images/

5
fonts/biznet-iso8859_2/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.3 2006/02/17 19:28:43 wiz Exp $
@comment $NetBSD: PLIST,v 1.4 2006/09/22 21:53:56 joerg Exp $
lib/X11/fonts/biznet/100dpi/UTI___10.pcf.gz
lib/X11/fonts/biznet/100dpi/UTI___12.pcf.gz
lib/X11/fonts/biznet/100dpi/UTI___14.pcf.gz
@ -45,6 +45,7 @@ lib/X11/fonts/biznet/100dpi/courR12.pcf.gz
lib/X11/fonts/biznet/100dpi/courR14.pcf.gz
lib/X11/fonts/biznet/100dpi/courR18.pcf.gz
lib/X11/fonts/biznet/100dpi/courR24.pcf.gz
lib/X11/fonts/biznet/100dpi/fonts.alias
lib/X11/fonts/biznet/100dpi/helvB08.pcf.gz
lib/X11/fonts/biznet/100dpi/helvB10.pcf.gz
lib/X11/fonts/biznet/100dpi/helvB12.pcf.gz
@ -259,6 +260,7 @@ lib/X11/fonts/biznet/75dpi/helvR12.pcf.gz
lib/X11/fonts/biznet/75dpi/helvR14.pcf.gz
lib/X11/fonts/biznet/75dpi/helvR18.pcf.gz
lib/X11/fonts/biznet/75dpi/helvR24.pcf.gz
lib/X11/fonts/biznet/75dpi/fonts.alias
lib/X11/fonts/biznet/75dpi/luBIS08.pcf.gz
lib/X11/fonts/biznet/75dpi/luBIS10.pcf.gz
lib/X11/fonts/biznet/75dpi/luBIS12.pcf.gz
@ -394,3 +396,4 @@ lib/X11/fonts/biznet/misc/8x13B.pcf.gz
lib/X11/fonts/biznet/misc/8x16.pcf.gz
lib/X11/fonts/biznet/misc/9x15.pcf.gz
lib/X11/fonts/biznet/misc/9x15B.pcf.gz
lib/X11/fonts/biznet/misc/fonts.alias

4
fonts/cyr-rfx-bulgarian-mik/Makefile
View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.3 2006/02/17 19:29:56 wiz Exp $
# $NetBSD: Makefile,v 1.4 2006/09/22 21:53:57 joerg Exp $
CYR_RFX_ENCODING=bulgarian-mik
PKGREVISION= 2
PKGREVISION= 3
.include "../../fonts/cyr-rfx-share/Makefile.common"

4
fonts/cyr-rfx-bulgarian-mik/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.2 2006/02/17 19:29:56 wiz Exp $
@comment $NetBSD: PLIST,v 1.3 2006/09/22 21:53:57 joerg Exp $
lib/X11/fonts/local/bulgarian-mik/75dpi/courB08b.pcf
lib/X11/fonts/local/bulgarian-mik/75dpi/courB10b.pcf
lib/X11/fonts/local/bulgarian-mik/75dpi/courB12b.pcf
@ -23,6 +23,7 @@ lib/X11/fonts/local/bulgarian-mik/75dpi/courR12b.pcf
lib/X11/fonts/local/bulgarian-mik/75dpi/courR14b.pcf
lib/X11/fonts/local/bulgarian-mik/75dpi/courR18b.pcf
lib/X11/fonts/local/bulgarian-mik/75dpi/courR24b.pcf
lib/X11/fonts/local/bulgarian-mik/75dpi/fonts.alias
lib/X11/fonts/local/bulgarian-mik/75dpi/helvB08b.pcf
lib/X11/fonts/local/bulgarian-mik/75dpi/helvB10b.pcf
lib/X11/fonts/local/bulgarian-mik/75dpi/helvB12b.pcf
@ -128,4 +129,5 @@ lib/X11/fonts/local/bulgarian-mik/misc/8x13b.pcf
lib/X11/fonts/local/bulgarian-mik/misc/8x16b.pcf
lib/X11/fonts/local/bulgarian-mik/misc/9x15Bb.pcf
lib/X11/fonts/local/bulgarian-mik/misc/9x15b.pcf
lib/X11/fonts/local/bulgarian-mik/misc/fonts.alias
lib/X11/fonts/local/bulgarian-mik/misc/nil2b.pcf

4
fonts/cyr-rfx-ibm-cp866/Makefile
View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.3 2006/02/17 19:29:56 wiz Exp $
# $NetBSD: Makefile,v 1.4 2006/09/22 21:53:57 joerg Exp $
CYR_RFX_ENCODING=ibm-cp866
PKGREVISION= 2
PKGREVISION= 3
.include "../../fonts/cyr-rfx-share/Makefile.common"

4
fonts/cyr-rfx-ibm-cp866/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.2 2006/02/17 19:29:56 wiz Exp $
@comment $NetBSD: PLIST,v 1.3 2006/09/22 21:53:57 joerg Exp $
lib/X11/fonts/local/ibm-cp866/75dpi/courB08d.pcf
lib/X11/fonts/local/ibm-cp866/75dpi/courB10d.pcf
lib/X11/fonts/local/ibm-cp866/75dpi/courB12d.pcf
@ -23,6 +23,7 @@ lib/X11/fonts/local/ibm-cp866/75dpi/courR12d.pcf
lib/X11/fonts/local/ibm-cp866/75dpi/courR14d.pcf
lib/X11/fonts/local/ibm-cp866/75dpi/courR18d.pcf
lib/X11/fonts/local/ibm-cp866/75dpi/courR24d.pcf
lib/X11/fonts/local/ibm-cp866/75dpi/fonts.alias
lib/X11/fonts/local/ibm-cp866/75dpi/helvB08d.pcf
lib/X11/fonts/local/ibm-cp866/75dpi/helvB10d.pcf
lib/X11/fonts/local/ibm-cp866/75dpi/helvB12d.pcf
@ -128,4 +129,5 @@ lib/X11/fonts/local/ibm-cp866/misc/8x13d.pcf
lib/X11/fonts/local/ibm-cp866/misc/8x16d.pcf
lib/X11/fonts/local/ibm-cp866/misc/9x15Bd.pcf
lib/X11/fonts/local/ibm-cp866/misc/9x15d.pcf
lib/X11/fonts/local/ibm-cp866/misc/fonts.alias
lib/X11/fonts/local/ibm-cp866/misc/nil2d.pcf

4
fonts/cyr-rfx-iso10646_0400/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.4 2006/02/17 19:29:56 wiz Exp $
# $NetBSD: Makefile,v 1.5 2006/09/22 21:53:57 joerg Exp $
CYR_RFX_ENCODING=iso10646-0400
PKGNAME= ${DISTNAME:S/6-0/6_0/}
PKGREVISION= 2
PKGREVISION= 3
.include "../../fonts/cyr-rfx-share/Makefile.common"

4
fonts/cyr-rfx-iso10646_0400/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.2 2006/02/17 19:29:56 wiz Exp $
@comment $NetBSD: PLIST,v 1.3 2006/09/22 21:53:57 joerg Exp $
lib/X11/fonts/local/iso10646-0400/75dpi/courB08c.pcf
lib/X11/fonts/local/iso10646-0400/75dpi/courB10c.pcf
lib/X11/fonts/local/iso10646-0400/75dpi/courB12c.pcf
@ -23,6 +23,7 @@ lib/X11/fonts/local/iso10646-0400/75dpi/courR12c.pcf
lib/X11/fonts/local/iso10646-0400/75dpi/courR14c.pcf
lib/X11/fonts/local/iso10646-0400/75dpi/courR18c.pcf
lib/X11/fonts/local/iso10646-0400/75dpi/courR24c.pcf
lib/X11/fonts/local/iso10646-0400/75dpi/fonts.alias
lib/X11/fonts/local/iso10646-0400/75dpi/helvB08c.pcf
lib/X11/fonts/local/iso10646-0400/75dpi/helvB10c.pcf
lib/X11/fonts/local/iso10646-0400/75dpi/helvB12c.pcf
@ -128,4 +129,5 @@ lib/X11/fonts/local/iso10646-0400/misc/8x13c.pcf
lib/X11/fonts/local/iso10646-0400/misc/8x16c.pcf
lib/X11/fonts/local/iso10646-0400/misc/9x15Bc.pcf
lib/X11/fonts/local/iso10646-0400/misc/9x15c.pcf
lib/X11/fonts/local/iso10646-0400/misc/fonts.alias
lib/X11/fonts/local/iso10646-0400/misc/nil2c.pcf

4
fonts/cyr-rfx-koi8-o/Makefile
View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.3 2006/02/17 19:29:57 wiz Exp $
# $NetBSD: Makefile,v 1.4 2006/09/22 21:53:57 joerg Exp $
CYR_RFX_ENCODING=koi8-o
PKGREVISION= 2
PKGREVISION= 3
.include "../../fonts/cyr-rfx-share/Makefile.common"

4
fonts/cyr-rfx-koi8-o/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.2 2006/02/17 19:29:57 wiz Exp $
@comment $NetBSD: PLIST,v 1.3 2006/09/22 21:53:57 joerg Exp $
lib/X11/fonts/local/koi8-o/75dpi/courB08o.pcf
lib/X11/fonts/local/koi8-o/75dpi/courB10o.pcf
lib/X11/fonts/local/koi8-o/75dpi/courB12o.pcf
@ -23,6 +23,7 @@ lib/X11/fonts/local/koi8-o/75dpi/courR12o.pcf
lib/X11/fonts/local/koi8-o/75dpi/courR14o.pcf
lib/X11/fonts/local/koi8-o/75dpi/courR18o.pcf
lib/X11/fonts/local/koi8-o/75dpi/courR24o.pcf
lib/X11/fonts/local/koi8-o/75dpi/fonts.alias
lib/X11/fonts/local/koi8-o/75dpi/helvB08o.pcf
lib/X11/fonts/local/koi8-o/75dpi/helvB10o.pcf
lib/X11/fonts/local/koi8-o/75dpi/helvB12o.pcf
@ -128,4 +129,5 @@ lib/X11/fonts/local/koi8-o/misc/8x13o.pcf
lib/X11/fonts/local/koi8-o/misc/8x16o.pcf
lib/X11/fonts/local/koi8-o/misc/9x15Bo.pcf
lib/X11/fonts/local/koi8-o/misc/9x15o.pcf
lib/X11/fonts/local/koi8-o/misc/fonts.alias
lib/X11/fonts/local/koi8-o/misc/nil2o.pcf

4
fonts/cyr-rfx-koi8-ru/Makefile
View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.3 2006/02/17 19:29:57 wiz Exp $
# $NetBSD: Makefile,v 1.4 2006/09/22 21:53:57 joerg Exp $
CYR_RFX_ENCODING=koi8-ru
PKGREVISION= 2
PKGREVISION= 3
.include "../../fonts/cyr-rfx-share/Makefile.common"

4
fonts/cyr-rfx-koi8-ru/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.2 2006/02/17 19:29:57 wiz Exp $
@comment $NetBSD: PLIST,v 1.3 2006/09/22 21:53:57 joerg Exp $
lib/X11/fonts/local/koi8-ru/75dpi/courB08u.pcf
lib/X11/fonts/local/koi8-ru/75dpi/courB10u.pcf
lib/X11/fonts/local/koi8-ru/75dpi/courB12u.pcf
@ -23,6 +23,7 @@ lib/X11/fonts/local/koi8-ru/75dpi/courR12u.pcf
lib/X11/fonts/local/koi8-ru/75dpi/courR14u.pcf
lib/X11/fonts/local/koi8-ru/75dpi/courR18u.pcf
lib/X11/fonts/local/koi8-ru/75dpi/courR24u.pcf
lib/X11/fonts/local/koi8-ru/75dpi/fonts.alias
lib/X11/fonts/local/koi8-ru/75dpi/helvB08u.pcf
lib/X11/fonts/local/koi8-ru/75dpi/helvB10u.pcf
lib/X11/fonts/local/koi8-ru/75dpi/helvB12u.pcf
@ -128,4 +129,5 @@ lib/X11/fonts/local/koi8-ru/misc/8x13u.pcf
lib/X11/fonts/local/koi8-ru/misc/8x16u.pcf
lib/X11/fonts/local/koi8-ru/misc/9x15Bu.pcf
lib/X11/fonts/local/koi8-ru/misc/9x15u.pcf
lib/X11/fonts/local/koi8-ru/misc/fonts.alias
lib/X11/fonts/local/koi8-ru/misc/nil2u.pcf

4
fonts/cyr-rfx-windows_1251/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.4 2006/02/17 19:29:57 wiz Exp $
# $NetBSD: Makefile,v 1.5 2006/09/22 21:53:57 joerg Exp $
CYR_RFX_ENCODING=windows-1251
PKGNAME= ${DISTNAME:S/s-1/s_1/}
PKGREVISION= 2
PKGREVISION= 3
.include "../../fonts/cyr-rfx-share/Makefile.common"

4
fonts/cyr-rfx-windows_1251/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.2 2006/02/17 19:29:57 wiz Exp $
@comment $NetBSD: PLIST,v 1.3 2006/09/22 21:53:57 joerg Exp $
lib/X11/fonts/local/windows-1251/75dpi/courB08w.pcf
lib/X11/fonts/local/windows-1251/75dpi/courB10w.pcf
lib/X11/fonts/local/windows-1251/75dpi/courB12w.pcf
@ -23,6 +23,7 @@ lib/X11/fonts/local/windows-1251/75dpi/courR12w.pcf
lib/X11/fonts/local/windows-1251/75dpi/courR14w.pcf
lib/X11/fonts/local/windows-1251/75dpi/courR18w.pcf
lib/X11/fonts/local/windows-1251/75dpi/courR24w.pcf
lib/X11/fonts/local/windows-1251/75dpi/fonts.alias
lib/X11/fonts/local/windows-1251/75dpi/helvB08w.pcf
lib/X11/fonts/local/windows-1251/75dpi/helvB10w.pcf
lib/X11/fonts/local/windows-1251/75dpi/helvB12w.pcf
@ -128,4 +129,5 @@ lib/X11/fonts/local/windows-1251/misc/8x13w.pcf
lib/X11/fonts/local/windows-1251/misc/8x16w.pcf
lib/X11/fonts/local/windows-1251/misc/9x15Bw.pcf
lib/X11/fonts/local/windows-1251/misc/9x15w.pcf
lib/X11/fonts/local/windows-1251/misc/fonts.alias
lib/X11/fonts/local/windows-1251/misc/nil2w.pcf

7
fonts/jmk-fonts/Makefile
View file

@ -1,9 +1,9 @@
# $NetBSD: Makefile,v 1.10 2006/03/04 21:29:39 jlam Exp $
# $NetBSD: Makefile,v 1.11 2006/09/22 21:53:57 joerg Exp $
#
DISTNAME= jmk-x11-fonts-3.0
PKGNAME= jmk-fonts-3.0
PKGREVISION= 2
PKGREVISION= 3
CATEGORIES= fonts x11
MASTER_SITES= ${MASTER_SITE_SUNSITE:=X11/fonts/}
@ -17,4 +17,7 @@ USE_TOOLS+= bdftopcf
FONTS_DIRS.x11+= ${PREFIX}/lib/X11/fonts/jmk
REQD_DIRS+= ${PREFIX}/lib/X11/fonts/jmk
post-install:
${RM} ${PREFIX}/lib/X11/fonts/jmk/fonts.scale
.include "../../mk/bsd.pkg.mk"

3
fonts/jmk-fonts/PLIST
View file

@ -1,4 +1,5 @@
@comment $NetBSD: PLIST,v 1.3 2006/02/17 19:34:08 wiz Exp $
@comment $NetBSD: PLIST,v 1.4 2006/09/22 21:53:57 joerg Exp $
lib/X11/fonts/jmk/fonts.alias
lib/X11/fonts/jmk/modd-iso8859-1-06x11-bold.pcf.gz
lib/X11/fonts/jmk/modd-iso8859-1-06x11.pcf.gz
lib/X11/fonts/jmk/modd-iso8859-1-06x13-bold.pcf.gz

4
fonts/kcfonts/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.8 2006/02/17 19:34:33 wiz Exp $
# $NetBSD: Makefile,v 1.9 2006/09/22 21:53:57 joerg Exp $
DISTNAME= kcfonts-1.05
PKGREVISION= 2
PKGREVISION= 3
CATEGORIES= fonts
MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/distfiles/

3
fonts/kcfonts/PLIST
View file

@ -1,4 +1,5 @@
@comment $NetBSD: PLIST,v 1.3 2006/02/17 19:34:33 wiz Exp $
@comment $NetBSD: PLIST,v 1.4 2006/09/22 21:53:57 joerg Exp $
lib/X11/fonts/local/fonts.alias
lib/X11/fonts/local/kc8x15.pcf.gz
lib/X11/fonts/local/kc12x24.pcf.gz
lib/X11/fonts/local/kc15f.pcf.gz

4
fonts/mozilla-fonts/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.6 2006/02/17 19:36:11 wiz Exp $
# $NetBSD: Makefile,v 1.7 2006/09/22 21:53:57 joerg Exp $
DISTNAME= mozilla-fonts-1.0
PKGREVISION= 2
PKGREVISION= 3
CATEGORIES= fonts www
#MASTER_SITES= http://www.myrddin.demon.co.uk/dist/

3
fonts/mozilla-fonts/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.2 2006/02/17 19:36:11 wiz Exp $
@comment $NetBSD: PLIST,v 1.3 2006/09/22 21:53:57 joerg Exp $
lib/X11/fonts/Mozilla/cour1.pcf.gz
lib/X11/fonts/Mozilla/cour2.pcf.gz
lib/X11/fonts/Mozilla/cour3.pcf.gz
@ -27,6 +27,7 @@ lib/X11/fonts/Mozilla/couri4.pcf.gz
lib/X11/fonts/Mozilla/couri5.pcf.gz
lib/X11/fonts/Mozilla/couri6.pcf.gz
lib/X11/fonts/Mozilla/couri7.pcf.gz
lib/X11/fonts/Mozilla/fonts.alias
lib/X11/fonts/Mozilla/helv0.pcf.gz
lib/X11/fonts/Mozilla/helv1.pcf.gz
lib/X11/fonts/Mozilla/helv2.pcf.gz

7
fonts/sgi-fonts/Makefile
View file

@ -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"

3
fonts/sgi-fonts/PLIST
View file

@ -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

6
fonts/xorg-fonts100dpi/Makefile
View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.12 2006/06/19 12:23:02 joerg Exp $
# $NetBSD: Makefile,v 1.13 2006/09/22 21:53:57 joerg Exp $
DISTNAME= X11R${XORG_VER}-src1
PKGNAME= xorg-fonts100dpi-${XORG_VER}
PKGREVISION= 2
PKGREVISION= 3
CATEGORIES= fonts x11
MASTER_SITES= ${MASTER_SITE_XORG}
@ -18,5 +18,7 @@ XBUILD_DIRS= fonts/encodings fonts/bdf/100dpi
XINSTALL_DIRS= fonts/bdf/100dpi
XEXTRACTS= ${XBUILD_DIRS} fonts/bdf/75dpi/Imakefile.inc
FONTS_DIRS.x11= ${X11ROOT_PREFIX}/lib/X11/fonts/100dpi
.include "../../fonts/xorg-fontsEncodings/Makefile.common"
.include "../../mk/bsd.pkg.mk"

5
fonts/xorg-fonts100dpi/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.3 2005/03/01 19:00:10 xtraeme Exp $
@comment $NetBSD: PLIST,v 1.4 2006/09/22 21:53:57 joerg Exp $
${X11ROOT_PREFIX}/lib/X11/fonts/100dpi/UTBI__10-ISO8859-1.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/100dpi/UTBI__10-ISO8859-10.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/100dpi/UTBI__10-ISO8859-13.pcf.gz
@ -463,10 +463,7 @@ ${X11ROOT_PREFIX}/lib/X11/fonts/100dpi/courR24-ISO8859-3.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/100dpi/courR24-ISO8859-4.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/100dpi/courR24-ISO8859-9.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/100dpi/courR24.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/100dpi/encodings.dir
${X11ROOT_PREFIX}/lib/X11/fonts/100dpi/fonts.alias
${X11ROOT_PREFIX}/lib/X11/fonts/100dpi/fonts.dir
${X11ROOT_PREFIX}/lib/X11/fonts/100dpi/fonts.scale
${X11ROOT_PREFIX}/lib/X11/fonts/100dpi/helvB08-ISO8859-1.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/100dpi/helvB08-ISO8859-10.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/100dpi/helvB08-ISO8859-13.pcf.gz

6
fonts/xorg-fonts75dpi/Makefile
View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.12 2006/06/19 12:23:02 joerg Exp $
# $NetBSD: Makefile,v 1.13 2006/09/22 21:53:57 joerg Exp $
DISTNAME= X11R${XORG_VER}-src1
PKGNAME= xorg-fonts75dpi-${XORG_VER}
PKGREVISION= 2
PKGREVISION= 3
CATEGORIES= fonts x11
MASTER_SITES= ${MASTER_SITE_XORG}
@ -18,5 +18,7 @@ XBUILD_DIRS= fonts/encodings fonts/bdf/75dpi
XINSTALL_DIRS= fonts/bdf/75dpi
XEXTRACTS= ${XBUILD_DIRS}
FONTS_DIRS.x11= ${X11ROOT_PREFIX}/lib/X11/fonts/75dpi
.include "../../fonts/xorg-fontsEncodings/Makefile.common"
.include "../../mk/bsd.pkg.mk"

6
fonts/xorg-fonts75dpi/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.3 2005/03/01 19:00:10 xtraeme Exp $
@comment $NetBSD: PLIST,v 1.4 2006/09/22 21:53:57 joerg Exp $
${X11ROOT_PREFIX}/lib/X11/fonts/75dpi/UTBI__10-ISO8859-1.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/75dpi/UTBI__10-ISO8859-10.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/75dpi/UTBI__10-ISO8859-13.pcf.gz
@ -463,10 +463,7 @@ ${X11ROOT_PREFIX}/lib/X11/fonts/75dpi/courR24-ISO8859-3.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/75dpi/courR24-ISO8859-4.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/75dpi/courR24-ISO8859-9.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/75dpi/courR24.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/75dpi/encodings.dir
${X11ROOT_PREFIX}/lib/X11/fonts/75dpi/fonts.alias
${X11ROOT_PREFIX}/lib/X11/fonts/75dpi/fonts.dir
${X11ROOT_PREFIX}/lib/X11/fonts/75dpi/fonts.scale
${X11ROOT_PREFIX}/lib/X11/fonts/75dpi/helvB08-ISO8859-1.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/75dpi/helvB08-ISO8859-10.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/75dpi/helvB08-ISO8859-13.pcf.gz
@ -1897,4 +1894,3 @@ ${X11ROOT_PREFIX}/lib/X11/fonts/75dpi/timR24-ISO8859-3.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/75dpi/timR24-ISO8859-4.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/75dpi/timR24-ISO8859-9.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/75dpi/timR24.pcf.gz
@dirrm ${X11ROOT_PREFIX}/lib/X11/fonts/75dpi

4
fonts/xorg-fontsCyrillic/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.12 2006/06/18 19:37:49 joerg Exp $
# $NetBSD: Makefile,v 1.13 2006/09/22 21:53:57 joerg Exp $
DISTNAME= X11R${XORG_VER}-src1
PKGNAME= xorg-fontsCyrillic-${XORG_VER}
@ -18,5 +18,7 @@ XBUILD_DIRS= fonts/encodings fonts/bdf/cyrillic
XINSTALL_DIRS= fonts/bdf/cyrillic
XEXTRACTS= ${XBUILD_DIRS}
FONTS_DIRS.x11+= ${X11ROOT_PREFIX}/lib/X11/fonts/cyrillic
.include "../../fonts/xorg-fontsEncodings/Makefile.common"
.include "../../mk/bsd.pkg.mk"

5
fonts/xorg-fontsCyrillic/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/29 04:57:12 xtraeme Exp $
@comment $NetBSD: PLIST,v 1.2 2006/09/22 21:53:57 joerg Exp $
${X11ROOT_PREFIX}/lib/X11/fonts/cyrillic/crox1c.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/cyrillic/crox1cb.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/cyrillic/crox1cbo.pcf.gz
@ -59,10 +59,7 @@ ${X11ROOT_PREFIX}/lib/X11/fonts/cyrillic/crox6t.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/cyrillic/crox6tb.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/cyrillic/crox6tbo.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/cyrillic/crox6to.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/cyrillic/encodings.dir
${X11ROOT_PREFIX}/lib/X11/fonts/cyrillic/fonts.alias
${X11ROOT_PREFIX}/lib/X11/fonts/cyrillic/fonts.dir
${X11ROOT_PREFIX}/lib/X11/fonts/cyrillic/fonts.scale
${X11ROOT_PREFIX}/lib/X11/fonts/cyrillic/koi10x16b.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/cyrillic/koi10x20.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/cyrillic/koi12x24.pcf.gz

3
fonts/xorg-fontsEncodings/distinfo
View file

@ -1,6 +1,7 @@
$NetBSD: distinfo,v 1.6 2006/01/18 23:53:05 xtraeme Exp $
$NetBSD: distinfo,v 1.7 2006/09/22 21:53:57 joerg Exp $
SHA1 (X11R6.9.0-src1.tar.gz) = a6c077ed8fdeee5fe1956a427c4cb0bc266e1bef
RMD160 (X11R6.9.0-src1.tar.gz) = d12270a4f41a3ceee4bfd5da22d387a3aa707df8
Size (X11R6.9.0-src1.tar.gz) = 33460996 bytes
SHA1 (patch-aa) = 79d826e9d8d4a05f250378814d47f0383ab2eafe
SHA1 (patch-ab) = bd063dd282ba7e27c84ce5197b4501a1b44f4517

98
fonts/xorg-fontsEncodings/patches/patch-ab Normal file
View file

@ -0,0 +1,98 @@
$NetBSD: patch-ab,v 1.1 2006/09/22 21:53:57 joerg Exp $
--- config/cf/X11.tmpl.orig 2005-12-15 00:41:52.000000000 +0100
+++ config/cf/X11.tmpl
@@ -4042,27 +4042,6 @@ InstallNamedTargetNoClobber(install,file
* MakeFcCache - generate rules to build fontconfig cache database
*/
-#if defined UseFreetype2 && !CrossCompiling
-
-# ifndef MakeFcCache
-# define MakeFcCache(deplist) @@\
-all:: fonts.cache @@\
- @@\
-fonts.cache: deplist @@\
- RunProgram(FCCACHE, $(FCCACHEOPTS) .) @@\
- @@\
-clean:: @@\
- RemoveFiles(fonts.cache*)
-# endif /* MakeFcCache */
-
-# ifndef InstallFcCache
-# define InstallFcCache(dest) @@\
-install:: @@\
- RunProgram(FCCACHE, $(FCCACHEOPTS) $(DESTDIR)dest)
-# endif /* InstallFcCache */
-
-#else
-
#ifndef MakeFcCache
#define MakeFcCache(deplist)
#endif
@@ -4071,8 +4050,6 @@ install:: @@\
#define InstallFcCache(dest)
#endif
-#endif
-
/*
* MakeFontsScale - generate rules to build fonts.scale database.
*/
@@ -4098,21 +4075,9 @@ clean:: @@\
* MakeFontsDir - generate rules to build fonts.dir database.
*/
#ifndef MakeFontsDir
-# if !CrossCompiling || UseInstalledOnCrossCompile
# define MakeFontsDir(deplist) @@\
-all:: fonts.dir @@\
- @@\
-fonts.dir: deplist @@\
- RemoveFile(fonts.dir) @@\
- RunProgram(MKFONTDIR, $(MKFONTDIROPTS) .) @@\
- @@\
clean:: @@\
RemoveFile(fonts.dir)
-# else
-# define MakeFontsDir(deplist) @@\
-clean:: @@\
- RemoveFile(fonts.dir)
-# endif
#endif /* MakeFontsDir */
@@ -4138,21 +4103,7 @@ clean:: @@\
#endif /* MakeFonts */
#ifndef InstallFontsDir
-# if !CrossCompiling || UseInstalledOnCrossCompile
-# define InstallFontsDir(dest) @@\
-install:: @@\
- MakeDir($(DESTDIR)dest) @@\
- @if [ X$(STATIC_FONTS_SCALE) = X ]; then (set -x; \ @@\
- RemoveFile($(DESTDIR)dest/fonts.scale); \ @@\
- RunProgram(MKFONTSCALE, $(DESTDIR)dest)); \ @@\
- else (set -x; \ @@\
- InstallInline(fonts.scale,$(INSTDATFLAGS),dest)); \ @@\
- fi @@\
- RemoveFile($(DESTDIR)dest/fonts.dir) @@\
- RunProgram(MKFONTDIR, $(MKFONTDIROPTS) $(DESTDIR)dest)
-# else
# define InstallFontsDir(dest)
-# endif
#endif
/*
@@ -4348,12 +4299,7 @@ InstallEncObjs($(OBJS),dest)
#endif /* InstallEncodings */
#ifndef InstallEncodingsDir
-# if !CrossCompiling || UseInstalledOnCrossCompile
-# define InstallEncodingsDir(edir,fdir) @@\
-InstallNamedTarget(install,edir/encodings.dir,$(INSTDATFLAGS),fdir,encodings.dir)
-# else
# define InstallEncodingsDir(edir,fdir)
-# endif
#endif

6
fonts/xorg-fontsMisc/Makefile
View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.12 2006/06/19 12:23:02 joerg Exp $
# $NetBSD: Makefile,v 1.13 2006/09/22 21:53:57 joerg Exp $
DISTNAME= X11R${XORG_VER}-src1
PKGNAME= xorg-fontsMisc-${XORG_VER}
PKGREVISION= 2
PKGREVISION= 3
CATEGORIES= fonts x11
MASTER_SITES= ${MASTER_SITE_XORG}
@ -18,5 +18,7 @@ XBUILD_DIRS= fonts/encodings fonts/bdf/misc
XINSTALL_DIRS= fonts/bdf/misc
XEXTRACTS= ${XBUILD_DIRS} extras/fonts
FONTS_DIRS.x11= ${X11ROOT_PREFIX}/lib/X11/fonts/misc
.include "../../fonts/xorg-fontsEncodings/Makefile.common"
.include "../../mk/bsd.pkg.mk"

6
fonts/xorg-fontsMisc/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/29 04:58:31 xtraeme Exp $
@comment $NetBSD: PLIST,v 1.2 2006/09/22 21:53:57 joerg Exp $
${X11ROOT_PREFIX}/lib/X11/fonts/misc/10x20-ISO8859-1.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/misc/10x20-ISO8859-10.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/misc/10x20-ISO8859-11.pcf.gz
@ -392,10 +392,7 @@ ${X11ROOT_PREFIX}/lib/X11/fonts/misc/cudevnag12.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/misc/cursor.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/misc/deccurs.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/misc/decsess.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/misc/encodings.dir
${X11ROOT_PREFIX}/lib/X11/fonts/misc/fonts.alias
${X11ROOT_PREFIX}/lib/X11/fonts/misc/fonts.dir
${X11ROOT_PREFIX}/lib/X11/fonts/misc/fonts.scale
${X11ROOT_PREFIX}/lib/X11/fonts/misc/gb16fs.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/misc/gb16st.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/misc/gb24st.pcf.gz
@ -412,4 +409,3 @@ ${X11ROOT_PREFIX}/lib/X11/fonts/misc/olgl10.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/misc/olgl12.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/misc/olgl14.pcf.gz
${X11ROOT_PREFIX}/lib/X11/fonts/misc/olgl19.pcf.gz
@dirrm ${X11ROOT_PREFIX}/lib/X11/fonts/misc

7
fonts/xorg-fontsTruetype/Makefile
View file

@ -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"

7
fonts/xorg-fontsTruetype/PLIST
View file

@ -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

7
fonts/xorg-fontsType1/Makefile
View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.15 2006/06/19 12:23:02 joerg Exp $
# $NetBSD: Makefile,v 1.16 2006/09/22 21:53:57 joerg Exp $
DISTNAME= X11R${XORG_VER}-src1
PKGNAME= xorg-fontsType1-${XORG_VER}
PKGREVISION= 2
PKGREVISION= 3
CATEGORIES= fonts x11
MASTER_SITES= ${MASTER_SITE_XORG}
@ -29,5 +29,8 @@ SUBST_STAGE.scaled= post-configure
SUBST_FILES.scaled= fonts/scaled/Type1/Makefile
SUBST_SED.scaled= -e "s,/usr/X11R6,${LOCALBASE},g"
FONTS_DIRS.type1= ${X11ROOT_PREFIX}/lib/X11/fonts/Type1
FONTS_DIRS.x11= ${X11ROOT_PREFIX}/lib/X11/fonts/Type1
.include "../../fonts/xorg-fontsEncodings/Makefile.common"
.include "../../mk/bsd.pkg.mk"

7
fonts/xorg-fontsType1/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.1.1.1 2004/07/29 05:00:09 xtraeme Exp $
@comment $NetBSD: PLIST,v 1.2 2006/09/22 21:53:57 joerg Exp $
${X11ROOT_PREFIX}/lib/X11/fonts/Type1/UTBI____.afm
${X11ROOT_PREFIX}/lib/X11/fonts/Type1/UTBI____.pfa
${X11ROOT_PREFIX}/lib/X11/fonts/Type1/UTB_____.afm
@ -32,10 +32,6 @@ ${X11ROOT_PREFIX}/lib/X11/fonts/Type1/courbi.pfa
${X11ROOT_PREFIX}/lib/X11/fonts/Type1/couri.afm
${X11ROOT_PREFIX}/lib/X11/fonts/Type1/couri.pfa
${X11ROOT_PREFIX}/lib/X11/fonts/Type1/cursor.pfa
${X11ROOT_PREFIX}/lib/X11/fonts/Type1/encodings.dir
${X11ROOT_PREFIX}/lib/X11/fonts/Type1/fonts.cache-1
${X11ROOT_PREFIX}/lib/X11/fonts/Type1/fonts.dir
${X11ROOT_PREFIX}/lib/X11/fonts/Type1/fonts.scale
${X11ROOT_PREFIX}/lib/X11/fonts/Type1/l047013t.afm
${X11ROOT_PREFIX}/lib/X11/fonts/Type1/l047013t.pfa
${X11ROOT_PREFIX}/lib/X11/fonts/Type1/l047016t.afm
@ -60,4 +56,3 @@ ${X11ROOT_PREFIX}/lib/X11/fonts/Type1/l049033t.afm
${X11ROOT_PREFIX}/lib/X11/fonts/Type1/l049033t.pfa
${X11ROOT_PREFIX}/lib/X11/fonts/Type1/l049036t.afm
${X11ROOT_PREFIX}/lib/X11/fonts/Type1/l049036t.pfa
@dirrm ${X11ROOT_PREFIX}/lib/X11/fonts/Type1

5
mk/bsd.prefs.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: bsd.prefs.mk,v 1.235 2006/09/10 20:19:39 schwarz Exp $
# $NetBSD: bsd.prefs.mk,v 1.236 2006/09/22 21:53:57 joerg Exp $
#
# Make file, included to get the site preferences, if any. Should
# only be included by package Makefiles before any .if defined()
@ -413,6 +413,9 @@ X11PREFIX= ${LOCALBASE}
X11PREFIX= ${X11BASE}
.endif
# Default directory for font encodings
X11_ENCODINGSDIR?= ${X11BASE}/lib/X11/fonts/encodings
DEPOT_SUBDIR?= packages
DEPOTBASE= ${LOCALBASE}/${DEPOT_SUBDIR}

13
mk/check/check-files.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: check-files.mk,v 1.7 2006/09/17 17:02:38 joerg Exp $
# $NetBSD: check-files.mk,v 1.8 2006/09/22 21:53:58 joerg Exp $
.if defined(PKG_DEVELOPER)
CHECK_FILES?= yes
@ -48,12 +48,17 @@ CHECK_FILES_SKIP+= ${d:C/^([^\/])/${PREFIX}\/\1/}.*
.endfor
# Mutable X11 font database files
.if (defined(FONTS_DIRS.x11) && !empty(FONTS_DIRS.x11:M*))
CHECK_FILES_SKIP+= ${PREFIX}/.*/encodings.dir
CHECK_FILES_SKIP+= ${PREFIX}/.*/fonts.dir
.endif
.if (defined(FONTS_DIRS.ttf) && !empty(FONTS_DIRS.ttf:M*)) || \
(defined(FONTS_DIRS.type1) && !empty(FONTS_DIRS.type1:M*))
CHECK_FILES_SKIP+= ${PREFIX}/.*/fonts.scale
.endif
.if (defined(FONTS_DIRS.ttf) && !empty(FONTS_DIRS.ttf:M*)) || \
(defined(FONTS_DIRS.type1) && !empty(FONTS_DIRS.type1:M*)) || \
(defined(FONTS_DIRS.x11) && !empty(FONTS_DIRS.x11:M*))
CHECK_FILES_SKIP+= ${PREFIX}/.*/fonts.alias
CHECK_FILES_SKIP+= ${PREFIX}/.*/fonts.dir
CHECK_FILES_SKIP+= ${PREFIX}/.*/fonts.scale
CHECK_FILES_SKIP+= ${PREFIX}/.*/fonts.cache-1
.endif

4
mk/pkginstall/bsd.pkginstall.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: bsd.pkginstall.mk,v 1.14 2006/07/19 18:05:35 jlam Exp $
# $NetBSD: bsd.pkginstall.mk,v 1.15 2006/09/22 21:53:58 joerg Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and implements the
# common INSTALL/DEINSTALL scripts framework. To use the pkginstall
@ -700,6 +700,8 @@ USE_TOOLS+= mkfontdir:run
FILES_SUBST+= MKFONTDIR=${TOOLS_PATH.mkfontdir:Q}
.endif
FILES_SUBST+= X11_ENCODINGSDIR=${X11_ENCODINGSDIR:Q}
${_INSTALL_FONTS_DATAFILE}:
${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
${_PKG_SILENT}${_PKG_DEBUG}${_FUNC_STRIP_PREFIX}; \

18
mk/pkginstall/fonts
View file

@ -1,4 +1,4 @@
# $NetBSD: fonts,v 1.2 2006/07/19 22:26:26 jlam Exp $
# $NetBSD: fonts,v 1.3 2006/09/22 21:53:58 joerg Exp $
#
# Generate a +FONTS script that updates font databases for the package.
#
@ -37,6 +37,7 @@ TEST="@TEST@"
TRUE="@TRUE@"
TTMKFDIR="@TTMKFDIR@"
TYPE1INST="@TYPE1INST@"
X11_ENCODINGSDIR="@X11_ENCODINGSDIR@"
SELF=$0
@ -74,19 +75,24 @@ ${SED} -n "/^\# FONTS: /{s/^\# FONTS: //;p;}" ${SELF} | ${SORT} -u |
esac
( ${ECHO} " $dir ($font_type)"
cd $dir
update_args=
post_update_cmd=
case $font_type in
[tT][tT][fF]) update_cmd="${TTMKFDIR}" ;;
[tT][yY][pP][eE]1) update_cmd="${TYPE1INST}; ${RM} type1inst.log" ;;
[xX]11) update_cmd="${MKFONTDIR}" ;;
[tT][yY][pP][eE]1) update_cmd="${TYPE1INST}"
post_update_cmd="${RM} type1inst.log" ;;
[xX]11) update_cmd="${MKFONTDIR}"
[ ! -z "${X11_ENCODINGSDIR}" ] && update_args="-e ${X11_ENCODINGSDIR}" ;;
esac
${TEST} -f "$update_cmd" || update_cmd="${TRUE}"
$update_cmd >/dev/null
$update_cmd $update_args >/dev/null
$post_update_cmd
#
# Remove fonts databases if there are no fonts in the directory.
# We filter out the encodings.dir, fonts.{alias,dirs,scale}, and
# We filter out the encodings.dir, fonts.{dirs,scale}, and
# Fontmap database files from the directory listing.
#
${FIND} . -type f | ${GREP} -v "/encodings.dir" | ${GREP} -v "/fonts\." | ${GREP} -v "/Fontmap" >/dev/null || ${RM} -f fonts.* Fontmap*
${FIND} . -type f | ${GREP} -v "/encodings.dir" | ${GREP} -v "/fonts\.scale" | ${GREP} -v "/fonts\.dir" | ${GREP} -v "/Fontmap" >/dev/null || ${RM} -f fonts.dir fonts.scale Fontmap* encodings.dir > /dev/null
)
done
case "$printed_header" in