From d8aaedd0d9eabf12c6a28c6b3a7c7fbb5035c7f6 Mon Sep 17 00:00:00 2001
From: kei <kei@pkgsrc.org>
Date: Wed, 20 Aug 2003 04:49:28 +0000
Subject: - make vfontcap package work even if xpkgwedge is not installed. 
 problem   noticed by Hiroshi Fujishima.  Thanks a lot!

- use an appropriate `-[0-9]*' suffix in `DEPENDS+=' line.  unless the
  package system get confused.
---
 fonts/vfontcap-kochi/Makefile       | 10 ++++++----
 fonts/vfontcap-kochi/files/vfontcap |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'fonts/vfontcap-kochi')

diff --git a/fonts/vfontcap-kochi/Makefile b/fonts/vfontcap-kochi/Makefile
index 6e8b9a5668a..70904c28cc8 100644
--- a/fonts/vfontcap-kochi/Makefile
+++ b/fonts/vfontcap-kochi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/30 10:41:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/08/20 04:49:28 kei Exp $
 
 DISTNAME=		vfontcap-kochi-0.0
 WRKSRC=			${WRKDIR}
@@ -9,12 +9,13 @@ DISTFILES=		# empty
 MAINTAINER=		kei@NetBSD.org
 COMMENT=		Configuration file for VFlib to use kochi-ttf
 
-DEPENDS+=		ja-vflib-lib-*:../../print/ja-vflib-lib
-DEPENDS+=		kochi-ttf-*:../../fonts/kochi-ttf
+DEPENDS+=		ja-vflib-lib-[0-9]*:../../print/ja-vflib-lib
+DEPENDS+=		kochi-ttf-[0-9]*:../../fonts/kochi-ttf
 
 EXTRACT_ONLY=		# empty
 NO_CHECKSUM=		YES
 NO_BUILD=		YES
+USE_X11=		YES # kochi font defines this as well.
 
 USE_PKGINSTALL=		YES
 
@@ -22,7 +23,8 @@ VFONTCAPDIR=		${PREFIX}/share/VFlib/2.24.2
 FILES_SUBST+=		VFONTCAPDIR=${VFONTCAPDIR}
 
 do-configure:
-	${CP} ${FILESDIR}/vfontcap ${WRKSRC}
+	${SED} -e 's,@X11PREFIX@,${X11PREFIX},g' ${FILESDIR}/vfontcap \
+		> ${WRKSRC}/vfontcap
 
 do-install:
 	${INSTALL_DATA} ${WRKDIR}/vfontcap ${VFONTCAPDIR}
diff --git a/fonts/vfontcap-kochi/files/vfontcap b/fonts/vfontcap-kochi/files/vfontcap
index db4a14d451e..32d1e231a6a 100755
--- a/fonts/vfontcap-kochi/files/vfontcap
+++ b/fonts/vfontcap-kochi/files/vfontcap
@@ -1,9 +1,9 @@
-# $NetBSD: vfontcap,v 1.1.1.1 2003/03/15 20:28:01 kei Exp $
+# $NetBSD: vfontcap,v 1.2 2003/08/20 04:49:29 kei Exp $
 # vfontcap - configuration file for VFlib
 
 min|min5|min6|min7|min8|min9|min10|min12|min17|Mincho Font:\
 	:ft=freetype:\
-	:ff=/usr/pkg/lib/X11/fonts/TrueType/kochi-mincho.ttf:
+	:ff=@X11PREFIX@/lib/X11/fonts/TrueType/kochi-mincho.ttf:
 goth|goth5||goth6|goth7|goth8|goth9|goth10|goth12|goth17|Gothic Font:\
 	:ft=freetype:\
-	:ff=/usr/pkg/lib/X11/fonts/TrueType/kochi-gothic.ttf:
+	:ff=@X11PREFIX@/lib/X11/fonts/TrueType/kochi-gothic.ttf:
-- 
cgit v1.2.3