Merge commit '8206fbf', due to my screwup of committing it on a detached

[nmh] / etc / mhn.defaults.sh

diff --git a/etc/mhn.defaults.sh b/etc/mhn.defaults.sh
index 298dae60d6388eed63ab70eabeea7d3513b67443..d9d35b00f496117395c41a69750b593c42033c8b 100755 (executable)
--- a/etc/mhn.defaults.sh
+++ b/etc/mhn.defaults.sh
@@ -46,6 +46,7 @@ expand | sed -e 's/^   //' -e 's/  *$//'" >> $TMP
 fi
 
 echo "mhstore-store-text: %m%P.txt" >> $TMP
 fi
 
 echo "mhstore-store-text: %m%P.txt" >> $TMP

+echo "mhstore-store-text/html: %m%P.html" >> $TMP

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


@@ -314,10 +315,17 @@ fi
 
 # This entry is used to retrieve external-body types that use a "url"
 # access-type.
 
 # This entry is used to retrieve external-body types that use a "url"
 # access-type.

-PGM=`$SEARCHPROG "$SEARCHPATH" curl`
-if [ ! -z "$PGM" ]; then
-       echo "nmh-access-url: $PGM -L" >> $TMP
-fi
+case "`uname`" in
+  FreeBSD)
+       echo "nmh-access-url: fetch -o -" >> $TMP
+       ;;
+  *)
+       PGM=`$SEARCHPROG "$SEARCHPATH" curl`
+       if [ ! -z "$PGM" ]; then
+               echo "nmh-access-url: $PGM -L" >> $TMP
+       fi
+       ;;
+esac

 
 # output a sorted version of the file
 sort < $TMP
 
 # output a sorted version of the file
 sort < $TMP