From 7536782c811d126b8a51fc558019768759388768 Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Fri, 17 Jun 2005 22:30:06 +0000 Subject: [PATCH] Add a check for out-of-date freetype2, print version info if debugging is enabled (env VERBOSE=pants), and upgrade the included get_tmpfile.sh code. Obtained from: MarcusCom repo --- en/gnome/gnomelogalyzer.sh | 56 ++++++++++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 14 deletions(-) diff --git a/en/gnome/gnomelogalyzer.sh b/en/gnome/gnomelogalyzer.sh index 41b3f2d406..ac647a7b3b 100644 --- a/en/gnome/gnomelogalyzer.sh +++ b/en/gnome/gnomelogalyzer.sh @@ -26,7 +26,7 @@ # # Heh. "Tort." # -# $Id: gnomelogalyzer.sh,v 1.4 2005-03-29 22:12:33 adamw Exp $ +# $Id: gnomelogalyzer.sh,v 1.5 2005-06-17 22:30:06 adamw Exp $ # # This script uses some simple yet effective heuristics to analyse @@ -77,24 +77,33 @@ soln_portupgrade(){ } +get_tmpdir() +{ + if [ -n "${MC_TMPDIR}" -a -d "${MC_TMPDIR}" ]; then + tmpdir="${MC_TMPDIR}" + elif [ -n "${TMPDIR}" -a -d "${TMPDIR}" ]; then + tmpdir="${TMPDIR}" + elif [ -d "/var/tmp" ]; then + tmpdir="/var/tmp" + elif [ -d "/tmp" ]; then + tmpdir="/tmp" + elif [ -d "/usr/tmp" ]; then + tmpdir="/usr/tmp" + else + return 1 + fi + + echo ${tmpdir} + + return 0 +} + get_tmpfile() { template=$1 tmpfile="" - if [ -n "${MC_TMPDIR}" -a -d "${MC_TMPDIR}" ]; then - tmpfile="${MC_TMPDIR}/${template}.XXXXXX" - elif [ -n "${TMPDIR}" -a -d "${TMPDIR}" ]; then - tmpfile="${TMPDIR}/${template}.XXXXXX" - elif [ -d "/var/tmp" ]; then - tmpfile="/var/tmp/${template}.XXXXXX" - elif [ -d "/tmp" ]; then - tmpfile="/tmp/${template}.XXXXXX" - elif [ -d "/usr/tmp" ]; then - tmpfile="/usr/tmp/${template}.XXXXXX" - else - return 1 - fi + tmpfile="`get_tmpdir`/${template}.XXXXXX" tmpfile=`mktemp -q ${tmpfile}` @@ -107,6 +116,9 @@ get_tmpfile() # # main() +debug -n "gnomelogalyzer ($0), ver. " +debug `echo "$Id: gnomelogalyzer.sh,v 1.5 2005-06-17 22:30:06 adamw Exp $" | cut -f3 -d' '` + echo; # for good measure. # check to make sure that the build log has been specified if [ ! -z "$1" ]; then @@ -213,6 +225,22 @@ else debug "OK" fi +##### +# +# TEST:FreeType2 out-of-date +# +# SOLUTION: portupgrade freetype2 + +debug -n "Checking for an out-of-date freetype2... " +if grep -q "struct FTC_ImageTypeRec_' has no member named" ${buildlog} || \ + grep -q '\#error "`ft2build.h' ${buildlog} ; then + echo "Your freetype2 is out-of-date." + soln_portupgrade "-f freetype2" + exit +else + debug "OK" +fi + ##### # # Catch-all