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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ae0aec0878fc
branches:  pkgsrc-2003Q4
changeset: 463720:ae0aec0878fc
user:      agc <agc%pkgsrc.org@localhost>
date:      Tue Dec 30 16:08:04 2003 +0000

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

        Module Name:    pkgsrc
        Committed By:   jmmv
        Date:           Fri Dec 19 23:46:41 UTC 2003

        Modified Files:
                pkgsrc/mk: fonts.mk
                pkgsrc/mk/install: fonts

        Log Message:
        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 1e1d12620fb0 -r ae0aec0878fc mk/fonts.mk
--- a/mk/fonts.mk       Tue Dec 30 16:04:35 2003 +0000
+++ b/mk/fonts.mk       Tue Dec 30 16:08:04 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.3.6.1 2003/12/30 16:08:04 agc 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 1e1d12620fb0 -r ae0aec0878fc mk/install/fonts
--- a/mk/install/fonts  Tue Dec 30 16:04:35 2003 +0000
+++ b/mk/install/fonts  Tue Dec 30 16:08:04 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: fonts,v 1.1.6.1 2003/12/30 16:04:35 agc Exp $
+# $NetBSD: fonts,v 1.1.6.2 2003/12/30 16:08:04 agc 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