Don't abuse the INSTALL and DEINSTALL scripts to replace the configuration

file for another package (and breaking CHECK_FILES).  Instead, instruct
the user on how to merge the example configuration file into the true
configuration file in a MESSAGE file.  Also, fix the path to the
kochi-ttf fonts.  Bump the PKGREVISION.

6 files changed, 29 insertions, 28 deletions

diff --git a/fonts/vfontcap-kochi/DEINSTALL b/fonts/vfontcap-kochi/DEINSTALL
deleted file mode 100644
index e227dee158a..00000000000
--- a/fonts/vfontcap-kochi/DEINSTALL
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:22:53 jlam Exp $
-
-case ${STAGE} in
-POST-DEINSTALL)
-	${MV} @VFONTCAPDIR@/vfontcap.orig @VFONTCAPDIR@/vfontcap
-	;;
-esac
diff --git a/fonts/vfontcap-kochi/INSTALL b/fonts/vfontcap-kochi/INSTALL
deleted file mode 100644
index 371900662a0..00000000000
--- a/fonts/vfontcap-kochi/INSTALL
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: INSTALL,v 1.2 2003/08/30 20:22:53 jlam Exp $
-
-case ${STAGE} in
-PRE-INSTALL)
-	${MV} @VFONTCAPDIR@/vfontcap @VFONTCAPDIR@/vfontcap.orig
-	;;
-esac
diff --git a/fonts/vfontcap-kochi/MESSAGE b/fonts/vfontcap-kochi/MESSAGE
new file mode 100644
index 00000000000..b235dd7c73f
--- /dev/null
+++ b/fonts/vfontcap-kochi/MESSAGE
@@ -0,0 +1,10 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2006/06/20 15:50:46 jlam Exp $
+
+You will need to appropriate insert the entries in:
+
+	${PREFIX}/${VFONTCAPDIR}/vfontcap.kochi-ttf
+
+into your VFlib configuration database, possibly replacing existing
+entries.
+===========================================================================
diff --git a/fonts/vfontcap-kochi/Makefile b/fonts/vfontcap-kochi/Makefile
index 5ac997cc280..f0b936c2dcd 100644
--- a/fonts/vfontcap-kochi/Makefile
+++ b/fonts/vfontcap-kochi/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2006/03/14 01:14:28 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/06/20 15:50:46 jlam Exp $
 
 DISTNAME=		vfontcap-kochi-0.0
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		fonts x11 japanese
 MASTER_SITES=		# empty
 DISTFILES=		# empty
@@ -14,19 +14,24 @@ DEPENDS+=		kochi-ttf-[0-9]*:../../fonts/kochi-ttf
 
 WRKSRC=			${WRKDIR}
 EXTRACT_ONLY=		# empty
-NO_CHECKSUM=		YES
-NO_BUILD=		YES
+NO_CHECKSUM=		yes
+NO_BUILD=		yes
 
-VFONTCAPDIR=		${PREFIX}/share/VFlib/2.24.2
-FILES_SUBST+=		VFONTCAPDIR=${VFONTCAPDIR:Q}
+EVAL_PREFIX+=		KOCHI_TTF_PREFIX=kochi-ttf
+
+VFONTCAPDIR=		share/VFlib/2.24.2
+FILES_SUBST+=		VFONTCAPDIR=${VFONTCAPDIR}
+MESSAGE_SUBST+=		VFONTCAPDIR=${VFONTCAPDIR}
+PLIST_SUBST+=		VFONTCAPDIR=${VFONTCAPDIR}
 
 INSTALLATION_DIRS=	share/VFlib/2.24.2
 
 do-configure:
-	${SED} -e 's,@X11PREFIX@,${X11PREFIX},g' ${FILESDIR}/vfontcap \
-		> ${WRKSRC}/vfontcap
+	${SED}	-e "s,@KOCHI_TTF_PREFIX@,${KOCHI_TTF_PREFIX},g"		\
+		${FILESDIR}/vfontcap > ${WRKSRC}/vfontcap
 
 do-install:
-	${INSTALL_DATA} ${WRKDIR}/vfontcap ${VFONTCAPDIR}
+	${INSTALL_DATA} ${WRKSRC}/vfontcap				\
+		${PREFIX}/${VFONTCAPDIR}/vfontcap.kochi-ttf
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/vfontcap-kochi/PLIST b/fonts/vfontcap-kochi/PLIST
index f216f3f8b0b..3c6c95b7c22 100644
--- a/fonts/vfontcap-kochi/PLIST
+++ b/fonts/vfontcap-kochi/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/03/15 20:28:01 kei Exp $
-share/VFlib/2.24.2/vfontcap
+@comment $NetBSD: PLIST,v 1.2 2006/06/20 15:50:46 jlam Exp $
+${VFONTCAPDIR}/vfontcap.kochi-ttf
diff --git a/fonts/vfontcap-kochi/files/vfontcap b/fonts/vfontcap-kochi/files/vfontcap
index e4b55260bfc..5709fbe5afa 100755
--- a/fonts/vfontcap-kochi/files/vfontcap
+++ b/fonts/vfontcap-kochi/files/vfontcap
@@ -1,9 +1,9 @@
-# $NetBSD: vfontcap,v 1.3 2004/01/25 20:37:04 wiz Exp $
+# $NetBSD: vfontcap,v 1.4 2006/06/20 15:50:46 jlam Exp $
 # vfontcap - configuration file for VFlib
 
 min|min5|min6|min7|min8|min9|min10|min12|min17|Mincho Font:\
 	:ft=freetype:\
-	:ff=@X11PREFIX@/lib/X11/fonts/TTF/kochi-mincho.ttf:
+	:ff=@KOCHI_TTF_PREFIX@/lib/X11/fonts/TTF/kochi-mincho.ttf:
 goth|goth5||goth6|goth7|goth8|goth9|goth10|goth12|goth17|Gothic Font:\
 	:ft=freetype:\
-	:ff=@X11PREFIX@/lib/X11/fonts/TTF/kochi-gothic.ttf:
+	:ff=@KOCHI_TTF_PREFIX@/lib/X11/fonts/TTF/kochi-gothic.ttf: