- Provide explicit support for sendmail 8.10 (same as 8.9), 8.11

  (new), and 8.12 (new).
- libexec/* -> libexec/bsmtp/*

6 files changed, 136 insertions, 13 deletions

diff --git a/mail/bsmtp/Makefile b/mail/bsmtp/Makefile
index 9a199323a038..50c8da64c718 100644
--- a/mail/bsmtp/Makefile
+++ b/mail/bsmtp/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	bsmtp
 PORTVERSION=	1.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.stud.uni-karlsruhe.de/~uk1o/bsmtp/
 
@@ -25,6 +25,10 @@ RUN_DEPENDS=	${LOCALBASE}/bin/uux:${PORTSDIR}/net/freebsd-uucp
 UUPREFIX=	${LOCALBASE}
 .endif
 
+post-patch:
+	@${CP} ${WRKSRC}/bsmtp.m4.8.9.in ${WRKSRC}/bsmtp.m4.8.10.in
+	@${CP} ${FILESDIR}/bsmtp.m4.*.in ${WRKSRC}/
+
 pre-configure:
 	@${SED} <${FILESDIR}/config.sed >${WRKSRC}/config.sed \
 		-e 's:%%CC%%:${CC}:' \
diff --git a/mail/bsmtp/files/bsmtp.m4.8.11.in b/mail/bsmtp/files/bsmtp.m4.8.11.in
new file mode 100644
index 000000000000..c68b1a2eb656
--- /dev/null
+++ b/mail/bsmtp/files/bsmtp.m4.8.11.in
@@ -0,0 +1,44 @@
+PUSHDIVERT(-1)
+# Copyright (c) 1995-1999 Hannah Schroeter <hannah@mamba.pond.sub.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer,
+#     either in a separate file included with the distribution, or
+#     copied into the source files.
+#  2. Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND HIS CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR HIS CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+ifdef(`BSMTP_MAILER_PATH',, `define(`BSMTP_MAILER_PATH', @PRIVBINDIR@/bsmtp)')
+POPDIVERT
+######################################
+###   BSMTP Mailer specification   ###
+######################################
+
+VERSIONID(`$FreeBSD$')
+
+ifdef(`_MAILER_smtp_', `
+Mbsmtp,		P=BSMTP_MAILER_PATH,
+		F=_MODMF_(CONCAT(_DEF_SMTP_MAILER_FLAGS, `n8', SMTP_MAILER_FLAGS), `BSMTP'),
+		S=EnvFromSMTP/HdrFromSMTP,
+		R=ifdef(`_ALL_MASQUERADE_', `EnvToSMTP/HdrFromSMTP', `EnvToSMTP'), E=\n, L=990,
+		_OPTINS(`SMTP_MAILER_MAX', `M=', `, ')_OPTINS(`SMTP_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`SMTP_MAILER_MAXRCPTS', `r=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `, ')T=X-UUCP/RFC822/X-Unix,
+		A=bsmtp -f $g $h $u',
+`errprint(`*** MAILER(`smtp') must appear before MAILER(`bsmtp')')
+')
diff --git a/mail/bsmtp/files/bsmtp.m4.8.12.in b/mail/bsmtp/files/bsmtp.m4.8.12.in
new file mode 100644
index 000000000000..975fdcae711a
--- /dev/null
+++ b/mail/bsmtp/files/bsmtp.m4.8.12.in
@@ -0,0 +1,45 @@
+PUSHDIVERT(-1)
+# Copyright (c) 1995-1999 Hannah Schroeter <hannah@mamba.pond.sub.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer,
+#     either in a separate file included with the distribution, or
+#     copied into the source files.
+#  2. Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND HIS CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR HIS CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+ifdef(`BSMTP_MAILER_PATH',, `define(`BSMTP_MAILER_PATH', @PRIVBINDIR@/bsmtp)')
+define(`_BSMTP_QGRP', `ifelse(defn(`BSMTP_MAILER_QGRP'),`',`', ` Q=BSMTP_MAILER_QGRP,')')dnl
+POPDIVERT
+######################################
+###   BSMTP Mailer specification   ###
+######################################
+
+VERSIONID(`$FreeBSD$')
+
+ifdef(`_MAILER_smtp_', `
+Mbsmtp,		P=BSMTP_MAILER_PATH,
+		F=_MODMF_(CONCAT(_DEF_SMTP_MAILER_FLAGS, `n8', SMTP_MAILER_FLAGS), `BSMTP'),
+		S=EnvFromSMTP/HdrFromSMTP,
+		R=ifdef(`_ALL_MASQUERADE_', `EnvToSMTP/HdrFromSMTP', `EnvToSMTP'), E=\n, L=990,
+		_OPTINS(`SMTP_MAILER_MAX', `M=', `, ')_OPTINS(`SMTP_MAILER_MAXMSGS', `m=', `, ')_OPTINS(`SMTP_MAILER_MAXRCPTS', `r=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `, ')T=X-UUCP/RFC822/X-Unix,_BSMTP_QGRP
+		A=bsmtp -f $g $h $u',
+`errprint(`*** MAILER(`smtp') must appear before MAILER(`bsmtp')')
+')
diff --git a/mail/bsmtp/files/config.sed b/mail/bsmtp/files/config.sed
index d083dc5d4624..1c90cb181839 100644
--- a/mail/bsmtp/files/config.sed
+++ b/mail/bsmtp/files/config.sed
@@ -8,7 +8,7 @@ s,@COMPRESS@,/usr/bin/compress,
 s,@UUX@,%%UUPREFIX%%/bin/uux,
 s,@SENDMAIL@,/usr/sbin/sendmail,
 s,@CFLAGS@,%%CFLAGS%%,
-s,@PRIVBINDIR@,%%PREFIX%%/libexec,
+s,@PRIVBINDIR@,%%PREFIX%%/libexec/bsmtp,
 s,@PUBBINDIR@,%%PREFIX%%/bin,
 s,@MAILERDIR@,%%PREFIX%%/share/sendmail,
 s,@BINUSR@,root,
@@ -17,12 +17,12 @@ s,@QUEUEDIR@,/var/spool/bsmtp,
 s,@DAEMONUSER@,uucp,
 s,@DAEMONGID@,66,
 s,@DAEMONUID@,66,
-s,@INPROTO@,bsmtp,
+s,@INPROTO@,BSMTP,
 s,@LOCALHOSTNAME@,`hostname`,
 s,@DOMAINSUFFIX@,none,
-s,@SENDMAILVERS@,8.9,
+s,@SENDMAILVERS@,8.11,
 s,@INSTALLMAILER@,true,
-s,@MAILERVERSION@,8.9,
+s,@MAILERVERSION@,8.11,
 s,@FLOCK@,true,
 s,@LOCKDEFINE@,-DUSE_FLOCK,
 s,@BATCHER@,batcher.new,
diff --git a/mail/bsmtp/files/patch-configure b/mail/bsmtp/files/patch-configure
new file mode 100644
index 000000000000..096a7de0a43f
--- /dev/null
+++ b/mail/bsmtp/files/patch-configure
@@ -0,0 +1,29 @@
+
+$FreeBSD$
+
+--- configure.orig	Fri Feb 22 17:30:58 2002
++++ configure	Fri Feb 22 17:32:13 2002
+@@ -41,6 +41,10 @@
+   "batcher",
+   "batcher.c",
+   "bsmtp.c",
++  "bsmtp.m4.8.12",
++  "bsmtp.m4.8.11",
++  "bsmtp.m4.8.10",
++  "bsmtp.m4.8.9",
+   "bsmtp.m4.8.9",
+   "bsmtp.m4.8.8",
+   "bsmtp.m4.8.7",
+@@ -198,6 +202,12 @@
+ 	    $default[$i] = '8.8';
+ 	  } elsif ($value{'@SENDMAILVERS@'} =~ /^\s*8\.9(\..*)?\s*$/) {
+ 	    $default[$i] = '8.9';
++	  } elsif ($value{'@SENDMAILVERS@'} =~ /^\s*8\.10(\..*)?\s*$/) {
++	    $default[$i] = '8.10';
++	  } elsif ($value{'@SENDMAILVERS@'} =~ /^\s*8\.11(\..*)?\s*$/) {
++	    $default[$i] = '8.11';
++	  } elsif ($value{'@SENDMAILVERS@'} =~ /^\s*8\.12(\..*)?\s*$/) {
++	    $default[$i] = '8.12';
+ 	  } else {
+ 	    $default[$i] = ''; # Will not be installed
+ 	  }
diff --git a/mail/bsmtp/pkg-plist b/mail/bsmtp/pkg-plist
index ec181b48113d..f154daf89924 100644
--- a/mail/bsmtp/pkg-plist
+++ b/mail/bsmtp/pkg-plist
@@ -7,16 +7,17 @@ bin/crsmtp
 bin/rcsmtp
 bin/rgsmtp
 bin/rsmtp
-libexec/batcher
-libexec/bsmtp
-libexec/rsmtp
-libexec/transmitter.c-cbsmtp
-libexec/transmitter.c-rcsmtp
-libexec/transmitter.g-rcsmtp
-libexec/transmitter.g-rgsmtp
-libexec/transmitter.n-rsmtp
+libexec/bsmtp/batcher
+libexec/bsmtp/bsmtp
+libexec/bsmtp/rsmtp
+libexec/bsmtp/transmitter.c-cbsmtp
+libexec/bsmtp/transmitter.c-rcsmtp
+libexec/bsmtp/transmitter.g-rcsmtp
+libexec/bsmtp/transmitter.g-rgsmtp
+libexec/bsmtp/transmitter.n-rsmtp
 share/doc/bsmtp/README
 share/sendmail/bsmtp.m4
+@dirrm libexec/bsmtp
 @dirrm share/doc/bsmtp
 @dirrm share/sendmail
 @exec mkdir -pm 770 /var/spool/bsmtp; chown uucp:uucp /var/spool/bsmtp