101 files changed, 92 insertions, 97 deletions

diff --git a/mail/adcomplain/files/patch-aa b/mail/adcomplain/files/patch-adcomplain.pl
index 44054e48a201..44054e48a201 100644
--- a/mail/adcomplain/files/patch-aa
+++ b/mail/adcomplain/files/patch-adcomplain.pl
diff --git a/mail/cclient/files/patch-ac b/mail/cclient/files/patch-Makefile
index 1e10918790a8..1e10918790a8 100644
--- a/mail/cclient/files/patch-ac
+++ b/mail/cclient/files/patch-Makefile
diff --git a/mail/cclient/files/patch-ab b/mail/cclient/files/patch-src_osdep_unix_Makefile
index 6695c7355072..6695c7355072 100644
--- a/mail/cclient/files/patch-ab
+++ b/mail/cclient/files/patch-src_osdep_unix_Makefile
diff --git a/mail/cclient/files/patch-aa b/mail/cclient/files/patch-src_osdep_unix_os_bsi.h
index ade4d1289237..ade4d1289237 100644
--- a/mail/cclient/files/patch-aa
+++ b/mail/cclient/files/patch-src_osdep_unix_os_bsi.h
diff --git a/mail/drac/files/patch-aa b/mail/drac/files/patch-Makefile
index 6ca9088fb3dc..6ca9088fb3dc 100644
--- a/mail/drac/files/patch-aa
+++ b/mail/drac/files/patch-Makefile
diff --git a/mail/drac/files/patch-ab b/mail/drac/files/patch-rpc.dracd.1m
index 8868dd82e8ba..8868dd82e8ba 100644
--- a/mail/drac/files/patch-ab
+++ b/mail/drac/files/patch-rpc.dracd.1m
diff --git a/mail/drac/files/patch-ac b/mail/drac/files/patch-rpc.dracd.c
index 0550d5159b65..0550d5159b65 100644
--- a/mail/drac/files/patch-ac
+++ b/mail/drac/files/patch-rpc.dracd.c
diff --git a/mail/drac/files/patch-ad b/mail/drac/files/patch-testing.c
index fc9b9d64f68a..fc9b9d64f68a 100644
--- a/mail/drac/files/patch-ad
+++ b/mail/drac/files/patch-testing.c
diff --git a/mail/evolution/files/patch-aa b/mail/evolution/files/patch-configure
index 3b9eb70943d4..3b9eb70943d4 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-configure
diff --git a/mail/ezmlm/files/patch-aa b/mail/ezmlm/files/patch-Makefile
index 4dff5c8dc5f1..4dff5c8dc5f1 100644
--- a/mail/ezmlm/files/patch-aa
+++ b/mail/ezmlm/files/patch-Makefile
diff --git a/mail/faces/files/patch-ca b/mail/faces/files/patch-compface_arith.c
index b76ad572de07..b76ad572de07 100644
--- a/mail/faces/files/patch-ca
+++ b/mail/faces/files/patch-compface_arith.c
diff --git a/mail/faces/files/patch-cb b/mail/faces/files/patch-compface_cmain.c
index 31f64942af3b..31f64942af3b 100644
--- a/mail/faces/files/patch-cb
+++ b/mail/faces/files/patch-compface_cmain.c
diff --git a/mail/faces/files/patch-cc b/mail/faces/files/patch-compface_compface.1
index 9f2a15e6ea4d..9f2a15e6ea4d 100644
--- a/mail/faces/files/patch-cc
+++ b/mail/faces/files/patch-compface_compface.1
diff --git a/mail/faces/files/patch-cd b/mail/faces/files/patch-compface_compface.c
index 177e6ed7d9db..177e6ed7d9db 100644
--- a/mail/faces/files/patch-cd
+++ b/mail/faces/files/patch-compface_compface.c
diff --git a/mail/faces/files/patch-ce b/mail/faces/files/patch-compface_compface.h
index 41db8268a5db..41db8268a5db 100644
--- a/mail/faces/files/patch-ce
+++ b/mail/faces/files/patch-compface_compface.h
diff --git a/mail/faces/files/patch-cf b/mail/faces/files/patch-compface_compress.c
index 1b69b9560297..1b69b9560297 100644
--- a/mail/faces/files/patch-cf
+++ b/mail/faces/files/patch-compface_compress.c
diff --git a/mail/faces/files/patch-ch b/mail/faces/files/patch-compface_file.c
index 836f5a14a3ee..836f5a14a3ee 100644
--- a/mail/faces/files/patch-ch
+++ b/mail/faces/files/patch-compface_file.c
diff --git a/mail/faces/files/patch-ci b/mail/faces/files/patch-compface_gen.c
index 9f1e78ef357c..9f1e78ef357c 100644
--- a/mail/faces/files/patch-ci
+++ b/mail/faces/files/patch-compface_gen.c
diff --git a/mail/faces/files/patch-cj b/mail/faces/files/patch-compface_uncmain.c
index 8df10e250e0f..8df10e250e0f 100644
--- a/mail/faces/files/patch-cj
+++ b/mail/faces/files/patch-compface_uncmain.c
diff --git a/mail/faces/files/patch-ck b/mail/faces/files/patch-compface_uncompface.c
index 74d68d31bfc1..74d68d31bfc1 100644
--- a/mail/faces/files/patch-ck
+++ b/mail/faces/files/patch-compface_uncompface.c
diff --git a/mail/faces/files/patch-ba b/mail/faces/files/patch-faces_Faces.ad
index 2f32d2cee0de..2f32d2cee0de 100644
--- a/mail/faces/files/patch-ba
+++ b/mail/faces/files/patch-faces_Faces.ad
diff --git a/mail/hbiff/files/patch-01 b/mail/hbiff/files/patch-hbiff.c
index 38e4cb7ac210..38e4cb7ac210 100644
--- a/mail/hbiff/files/patch-01
+++ b/mail/hbiff/files/patch-hbiff.c
diff --git a/mail/imap-uw/files/patch-ad b/mail/imap-uw/files/patch-Makefile
index 1da592cee2a5..1da592cee2a5 100644
--- a/mail/imap-uw/files/patch-ad
+++ b/mail/imap-uw/files/patch-Makefile
diff --git a/mail/imap-uw/files/patch-ac b/mail/imap-uw/files/patch-src_imapd_Makefile
index 0eb221b2e8ee..0eb221b2e8ee 100644
--- a/mail/imap-uw/files/patch-ac
+++ b/mail/imap-uw/files/patch-src_imapd_Makefile
diff --git a/mail/imap-uw/files/patch-ai b/mail/imap-uw/files/patch-src_imapd_imapd.c
index a1dc32829b12..a1dc32829b12 100644
--- a/mail/imap-uw/files/patch-ai
+++ b/mail/imap-uw/files/patch-src_imapd_imapd.c
diff --git a/mail/imap-uw/files/patch-af b/mail/imap-uw/files/patch-src_ipopd_Makefile
index 2464eff218fd..2464eff218fd 100644
--- a/mail/imap-uw/files/patch-af
+++ b/mail/imap-uw/files/patch-src_ipopd_Makefile
diff --git a/mail/imap-uw/files/patch-ah b/mail/imap-uw/files/patch-src_ipopd_ipop3d.c
index a9f3715c6158..a9f3715c6158 100644
--- a/mail/imap-uw/files/patch-ah
+++ b/mail/imap-uw/files/patch-src_ipopd_ipop3d.c
diff --git a/mail/imap-uw/files/patch-ag b/mail/imap-uw/files/patch-src_mtest_Makefile
index 041d6a63b98e..041d6a63b98e 100644
--- a/mail/imap-uw/files/patch-ag
+++ b/mail/imap-uw/files/patch-src_mtest_Makefile
diff --git a/mail/imap-uw/files/patch-ae b/mail/imap-uw/files/patch-src_mtest_mtest.c
index a3b490909a09..a3b490909a09 100644
--- a/mail/imap-uw/files/patch-ae
+++ b/mail/imap-uw/files/patch-src_mtest_mtest.c
diff --git a/mail/imap-uw/files/patch-ab b/mail/imap-uw/files/patch-src_osdep_unix_Makefile
index d81228f915c0..d81228f915c0 100644
--- a/mail/imap-uw/files/patch-ab
+++ b/mail/imap-uw/files/patch-src_osdep_unix_Makefile
diff --git a/mail/imap-uw/files/patch-aa b/mail/imap-uw/files/patch-src_osdep_unix_os_bsi.h
index 4615f235b3fb..4615f235b3fb 100644
--- a/mail/imap-uw/files/patch-aa
+++ b/mail/imap-uw/files/patch-src_osdep_unix_os_bsi.h
diff --git a/mail/mail2sms/files/patch-aa b/mail/mail2sms/files/patch-aa
deleted file mode 100644
index 9c6426113e45..000000000000
--- a/mail/mail2sms/files/patch-aa
+++ /dev/null
@@ -1,79 +0,0 @@
---- main.c.orig	Wed Apr 16 05:11:21 2003
-+++ main.c	Wed Apr 16 05:12:16 2003
-@@ -18,7 +18,7 @@
- #ifdef AFS
- #define CONFIGDIR "/var/mail2sms/"
- #else
--#define GLOBAL_CONFIG "/etc/mail/sms/mail2sms.conf"
-+#define GLOBAL_CONFIG "%%PREFIX%%/etc/mail2sms.conf"
- #endif
- 
- extern FILE *logfile; /* write logs to this file pointer */
---- parse.c.orig	Wed Apr 16 05:06:23 2003
-+++ parse.c	Wed Apr 16 05:45:31 2003
-@@ -48,8 +48,9 @@
- /*
- ** strcasestr() - case insensitive strstr()
- */
-- 
--char *strcasestr(char *haystack, char *needle)
-+
-+/* FreeBSD defines this function a bit differently, so rename this version */
-+char *mail2sms_strcasestr(char *haystack, char *needle)
- {
-   int nlen = strlen(needle);
-   int hlen = strlen(haystack);
-@@ -325,7 +326,7 @@ struct body * process(char *mbox,    /*
-   if (use_stdin || !mbox || !strcasecmp(mbox, "NONE"))
-     fp = stdin;
-   else if ((fp = fopen(mbox, "r")) == NULL) {
--    return; /* add error code */
-+    return -1; /* add error code */
-   }
-
-   isinheader = 1;
---- mail2sms.1.orig	Wed Apr 16 05:22:01 2003
-+++ mail2sms.1	Wed Apr 16 05:22:57 2003
-@@ -32,7 +32,7 @@
- .IP "-v"
- Shows mail2sms' version number then quits.
- .SH AUTHORS
--mail2sms has been written by Daniel Stenberg <daniel@haxx.se> with lofs of
-+mail2sms has been written by Daniel Stenberg <daniel@haxx.se> with lots of
- help from friendly contributors, such as:
- 
-  - Linus Nielsen <linus@haxx.se>
-@@ -48,4 +48,4 @@
- .SH WWW
- http://www.contactor.se/~dast/mail2sms/
- .SH "SEE ALSO"
--.BR mail2sms (4)
-+.BR mail2sms (5)
---- mail2sms.4.orig	Wed Apr 16 05:11:35 2003
-+++ mail2sms.4	Wed Apr 16 06:03:10 2003
-@@ -1,12 +1,12 @@
- .\" You can view this file with:
--.\" nroff -man mail2sms.4
-+.\" nroff -man mail2sms.5
- .\" Written by Daniel Stenberg
- .\"
--.TH mail2sms 4 "11 October 1999"
-+.TH mail2sms 5 "11 October 1999"
- .SH NAME
- mail2sms \- reads a (MIME) mail and converts it to a short message.
- .SH SYNOPSIS
--.B /etc/mail/sms/mail2sms.conf
-+.B %%PREFIX%%/etc/mail2sms.conf
- .br
- .B ~/.mail2sms
- .SH DESCRIPTION
-@@ -67,7 +67,7 @@
- http://www.contactor.se/~dast/mail2sms/
- .SH "SEE ALSO"
- .BR mail2sms (1),
--.BR sendmail (1M),
-+.BR sendmail (8),
- .BR procmail (1),
--.BR aliases (4)
-+.BR aliases (5)
- 
diff --git a/mail/mail2sms/files/patch-mail2sms.1 b/mail/mail2sms/files/patch-mail2sms.1
new file mode 100644
index 000000000000..34d60cfce867
--- /dev/null
+++ b/mail/mail2sms/files/patch-mail2sms.1
@@ -0,0 +1,17 @@
+--- mail2sms.1.orig	Wed Apr 16 05:22:01 2003
++++ mail2sms.1	Wed Apr 16 05:22:57 2003
+@@ -32,7 +32,7 @@
+ .IP "-v"
+ Shows mail2sms' version number then quits.
+ .SH AUTHORS
+-mail2sms has been written by Daniel Stenberg <daniel@haxx.se> with lofs of
++mail2sms has been written by Daniel Stenberg <daniel@haxx.se> with lots of
+ help from friendly contributors, such as:
+ 
+  - Linus Nielsen <linus@haxx.se>
+@@ -48,4 +48,4 @@
+ .SH WWW
+ http://www.contactor.se/~dast/mail2sms/
+ .SH "SEE ALSO"
+-.BR mail2sms (4)
++.BR mail2sms (5)
diff --git a/mail/mail2sms/files/patch-mail2sms.4 b/mail/mail2sms/files/patch-mail2sms.4
new file mode 100644
index 000000000000..325d30d5548e
--- /dev/null
+++ b/mail/mail2sms/files/patch-mail2sms.4
@@ -0,0 +1,28 @@
+--- mail2sms.4.orig	Wed Apr 16 05:11:35 2003
++++ mail2sms.4	Wed Apr 16 06:03:10 2003
+@@ -1,12 +1,12 @@
+ .\" You can view this file with:
+-.\" nroff -man mail2sms.4
++.\" nroff -man mail2sms.5
+ .\" Written by Daniel Stenberg
+ .\"
+-.TH mail2sms 4 "11 October 1999"
++.TH mail2sms 5 "11 October 1999"
+ .SH NAME
+ mail2sms \- reads a (MIME) mail and converts it to a short message.
+ .SH SYNOPSIS
+-.B /etc/mail/sms/mail2sms.conf
++.B %%PREFIX%%/etc/mail2sms.conf
+ .br
+ .B ~/.mail2sms
+ .SH DESCRIPTION
+@@ -67,7 +67,7 @@
+ http://www.contactor.se/~dast/mail2sms/
+ .SH "SEE ALSO"
+ .BR mail2sms (1),
+-.BR sendmail (1M),
++.BR sendmail (8),
+ .BR procmail (1),
+-.BR aliases (4)
++.BR aliases (5)
+ 
diff --git a/mail/mail2sms/files/patch-main.c b/mail/mail2sms/files/patch-main.c
new file mode 100644
index 000000000000..ff54c97870b8
--- /dev/null
+++ b/mail/mail2sms/files/patch-main.c
@@ -0,0 +1,11 @@
+--- main.c.orig	Wed Apr 16 05:11:21 2003
++++ main.c	Wed Apr 16 05:12:16 2003
+@@ -18,7 +18,7 @@
+ #ifdef AFS
+ #define CONFIGDIR "/var/mail2sms/"
+ #else
+-#define GLOBAL_CONFIG "/etc/mail/sms/mail2sms.conf"
++#define GLOBAL_CONFIG "%%PREFIX%%/etc/mail2sms.conf"
+ #endif
+ 
+ extern FILE *logfile; /* write logs to this file pointer */
diff --git a/mail/mail2sms/files/patch-parse.c b/mail/mail2sms/files/patch-parse.c
new file mode 100644
index 000000000000..0c46925f1574
--- /dev/null
+++ b/mail/mail2sms/files/patch-parse.c
@@ -0,0 +1,23 @@
+--- parse.c.orig	Wed Apr 16 05:06:23 2003
++++ parse.c	Wed Apr 16 05:45:31 2003
+@@ -48,8 +48,9 @@
+ /*
+ ** strcasestr() - case insensitive strstr()
+ */
+- 
+-char *strcasestr(char *haystack, char *needle)
++
++/* FreeBSD defines this function a bit differently, so rename this version */
++char *mail2sms_strcasestr(char *haystack, char *needle)
+ {
+   int nlen = strlen(needle);
+   int hlen = strlen(haystack);
+@@ -325,7 +326,7 @@ struct body * process(char *mbox,    /*
+   if (use_stdin || !mbox || !strcasecmp(mbox, "NONE"))
+     fp = stdin;
+   else if ((fp = fopen(mbox, "r")) == NULL) {
+-    return; /* add error code */
++    return -1; /* add error code */
+   }
+
+   isinheader = 1;
diff --git a/mail/mailagent/files/patch-ac b/mail/mailagent/files/patch-agent-filter-io.c
index ab4f26f2f2aa..ab4f26f2f2aa 100644
--- a/mail/mailagent/files/patch-ac
+++ b/mail/mailagent/files/patch-agent-filter-io.c
diff --git a/mail/mailagent/files/patch-agent::filter::logfile.c b/mail/mailagent/files/patch-agent-filter-logfile.c
index 60a0bcbc130a..60a0bcbc130a 100644
--- a/mail/mailagent/files/patch-agent::filter::logfile.c
+++ b/mail/mailagent/files/patch-agent-filter-logfile.c
diff --git a/mail/mailagent/files/patch-agent::man::Makefile.SH b/mail/mailagent/files/patch-agent-man-Makefile.SH
index 9e4bb2cc9fcd..9e4bb2cc9fcd 100644
--- a/mail/mailagent/files/patch-agent::man::Makefile.SH
+++ b/mail/mailagent/files/patch-agent-man-Makefile.SH
diff --git a/mail/mess822/files/patch-aa b/mail/mess822/files/patch-hier.c
index a32b04085e24..a32b04085e24 100644
--- a/mail/mess822/files/patch-aa
+++ b/mail/mess822/files/patch-hier.c
diff --git a/mail/ml/files/patch-ab b/mail/ml/files/patch-Imakefile_1
index 21f8d4f6b707..21f8d4f6b707 100644
--- a/mail/ml/files/patch-ab
+++ b/mail/ml/files/patch-Imakefile_1
diff --git a/mail/ml/files/patch-ag b/mail/ml/files/patch-Imakefile_2
index c295f1b80a8e..c295f1b80a8e 100644
--- a/mail/ml/files/patch-ag
+++ b/mail/ml/files/patch-Imakefile_2
diff --git a/mail/ml/files/patch-af b/mail/ml/files/patch-imap-4-src-c-client-mtest.c
index d986c4773ff4..d986c4773ff4 100644
--- a/mail/ml/files/patch-af
+++ b/mail/ml/files/patch-imap-4-src-c-client-mtest.c
diff --git a/mail/ml/files/patch-aa b/mail/ml/files/patch-imap-4-src-osdep-unix-Makefile
index 1b9178ffd035..1b9178ffd035 100644
--- a/mail/ml/files/patch-aa
+++ b/mail/ml/files/patch-imap-4-src-osdep-unix-Makefile
diff --git a/mail/ml/files/patch-impa-4-src-osdep-unix-mmdf.c b/mail/ml/files/patch-imap-4-src-osdep-unix-mmdf.c
index 81a7a6ac7b47..81a7a6ac7b47 100644
--- a/mail/ml/files/patch-impa-4-src-osdep-unix-mmdf.c
+++ b/mail/ml/files/patch-imap-4-src-osdep-unix-mmdf.c
diff --git a/mail/ml/files/patch-ae b/mail/ml/files/patch-imap-4-src-osdep-unix-os_bsi.h
index c5d3797740e8..c5d3797740e8 100644
--- a/mail/ml/files/patch-ae
+++ b/mail/ml/files/patch-imap-4-src-osdep-unix-os_bsi.h
diff --git a/mail/ml/files/patch-ac b/mail/ml/files/patch-lib-CheckConnection.ppp
index 7cf9decb6b65..7cf9decb6b65 100644
--- a/mail/ml/files/patch-ac
+++ b/mail/ml/files/patch-lib-CheckConnection.ppp
diff --git a/mail/ml/files/patch-ad b/mail/ml/files/patch-lib-ML.ad
index dcbdda8ac3fb..dcbdda8ac3fb 100644
--- a/mail/ml/files/patch-ad
+++ b/mail/ml/files/patch-lib-ML.ad
diff --git a/mail/mutt/files/patch-05 b/mail/mutt/files/patch-curs_lib.c
index bfbb5aa3ab9b..bfbb5aa3ab9b 100644
--- a/mail/mutt/files/patch-05
+++ b/mail/mutt/files/patch-curs_lib.c
diff --git a/mail/mutt/files/patch-02 b/mail/mutt/files/patch-doc-Makefile.am
index 557432a6a60b..557432a6a60b 100644
--- a/mail/mutt/files/patch-02
+++ b/mail/mutt/files/patch-doc-Makefile.am
diff --git a/mail/mutt/files/patch-08 b/mail/mutt/files/patch-doc-Muttrc
index 69d353f64b40..69d353f64b40 100644
--- a/mail/mutt/files/patch-08
+++ b/mail/mutt/files/patch-doc-Muttrc
diff --git a/mail/mutt14/files/patch-08 b/mail/mutt14/files/patch-Muttrc
index 3e50cbd13779..3e50cbd13779 100644
--- a/mail/mutt14/files/patch-08
+++ b/mail/mutt14/files/patch-Muttrc
diff --git a/mail/mutt14/files/patch-02 b/mail/mutt14/files/patch-doc-Makefile.in
index afeadc06b9d4..afeadc06b9d4 100644
--- a/mail/mutt14/files/patch-02
+++ b/mail/mutt14/files/patch-doc-Makefile.in
diff --git a/mail/mutt14/files/patch-03 b/mail/mutt14/files/patch-doc_manual.sgml
index b870f7f7aaec..b870f7f7aaec 100644
--- a/mail/mutt14/files/patch-03
+++ b/mail/mutt14/files/patch-doc_manual.sgml
diff --git a/mail/mutt14/files/patch-05 b/mail/mutt14/files/patch-string-handling
index 13a52d9daa40..13a52d9daa40 100644
--- a/mail/mutt14/files/patch-05
+++ b/mail/mutt14/files/patch-string-handling
diff --git a/mail/popa3d/files/patch-ab b/mail/popa3d/files/patch-Makefile
index ade5e6b8c8c9..ade5e6b8c8c9 100644
--- a/mail/popa3d/files/patch-ab
+++ b/mail/popa3d/files/patch-Makefile
diff --git a/mail/popa3d/files/patch-aa b/mail/popa3d/files/patch-params.h
index 7d0d1221a136..7d0d1221a136 100644
--- a/mail/popa3d/files/patch-aa
+++ b/mail/popa3d/files/patch-params.h
diff --git a/mail/poppassd/files/patch-aa b/mail/poppassd/files/patch-Makefile
index 1ade77dca5b9..1ade77dca5b9 100644
--- a/mail/poppassd/files/patch-aa
+++ b/mail/poppassd/files/patch-Makefile
diff --git a/mail/poppassd/files/patch-ab b/mail/poppassd/files/patch-poppassd.c
index e4169d6097b8..e4169d6097b8 100644
--- a/mail/poppassd/files/patch-ab
+++ b/mail/poppassd/files/patch-poppassd.c
diff --git a/mail/procmail/files/patch-aa b/mail/procmail/files/patch-Makefile
index 91a38924c475..91a38924c475 100644
--- a/mail/procmail/files/patch-aa
+++ b/mail/procmail/files/patch-Makefile
diff --git a/mail/procmail/files/patch-ae b/mail/procmail/files/patch-Makefile.1
index d314a6af2685..d314a6af2685 100644
--- a/mail/procmail/files/patch-ae
+++ b/mail/procmail/files/patch-Makefile.1
diff --git a/mail/procmail/files/patch-ab b/mail/procmail/files/patch-config.h
index b5bc1b48f429..b5bc1b48f429 100644
--- a/mail/procmail/files/patch-ab
+++ b/mail/procmail/files/patch-config.h
diff --git a/mail/procmail/files/patch-ac b/mail/procmail/files/patch-initmake
index e363e3ac83e7..e363e3ac83e7 100644
--- a/mail/procmail/files/patch-ac
+++ b/mail/procmail/files/patch-initmake
diff --git a/mail/procmail/files/patch-ah b/mail/procmail/files/patch-man-procmail.man
index c3a84f47d61f..c3a84f47d61f 100644
--- a/mail/procmail/files/patch-ah
+++ b/mail/procmail/files/patch-man-procmail.man
diff --git a/mail/procmail/files/patch-aj b/mail/procmail/files/patch-src-comsat.c
index 02d3e9a9ba74..02d3e9a9ba74 100644
--- a/mail/procmail/files/patch-aj
+++ b/mail/procmail/files/patch-src-comsat.c
diff --git a/mail/procmail/files/patch-ag b/mail/procmail/files/patch-src-manconf.c
index 1ec12acc25bd..1ec12acc25bd 100644
--- a/mail/procmail/files/patch-ag
+++ b/mail/procmail/files/patch-src-manconf.c
diff --git a/mail/procmail/files/patch-af b/mail/procmail/files/patch-src-pipes.c
index 1cfe9af851dd..1cfe9af851dd 100644
--- a/mail/procmail/files/patch-af
+++ b/mail/procmail/files/patch-src-pipes.c
diff --git a/mail/procmail/files/patch-ai b/mail/procmail/files/patch-src-procmail.c
index a267f97e9f87..a267f97e9f87 100644
--- a/mail/procmail/files/patch-ai
+++ b/mail/procmail/files/patch-src-procmail.c
diff --git a/mail/procmail/files/patch-ad b/mail/procmail/files/patch-src-recommend.c
index c73f9f9373cf..c73f9f9373cf 100644
--- a/mail/procmail/files/patch-ad
+++ b/mail/procmail/files/patch-src-recommend.c
diff --git a/mail/qpopper/files/patch-ac b/mail/qpopper/files/patch-man__popper.8
index e4b4db0e0768..e4b4db0e0768 100644
--- a/mail/qpopper/files/patch-ac
+++ b/mail/qpopper/files/patch-man__popper.8
diff --git a/mail/qpopper/files/patch-aa b/mail/qpopper/files/patch-popper__Makefile.in
index a5ca95186ebb..a5ca95186ebb 100644
--- a/mail/qpopper/files/patch-aa
+++ b/mail/qpopper/files/patch-popper__Makefile.in
diff --git a/mail/qpopper/files/patch-ar b/mail/qpopper/files/patch-popper__hmac.c
index 272aadbeccac..272aadbeccac 100644
--- a/mail/qpopper/files/patch-ar
+++ b/mail/qpopper/files/patch-popper__hmac.c
diff --git a/mail/qpopper/files/patch-ap b/mail/qpopper/files/patch-popper__popauth.8
index 009b38f3b1a4..009b38f3b1a4 100644
--- a/mail/qpopper/files/patch-ap
+++ b/mail/qpopper/files/patch-popper__popauth.8
diff --git a/mail/qpopper/files/patch-ao b/mail/qpopper/files/patch-popper__popauth.c
index c1cf86d50025..c1cf86d50025 100644
--- a/mail/qpopper/files/patch-ao
+++ b/mail/qpopper/files/patch-popper__popauth.c
diff --git a/mail/qpopper/files/patch-aq b/mail/qpopper/files/patch-popper__scram.c
index 79c1b59753c8..79c1b59753c8 100644
--- a/mail/qpopper/files/patch-aq
+++ b/mail/qpopper/files/patch-popper__scram.c
diff --git a/mail/rbl-milter/files/patch-aa b/mail/rbl-milter/files/patch-configure
index 743700ee030f..743700ee030f 100644
--- a/mail/rbl-milter/files/patch-aa
+++ b/mail/rbl-milter/files/patch-configure
diff --git a/mail/rblcheck/files/patch-aa b/mail/rblcheck/files/patch-rblcheck.c
index 3ab717674fb8..3ab717674fb8 100644
--- a/mail/rblcheck/files/patch-aa
+++ b/mail/rblcheck/files/patch-rblcheck.c
diff --git a/mail/rftp/files/patch-01 b/mail/rftp/files/patch-Makefile
index 30d18068fb8d..30d18068fb8d 100644
--- a/mail/rftp/files/patch-01
+++ b/mail/rftp/files/patch-Makefile
diff --git a/mail/sa-stats/files/patch-za b/mail/sa-stats/files/patch-sa-stats-1.0.txt
index f6ad8bbfbaa7..f6ad8bbfbaa7 100644
--- a/mail/sa-stats/files/patch-za
+++ b/mail/sa-stats/files/patch-sa-stats-1.0.txt
diff --git a/mail/sentinel/files/patch-aa b/mail/sentinel/files/patch-sentinel.c
index dc3328b409b3..dc3328b409b3 100644
--- a/mail/sentinel/files/patch-aa
+++ b/mail/sentinel/files/patch-sentinel.c
diff --git a/mail/serialmail/files/patch-aa b/mail/serialmail/files/patch-Makefile
index 9f0f32f9337b..9f0f32f9337b 100644
--- a/mail/serialmail/files/patch-aa
+++ b/mail/serialmail/files/patch-Makefile
diff --git a/mail/wmpop3/files/patch-aa b/mail/wmpop3/files/patch-Makefile
index 9fa92fb40294..9fa92fb40294 100644
--- a/mail/wmpop3/files/patch-aa
+++ b/mail/wmpop3/files/patch-Makefile
diff --git a/mail/wmpop3/files/patch-ab b/mail/wmpop3/files/patch-Pop3Client.c
index 177071a9d7c9..177071a9d7c9 100644
--- a/mail/wmpop3/files/patch-ab
+++ b/mail/wmpop3/files/patch-Pop3Client.c
diff --git a/mail/xlbiff/Makefile b/mail/xlbiff/Makefile
index 5f01316ea4d4..f71ca45d4829 100644
--- a/mail/xlbiff/Makefile
+++ b/mail/xlbiff/Makefile
@@ -6,12 +6,11 @@ PORTVERSION=	3.0
 PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	obrien@FreeBSD.org
 COMMENT=	The X Literate Biff - displays the from and subject from incoming mails
 
-USES=		imake
+USES=		imake tar:Z
 USE_XORG=	ice sm x11 xaw xext xmu xpm xt
 
 .include <bsd.port.mk>
diff --git a/mail/xlbiff/files/patch-01 b/mail/xlbiff/files/patch-Imakefile
index 6cb0f76a6a09..6cb0f76a6a09 100644
--- a/mail/xlbiff/files/patch-01
+++ b/mail/xlbiff/files/patch-Imakefile
diff --git a/mail/xlbiff/files/patch-02 b/mail/xlbiff/files/patch-xlbiff.man
index b7d34346b7b6..b7d34346b7b6 100644
--- a/mail/xlbiff/files/patch-02
+++ b/mail/xlbiff/files/patch-xlbiff.man
diff --git a/mail/xmail/files/patch-aa b/mail/xmail/files/patch-Imakefile
index fd65a954a33a..fd65a954a33a 100644
--- a/mail/xmail/files/patch-aa
+++ b/mail/xmail/files/patch-Imakefile
diff --git a/mail/xmail/files/patch-ac b/mail/xmail/files/patch-XMail.ad
index 514481fe10f9..514481fe10f9 100644
--- a/mail/xmail/files/patch-ac
+++ b/mail/xmail/files/patch-XMail.ad
diff --git a/mail/xmail/files/patch-ad b/mail/xmail/files/patch-callMail.c
index 53fcd326af4e..53fcd326af4e 100644
--- a/mail/xmail/files/patch-ad
+++ b/mail/xmail/files/patch-callMail.c
diff --git a/mail/xmail/files/patch-ab b/mail/xmail/files/patch-callbacks.c
index 2ccc84a8b246..2ccc84a8b246 100644
--- a/mail/xmail/files/patch-ab
+++ b/mail/xmail/files/patch-callbacks.c
diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
index 2b795398c65c..c4a8340a5a15 100644
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@@ -15,19 +15,15 @@ USE_XORG=	xaw
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/XMailbox.ad
 
 post-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/xmailbox
-	${INSTALL_DATA} ${WRKSRC}/dingdong.au ${STAGEDIR}${PREFIX}/share/xmailbox
-	${INSTALL_DATA} ${WRKSRC}/ugotmail.au ${STAGEDIR}${PREFIX}/share/xmailbox
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/xmailbox
-	${INSTALL_DATA} ${WRKSRC}/DISCLAIMER ${STAGEDIR}${PREFIX}/share/doc/xmailbox
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${PREFIX}/share/doc/xmailbox
-.endif
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/dingdong.au ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/ugotmail.au ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/DISCLAIMER ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/xmailbox/files/patch-aa b/mail/xmailbox/files/patch-Imakefile
index 52c02b2c4a1e..52c02b2c4a1e 100644
--- a/mail/xmailbox/files/patch-aa
+++ b/mail/xmailbox/files/patch-Imakefile
diff --git a/mail/xmailbox/files/patch-ad b/mail/xmailbox/files/patch-Mailbox.c
index 8730af0b6f0f..8730af0b6f0f 100644
--- a/mail/xmailbox/files/patch-ad
+++ b/mail/xmailbox/files/patch-Mailbox.c
diff --git a/mail/xmailbox/files/patch-ab b/mail/xmailbox/files/patch-MailboxP.h
index f87044adad2f..f87044adad2f 100644
--- a/mail/xmailbox/files/patch-ab
+++ b/mail/xmailbox/files/patch-MailboxP.h
diff --git a/mail/xmailbox/files/patch-ac b/mail/xmailbox/files/patch-XMailbox.ad
index fcdd7178f3a2..fcdd7178f3a2 100644
--- a/mail/xmailbox/files/patch-ac
+++ b/mail/xmailbox/files/patch-XMailbox.ad
diff --git a/mail/xmailbox/pkg-plist b/mail/xmailbox/pkg-plist
index 880c73caf33e..6dc441209947 100644
--- a/mail/xmailbox/pkg-plist
+++ b/mail/xmailbox/pkg-plist
@@ -1,9 +1,9 @@
 bin/xmailbox
 lib/X11/app-defaults/XMailbox
 man/man1/xmailbox.1.gz
-%%PORTDOCS%%share/doc/xmailbox/DISCLAIMER
-%%PORTDOCS%%share/doc/xmailbox/README
-share/xmailbox/dingdong.au
-share/xmailbox/ugotmail.au
-%%PORTDOCS%%@dirrm share/doc/xmailbox
-@dirrm share/xmailbox
+%%PORTDOCS%%%%DOCSDIR%%/DISCLAIMER
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%DATADIR%%/dingdong.au
+%%DATADIR%%/ugotmail.au
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%
diff --git a/mail/xmailwatcher/files/patch-aa b/mail/xmailwatcher/files/patch-box.c
index dfb562ea01f3..dfb562ea01f3 100644
--- a/mail/xmailwatcher/files/patch-aa
+++ b/mail/xmailwatcher/files/patch-box.c
diff --git a/mail/xpbiff/files/patch-ad b/mail/xpbiff/files/patch-Imakefile
index e199776d4d41..e199776d4d41 100644
--- a/mail/xpbiff/files/patch-ad
+++ b/mail/xpbiff/files/patch-Imakefile
diff --git a/mail/xpbiff/files/patch-ab b/mail/xpbiff/files/patch-StrToPmap.c
index 2bf6efa618c6..2bf6efa618c6 100644
--- a/mail/xpbiff/files/patch-ab
+++ b/mail/xpbiff/files/patch-StrToPmap.c
diff --git a/mail/xpbiff/files/patch-aa b/mail/xpbiff/files/patch-config.h
index 085a89f05d2d..085a89f05d2d 100644
--- a/mail/xpbiff/files/patch-aa
+++ b/mail/xpbiff/files/patch-config.h
diff --git a/mail/xpbiff/files/patch-ae b/mail/xpbiff/files/patch-xpbiff.c
index 0d36d557df4f..0d36d557df4f 100644
--- a/mail/xpbiff/files/patch-ae
+++ b/mail/xpbiff/files/patch-xpbiff.c