4 files changed, 37 insertions, 24 deletions

diff --git a/mail/smail/Makefile b/mail/smail/Makefile
index bb2eb7997060..c3703e24f9c1 100644
--- a/mail/smail/Makefile
+++ b/mail/smail/Makefile
@@ -3,12 +3,13 @@
 # Date created:		16 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.18 1997/10/15 09:16:03 torstenb Exp $
+# $Id: Makefile,v 1.19 1997/10/15 09:38:57 torstenb Exp $
 #
 
-DISTNAME=	smail-3.2.0.97
+DISTNAME=	smail-3.2.0.101
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.uu.net/networking/mail/smail/ \
+		ftp://ftp.planix.com/pub/Smail/ \
 		ftp://ftp.fu-berlin.de/unix/mail/smail/
 
 MAINTAINER=	torstenb@FreeBSD.ORG
diff --git a/mail/smail/distinfo b/mail/smail/distinfo
index 352f42662f0a..8a4bda212895 100644
--- a/mail/smail/distinfo
+++ b/mail/smail/distinfo
@@ -1 +1 @@
-MD5 (smail-3.2.0.97.tar.gz) = b548c6b250017c8d6f9639f7469d6f11
+MD5 (smail-3.2.0.101.tar.gz) = c226371436819a0da18583218d8de844
diff --git a/mail/smail/files/freebsd2.0 b/mail/smail/files/freebsd2.0
index 6660d13eec4c..7fd3db694553 100644
--- a/mail/smail/files/freebsd2.0
+++ b/mail/smail/files/freebsd2.0
@@ -58,6 +58,10 @@ FORCE_PATHS_TYPE=lsearch
 FORCE_SMTP_FILE=forcesmtp
 FORCE_SMTP_TYPE=lsearch
 
+# Rewrite File
+REWRITE_FILE=rewrite
+REWRITE_TYPE=lsearch
+
 # CPPFLAGS - interesting flags for the cpp, and cc commands
 CPPFLAGS="-I!!PREFIX!!/include"
 
@@ -69,4 +73,4 @@ LDFLAGS="-L!!PREFIX!!/lib"
 # LIBS - libraries to include in binaries
 LIBS="-lident -lwrap"
 
-MISC_DEFINES="$MISC_DEFINES:USE_TARGET_DOMAIN:NO_FORWARDTO_FILE"
+MISC_DEFINES="$MISC_DEFINES:USE_TARGET_DOMAIN:NO_FORWARDTO_FILE:USE_LSEARCH_REGEXCMP:USE_STRICT_MX"
diff --git a/mail/smail/pkg-plist b/mail/smail/pkg-plist
index 037a1d8e49fd..3ae06ed09a57 100644
--- a/mail/smail/pkg-plist
+++ b/mail/smail/pkg-plist
@@ -1,6 +1,7 @@
 bin/mailq
 bin/uuwho
 bin/mkaliases
+bin/smailbug
 bin/smail
 bin/pathto
 bin/uupath
@@ -9,56 +10,63 @@ bin/rsmtp
 bin/smtpd
 bin/newaliases
 bin/rmail
-sbin/sendmail
-libexec/smail/mkpath.awk
+etc/smail/forcepaths
+etc/smail/COPYING
+etc/smail/forcesmtp
+etc/smail/paths
+libexec/smail/bouncemail
 libexec/smail/getopt
 libexec/smail/pathalias
 libexec/smail/makedb
-libexec/smail/mkline
-libexec/smail/mksort
-libexec/smail/dcasehost
-libexec/smail/mkdbm
 libexec/smail/mkpath
-libexec/smail/pathmerge
 libexec/smail/checkerr
 libexec/smail/getmap
-libexec/smail/gleem
 libexec/smail/logsumm
-libexec/smail/unsharmap
+libexec/smail/mkaliases
 libexec/smail/savelog
 libexec/smail/mkuuwho
 libexec/smail/mkhpath
+libexec/smail/mkaliases.O
 libexec/smail/smailbug
-libexec/smail/mkaliases
+libexec/smail/mkline
+libexec/smail/mksort
+libexec/smail/dcasehost
+libexec/smail/mkdbm
+libexec/smail/pathmerge
+libexec/smail/gleem
+libexec/smail/unsharmap
+libexec/smail/smailbug.O
+libexec/smail/mkpath.awk
 libexec/smail/mkuuwho.awk
-etc/smail/COPYING
 man/man1/pathto.1.gz
 man/man1/uuwho.1.gz
 man/man1/uupath.1.gz
-man/man5/smailconf.5.gz
 man/man5/smail.5.gz
 man/man5/smaildrct.5.gz
-man/man5/smailmeth.5.gz
+man/man5/smailconf.5.gz
 man/man5/smailqual.5.gz
 man/man5/smailrtrs.5.gz
 man/man5/smailrtry.5.gz
 man/man5/smailtrns.5.gz
+man/man5/smailmeth.5.gz
 man/man8/pathalias.8.gz
-man/man8/mkdbm.8.gz
 man/man8/mkline.8.gz
 man/man8/mksort.8.gz
 man/man8/mkaliases.8.gz
+man/man8/mkdbm.8.gz
 man/man8/smail.8.gz
-man/man8/mkpath.8.gz
-man/man8/pathmerge.8.gz
-man/man8/checkerr.8.gz
 man/man8/getmap.8.gz
-man/man8/mkhpath.8.gz
-man/man8/savelog.8.gz
 man/man8/mkuuwho.8.gz
 man/man8/mailq.8.gz
-man/man8/sendmail.8.gz
+man/man8/smailbug.8
 man/man8/runq.8.gz
 man/man8/rmail.8.gz
 man/man8/rsmtp.8.gz
 man/man8/smtpd.8.gz
+man/man8/mkpath.8.gz
+man/man8/pathmerge.8.gz
+man/man8/checkerr.8.gz
+man/man8/mkhpath.8.gz
+man/man8/savelog.8.gz
+man/man8/sendmail.8.gz
+sbin/sendmail