From 6ed5fe7d95a94322e690fdb58e55506cf4634cb0 Mon Sep 17 00:00:00 2001
From: martynas <martynas@openbsd.org>
Date: Tue, 6 Jan 2009 23:31:45 +0000
Subject: [PATCH] use fonts that are available instead of msttcorefonts.  fixes
 the looks of xulrunner-dependent applications;  as reported by ajacoutot@
 "YES!" ajacoutot@

---
 devel/xulrunner/Makefile                      |  6 +-
 .../patch-modules_libpref_src_init_all_js     | 55 ++++++++++++++++++-
 2 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile
index 5d6421ef0ba..29f067c8557 100644
--- a/devel/xulrunner/Makefile
+++ b/devel/xulrunner/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2008/12/18 19:29:38 martynas Exp $
+# $OpenBSD: Makefile,v 1.33 2009/01/06 23:31:45 martynas Exp $
 
 ONLY_FOR_ARCHS=	alpha amd64 arm i386 powerpc sparc sparc64
 
@@ -8,8 +8,8 @@ COMMENT-devel=	devel files for Gecko
 VER=		1.8.1.19
 DISTNAME=	mozilla
 PKGNAME=	xulrunner-${VER}
-PKGNAME-main=	xulrunner-${VER}
-PKGNAME-devel=	xulrunner-devel-${VER}
+PKGNAME-main=	xulrunner-${VER}p0
+PKGNAME-devel=	xulrunner-devel-${VER}p0
 SO_VERSION=	2.0
 # NOTE: Must bump minor version if any shlib's are removed from the
 # components dir to avoid pkg_add -r issues.
diff --git a/devel/xulrunner/patches/patch-modules_libpref_src_init_all_js b/devel/xulrunner/patches/patch-modules_libpref_src_init_all_js
index 77f409eef8d..ebaaadc6c80 100644
--- a/devel/xulrunner/patches/patch-modules_libpref_src_init_all_js
+++ b/devel/xulrunner/patches/patch-modules_libpref_src_init_all_js
@@ -1,6 +1,55 @@
-$OpenBSD: patch-modules_libpref_src_init_all_js,v 1.6 2008/11/14 16:29:36 martynas Exp $
---- modules/libpref/src/init/all.js.orig	Mon Oct 13 00:48:38 2008
-+++ modules/libpref/src/init/all.js	Wed Nov 12 23:38:20 2008
+$OpenBSD: patch-modules_libpref_src_init_all_js,v 1.7 2009/01/06 23:31:45 martynas Exp $
+--- modules/libpref/src/init/all.js.orig	Fri Oct 31 00:05:49 2008
++++ modules/libpref/src/init/all.js	Wed Nov 12 23:24:59 2008
+@@ -1944,33 +1944,33 @@ pref("font.name.monospace.ko", "monospace");
+ 
+ // th
+ 
+-pref("font.name.serif.tr", "Times");
+-pref("font.name.sans-serif.tr", "Helvetica");
+-pref("font.name.monospace.tr", "Courier");
++pref("font.name.serif.tr", "serif");
++pref("font.name.sans-serif.tr", "sans-serif");
++pref("font.name.monospace.tr", "monospace");
+ 
+ pref("font.name.serif.x-baltic", "serif");
+ pref("font.name.sans-serif.x-baltic", "sans-serif");
+ pref("font.name.monospace.x-baltic", "monospace");
+ 
+-pref("font.name.serif.x-central-euro", "Times");
+-pref("font.name.sans-serif.x-central-euro", "Helvetica");
+-pref("font.name.monospace.x-central-euro", "Courier");
++pref("font.name.serif.x-central-euro", "serif");
++pref("font.name.sans-serif.x-central-euro", "sans-serif");
++pref("font.name.monospace.x-central-euro", "monospace");
+ 
+ pref("font.name.serif.x-cyrillic", "serif");
+ pref("font.name.sans-serif.x-cyrillic", "sans-serif");
+ pref("font.name.monospace.x-cyrillic", "monospace");
+ 
+-pref("font.name.serif.x-unicode", "Times");
+-pref("font.name.sans-serif.x-unicode", "Helvetica");
+-pref("font.name.monospace.x-unicode", "Courier");
++pref("font.name.serif.x-unicode", "serif");
++pref("font.name.sans-serif.x-unicode", "sans-serif");
++pref("font.name.monospace.x-unicode", "monospace");
+ 
+-pref("font.name.serif.x-user-def", "Times");
+-pref("font.name.sans-serif.x-user-def", "Helvetica");
+-pref("font.name.monospace.x-user-def", "Courier");
++pref("font.name.serif.x-user-def", "serif");
++pref("font.name.sans-serif.x-user-def", "sans-serif");
++pref("font.name.monospace.x-user-def", "monospace");
+ 
+-pref("font.name.serif.x-western", "Times");
+-pref("font.name.sans-serif.x-western", "Helvetica");
+-pref("font.name.monospace.x-western", "Courier");
++pref("font.name.serif.x-western", "serif");
++pref("font.name.sans-serif.x-western", "sans-serif");
++pref("font.name.monospace.x-western", "monospace");
+ 
+ pref("font.name.serif.zh-CN", "serif");
+ pref("font.name.sans-serif.zh-CN", "sans-serif");
 @@ -2110,7 +2110,7 @@ pref("font.scale.outline.min",      6);
  
  // TrueType