diff -ruNd mail/muttzilla/patches/patch-Makefile mail/muttzilla/patches/patch-Makefile
--- mail/muttzilla/patches/patch-Makefile	Sat Feb  5 03:01:06 2000
+++ mail/muttzilla/patches/patch-Makefile	Tue May  2 01:14:06 2000
@@ -1,8 +1,9 @@
---- Makefile.orig	Wed Jan 26 23:11:08 2000
-+++ Makefile	Fri Feb  4 15:52:52 2000
-@@ -1,12 +1,11 @@
+--- Makefile.orig	Thu Jan 27 10:11:08 2000
++++ Makefile	Tue May  2 00:50:53 2000
+@@ -1,21 +1,24 @@
 -CFLAGS = -O2 -Wall
- LDFLAGS = -G -lc
+-LDFLAGS = -G -lc
++LDFLAGS = -lc
  
  OBJS = muttzilla.o mzargs.o mzbase.o mzmail.o mznews.o nsapi.o
  TARGET = muttzilla.so
@@ -16,7 +17,21 @@
  
  MZLIBDIR = $(LIBDIR)/muttzilla
  MAILERLIBS = mutt pine dtmail VM tin
-@@ -24,11 +23,11 @@
+ 
++# FreeBSD (a.out netscape)
++CC=gcc -fpic -aout
++LD=gcc -shared  -aout
++
+ 
+ all: $(TARGET)
+ 
+ $(TARGET): $(OBJS)
+-	$(LD) $(LDFLAGS) -o $@ $^
++	$(LD) $(LDFLAGS) -o $@ $(OBJS)
+ 
+ clean:
+ 	rm -f $(OBJS) core a.out *~
+@@ -24,11 +27,11 @@
  	rm -f $(TARGET)
  
  install: $(TARGET)
