diff options
| author | agc <agc> | 2003-12-30 16:12:33 +0000 |
|---|---|---|
| committer | agc <agc> | 2003-12-30 16:12:33 +0000 |
| commit | 40aa97b0951a38aeff1ac82965d14d6cb675a0f0 (patch) | |
| tree | e43346f69bebb3fc2360dc9748cacea19cd3055a | |
| parent | bbf70f75497e54066319a7b91e679e2807f3dea7 (diff) | |
| download | pkgsrc-40aa97b0951a38aeff1ac82965d14d6cb675a0f0.tar.gz | |
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).
| -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 1a9a2a29ae4..88c5854f6fd 100644 --- a/mk/install/fonts +++ b/mk/install/fonts @@ -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 @@ 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 ) |