[pkgsrc/trunk]: pkgsrc/mk/install Remove type1inst log file; improve empty di...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/35f4238c6dbf
branches:  trunk
changeset: 508312:35f4238c6dbf
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Feb 17 19:32:48 2006 +0000

description:
Remove type1inst log file; improve empty dir detection;
needed by fonts/intlfonts, ok@ jlam.

diffstat:

 mk/install/fonts |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r 811261f76224 -r 35f4238c6dbf mk/install/fonts
--- a/mk/install/fonts  Fri Feb 17 19:31:33 2006 +0000
+++ b/mk/install/fonts  Fri Feb 17 19:32:48 2006 +0000
@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $NetBSD: fonts,v 1.8 2005/12/29 14:10:01 jlam Exp $
+# $NetBSD: fonts,v 1.9 2006/02/17 19:32:48 wiz Exp $
 #
 # +FONTS - font database management script
 #
@@ -21,8 +21,8 @@
 #
 
 ECHO="@ECHO@"
+FIND="@FIND@"
 GREP="@GREP@"
-LS="@LS@"
 MKFONTDIR="@MKFONTDIR@"
 PWD_CMD="@PWD_CMD@"
 RM="@RM@"
@@ -69,7 +69,7 @@
          cd $dir
          case $font_type in
          [tT][tT][fF])         update_cmd="${TTMKFDIR}" ;;
-         [tT][yY][pP][eE]1)    update_cmd="${TYPE1INST}" ;;
+         [tT][yY][pP][eE]1)    update_cmd="${TYPE1INST}; ${RM} type1inst.log" ;;
          [xX]11)               update_cmd="${MKFONTDIR}" ;;
          esac
          ${TEST} -f "$update_cmd" || update_cmd="${TRUE}"
@@ -79,7 +79,7 @@
          # We filter out the encodings.dir, fonts.{alias,dirs,scale}, and
          # Fontmap database files from the directory listing.
          #
-         ${LS} | ${GREP} -v "^encodings.dir" | ${GREP} -v "^fonts\." | ${GREP} -v "^Fontmap" >/dev/null || ${RM} -f fonts.* Fontmap*
+         ${FIND} . -type f | ${GREP} -v "/encodings.dir" | ${GREP} -v "/fonts\." | ${GREP} -v "/Fontmap" >/dev/null || ${RM} -f fonts.* Fontmap*
        )
 done
 case "$printed_header" in