summaryrefslogtreecommitdiff
path: root/fonts
diff options
context:
space:
mode:
authorwiz <wiz>2004-12-28 14:38:03 +0000
committerwiz <wiz>2004-12-28 14:38:03 +0000
commita2de47d97128ef3ea5225981f245216bcdd4e6b1 (patch)
tree3c57a9e442dc4d6c96263158fc72d70a96e3df2b /fonts
parentc8c3c66b78f7b0de036deecf86133c4cfde8df61 (diff)
downloadpkgsrc-a2de47d97128ef3ea5225981f245216bcdd4e6b1.tar.gz
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 (limited to 'fonts')
-rw-r--r--fonts/alee-ttf/Makefile3
-rw-r--r--fonts/arphic-ttf/Makefile4
-rw-r--r--fonts/baekmuk-ttf/Makefile3
-rw-r--r--fonts/cyberbase-ttf/Makefile4
-rw-r--r--fonts/cyberbit-ttf/Makefile4
-rw-r--r--fonts/dbz-ttf/Makefile4
-rw-r--r--fonts/geoslab703-ttf/Makefile4
-rw-r--r--fonts/kochi-ttf/Makefile4
-rw-r--r--fonts/ms-ttf/Makefile4
-rw-r--r--fonts/un-core-ttf/Makefile3
-rw-r--r--fonts/un-extra-ttf/Makefile3
-rw-r--r--fonts/vera-ttf/Makefile4
12 files changed, 24 insertions, 20 deletions
diff --git a/fonts/alee-ttf/Makefile b/fonts/alee-ttf/Makefile
index 50b28d7d97f..fb94607a113 100644
--- a/fonts/alee-ttf/Makefile
+++ b/fonts/alee-ttf/Makefile
@@ -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 --git a/fonts/arphic-ttf/Makefile b/fonts/arphic-ttf/Makefile
index 31a22942c83..2569b681cbc 100644
--- a/fonts/arphic-ttf/Makefile
+++ b/fonts/arphic-ttf/Makefile
@@ -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 --git a/fonts/baekmuk-ttf/Makefile b/fonts/baekmuk-ttf/Makefile
index e1e85c25b1b..d0de6125c0c 100644
--- a/fonts/baekmuk-ttf/Makefile
+++ b/fonts/baekmuk-ttf/Makefile
@@ -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 --git a/fonts/cyberbase-ttf/Makefile b/fonts/cyberbase-ttf/Makefile
index be01a4e8ed2..c1e2b92d870 100644
--- a/fonts/cyberbase-ttf/Makefile
+++ b/fonts/cyberbase-ttf/Makefile
@@ -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 --git a/fonts/cyberbit-ttf/Makefile b/fonts/cyberbit-ttf/Makefile
index e6e06b396cb..c2168d54499 100644
--- a/fonts/cyberbit-ttf/Makefile
+++ b/fonts/cyberbit-ttf/Makefile
@@ -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 --git a/fonts/dbz-ttf/Makefile b/fonts/dbz-ttf/Makefile
index 6f4e137839e..b079551961b 100644
--- a/fonts/dbz-ttf/Makefile
+++ b/fonts/dbz-ttf/Makefile
@@ -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 --git a/fonts/geoslab703-ttf/Makefile b/fonts/geoslab703-ttf/Makefile
index ff24be618f8..7dcee452095 100644
--- a/fonts/geoslab703-ttf/Makefile
+++ b/fonts/geoslab703-ttf/Makefile
@@ -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 --git a/fonts/kochi-ttf/Makefile b/fonts/kochi-ttf/Makefile
index 6ae83842d9e..d4349acfbab 100644
--- a/fonts/kochi-ttf/Makefile
+++ b/fonts/kochi-ttf/Makefile
@@ -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 --git a/fonts/ms-ttf/Makefile b/fonts/ms-ttf/Makefile
index 08aedba16f4..9db0990953a 100644
--- a/fonts/ms-ttf/Makefile
+++ b/fonts/ms-ttf/Makefile
@@ -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 --git a/fonts/un-core-ttf/Makefile b/fonts/un-core-ttf/Makefile
index db5d4520356..8855d08cfa6 100644
--- a/fonts/un-core-ttf/Makefile
+++ b/fonts/un-core-ttf/Makefile
@@ -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 --git a/fonts/un-extra-ttf/Makefile b/fonts/un-extra-ttf/Makefile
index 93361fbfe8d..87f2ba58478 100644
--- a/fonts/un-extra-ttf/Makefile
+++ b/fonts/un-extra-ttf/Makefile
@@ -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 --git a/fonts/vera-ttf/Makefile b/fonts/vera-ttf/Makefile
index 2a905586a05..e0232abbbeb 100644
--- a/fonts/vera-ttf/Makefile
+++ b/fonts/vera-ttf/Makefile
@@ -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