diff options
| author | jmmv <jmmv> | 2003-12-20 10:04:32 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2003-12-20 10:04:32 +0000 |
| commit | 36679393b5bc10fb8aa8c72f3a47f81db61d6a6f (patch) | |
| tree | c2e30768f67930545a88d45264fc96eee3645015 | |
| parent | c652f1e150f94aebab438d5f5f6a4fedffa18778 (diff) | |
| download | pkgsrc-36679393b5bc10fb8aa8c72f3a47f81db61d6a6f.tar.gz | |
Handle removal of fonts databases properly if the package is using
{MAKE,OWN}_DIRS (i.e., the .pkgsrc file exists in them).
| -rw-r--r-- | mk/install/fonts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/install/fonts b/mk/install/fonts index a8207f270ca..f12c5a16c54 100644 --- a/mk/install/fonts +++ b/mk/install/fonts @@ -1,4 +1,4 @@ -# $NetBSD: fonts,v 1.3 2003/12/19 23:46:41 jmmv Exp $ +# $NetBSD: fonts,v 1.4 2003/12/20 10:04:32 jmmv Exp $ # # Handle font databases; used by fonts.mk. # @@ -18,7 +18,7 @@ POST-INSTALL|POST-DEINSTALL) ${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 @@ POST-INSTALL|POST-DEINSTALL) 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 @@ POST-INSTALL|POST-DEINSTALL) 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 ) |