[pkgsrc/trunk]: pkgsrc/mk Handle font (de)installation before bsd.pkg.install...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bd0c64331762
branches:  trunk
changeset: 465044:bd0c64331762
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Fri Dec 19 23:46:41 2003 +0000

description:
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:

 mk/fonts.mk      |  5 ++---
 mk/install/fonts |  5 +----
 2 files changed, 3 insertions(+), 7 deletions(-)

diffs (52 lines):

diff -r 229f464ff6a1 -r bd0c64331762 mk/fonts.mk
--- a/mk/fonts.mk       Fri Dec 19 23:42:51 2003 +0000
+++ b/mk/fonts.mk       Fri Dec 19 23:46:41 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: fonts.mk,v 1.3 2003/02/18 17:51:08 jmmv Exp $
+# $NetBSD: fonts.mk,v 1.4 2003/12/19 23:46:41 jmmv Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # fonts (most of them in the fonts category).  It takes care of updating the
@@ -25,8 +25,7 @@
 .if !empty(FONTS_TTF_DIRS) || !empty(FONTS_TYPE1_DIRS) || !empty(FONTS_X11_DIRS)
 
 USE_PKGINSTALL=                YES
-INSTALL_EXTRA_TMPL+=   ${.CURDIR}/../../mk/install/fonts
-DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/../../mk/install/fonts
+HEADER_EXTRA_TMPL+=    ${.CURDIR}/../../mk/install/fonts
 
 .if !empty(FONTS_TTF_DIRS)
 EVAL_PREFIX+=                  TTMKFDIR_PREFIX=ttmkfdir
diff -r 229f464ff6a1 -r bd0c64331762 mk/install/fonts
--- a/mk/install/fonts  Fri Dec 19 23:42:51 2003 +0000
+++ b/mk/install/fonts  Fri Dec 19 23:46:41 2003 +0000
@@ -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 @@
                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 @@
                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 @@
                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