[pkgsrc/trunk]: pkgsrc/fonts/vfontcap-kochi Don't abuse the INSTALL and DEINS...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/083a7acfff5e
branches:  trunk
changeset: 514898:083a7acfff5e
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Jun 20 15:50:46 2006 +0000

description:
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.

diffstat:

 fonts/vfontcap-kochi/DEINSTALL      |   7 -------
 fonts/vfontcap-kochi/INSTALL        |   7 -------
 fonts/vfontcap-kochi/MESSAGE        |  10 ++++++++++
 fonts/vfontcap-kochi/Makefile       |  23 ++++++++++++++---------
 fonts/vfontcap-kochi/PLIST          |   4 ++--
 fonts/vfontcap-kochi/files/vfontcap |   6 +++---
 6 files changed, 29 insertions(+), 28 deletions(-)

diffs (105 lines):

diff -r 9dbd01da1bc1 -r 083a7acfff5e fonts/vfontcap-kochi/DEINSTALL
--- a/fonts/vfontcap-kochi/DEINSTALL    Tue Jun 20 15:39:06 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 9dbd01da1bc1 -r 083a7acfff5e fonts/vfontcap-kochi/INSTALL
--- a/fonts/vfontcap-kochi/INSTALL      Tue Jun 20 15:39:06 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 9dbd01da1bc1 -r 083a7acfff5e fonts/vfontcap-kochi/MESSAGE
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/fonts/vfontcap-kochi/MESSAGE      Tue Jun 20 15:50:46 2006 +0000
@@ -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 -r 9dbd01da1bc1 -r 083a7acfff5e fonts/vfontcap-kochi/Makefile
--- a/fonts/vfontcap-kochi/Makefile     Tue Jun 20 15:39:06 2006 +0000
+++ b/fonts/vfontcap-kochi/Makefile     Tue Jun 20 15:50:46 2006 +0000
@@ -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 @@
 
 WRKSRC=                        ${WRKDIR}
 EXTRACT_ONLY=          # empty
-NO_CHECKSUM=           YES
-NO_BUILD=              YES
+NO_CHECKSUM=           yes
+NO_BUILD=              yes
+
+EVAL_PREFIX+=          KOCHI_TTF_PREFIX=kochi-ttf
 
-VFONTCAPDIR=           ${PREFIX}/share/VFlib/2.24.2
-FILES_SUBST+=          VFONTCAPDIR=${VFONTCAPDIR:Q}
+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 -r 9dbd01da1bc1 -r 083a7acfff5e fonts/vfontcap-kochi/PLIST
--- a/fonts/vfontcap-kochi/PLIST        Tue Jun 20 15:39:06 2006 +0000
+++ b/fonts/vfontcap-kochi/PLIST        Tue Jun 20 15:50:46 2006 +0000
@@ -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 -r 9dbd01da1bc1 -r 083a7acfff5e fonts/vfontcap-kochi/files/vfontcap
--- a/fonts/vfontcap-kochi/files/vfontcap       Tue Jun 20 15:39:06 2006 +0000
+++ b/fonts/vfontcap-kochi/files/vfontcap       Tue Jun 20 15:50:46 2006 +0000
@@ -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: