From 95b88d41fb0cdcefc3283bf95225385f1b184fc3 Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Wed, 11 Aug 2004 10:03:21 +0000
Subject: [PATCH] more fontdir

---
 chinese/arphicttf/pkg/PLIST |  6 +++---
 x11/jmk-fonts/Makefile      |  5 ++++-
 x11/jmk-fonts/pkg/PLIST     | 11 ++++++-----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/chinese/arphicttf/pkg/PLIST b/chinese/arphicttf/pkg/PLIST
index 5425c462b3b..42340c23bfc 100644
--- a/chinese/arphicttf/pkg/PLIST
+++ b/chinese/arphicttf/pkg/PLIST
@@ -1,7 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.2 2001/10/13 17:04:02 kevlo Exp $
+@comment $OpenBSD: PLIST,v 1.3 2004/08/11 10:03:21 espie Exp $
+lib/X11/fonts/
+@fontdir lib/X11/fonts/TrueType/
 lib/X11/fonts/TrueType/bkai00mp.ttf
 lib/X11/fonts/TrueType/bsmi00lp.ttf
 lib/X11/fonts/TrueType/gbsn00lp.ttf
 lib/X11/fonts/TrueType/gkai00mp.ttf
-@exec echo "Remember to add %B to your font path."
-@unexec echo "Remove %B manually if it's now empty"
diff --git a/x11/jmk-fonts/Makefile b/x11/jmk-fonts/Makefile
index a8f4eb17817..0266a8cd152 100644
--- a/x11/jmk-fonts/Makefile
+++ b/x11/jmk-fonts/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2003/04/27 08:03:35 sturm Exp $
+# $OpenBSD: Makefile,v 1.2 2004/08/11 10:03:21 espie Exp $
 
 COMMENT=		"nice fixed width fonts, easy on the eye"
 
@@ -24,4 +24,7 @@ USE_X11=		Yes
 
 NO_REGRESS=		Yes
 
+post-install:
+	cd ${PREFIX}/lib/X11/fonts/jmk && mv fonts.alias fonts.alias-jmk
+
 .include <bsd.port.mk>
diff --git a/x11/jmk-fonts/pkg/PLIST b/x11/jmk-fonts/pkg/PLIST
index d97110d8eb7..669e67304f5 100644
--- a/x11/jmk-fonts/pkg/PLIST
+++ b/x11/jmk-fonts/pkg/PLIST
@@ -1,6 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.2 2003/12/15 21:08:44 naddy Exp $
-lib/X11/fonts/jmk/fonts.alias
-lib/X11/fonts/jmk/fonts.dir
+@comment $OpenBSD: PLIST,v 1.3 2004/08/11 10:03:22 espie Exp $
+lib/X11/fonts/
+@fontdir lib/X11/fonts/jmk/
+lib/X11/fonts/jmk/fonts.alias-jmk
+@comment lib/X11/fonts/jmk/fonts.dir
+lib/X11/fonts/jmk/fonts.scale
 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
@@ -109,5 +112,3 @@ lib/X11/fonts/jmk/neep-iso8859-9-10x20-bold.pcf.gz
 lib/X11/fonts/jmk/neep-iso8859-9-10x20.pcf.gz
 lib/X11/fonts/jmk/neep-iso8859-9-12x24-bold.pcf.gz
 lib/X11/fonts/jmk/neep-iso8859-9-12x24.pcf.gz
-@dirrm lib/X11/fonts/jmk
-@dirrm lib/X11/fonts