summaryrefslogtreecommitdiff
path: root/mk/install
diff options
context:
space:
mode:
authorjmmv <jmmv>2003-12-19 23:46:41 +0000
committerjmmv <jmmv>2003-12-19 23:46:41 +0000
commit6752c343cdaaa2e64fdad9ca1669f28b9c3e692d (patch)
treed02e3529c86a9b245871698de6db8a4768fe0a17 /mk/install
parentb18f496678da83d657d9174d2adad582693144b6 (diff)
downloadpkgsrc-6752c343cdaaa2e64fdad9ca1669f28b9c3e692d.tar.gz
Handle font (de)installation before bsd.pkg.install.mk handles OWN_DIRS.
This way font directories are not automatically removed; the package must define OWN_DIRS if it wants them to be deleted during deinstallation. This is done to avoid removal of standard font directories (those that appear in *.dist files).
Diffstat (limited to 'mk/install')
-rw-r--r--mk/install/fonts5
1 files changed, 1 insertions, 4 deletions
diff --git a/mk/install/fonts b/mk/install/fonts
index da320b927b7..a8207f270ca 100644
--- a/mk/install/fonts
+++ b/mk/install/fonts
@@ -1,4 +1,4 @@
-# $NetBSD: fonts,v 1.2 2003/12/19 23:18:49 jmmv Exp $
+# $NetBSD: fonts,v 1.3 2003/12/19 23:46:41 jmmv Exp $
#
# Handle font databases; used by fonts.mk.
#
@@ -20,7 +20,6 @@ POST-INSTALL|POST-DEINSTALL)
for d in ${FONTS_TTF_DIRS}; do
if [ -z "`cd $d ; ${LS} | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then
${RM} -f $d/fonts* $d/Fontmap*
- ${RMDIR} $d >/dev/null 2>&1
else
( cd $d && ${TTMKFDIR} >fonts.dir 2>/dev/null )
fi
@@ -30,7 +29,6 @@ POST-INSTALL|POST-DEINSTALL)
for d in ${FONTS_TYPE1_DIRS}; do
if [ -z "`cd $d ; ${LS} | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then
${RM} -f $d/fonts* $d/Fontmap*
- ${RMDIR} $d >/dev/null 2>&1
else
( cd $d && ${TYPE1INST} >/dev/null 2>&1 )
fi
@@ -40,7 +38,6 @@ POST-INSTALL|POST-DEINSTALL)
for d in ${FONTS_X11_DIRS}; do
if [ -z "`cd $d ; ${LS} | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then
${RM} -f $d/fonts* $d/Fontmap*
- ${RMDIR} $d >/dev/null 2>&1
else
( cd $d && ${MKFONTDIR} >/dev/null 2>&1 )
fi