upgrade to smail 3.2.0.106

4 files changed, 32 insertions, 35 deletions

diff --git a/mail/smail/Makefile b/mail/smail/Makefile
index f0222325f0c7..c594b14fd518 100644
--- a/mail/smail/Makefile
+++ b/mail/smail/Makefile
@@ -3,10 +3,10 @@
 # Date created:		16 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.20 1998/01/25 20:45:14 torstenb Exp $
+# $Id: Makefile,v 1.21 1998/09/17 10:53:27 asami Exp $
 #
 
-DISTNAME=	smail-3.2.0.101
+DISTNAME=	smail-3.2.0.106
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.uu.net/networking/mail/smail/ \
 		ftp://ftp.planix.com/pub/Smail/ \
@@ -21,7 +21,7 @@ INSTALL_TARGET=	install installman
 
 MAN1=		pathto.1 uuwho.1 uupath.1
 MAN5=		smailconf.5 smail.5 smaildrct.5 smailmeth.5 smailqual.5 \
-		smailrtrs.5 smailrtry.5 smailtrns.5 
+		smailrtrs.5 smailrtry.5 smailtrns.5
 MAN8=		pathalias.8 mkdbm.8 mkline.8 mksort.8 mkaliases.8 smail.8 \
 		mkpath.8 pathmerge.8 checkerr.8 getmap.8 mkhpath.8 savelog.8 \
 		mkuuwho.8 mailq.8 sendmail.8 runq.8 rmail.8 rsmtp.8 smtpd.8
@@ -35,34 +35,34 @@ post-install:
 replace:
 	@echo "===> Replacing sendmail"
 	if [ -e /usr/sbin/sendmail ]; then \
-		mv -f /usr/sbin/sendmail /usr/sbin/sendmail.BAK; \
+		${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.BAK; \
 		if [ -f /usr/sbin/sendmail.BAK ]; then \
 			chmod 0 /usr/sbin/sendmail.BAK; \
 		fi;\
 	fi
-	if [ -e /usr/local/bin/smail ]; then \
-		cp -fp /usr/local/bin/smail /usr/sbin/sendmail; \
+	if [ -e ${PREFIX}/bin/smail ]; then \
+		cp -fp ${PREFIX}/bin/smail /usr/sbin/sendmail; \
 	fi
 	if [ -f /usr/sbin/mailstats ]; then \
 		chmod 0 /usr/sbin/mailstats; \
 	fi
 	if [ -e /usr/bin/newaliases ]; then \
-		mv -f /usr/bin/newaliases /usr/bin/newaliases.BAK; \
+		${MV} -f /usr/bin/newaliases /usr/bin/newaliases.BAK; \
 		if [ -f /usr/bin/newaliases.BAK ]; then \
 			chmod 0 /usr/bin/newaliases.BAK; \
 		fi;\
 	fi
-	if [ -e /usr/local/bin/newaliases ]; then \
-		cp -fp /usr/local/bin/newaliases /usr/bin/newaliases; \
+	if [ -e ${PREFIX}/bin/newaliases ]; then \
+		cp -fp ${PREFIX}/bin/newaliases /usr/bin/newaliases; \
 	fi
 	if [ -e /usr/bin/mailq ]; then \
-		mv -f /usr/bin/mailq /usr/bin/mailq.BAK; \
+		${MV} -f /usr/bin/mailq /usr/bin/mailq.BAK; \
 		if [ -f /usr/bin/mailq.BAK ]; then \
 			chmod 0 /usr/bin/mailq.BAK; \
 		fi;\
 	fi
-	if [ -e /usr/local/bin/mailq ]; then \
-		cp -fp /usr/local/bin/mailq /usr/bin/mailq; \
+	if [ -e ${PREFIX}/bin/mailq ]; then \
+		${CP} -fp ${PREFIX}/bin/mailq /usr/bin/mailq; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/mail/smail/distinfo b/mail/smail/distinfo
index 8a4bda212895..d58a0a843c78 100644
--- a/mail/smail/distinfo
+++ b/mail/smail/distinfo
@@ -1 +1 @@
-MD5 (smail-3.2.0.101.tar.gz) = c226371436819a0da18583218d8de844
+MD5 (smail-3.2.0.106.tar.gz) = dd67ddba9a38cb6b18be4ecfef8f21fe
diff --git a/mail/smail/files/freebsd2.0 b/mail/smail/files/freebsd2.0
index 7fd3db694553..c2aa1ef6336c 100644
--- a/mail/smail/files/freebsd2.0
+++ b/mail/smail/files/freebsd2.0
@@ -63,12 +63,12 @@ REWRITE_FILE=rewrite
 REWRITE_TYPE=lsearch
 
 # CPPFLAGS - interesting flags for the cpp, and cc commands
-CPPFLAGS="-I!!PREFIX!!/include"
+CPPFLAGS="-I. -I.. -I../src -I/usr/local/include -I!!PREFIX!!/include"
 
 CFLAGS="$CFLAGS -I!!PREFIX!!/include"
 
 # LDFLAGS - flags to pass to the loader
-LDFLAGS="-L!!PREFIX!!/lib"
+LDFLAGS="-L/usr/local/lib -L!!PREFIX!!/lib"
 
 # LIBS - libraries to include in binaries
 LIBS="-lident -lwrap"
diff --git a/mail/smail/pkg-plist b/mail/smail/pkg-plist
index 5e2c877f6c3a..7d221d686392 100644
--- a/mail/smail/pkg-plist
+++ b/mail/smail/pkg-plist
@@ -1,23 +1,7 @@
-bin/mailq
-bin/uuwho
-bin/mkaliases
-bin/smailbug
-bin/smail
-bin/pathto
-bin/uupath
-bin/runq
-bin/rsmtp
-bin/smtpd
-bin/newaliases
-bin/rmail
-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/bouncemail
 libexec/smail/mkpath
 libexec/smail/checkerr
 libexec/smail/getmap
@@ -26,7 +10,6 @@ libexec/smail/mkaliases
 libexec/smail/savelog
 libexec/smail/mkuuwho
 libexec/smail/mkhpath
-libexec/smail/mkaliases.O
 libexec/smail/smailbug
 libexec/smail/mkline
 libexec/smail/mksort
@@ -35,8 +18,22 @@ libexec/smail/mkdbm
 libexec/smail/pathmerge
 libexec/smail/gleem
 libexec/smail/unsharmap
-libexec/smail/smailbug.O
 libexec/smail/mkpath.awk
 libexec/smail/mkuuwho.awk
-man/man8/smailbug.8
+bin/uuwho
+bin/mkaliases
+bin/smailbug
+bin/mailq
+bin/smail
+bin/pathto
+bin/uupath
+bin/runq
+bin/rsmtp
+bin/smtpd
+bin/newaliases
+bin/rmail
+etc/smail/forcepaths
+etc/smail/COPYING
+etc/smail/forcesmtp
+etc/smail/paths
 sbin/sendmail