pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Fix ttf/type1 handling in fonts.mk:
details: https://anonhg.NetBSD.org/pkgsrc/rev/571e32276b36
branches: trunk
changeset: 486444:571e32276b36
user: wiz <wiz%pkgsrc.org@localhost>
date: Tue Dec 28 14:38:03 2004 +0000
description:
Fix ttf/type1 handling in fonts.mk:
Previously, ttmkfdir's output was redirected to fonts.dir,
while the correct behaviour is to let it create fonts.scale
and then let mkfontdir merge fonts.scale into fonts.dir.
type1 handling had a similar problem.
Get the wanted behaviour by automatically appending the contents of
FONTS_TTF_DIRS and FONTS_TYPE1_DIRS to FONTS_X11_DIRS.
Also, save a subshell in install/fonts while there.
Bump PKGREVISION for all affected packages.
jmmv@ says ok.
diffstat:
fonts/alee-ttf/Makefile | 3 ++-
fonts/arphic-ttf/Makefile | 4 ++--
fonts/baekmuk-ttf/Makefile | 3 ++-
fonts/cyberbase-ttf/Makefile | 4 ++--
fonts/cyberbit-ttf/Makefile | 4 ++--
fonts/dbz-ttf/Makefile | 4 ++--
fonts/geoslab703-ttf/Makefile | 4 ++--
fonts/kochi-ttf/Makefile | 4 ++--
fonts/ms-ttf/Makefile | 4 ++--
fonts/un-core-ttf/Makefile | 3 ++-
fonts/un-extra-ttf/Makefile | 3 ++-
fonts/vera-ttf/Makefile | 4 ++--
mk/fonts.mk | 6 +++++-
mk/install/fonts | 6 +++---
14 files changed, 32 insertions(+), 24 deletions(-)
diffs (220 lines):
diff -r 55e15b317dec -r 571e32276b36 fonts/alee-ttf/Makefile
--- a/fonts/alee-ttf/Makefile Tue Dec 28 14:21:38 2004 +0000
+++ b/fonts/alee-ttf/Makefile Tue Dec 28 14:38:03 2004 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2004/08/25 18:35:06 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2004/12/28 14:38:03 wiz Exp $
#
DISTNAME= ttf-alee_2.7
PKGNAME= alee-ttf-2.7
+PKGREVISION= 1
CATEGORIES= fonts korean
MASTER_SITES= http://ftp.debian.org/debian/pool/main/t/ttf-alee/
diff -r 55e15b317dec -r 571e32276b36 fonts/arphic-ttf/Makefile
--- a/fonts/arphic-ttf/Makefile Tue Dec 28 14:21:38 2004 +0000
+++ b/fonts/arphic-ttf/Makefile Tue Dec 28 14:38:03 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2004/10/13 22:27:52 ben Exp $
+# $NetBSD: Makefile,v 1.10 2004/12/28 14:38:03 wiz Exp $
#
DISTNAME= arphic-ttf-2.11
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= fonts
MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/keith/zh-arphicttf/
DISTFILES= ${FONT_FILES} ${MISC_FILES}
diff -r 55e15b317dec -r 571e32276b36 fonts/baekmuk-ttf/Makefile
--- a/fonts/baekmuk-ttf/Makefile Tue Dec 28 14:21:38 2004 +0000
+++ b/fonts/baekmuk-ttf/Makefile Tue Dec 28 14:38:03 2004 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2004/08/13 03:22:23 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2004/12/28 14:38:03 wiz Exp $
DISTNAME= baekmuk-ttf-2.2
+PKGREVISION= 1
CATEGORIES= fonts korean
MASTER_SITES= http://kldp.net/download.php/1429/
diff -r 55e15b317dec -r 571e32276b36 fonts/cyberbase-ttf/Makefile
--- a/fonts/cyberbase-ttf/Makefile Tue Dec 28 14:21:38 2004 +0000
+++ b/fonts/cyberbase-ttf/Makefile Tue Dec 28 14:38:03 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2004/01/25 20:29:30 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2004/12/28 14:38:03 wiz Exp $
#
PKGNAME= cyberbase-ttf-2.0
-PKGREVISION= 3
+PKGREVISION= 4
FONT_FILE= Cyberbase.ZIP
COMMENT= Cyberbit minus CJK subset, for ISO-8859-x languages
diff -r 55e15b317dec -r 571e32276b36 fonts/cyberbit-ttf/Makefile
--- a/fonts/cyberbit-ttf/Makefile Tue Dec 28 14:21:38 2004 +0000
+++ b/fonts/cyberbit-ttf/Makefile Tue Dec 28 14:38:03 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/01/25 20:29:30 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2004/12/28 14:38:03 wiz Exp $
#
PKGNAME= cyberbit-ttf-2.0
-PKGREVISION= 3
+PKGREVISION= 4
FONT_FILE= Cyberbit.ZIP
COMMENT= Multilingual TrueType font from Bitstream
diff -r 55e15b317dec -r 571e32276b36 fonts/dbz-ttf/Makefile
--- a/fonts/dbz-ttf/Makefile Tue Dec 28 14:21:38 2004 +0000
+++ b/fonts/dbz-ttf/Makefile Tue Dec 28 14:38:03 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2004/01/25 20:30:50 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/12/28 14:38:03 wiz Exp $
#
DISTNAME= dbz
PKGNAME= dbz-ttf-20020507
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= fonts
MASTER_SITES= http://www.andrew.cmu.edu/~twm/fonts/
EXTRACT_SUFX= .zip
diff -r 55e15b317dec -r 571e32276b36 fonts/geoslab703-ttf/Makefile
--- a/fonts/geoslab703-ttf/Makefile Tue Dec 28 14:21:38 2004 +0000
+++ b/fonts/geoslab703-ttf/Makefile Tue Dec 28 14:38:03 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2004/01/25 20:31:59 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2004/12/28 14:38:03 wiz Exp $
#
DISTNAME= geoslab703-ttf-20010522
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= fonts
MASTER_SITES= http://www.will-harris.com/fonts/
DISTFILES= geo703l.ttf geo703li.ttf
diff -r 55e15b317dec -r 571e32276b36 fonts/kochi-ttf/Makefile
--- a/fonts/kochi-ttf/Makefile Tue Dec 28 14:21:38 2004 +0000
+++ b/fonts/kochi-ttf/Makefile Tue Dec 28 14:38:03 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2004/12/26 17:30:51 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2004/12/28 14:38:03 wiz Exp $
DISTNAME= kochi-substitute-${KOCHI_VERSION}
PKGNAME= kochi-ttf-${KOCHI_VERSION}
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= fonts japanese
MASTER_SITES= http://osdn.dl.sourceforge.jp/efont/5411/
EXTRACT_SUFX= .tar.bz2
diff -r 55e15b317dec -r 571e32276b36 fonts/ms-ttf/Makefile
--- a/fonts/ms-ttf/Makefile Tue Dec 28 14:21:38 2004 +0000
+++ b/fonts/ms-ttf/Makefile Tue Dec 28 14:38:03 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/01/25 20:34:16 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2004/12/28 14:38:03 wiz Exp $
DISTNAME= # empty
PKGNAME= ms-ttf-20020306
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= fonts
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=corefonts/}
DISTFILES= andale32.exe webdin32.exe trebuc32.exe georgi32.exe \
diff -r 55e15b317dec -r 571e32276b36 fonts/un-core-ttf/Makefile
--- a/fonts/un-core-ttf/Makefile Tue Dec 28 14:21:38 2004 +0000
+++ b/fonts/un-core-ttf/Makefile Tue Dec 28 14:38:03 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/08/16 06:13:59 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2004/12/28 14:38:03 wiz Exp $
DISTNAME= un-fonts-core-${UN_CORE_VER}
PKGNAME= un-core-ttf-${UN_CORE_VER}
+PKGREVISION= 1
CATEGORIES= fonts korean
MASTER_SITES= http://kldp.net/download.php/1425/
diff -r 55e15b317dec -r 571e32276b36 fonts/un-extra-ttf/Makefile
--- a/fonts/un-extra-ttf/Makefile Tue Dec 28 14:21:38 2004 +0000
+++ b/fonts/un-extra-ttf/Makefile Tue Dec 28 14:38:03 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/08/16 06:19:37 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2004/12/28 14:38:03 wiz Exp $
DISTNAME= un-fonts-extra-${UN_EXTRA_VER}
PKGNAME= un-extra-ttf-${UN_EXTRA_VER}
+PKGREVISION= 1
CATEGORIES= fonts korean
MASTER_SITES= http://kldp.net/download.php/1435/
diff -r 55e15b317dec -r 571e32276b36 fonts/vera-ttf/Makefile
--- a/fonts/vera-ttf/Makefile Tue Dec 28 14:21:38 2004 +0000
+++ b/fonts/vera-ttf/Makefile Tue Dec 28 14:38:03 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2004/01/25 20:35:17 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/12/28 14:38:03 wiz Exp $
#
DISTNAME= ttf-bitstream-vera-1.10
PKGNAME= vera-ttf-1.10
-PKGREVISION= 2
+PKGREVISION= 3
CATEGORIES= fonts
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/ttf-bitstream-vera/1.10/}
EXTRACT_SUFX= .tar.bz2
diff -r 55e15b317dec -r 571e32276b36 mk/fonts.mk
--- a/mk/fonts.mk Tue Dec 28 14:21:38 2004 +0000
+++ b/mk/fonts.mk Tue Dec 28 14:38:03 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: fonts.mk,v 1.5 2004/03/29 22:13:47 recht Exp $
+# $NetBSD: fonts.mk,v 1.6 2004/12/28 14:38:03 wiz Exp $
#
# This Makefile fragment is intended to be included by packages that install
# fonts (most of them in the fonts category). It takes care of updating the
@@ -34,6 +34,8 @@
FILES_SUBST+= FONTS_TTF_DIRS="${FONTS_TTF_DIRS}"
FILES_SUBST+= TTMKFDIR="${TTMKFDIR_PREFIX}/bin/ttmkfdir"
DEPENDS+= ttmkfdir2>=20021109:../../fonts/ttmkfdir2
+# also need to run mkfontdir there
+FONTS_X11_DIRS+= ${FONTS_TTF_DIRS}
.endif
.if !empty(FONTS_TYPE1_DIRS)
@@ -43,6 +45,8 @@
FILES_SUBST+= FONTS_TYPE1_DIRS="${FONTS_TYPE1_DIRS}"
FILES_SUBST+= TYPE1INST="${TYPE1INST_PREFIX}/bin/type1inst"
DEPENDS+= type1inst>=0.6.1:../../fonts/type1inst
+# also need to run mkfontdir there
+FONTS_X11_DIRS+= ${FONTS_TYPE1_DIRS}
.endif
.if !empty(FONTS_X11_DIRS)
diff -r 55e15b317dec -r 571e32276b36 mk/install/fonts
--- a/mk/install/fonts Tue Dec 28 14:21:38 2004 +0000
+++ b/mk/install/fonts Tue Dec 28 14:38:03 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: fonts,v 1.5 2004/03/30 11:55:02 recht Exp $
+# $NetBSD: fonts,v 1.6 2004/12/28 14:38:03 wiz Exp $
#
# Handle font databases; used by fonts.mk.
#
@@ -21,7 +21,7 @@
if [ -z "`cd $d ; ${LS} | ${GREP} -v .pkgsrc | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then
${RM} -f $d/fonts* $d/Fontmap*
else
- ( cd $d && ${TTMKFDIR} -o fonts.dir >/dev/null 2>&1 )
+ ( cd $d && ${TTMKFDIR} >/dev/null 2>&1 )
fi
done
fi
@@ -39,7 +39,7 @@
if [ -z "`cd $d ; ${LS} | ${GREP} -v .pkgsrc | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then
${RM} -f $d/fonts* $d/Fontmap*
else
- ( cd $d && ${MKFONTDIR} >/dev/null 2>&1 )
+ ${MKFONTDIR} $d >/dev/null 2>&1
fi
done
fi
Home |
Main Index |
Thread Index |
Old Index