head 1.12; access; symbols pkgsrc-2013Q2:1.12.0.36 pkgsrc-2013Q2-base:1.12 pkgsrc-2012Q4:1.12.0.34 pkgsrc-2012Q4-base:1.12 pkgsrc-2011Q4:1.12.0.32 pkgsrc-2011Q4-base:1.12 pkgsrc-2011Q2:1.12.0.30 pkgsrc-2011Q2-base:1.12 pkgsrc-2009Q4:1.12.0.28 pkgsrc-2009Q4-base:1.12 pkgsrc-2008Q4:1.12.0.26 pkgsrc-2008Q4-base:1.12 pkgsrc-2008Q3:1.12.0.24 pkgsrc-2008Q3-base:1.12 cube-native-xorg:1.12.0.22 cube-native-xorg-base:1.12 pkgsrc-2008Q2:1.12.0.20 pkgsrc-2008Q2-base:1.12 pkgsrc-2008Q1:1.12.0.18 pkgsrc-2008Q1-base:1.12 pkgsrc-2007Q4:1.12.0.16 pkgsrc-2007Q4-base:1.12 pkgsrc-2007Q3:1.12.0.14 pkgsrc-2007Q3-base:1.12 pkgsrc-2007Q2:1.12.0.12 pkgsrc-2007Q2-base:1.12 pkgsrc-2007Q1:1.12.0.10 pkgsrc-2007Q1-base:1.12 jlam-pkgviews:1.12.0.8 jlam-pkgviews-base:1.12 pkgsrc-2006Q4:1.12.0.6 pkgsrc-2006Q4-base:1.12 pkgsrc-2006Q3:1.12.0.4 pkgsrc-2006Q3-base:1.12 pkgsrc-2006Q2:1.12.0.2 pkgsrc-2006Q2-base:1.12 tv-derecurse-eol:1.5.6.1 pkgsrc-2006Q1:1.11.0.2 pkgsrc-2006Q1-base:1.11 pkgsrc-2005Q4:1.6.0.8 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.6 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.4 pkgsrc-2005Q2-base:1.6 tv-derecurse-merge:1.6 pkgsrc-2005Q1:1.6.0.2 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.5.0.8 pkgsrc-2004Q4-base:1.5 tv-derecurse:1.5.0.6 tv-derecurse-base:1.6 pkgsrc-2004Q3:1.5.0.4 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.5.0.2 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.4.0.2 pkgsrc-2004Q1-base:1.4 pkgsrc-2003Q4:1.1.0.6 pkgsrc-2003Q4-base:1.1 pkgviews-base:1.1 pkgviews-mk:1.1.0.4 pkgviews:1.1.0.2 pkgviews-mk-base:1.1; locks; strict; comment @# @; 1.12 date 2006.05.21.23.50.15; author jlam; state dead; branches; next 1.11; 1.11 date 2006.03.19.23.58.14; author jlam; state Exp; branches; next 1.10; 1.10 date 2006.03.15.04.52.57; author jlam; state Exp; branches; next 1.9; 1.9 date 2006.02.17.19.32.48; author wiz; state Exp; branches; next 1.8; 1.8 date 2005.12.29.14.10.01; author jlam; state Exp; branches; next 1.7; 1.7 date 2005.12.29.03.44.38; author jlam; state Exp; branches; next 1.6; 1.6 date 2004.12.28.14.38.03; author wiz; state Exp; branches; next 1.5; 1.5 date 2004.03.30.11.55.02; author recht; state Exp; branches 1.5.6.1; next 1.4; 1.4 date 2003.12.20.10.04.32; author jmmv; state Exp; branches; next 1.3; 1.3 date 2003.12.19.23.46.41; author jmmv; state Exp; branches; next 1.2; 1.2 date 2003.12.19.23.18.49; author jmmv; state Exp; branches; next 1.1; 1.1 date 2003.02.16.12.14.32; author jmmv; state Exp; branches 1.1.2.1 1.1.6.1; next ; 1.5.6.1 date 2004.12.31.20.25.30; author tv; state Exp; branches; next 1.5.6.2; 1.5.6.2 date 2006.06.07.15.25.39; author tv; state dead; branches; next ; 1.1.2.1 date 2003.02.16.12.14.32; author jmmv; state dead; branches; next 1.1.2.2; 1.1.2.2 date 2003.02.16.12.14.33; author jmmv; state Exp; branches; next ; 1.1.6.1 date 2003.12.30.16.04.35; author agc; state Exp; branches; next 1.1.6.2; 1.1.6.2 date 2003.12.30.16.08.04; author agc; state Exp; branches; next 1.1.6.3; 1.1.6.3 date 2003.12.30.16.12.33; author agc; state Exp; branches; next ; desc @@ 1.12 log @Move mk/install to mk/pkginstall to better reflect the contents (the pkginstall framework). @ text @# $NetBSD: fonts,v 1.11 2006/03/19 23:58:14 jlam Exp $ # # Generate a +FONTS script that updates font databases for the package. # case "${STAGE},$1" in UNPACK,|UNPACK,+FONTS) ${CAT} > ./+FONTS << 'EOF' #!@@SH@@ # # +FONTS - font database management script # # Usage: ./+FONTS [metadatadir] # # This scripts rebuilds font databases needed by the package associated # with . # # Lines starting with "# FONTS: " are data read by this script that name # the directories in which the font database will be rebuilt. # # # FONTS: /usr/pkg/lib/X11/fonts/TTF ttf # # FONTS: /usr/pkg/lib/X11/fonts/Type1 type1 # # FONTS: /usr/pkg/lib/X11/fonts/misc x11 # # For each FONTS entry, if the path is relative, that it is taken to be # relative to ${PKG_PREFIX}. # ECHO="@@ECHO@@" FIND="@@FIND@@" GREP="@@GREP@@" MKFONTDIR="@@MKFONTDIR@@" PWD_CMD="@@PWD_CMD@@" RM="@@RM@@" SED="@@SED@@" SORT="@@SORT@@" TEST="@@TEST@@" TRUE="@@TRUE@@" TTMKFDIR="@@TTMKFDIR@@" TYPE1INST="@@TYPE1INST@@" SELF=$0 PKG_METADATA_DIR="${1-`${PWD_CMD}`}" : ${PKGNAME=${PKG_METADATA_DIR##*/}} : ${PKG_PREFIX=@@PREFIX@@} case "${PKG_UPDATE_FONTS_DB:-@@PKG_UPDATE_FONTS_DB@@}" in [Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1) _PKG_UPDATE_FONTS_DB=yes ;; [Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0) _PKG_UPDATE_FONTS_DB=no ;; esac ${SED} -n "/^\# FONTS: /{s/^\# FONTS: //;p;}" ${SELF} | ${SORT} -u | { while read dir font_type; do case ${_PKG_UPDATE_FONTS_DB} in no) continue ;; esac case $dir in "") continue ;; [!/]*) dir="${PKG_PREFIX}/$dir" ;; esac ${TEST} -d "$dir" || continue case "$printed_header" in yes) ;; *) printed_header=yes ${ECHO} "===========================================================================" ${ECHO} "Updating font databases in the following directories:" ${ECHO} "" ;; esac ( ${ECHO} " $dir ($font_type)" cd $dir case $font_type in [tT][tT][fF]) update_cmd="${TTMKFDIR}" ;; [tT][yY][pP][eE]1) update_cmd="${TYPE1INST}; ${RM} type1inst.log" ;; [xX]11) update_cmd="${MKFONTDIR}" ;; esac ${TEST} -f "$update_cmd" || update_cmd="${TRUE}" $update_cmd >/dev/null # # Remove fonts databases if there are no fonts in the directory. # We filter out the encodings.dir, fonts.{alias,dirs,scale}, and # Fontmap database files from the directory listing. # ${FIND} . -type f | ${GREP} -v "/encodings.dir" | ${GREP} -v "/fonts\." | ${GREP} -v "/Fontmap" >/dev/null || ${RM} -f fonts.* Fontmap* ) done case "$printed_header" in yes) ${ECHO} "" ${ECHO} "===========================================================================" ;; esac; } EOF ${SED} -n "/^\# FONTS: /p" ${SELF} >> ./+FONTS ${CHMOD} +x ./+FONTS ;; esac @ 1.11 log @Modify the INSTALL script to allow for selective unpacking of a scriptlet. @ text @d1 1 a1 1 # $NetBSD: fonts,v 1.10 2006/03/15 04:52:57 jlam Exp $ @ 1.10 log @Rototill of how the various template parts of the INSTALL and DEINSTALL scripts are generated. The various scriptlets in pkgsrc/mk/install are now full templates that can be combined to form the INSTALL and DEINSTALL scripts. All of the templates have either leading or trailing blank lines so that when they are concatentated, the full INSTALL and DEINSTALL scripts will still be easy to read. All of the generated template sources for the INSTALL and DEINSTALL scripts are now stored in ${WRKDIR}/.pkginstall for local consistency and have been renamed so that they are not dot-files. The "data" for the +* scriptlets are now generated in a separate step and instead of being appended to the unpacked scriptlet are now appended to the INSTALL script itself. When the scriptlets are unpacked, the corresponding data lines for each scriptlet are pulled out of the INSTALL script and put into the unpacked scriptlets. This makes it easy to append more data lines during the install phase without needing to regenerate the INSTALL script. @ text @d1 1 a1 1 # $NetBSD: fonts,v 1.9 2006/02/17 19:32:48 wiz Exp $ d5 2 a6 2 case "${STAGE}" in PRE-INSTALL|UNPACK) @ 1.9 log @Remove type1inst log file; improve empty dir detection; needed by fonts/intlfonts, ok@@ jlam. @ text @d1 7 a9 2 # $NetBSD: fonts,v 1.8 2005/12/29 14:10:01 jlam Exp $ # d95 7 @ 1.8 log @Allow avoiding the automatic update of the fonts databases by setting PKG_UPDATE_FONTS_DB=no in the environment or /etc/mk.conf. This can be beneficial when installing large numbers of fonts packages into the same directories as it avoids destroying and recreating the same database files over and over again. This might make it possible someday to run fc-cache, which is sometimes very time-consuming, from the +FONTS script automatically. @ text @d3 1 a3 1 # $NetBSD: fonts,v 1.7 2005/12/29 03:44:38 jlam Exp $ d24 1 a25 1 LS="@@LS@@" d72 1 a72 1 [tT][yY][pP][eE]1) update_cmd="${TYPE1INST}" ;; d82 1 a82 1 ${LS} | ${GREP} -v "^encodings.dir" | ${GREP} -v "^fonts\." | ${GREP} -v "^Fontmap" >/dev/null || ${RM} -f fonts.* Fontmap* @ 1.7 log @Re-implement the pkgsrc fonts-handling by integrating it into the pkginstall framework: * Rewrite the mk/install/fonts script fragment as a scriptlet that's generated by the +INSTALL script during package installation. * Rename the FONTS__DIRS variables to FONTS_DIRS. to be more consistent with how "families" of variables are currently named in pkgsrc. * Rewrite mk/fonts.mk so that it's implemented in terms of the new functionality in the pkginstall framework. This file will be obsoleted in the near future after packages have been transitioned to use the new functionality in the pkginstall framework. Currently, packages will continue to work with no changes. Integrating the fonts-handling into the pkginstall framework has the benefit of generating a +FONTS scriptlet that may be run independently of the +INSTALL scripts to (idempotently) update the fonts databases and fix package installation errors. @ text @d3 1 a3 1 # $NetBSD: fonts,v 1.6 2004/12/28 14:38:03 wiz Exp $ d41 9 d52 3 @ 1.6 log @Fix ttf/type1 handling in fonts.mk: Previously, ttmkfdir's output was redirected to fonts.dir, while the correct behaviour is to let it create fonts.scale and then let mkfontdir merge fonts.scale into fonts.dir. type1 handling had a similar problem. Get the wanted behaviour by automatically appending the contents of FONTS_TTF_DIRS and FONTS_TYPE1_DIRS to FONTS_X11_DIRS. Also, save a subshell in install/fonts while there. Bump PKGREVISION for all affected packages. jmmv@@ says ok. @ text @d1 1 a1 1 # $NetBSD: fonts,v 1.5 2004/03/30 11:55:02 recht Exp $ d3 18 a20 1 # Handle font databases; used by fonts.mk. d23 10 a32 6 FONTS_TTF="@@FONTS_TTF@@" FONTS_TTF_DIRS="@@FONTS_TTF_DIRS@@" FONTS_TYPE1="@@FONTS_TYPE1@@" FONTS_TYPE1_DIRS="@@FONTS_TYPE1_DIRS@@" FONTS_X11="@@FONTS_X11@@" FONTS_X11_DIRS="@@FONTS_X11_DIRS@@" a34 1 MKFONTDIR="@@MKFONTDIR@@" d36 40 a75 30 case ${STAGE} in 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 .pkgsrc | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then ${RM} -f $d/fonts* $d/Fontmap* else ( cd $d && ${TTMKFDIR} >/dev/null 2>&1 ) fi done fi if [ "${FONTS_TYPE1}" = "YES" ]; then for d in ${FONTS_TYPE1_DIRS}; do 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 ) fi done fi if [ "${FONTS_X11}" = "YES" ]; then for d in ${FONTS_X11_DIRS}; do if [ -z "`cd $d ; ${LS} | ${GREP} -v .pkgsrc | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then ${RM} -f $d/fonts* $d/Fontmap* else ${MKFONTDIR} $d >/dev/null 2>&1 fi done fi d77 1 a77 1 esac @ 1.5 log @Generate fonts.dir correctly with the ttmkfdir2. From PR 24968 by Jukka Salmi. @ text @d1 1 a1 1 # $NetBSD: fonts,v 1.4 2003/12/20 10:04:32 jmmv Exp $ d24 1 a24 1 ( cd $d && ${TTMKFDIR} -o fonts.dir >/dev/null 2>&1 ) d42 1 a42 1 ( cd $d && ${MKFONTDIR} >/dev/null 2>&1 ) @ 1.5.6.1 log @sync with HEAD @ text @d1 1 a1 1 # $NetBSD$ d24 1 a24 1 ( cd $d && ${TTMKFDIR} >/dev/null 2>&1 ) d42 1 a42 1 ${MKFONTDIR} $d >/dev/null 2>&1 @ 1.5.6.2 log @EOL the tv-derecurse branch; it has become too outdated. The last live revision can be fetched at the tv-derecurse-eol tag. @ text @d1 1 a1 1 # $NetBSD: fonts,v 1.5.6.1 2004/12/31 20:25:30 tv Exp $ @ 1.4 log @Handle removal of fonts databases properly if the package is using {MAKE,OWN}_DIRS (i.e., the .pkgsrc file exists in them). @ text @d1 1 a1 1 # $NetBSD: fonts,v 1.3 2003/12/19 23:46:41 jmmv Exp $ d24 1 a24 1 ( cd $d && ${TTMKFDIR} >fonts.dir 2>/dev/null ) @ 1.3 log @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). @ text @d1 1 a1 1 # $NetBSD: fonts,v 1.2 2003/12/19 23:18:49 jmmv Exp $ d21 1 a21 1 if [ -z "`cd $d ; ${LS} | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then d30 1 a30 1 if [ -z "`cd $d ; ${LS} | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then d39 1 a39 1 if [ -z "`cd $d ; ${LS} | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then @ 1.2 log @Use ${CD}, ${GREP}, ${RM} and ${RMDIR} instead of directly calling commands. @ text @d1 1 a1 1 # $NetBSD: fonts,v 1.1 2003/02/16 12:14:32 jmmv Exp $ a22 1 ${RMDIR} $d >/dev/null 2>&1 a31 1 ${RMDIR} $d >/dev/null 2>&1 a40 1 ${RMDIR} $d >/dev/null 2>&1 @ 1.1 log @Implement a simple framework to handle font databases. It regenerates the fonts.dir, fonts.scale and Fontmap files (depending on the font type) in the right directories at (de)install time. Support included for TrueType, Type1 and standard X11 fonts. Reviewed by jlam. @ text @d1 1 a1 1 # $NetBSD$ d21 3 a23 3 if [ -z "`cd $d ; ls | grep -v ^fonts | grep -v ^Fontmap`" ]; then rm -f $d/fonts* $d/Fontmap* rmdir $d >/dev/null 2>&1 d31 3 a33 3 if [ -z "`cd $d ; ls | grep -v ^fonts | grep -v ^Fontmap`" ]; then rm -f $d/fonts* $d/Fontmap* rmdir $d >/dev/null 2>&1 d41 3 a43 3 if [ -z "`cd $d ; ls | grep -v ^fonts | grep -v ^Fontmap`" ]; then rm -f $d/fonts* $d/Fontmap* rmdir $d >/dev/null 2>&1 @ 1.1.2.1 log @file fonts was added on branch pkgviews on 2003-02-16 12:14:33 +0000 @ text @d1 50 @ 1.1.2.2 log @Implement a simple framework to handle font databases. It regenerates the fonts.dir, fonts.scale and Fontmap files (depending on the font type) in the right directories at (de)install time. Support included for TrueType, Type1 and standard X11 fonts. Reviewed by jlam. @ text @a0 50 # $NetBSD: fonts,v 1.1 2003/02/16 12:14:32 jmmv Exp $ # # Handle font databases; used by fonts.mk. # FONTS_TTF="@@FONTS_TTF@@" FONTS_TTF_DIRS="@@FONTS_TTF_DIRS@@" FONTS_TYPE1="@@FONTS_TYPE1@@" FONTS_TYPE1_DIRS="@@FONTS_TYPE1_DIRS@@" FONTS_X11="@@FONTS_X11@@" FONTS_X11_DIRS="@@FONTS_X11_DIRS@@" TTMKFDIR="@@TTMKFDIR@@" TYPE1INST="@@TYPE1INST@@" MKFONTDIR="@@MKFONTDIR@@" case ${STAGE} in 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 rm -f $d/fonts* $d/Fontmap* rmdir $d >/dev/null 2>&1 else ( cd $d && ${TTMKFDIR} >fonts.dir 2>/dev/null ) fi done 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 rm -f $d/fonts* $d/Fontmap* rmdir $d >/dev/null 2>&1 else ( cd $d && ${TYPE1INST} >/dev/null 2>&1 ) fi done 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 rm -f $d/fonts* $d/Fontmap* rmdir $d >/dev/null 2>&1 else ( cd $d && ${MKFONTDIR} >/dev/null 2>&1 ) fi done fi ;; esac @ 1.1.6.1 log @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:18:49 UTC 2003 Modified Files: pkgsrc/mk/install: fonts Log Message: Use ${CD}, ${GREP}, ${RM} and ${RMDIR} instead of directly calling commands. @ text @d1 1 a1 1 # $NetBSD: fonts,v 1.2 2003/12/19 23:18:49 jmmv Exp $ d21 3 a23 3 if [ -z "`cd $d ; ${LS} | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then ${RM} -f $d/fonts* $d/Fontmap* ${RMDIR} $d >/dev/null 2>&1 d31 3 a33 3 if [ -z "`cd $d ; ${LS} | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then ${RM} -f $d/fonts* $d/Fontmap* ${RMDIR} $d >/dev/null 2>&1 d41 3 a43 3 if [ -z "`cd $d ; ${LS} | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then ${RM} -f $d/fonts* $d/Fontmap* ${RMDIR} $d >/dev/null 2>&1 @ 1.1.6.2 log @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). @ text @d1 1 a1 1 # $NetBSD: fonts,v 1.3 2003/12/19 23:46:41 jmmv Exp $ d23 1 d33 1 d43 1 @ 1.1.6.3 log @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). @ text @d1 1 a1 1 # $NetBSD: fonts,v 1.4 2003/12/20 10:04:32 jmmv Exp $ d21 1 a21 1 if [ -z "`cd $d ; ${LS} | ${GREP} -v .pkgsrc | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then d30 1 a30 1 if [ -z "`cd $d ; ${LS} | ${GREP} -v .pkgsrc | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then d39 1 a39 1 if [ -z "`cd $d ; ${LS} | ${GREP} -v .pkgsrc | ${GREP} -v ^fonts | ${GREP} -v ^Fontmap`" ]; then @