Need full path to cc on Solaris buildbot host, at this point.

[nmh] / etc / mhn.defaults.sh

diff --git a/etc/mhn.defaults.sh b/etc/mhn.defaults.sh
index 97774a7f10d21eeefe341a08b81d0bf8b456aaf0..f5a3e693158ab5a2c5839a176dace0cb2262152c 100755 (executable)
--- a/etc/mhn.defaults.sh
+++ b/etc/mhn.defaults.sh
@@ -25,6 +25,19 @@ fi
 TMP=/tmp/nmh_temp.$$
 trap "rm -f $TMP" 0 1 2 3 13 15
 
 TMP=/tmp/nmh_temp.$$
 trap "rm -f $TMP" 0 1 2 3 13 15
 

+
+if [ ! -z "`$SEARCHPROG $SEARCHPATH w3m`" ]; then
+  echo "mhfixmsg-format-text/html: w3m -dump -T text/html -O utf-8 '%F'" >> $TMP
+elif [ ! -z "`$SEARCHPROG $SEARCHPATH lynx`" ]; then
+  #### lynx indents with 3 spaces, remove them and any trailing spaces.
+  echo "mhfixmsg-format-text/html: lynx -child -dump -force_html '%F' | \
+expand | sed -e 's/^   //' -e 's/  *$//'" >> $TMP
+elif [ ! -z "`$SEARCHPROG $SEARCHPATH elinks`" ]; then
+  echo "mhfixmsg-format-text/html: elinks -dump -force-html -no-numbering \
+-eval 'set document.browse.margin_width = 0' '%F'" >> $TMP
+fi
+
+

 echo "mhstore-store-text: %m%P.txt" >> $TMP
 echo "mhstore-store-text/richtext: %m%P.rt" >> $TMP
 echo "mhstore-store-video/mpeg: %m%P.mpg" >> $TMP
 echo "mhstore-store-text: %m%P.txt" >> $TMP
 echo "mhstore-store-text/richtext: %m%P.rt" >> $TMP
 echo "mhstore-store-video/mpeg: %m%P.mpg" >> $TMP


@@ -37,26 +50,26 @@ else
     XWUD= X11DIR=
 fi
 
     XWUD= X11DIR=
 fi
 

-PGM="`$SEARCHPROG $SEARCHPATH pbmtoxwd`"
+PGM="`$SEARCHPROG $SEARCHPATH pnmtoxwd`"

 if [ ! -z "$PGM" ]; then
 if [ ! -z "$PGM" ]; then

-    PBM="$PGM" PBMDIR="`echo $PGM | awk -F/ '{ for(i=2;i<NF;i++)printf "/%s", $i;}'`"/
+    NETPBM="$PGM" NETPBMDIR="`echo $PGM | awk -F/ '{ for(i=2;i<NF;i++)printf "/%s", $i;}'`"/

 else
 else

-    PBM= PBMDIR=
+    NETPBM= NETPBMDIR=

 fi
 
 PGM="`$SEARCHPROG $SEARCHPATH xv`"
 if [ ! -z "$PGM" ]; then
     echo "mhshow-show-image: %p$PGM -geometry =-0+0 '%f'" >> $TMP
 fi
 
 PGM="`$SEARCHPROG $SEARCHPATH xv`"
 if [ ! -z "$PGM" ]; then
     echo "mhshow-show-image: %p$PGM -geometry =-0+0 '%f'" >> $TMP

