summaryrefslogtreecommitdiff
path: root/mail/bsmtp/files
diff options
context:
space:
mode:
Diffstat (limited to 'mail/bsmtp/files')
-rw-r--r--mail/bsmtp/files/config.sed8
-rw-r--r--mail/bsmtp/files/patch-Makefile.in14
-rw-r--r--mail/bsmtp/files/patch-configure8
-rw-r--r--mail/bsmtp/files/patch-rsmtp.in6
4 files changed, 11 insertions, 25 deletions
diff --git a/mail/bsmtp/files/config.sed b/mail/bsmtp/files/config.sed
index 47dad38823a7..b5b349720951 100644
--- a/mail/bsmtp/files/config.sed
+++ b/mail/bsmtp/files/config.sed
@@ -3,9 +3,9 @@ s,@CC@,%%CC%%,
s,@INSTALL@,/usr/bin/install,
s,@SH@,/bin/sh,
s,@GZIP@,/usr/bin/gzip,
-s,@PERL@,/usr/bin/perl,
+s,@PERL@,%%PERL%%,
s,@COMPRESS@,/usr/bin/compress,
-s,@UUX@,%%UUPREFIX%%/bin/uux,
+s,@UUX@,%%LOCALBASE%%/bin/uux,
s,@SENDMAIL@,/usr/sbin/sendmail,
s,@CFLAGS@,%%CFLAGS%%,
s,@PRIVBINDIR@,%%PREFIX%%/libexec/bsmtp,
@@ -20,9 +20,9 @@ s,@DAEMONUID@,66,
s,@INPROTO@,BSMTP,
s,@LOCALHOSTNAME@,`hostname`,
s,@DOMAINSUFFIX@,none,
-s,@SENDMAILVERS@,8.13,
+s,@SENDMAILVERS@,8.14,
s,@INSTALLMAILER@,true,
-s,@MAILERVERSION@,8.13,
+s,@MAILERVERSION@,8.14,
s,@FLOCK@,true,
s,@LOCKDEFINE@,-DUSE_FLOCK,
s,@BATCHER@,batcher.new,
diff --git a/mail/bsmtp/files/patch-Makefile.in b/mail/bsmtp/files/patch-Makefile.in
deleted file mode 100644
index 824efaee8cdc..000000000000
--- a/mail/bsmtp/files/patch-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig Thu Sep 5 15:38:26 2002
-+++ Makefile.in Thu Sep 5 15:38:51 2002
-@@ -103,7 +103,7 @@
- mkdir -p $(mailerdir) || mkdir $(mailerdir) || exit 0 ; \
- chown $(binusr) $(mailerdir) ; \
- chgrp $(bingrp) $(mailerdir) ; \
-- chmod 644 $(mailerdir) ; \
-+ chmod 755 $(mailerdir) ; \
- fi
- $(install) -c -o $(binusr) -g $(bingrp) -m 555 $(batcher) \
- $(privbin)/batcher || ( cp $(batcher) /tmp/batcher && \
diff --git a/mail/bsmtp/files/patch-configure b/mail/bsmtp/files/patch-configure
index 56ff15c81d87..22b7e859c2d8 100644
--- a/mail/bsmtp/files/patch-configure
+++ b/mail/bsmtp/files/patch-configure
@@ -1,9 +1,9 @@
$FreeBSD$
---- configure.orig
-+++ configure
-@@ -41,6 +41,11 @@
+--- configure.orig 2013-11-01 19:55:42.000000000 +0100
++++ configure 2013-11-01 19:55:42.000000000 +0100
+@@ -41,6 +41,11 @@ if ($#ARGV == 0) {
"batcher",
"batcher.c",
"bsmtp.c",
@@ -15,7 +15,7 @@ $FreeBSD$
"bsmtp.m4.8.9",
"bsmtp.m4.8.8",
"bsmtp.m4.8.7",
-@@ -198,6 +203,16 @@
+@@ -198,6 +203,16 @@ if (! $redo) {
$default[$i] = '8.8';
} elsif ($value{'@SENDMAILVERS@'} =~ /^\s*8\.9(\..*)?\s*$/) {
$default[$i] = '8.9';
diff --git a/mail/bsmtp/files/patch-rsmtp.in b/mail/bsmtp/files/patch-rsmtp.in
index c8be41aa310d..af3b0de0f65d 100644
--- a/mail/bsmtp/files/patch-rsmtp.in
+++ b/mail/bsmtp/files/patch-rsmtp.in
@@ -1,9 +1,9 @@
$FreeBSD$
---- rsmtp.in.orig
-+++ rsmtp.in
-@@ -72,7 +72,7 @@
+--- rsmtp.in.orig 1999-05-16 11:24:09.000000000 +0200
++++ rsmtp.in 2013-11-01 19:55:42.000000000 +0100
+@@ -72,7 +72,7 @@ while (<>) {
print STDERR "Recipient: $r\n" if ($debug);
push (@recipients, $r);
}