[pkgsrc/pkgsrc-2003Q4]: pkgsrc/mk/install Pullup correct functionality to the...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/37f026f596a4
branches:  pkgsrc-2003Q4
changeset: 463722:37f026f596a4
user:      agc <agc%pkgsrc.org@localhost>
date:      Tue Dec 30 16:12:33 2003 +0000

description:
Pullup correct functionality to the pkgsrc-2003Q4 branch, requested by
Julio M. Merino Vidal.

        Module Name:    pkgsrc
        Committed By:   jmmv
        Date:           Sat Dec 20 10:04:32 UTC 2003

        Modified Files:
                pkgsrc/mk/install: fonts

        Log Message:
        Handle removal of fonts databases properly if the package is using
        {MAKE,OWN}_DIRS (i.e., the .pkgsrc file exists in them).

diffstat:

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

diffs (36 lines):

diff -r 8098ec3fac37 -r 37f026f596a4 mk/install/fonts
--- a/mk/install/fonts  Tue Dec 30 16:10:27 2003 +0000
+++ b/mk/install/fonts  Tue Dec 30 16:12:33 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: fonts,v 1.1.6.2 2003/12/30 16:08:04 agc Exp $
+# $NetBSD: fonts,v 1.1.6.3 2003/12/30 16:12:33 agc Exp $
 #
 # Handle font databases; used by fonts.mk.
 #
@@ -18,7 +18,7 @@
        ${ECHO} "===> Updating font databases"
        if [ "${FONTS_TTF}" = "YES" ]; then
                for d in ${FONTS_TTF_DIRS}; do
-                       if [ -z "`cd $d ; ${LS} | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then
+                       if [ -z "`cd $d ; ${LS} | ${GREP} -v .pkgsrc | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then
                                ${RM} -f $d/fonts* $d/Fontmap*
                        else
                                ( cd $d && ${TTMKFDIR} >fonts.dir 2>/dev/null )
@@ -27,7 +27,7 @@
        fi
        if [ "${FONTS_TYPE1}" = "YES" ]; then
                for d in ${FONTS_TYPE1_DIRS}; do
-                       if [ -z "`cd $d ; ${LS} | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then
+                       if [ -z "`cd $d ; ${LS} | ${GREP} -v .pkgsrc | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then
                                ${RM} -f $d/fonts* $d/Fontmap*
                        else
                                ( cd $d && ${TYPE1INST} >/dev/null 2>&1 )
@@ -36,7 +36,7 @@
        fi
        if [ "${FONTS_X11}" = "YES" ]; then
                for d in ${FONTS_X11_DIRS}; do
-                       if [ -z "`cd $d ; ${LS} | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then
+                       if [ -z "`cd $d ; ${LS} | ${GREP} -v .pkgsrc | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then
                                ${RM} -f $d/fonts* $d/Fontmap*
                        else
                                ( cd $d && ${MKFONTDIR} >/dev/null 2>&1 )