From 3549aca90f20bdaf537dcad8b09fef539755ef8f Mon Sep 17 00:00:00 2001
From: minskim <minskim>
Date: Wed, 17 Nov 2010 19:27:05 +0000
Subject: Make opentype and truetype fonts directories interchangeable.

---
 print/kpathsea/Makefile         |  3 ++-
 print/kpathsea/distinfo         |  4 ++--
 print/kpathsea/patches/patch-aa | 16 +++++++++++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

(limited to 'print/kpathsea')

diff --git a/print/kpathsea/Makefile b/print/kpathsea/Makefile
index 56d0aaf96f0..ac95ded0951 100644
--- a/print/kpathsea/Makefile
+++ b/print/kpathsea/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2010/09/13 04:06:12 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2010/11/17 19:27:05 minskim Exp $
 
 DISTNAME=	texlive-20100720-source
 PKGNAME=	kpathsea-6.0.0
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN:=systems/texlive/Source/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/print/kpathsea/distinfo b/print/kpathsea/distinfo
index 945c5bd66fa..8b30d3d0fb1 100644
--- a/print/kpathsea/distinfo
+++ b/print/kpathsea/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2010/09/13 04:06:12 minskim Exp $
+$NetBSD: distinfo,v 1.9 2010/11/17 19:27:05 minskim Exp $
 
 SHA1 (texlive-20100720-source.tar.xz) = 713b861123e3d9e073e2c93d7ed3e13262d82c34
 RMD160 (texlive-20100720-source.tar.xz) = b1120f3377ca45b4d86911b99a95c2e6e45927b5
 Size (texlive-20100720-source.tar.xz) = 33484212 bytes
-SHA1 (patch-aa) = 55e52639087f93d6321eac12664fa5c13c938ea8
+SHA1 (patch-aa) = 80bf6767822ef0f5cc11d5fc028303351ce6d056
 SHA1 (patch-ab) = 241176f612485a800ec94974ab00419c92043243
 SHA1 (patch-ac) = cf7a574f78f13b4ff662e97da4b6a4bcfcd002b0
 SHA1 (patch-ad) = b9ff0a7d906c8ed613b84de9f200629d37e8ef40
diff --git a/print/kpathsea/patches/patch-aa b/print/kpathsea/patches/patch-aa
index 9af943e48db..89fdc5dfc71 100644
--- a/print/kpathsea/patches/patch-aa
+++ b/print/kpathsea/patches/patch-aa
@@ -1,6 +1,7 @@
-$NetBSD: patch-aa,v 1.6 2010/09/13 04:06:12 minskim Exp $
+$NetBSD: patch-aa,v 1.7 2010/11/17 19:27:05 minskim Exp $
 
 - Set paths to texmf trees for pkgsrc.
+- Sync with kpathsea r19875.
 
 --- texmf.cnf.orig	2010-05-30 21:52:39.000000000 +0000
 +++ texmf.cnf
@@ -50,6 +51,19 @@ $NetBSD: patch-aa,v 1.6 2010/09/13 04:06:12 minskim Exp $
  
  % On some systems, there will be a system tree which contains all the font
  % files that may be created as well as the formats.  For example
+@@ -345,10 +345,10 @@ T1FONTS = .;$TEXMF/fonts/type1//;$OSFONT
+ AFMFONTS = .;$TEXMF/fonts/afm//;$OSFONTDIR//
+ 
+ % TrueType outline fonts.
+-TTFONTS = .;$TEXMF/fonts/truetype//;$OSFONTDIR//
++TTFONTS = .;$TEXMF/fonts/{truetype,opentype}//;$OSFONTDIR//
+ 
+ % Opentype outline fonts.
+-OPENTYPEFONTS = .;$TEXMF/fonts/opentype//;$OSFONTDIR//
++OPENTYPEFONTS = .;$TEXMF/fonts/{opentype,truetype}//;$OSFONTDIR//
+ 
+ % Type 42 outline fonts.
+ T42FONTS = .;$TEXMF/fonts/type42//
 @@ -463,7 +463,7 @@ RUBYINPUTS   = .;$TEXMF/scripts/{$progna
  % 
  % For security reasons, it is better not to include . in this path.
-- 
cgit v1.2.3