diff -urN /usr/ports/mail/imp.orig/Makefile /usr/ports/mail/imp/Makefile
--- /usr/ports/mail/imp.orig/Makefile	Sun Feb 17 15:06:35 2002
+++ /usr/ports/mail/imp/Makefile	Sun Mar 10 15:33:49 2002
@@ -83,7 +83,7 @@
 RUN_DEPENDS+=	${LOCALBASE}/bin/wvHtml:${PORTSDIR}/textproc/wv
 .endif
 .if !defined(WITHOUT_XL)
-RUN_DEPENDS+=	${LOCALBASE}/bin/xlHtml:${PORTSDIR}/textproc/xlhtml
+RUN_DEPENDS+=	${LOCALBASE}/bin/xlhtml:${PORTSDIR}/textproc/xlhtml
 .endif
 .if !defined(WITHOUT_ZIP)
 RUN_DEPENDS+=	${LOCALBASE}/bin/zipinfo:${PORTSDIR}/archivers/unzip
@@ -177,7 +177,7 @@
 			${IMPDIR}/config/defaults.php3.dist
 	${PERL} -pi -e "s:/usr/bin/wvHtml:${LOCALBASE}/bin/wvHtml:g" \
 			${IMPDIR}/config/defaults.php3.dist
-	${PERL} -pi -e "s:/usr/bin/xlHtml:${LOCALBASE}/bin/xlHtml:g" \
+	${PERL} -pi -e "s:/usr/bin/xlHtml:${LOCALBASE}/bin/xlhtml:g" \
 			${IMPDIR}/config/defaults.php3.dist
 	${PERL} -pi -e "s:/bin/tar:/usr/bin/tar:g" ${IMPDIR}/config/defaults.php3.dist
 	${PERL} -pi -e "s:/usr/bin/zipinfo:${LOCALBASE}/bin/zipinfo:g" \
diff -urN /usr/ports/mail/imp.orig/files/patch-lib_mimetypes.lib /usr/ports/mail/imp/files/patch-lib_mimetypes.lib
--- /usr/ports/mail/imp.orig/files/patch-lib_mimetypes.lib	Thu Jan  1 01:00:00 1970
+++ /usr/ports/mail/imp/files/patch-lib_mimetypes.lib	Sun Mar 10 16:28:34 2002
@@ -0,0 +1,11 @@
+--- lib/mimetypes.lib.orig	Wed Jul 18 16:23:58 2001
++++ lib/mimetypes.lib	Sun Mar 10 16:26:33 2002
+@@ -449,7 +449,7 @@
+     fwrite( $fh, imap_base64($contents));
+     fclose( $fh );
+     
+-    $pipe = popen("$default->path_to_mswordview $word_name 2>&1","r");
++    $pipe = popen("$default->path_to_mswordview $word_name - 2>&1","r");
+     $data = "<b><u>MS Word Viewer</u></b><br><table><tr><td align=left>";
+     while( ($rc=fgets($pipe,8192)) )
+       $data.=$rc;
diff -urN /usr/ports/mail/imp.orig/pkg-plist /usr/ports/mail/imp/pkg-plist
--- /usr/ports/mail/imp.orig/pkg-plist	Wed Nov 14 22:27:23 2001
+++ /usr/ports/mail/imp/pkg-plist	Sun Mar 10 16:33:38 2002
@@ -101,6 +101,7 @@
 %%IMPDIR%%/lib/js/open_compose_win.js
 %%IMPDIR%%/lib/js/open_contacts.js
 %%IMPDIR%%/lib/mimetypes.lib
+%%IMPDIR%%/lib/mimetypes.lib.orig
 %%IMPDIR%%/lib/postconf.php3
 %%IMPDIR%%/lib/version.php
 %%IMPDIR%%/locale/ca/compose.help