diff -ruNd mail/muttzilla/patches/patch-ba mail/muttzilla/patches/patch-ba
--- mail/muttzilla/patches/patch-ba	Thu Jan  1 03:00:00 1970
+++ mail/muttzilla/patches/patch-ba	Mon May  1 23:16:34 2000
@@ -0,0 +1,11 @@
+--- muttzilla.conf.orig	Thu Jan 27 10:11:08 2000
++++ muttzilla.conf	Mon May  1 23:14:57 2000
+@@ -15,7 +15,7 @@
+ # like $HOME and ~.  For now this will be assumed to be relative to
+ # the user's home directory.
+ 
+-#userconf=.muttzillarc
++#userconf=.desk/muttzillarc
+ 
+ #mailscript=mzmail.sh
+ #mailprog=mutt                # name of the program to run
diff -ruNd mail/muttzilla/patches/patch-bb mail/muttzilla/patches/patch-bb
--- mail/muttzilla/patches/patch-bb	Thu Jan  1 03:00:00 1970
+++ mail/muttzilla/patches/patch-bb	Mon May  1 23:28:53 2000
@@ -0,0 +1,11 @@
+--- muttzilla.h.orig	Thu Jan 27 10:11:08 2000
++++ muttzilla.h	Mon May  1 23:19:06 2000
+@@ -68,7 +68,7 @@
+    SUPPORT_MAIL and SUPPORT_NEWS to go away RSN */
+ 
+ #define CONFIG_GLOBAL "/etc/muttzilla.conf"
+-#define CONFIG_USER   ".muttzillarc"
++#define CONFIG_USER   ".desk/muttzillarc"
+ #define CONFIG_REREAD 1       /* reread config files every time? */
+ 
+ /*#define DEBUG*/             /* use fprintf(stderr) to give debug info */
diff -ruNd mail/muttzilla/patches/patch-bc mail/muttzilla/patches/patch-bc
--- mail/muttzilla/patches/patch-bc	Thu Jan  1 03:00:00 1970
+++ mail/muttzilla/patches/patch-bc	Mon May  1 23:30:25 2000
@@ -0,0 +1,11 @@
+--- mzmail.py.orig	Thu Jan 27 10:11:08 2000
++++ mzmail.py	Mon May  1 23:20:19 2000
+@@ -40,7 +40,7 @@
+ ### Global variables which you can still configure here if you really,
+ ### really want to, but should be handled in a configuration file.
+ 
+-userconfig = '~/.muttzillarc'
++userconfig = '~/.desk/muttzillarc'
+ 
+ debug = 0
+ 
diff -ruNd mail/muttzilla/patches/patch-bd mail/muttzilla/patches/patch-bd
--- mail/muttzilla/patches/patch-bd	Thu Jan  1 03:00:00 1970
+++ mail/muttzilla/patches/patch-bd	Mon May  1 23:30:43 2000
@@ -0,0 +1,11 @@
+--- mzmail.sh.orig	Thu Jan 27 12:15:08 2000
++++ mzmail.sh	Mon May  1 23:21:06 2000
+@@ -14,7 +14,7 @@
+ # start with a few useful defaults
+ 
+ debug=0               # uncomment if you wish to see the command line
+-userconf=".muttzillarc"
++userconf=".desk/muttzillarc"
+ 
+ mailprog="mutt"
+ mailargs="mutt"
diff -ruNd mail/muttzilla/patches/patch-be mail/muttzilla/patches/patch-be
--- mail/muttzilla/patches/patch-be	Thu Jan  1 03:00:00 1970
+++ mail/muttzilla/patches/patch-be	Mon May  1 23:31:39 2000
@@ -0,0 +1,11 @@
+--- mznews.py.orig	Thu Jan 27 10:11:08 2000
++++ mznews.py	Mon May  1 23:22:04 2000
+@@ -40,7 +40,7 @@
+ ### Global variables which you can still configure here if you really,
+ ### really want to, but should be handled in a configuration file.
+ 
+-userconfig = '~/.muttzillarc'
++userconfig = '~/.desk/muttzillarc'
+ 
+ debug = 0
+ 
diff -ruNd mail/muttzilla/patches/patch-bf mail/muttzilla/patches/patch-bf
--- mail/muttzilla/patches/patch-bf	Thu Jan  1 03:00:00 1970
+++ mail/muttzilla/patches/patch-bf	Mon May  1 23:31:55 2000
@@ -0,0 +1,11 @@
+--- mznews.sh.orig	Thu Jan 27 12:15:08 2000
++++ mznews.sh	Mon May  1 23:22:36 2000
+@@ -10,7 +10,7 @@
+ # start with a few useful defaults
+ 
+ debug=0               # uncomment if you wish to see the command line
+-userconf=".muttzillarc"
++userconf=".desk/muttzillarc"
+ 
+ mailprog="tin"
+ mailargs="tin"
diff -ruNd mail/muttzilla/patches/patch-bg mail/muttzilla/patches/patch-bg
--- mail/muttzilla/patches/patch-bg	Thu Jan  1 03:00:00 1970
+++ mail/muttzilla/patches/patch-bg	Tue May  2 02:57:25 2000
@@ -0,0 +1,34 @@
+--- mzbase.c.orig	Thu Jan 27 10:11:08 2000
++++ mzbase.c	Mon May  1 23:54:20 2000
+@@ -28,6 +28,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+ #include <fcntl.h>
++#include <string.h>
+ 
+ 
+ /* create a linked list of tempfiles to clean up on exit */
+@@ -58,12 +59,21 @@
+    a few times if it fails.  I want to think about this a bit more
+    before I do it though.
+ */
++#define TMP_PIC "/muttzilla-XXXXXXXX"
+ tempfile_info *open_tempfile() {
+-  char fn[sizeof(TEMPDIR "/muttzilla-XXXXXXXX") / sizeof(char)]
+-    = TEMPDIR "/muttzilla-XXXXXXXX";
++  char *fn;
++  char *xx;
+   struct stat osb, nsb;
+   tempfile_info *tf;
+ 
++  xx = getenv("TMPDIR");
++  if  (xx && *xx)
++  {   fn = (char*)malloc(strlen(xx) + sizeof(TMP_PIC) + 1);
++      strcpy(fn, xx);
++      strcat(fn, TMP_PIC);
++  }else
++  {   fn = strdup(TEMPDIR TMP_PIC);
++  }
+   tf = malloc(sizeof(tempfile_info));
+   tf->next = NULL;
+   tf->fp = NULL;
diff -ruNd mail/muttzilla/patches/patch-bh mail/muttzilla/patches/patch-bh
--- mail/muttzilla/patches/patch-bh	Thu Jan  1 03:00:00 1970
+++ mail/muttzilla/patches/patch-bh	Tue May  2 04:00:33 2000
@@ -0,0 +1,24 @@
+--- mutt.orig	Thu Jan 27 10:11:08 2000
++++ mutt	Tue May  2 03:43:45 2000
+@@ -21,10 +21,6 @@
+ 
+ ARGS=""
+ 
+-if [ -n "$MZTO" ] ; then
+-    ARGS="$ARGS '$MZTO'"
+-fi
+-
+ if [ -n "$MZCC" ] ; then
+     ARGS="$ARGS -c '$MZCC'"
+ fi
+@@ -39,6 +35,10 @@
+ 
+ if [ -n "$MZBOD" ] ; then
+     ARGS="$ARGS -i '$MZBOD'"
++fi
++
++if [ -n "$MZTO" ] ; then
++    ARGS="$ARGS '$MZTO'"
+ fi
+ 
+ # no facility for setting "org" from the command line