diff options
| author | jmmv <jmmv@pkgsrc.org> | 2003-12-19 23:46:41 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2003-12-19 23:46:41 +0000 |
| commit | 456a588def486650703342bf65d299728bdb2b03 (patch) | |
| tree | d02e3529c86a9b245871698de6db8a4768fe0a17 /mk | |
| parent | 4f1bd3ab2187f8a6f61797997baa2ab14a0d7b67 (diff) | |
| download | pkgsrc-456a588def486650703342bf65d299728bdb2b03.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')
| -rw-r--r-- | mk/fonts.mk | 5 | ||||
| -rw-r--r-- | mk/install/fonts | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/mk/fonts.mk b/mk/fonts.mk index 0ca7103c388..bf39569b34b 100644 --- a/mk/fonts.mk +++ b/mk/fonts.mk @@ -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 @@ FONTS_X11_DIRS?= .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 --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 |