-elif [ ! -z $"PBM" -a ! -z "$XWUD" ]; then
-    echo "mhshow-show-image/gif: %p${PBMDIR}giftoppm | ${PBMDIR}ppmtopgm | ${PBMDIR}pgmtopbm | ${PBMDIR}pbmtoxwd | $XWUD -geometry =-0+0" >> $TMP
-    echo "mhshow-show-image/x-pbm: %p${PBMDIR}pbmtoxwd | $XWUD -geometry =-0+0" >> $TMP
-    echo "mhshow-show-image/x-pgm: %p${PBMDIR}pgmtopbm | ${PBMDIR}pbmtoxwd | $XWUD -geometry =-0+0" >> $TMP
-    echo "mhshow-show-image/x-ppm: %p${PBMDIR}ppmtopgm | ${PBMDIR}pgmtopbm | ${PBMDIR}pbmtoxwd | $XWUD -geometry =-0+0" >> $TMP
+elif [ ! -z $"NETPBM" -a ! -z "$XWUD" ]; then
+    echo "mhshow-show-image/gif: %p${NETPBMDIR}giftopnm | ${NETPBMDIR}ppmtopgm | ${NETPBMDIR}pgmtopbm | ${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP
+    echo "mhshow-show-image/x-pnm: %p${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP
+    echo "mhshow-show-image/x-pgm: %p${NETPBMDIR}pgmtopbm | ${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP
+    echo "mhshow-show-image/x-ppm: %p${NETPBMDIR}ppmtopgm | ${NETPBMDIR}pgmtopbm | ${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP

     echo "mhshow-show-image/x-xwd: %p$XWUD -geometry =-0+0" >> $TMP
 
     PGM="`$SEARCHPROG $SEARCHPATH djpeg`"
     if [ ! -z "$PGM" ]; then
     echo "mhshow-show-image/x-xwd: %p$XWUD -geometry =-0+0" >> $TMP
 
     PGM="`$SEARCHPROG $SEARCHPATH djpeg`"
     if [ ! -z "$PGM" ]; then

-       echo "mhshow-show-image/jpeg: %p$PGM -Pg | ${PBMDIR}ppmtopgm | ${PBMDIR}pgmtopbm | ${PBMDIR}pbmtoxwd | $XWUD -geometry =-0+0" >> $TMP
+       echo "mhshow-show-image/jpeg: %p$PGM -Pg | ${NETPBMDIR}ppmtopgm | ${NETPBMDIR}pgmtopbm | ${NETPBMDIR}pnmtoxwd | $XWUD -geometry =-0+0" >> $TMP

     fi
 fi
 
     fi
 fi
 


@@ -114,7 +127,7 @@ if [ ! -z "$PGM" ]; then
        echo "mhshow-show-application/PostScript: %plpr -Pps" >> $TMP
 else
     PGM="`$SEARCHPROG $SEARCHPATH lp`"
        echo "mhshow-show-application/PostScript: %plpr -Pps" >> $TMP
 else
     PGM="`$SEARCHPROG $SEARCHPATH lp`"

-    if [ ! -z "$PGM" ]; then    
+    if [ ! -z "$PGM" ]; then

        echo "mhshow-show-application/PostScript: %plp -dps" >> $TMP
     fi
 fi
        echo "mhshow-show-application/PostScript: %plp -dps" >> $TMP
     fi
 fi


@@ -137,6 +150,7 @@ mhshow-suffix-application/vnd.ms-excel: .xld
 mhshow-suffix-application/vnd.ms-excel: .xll
 mhshow-suffix-application/vnd.ms-excel: .xlm
 mhshow-suffix-application/vnd.ms-excel: .xls
 mhshow-suffix-application/vnd.ms-excel: .xll
 mhshow-suffix-application/vnd.ms-excel: .xlm
 mhshow-suffix-application/vnd.ms-excel: .xls

+mhshow-suffix-application/vnd.openxmlformats-officedocument.spreadsheetml.sheet: .xlsx

 mhshow-suffix-application/vnd.ms-excel: .xlt
 mhshow-suffix-application/vnd.ms-excel: .xlw
 mhshow-suffix-application/vnd.ms-powerpoint: .pot
 mhshow-suffix-application/vnd.ms-excel: .xlt
 mhshow-suffix-application/vnd.ms-excel: .xlw
 mhshow-suffix-application/vnd.ms-powerpoint: .pot