1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-22 20:41:26 +00:00

Use perl expression to fix path to sendmail rather than using

plain patches for each case.

Also fix some whitespace.

Suggested by: nectar, lioux
This commit is contained in:
Alexey Zelkin 2001-12-20 17:55:20 +00:00
parent 5602c5d82a
commit 54b7c3fb35
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=51896
27 changed files with 39 additions and 336 deletions

View File

@ -40,21 +40,22 @@ PERL_SITEDIR= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
BUGZILLADIR= ${PREFIX}/www/data.default/bugzilla
BUGZILLADOCS= html images txt rel_notes.txt
BONSAIPERLWC= *.cgi *.pl *.pm processmail syncshadowdb
BONSAIPERLWC= *.cgi *.pl *.pm processmail syncshadowdb contrib/*.pl
SENDMAILWC= *.pl *.pm processmail contrib/*.pl
pre-everything::
@${ECHO_MSG} ""
@${ECHO_MSG} "You may use the following options:"
@${ECHO_MSG} ""
@${ECHO_MSG} " WITHOUT_BUG_CHARTING_MODULES do not install perl modules required for bug"
@${ECHO_MSG} " charting support"
@${ECHO_MSG} " WITHOUT_BUG_CHARTING_MODULES do not install perl modules required for bug"
@${ECHO_MSG} " charting support"
@${ECHO_MSG} ""
@${ECHO_MSG} " WITH_BUG_MAILING_MODULES install perl modules required for bug"
@${ECHO_MSG} " mailing support (contrib/bug_email.pl) interface"
@${ECHO_MSG} " WITH_BUG_MAILING_MODULES install perl modules required for bug mailing"
@${ECHO_MSG} " support (contrib/bug_email.pl) interface"
@${ECHO_MSG} ""
@${ECHO_MSG} " WITH_BUG_EXPORT_AND_IMPORT install perl modules required for bug"
@${ECHO_MSG} " export/import feature to move bugs to or from"
@${ECHO_MSG} " other bugzilla installations"
@${ECHO_MSG} " WITH_BUG_EXPORT_AND_IMPORT install perl modules required for bug"
@${ECHO_MSG} " export/import feature to move bugs to or from"
@${ECHO_MSG} " other bugzilla installations"
@${ECHO_MSG} ""
post-patch:
@ -67,6 +68,10 @@ post-patch:
@${PERL} -pi -e 's@#!/usr/bonsaitools/bin/perl@#!/usr/bin/perl@' \
${WRKSRC}/$i
.endfor
.for i in ${SENDMAILWC}
@${PERL} -pi -e 's@/usr/lib/sendmail@/usr/sbin/sendmail@' \
${WRKSRC}/$i
.endfor
pre-install:
@find ${WRKSRC}/docs -type d -exec ${CHMOD} 755 {} \;

View File

@ -1,11 +0,0 @@
--- contrib/mysqld-watcher.pl~ Mon Dec 17 20:38:32 2001
+++ contrib/mysqld-watcher.pl Mon Dec 17 20:38:41 2001
@@ -40,7 +40,7 @@
#
# mail transfer agent. this should probably really be converted to a Param().
#
-my $mta_program = "/usr/lib/sendmail -t -ODeliveryMode=deferred";
+my $mta_program = "/usr/sbin/sendmail -t -ODeliveryMode=deferred";
# and STDIN is where we get the info about running threads
#

View File

@ -1,12 +0,0 @@
diff -u CGI.pl~ CGI.pl
--- CGI.pl~ Mon Dec 17 20:32:31 2001
+++ CGI.pl Mon Dec 17 20:33:02 2001
@@ -735,7 +735,7 @@
"login" => $login,
"password" => $password});
- open SENDMAIL, "|/usr/lib/sendmail -t";
+ open SENDMAIL, "|/usr/sbin/sendmail -t";
print SENDMAIL $msg;
close SENDMAIL;

View File

@ -1,21 +0,0 @@
diff -u Token.pm~ Token.pm
--- Token.pm~ Mon Dec 17 20:32:32 2001
+++ Token.pm Mon Dec 17 20:34:20 2001
@@ -102,7 +102,7 @@
my $emailsuffix = &::Param('emailsuffix');
$token = &::url_quote($token);
- open SENDMAIL, "|/usr/lib/sendmail -t";
+ open SENDMAIL, "|/usr/sbin/sendmail -t";
print SENDMAIL qq|From: bugzilla-daemon
To: $emailaddress$emailsuffix
@@ -145,7 +145,7 @@
my $username = $realname ? $realname . " <" . $loginname . ">" : $loginname;
# Notify the user via email about the cancellation.
- open SENDMAIL, "|/usr/lib/sendmail -t";
+ open SENDMAIL, "|/usr/sbin/sendmail -t";
print SENDMAIL qq|From: bugzilla-daemon
To: $username
Subject: "$tokentype" token cancelled

View File

@ -1,12 +0,0 @@
diff -u globals.pl~ globals.pl
--- globals.pl~ Mon Dec 17 20:32:32 2001
+++ globals.pl Mon Dec 17 20:34:30 2001
@@ -1243,7 +1243,7 @@
if (Param('sendmailnow')) {
$sendmailparm = '';
}
- if (open(SENDMAIL, "|/usr/lib/sendmail $sendmailparm -t")) {
+ if (open(SENDMAIL, "|/usr/sbin/sendmail $sendmailparm -t")) {
my %substs;
$substs{"to"} = $name;

View File

@ -1,12 +0,0 @@
diff -u importxml.pl~ importxml.pl
--- importxml.pl~ Mon Dec 17 20:32:32 2001
+++ importxml.pl Mon Dec 17 20:34:34 2001
@@ -108,7 +108,7 @@
$header.= "Subject: $subject\n\n";
open(SENDMAIL,
- "|/usr/lib/sendmail -ODeliveryMode=background -t") ||
+ "|/usr/sbin/sendmail -ODeliveryMode=background -t") ||
die "Can't open sendmail";
print SENDMAIL $header . $message . "\n";
close SENDMAIL;

View File

@ -1,12 +0,0 @@
diff -u move.pl~ move.pl
--- move.pl~ Mon Dec 17 20:32:32 2001
+++ move.pl Mon Dec 17 20:34:43 2001
@@ -147,7 +147,7 @@
$msg .= $xml . "\n";
open(SENDMAIL,
- "|/usr/lib/sendmail -ODeliveryMode=background -t") ||
+ "|/usr/sbin/sendmail -ODeliveryMode=background -t") ||
die "Can't open sendmail";
print SENDMAIL $msg;
close SENDMAIL;

View File

@ -1,12 +0,0 @@
diff -u processmail~ processmail
--- processmail~ Mon Dec 17 20:32:32 2001
+++ processmail Mon Dec 17 20:34:47 2001
@@ -742,7 +742,7 @@
}
if ($enableSendMail == 1) {
- open(SENDMAIL, "|/usr/lib/sendmail $sendmailparam -t") ||
+ open(SENDMAIL, "|/usr/sbin/sendmail $sendmailparam -t") ||
die "Can't open sendmail";
print SENDMAIL trim($msg) . "\n";

View File

@ -1,12 +0,0 @@
diff -u whineatnews.pl~ whineatnews.pl
--- whineatnews.pl~ Mon Dec 17 20:32:33 2001
+++ whineatnews.pl Mon Dec 17 20:33:18 2001
@@ -62,7 +62,7 @@
foreach my $i (@{$bugs{$email}}) {
$msg .= " ${urlbase}show_bug.cgi?id=$i\n"
}
- open(SENDMAIL, "|/usr/lib/sendmail -t") || die "Can't open sendmail";
+ open(SENDMAIL, "|/usr/sbin/sendmail -t") || die "Can't open sendmail";
print SENDMAIL $msg;
close SENDMAIL;
print "$email " . join(" ", @{$bugs{$email}}) . "\n";

View File

@ -40,21 +40,22 @@ PERL_SITEDIR= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
BUGZILLADIR= ${PREFIX}/www/data.default/bugzilla
BUGZILLADOCS= html images txt rel_notes.txt
BONSAIPERLWC= *.cgi *.pl *.pm processmail syncshadowdb
BONSAIPERLWC= *.cgi *.pl *.pm processmail syncshadowdb contrib/*.pl
SENDMAILWC= *.pl *.pm processmail contrib/*.pl
pre-everything::
@${ECHO_MSG} ""
@${ECHO_MSG} "You may use the following options:"
@${ECHO_MSG} ""
@${ECHO_MSG} " WITHOUT_BUG_CHARTING_MODULES do not install perl modules required for bug"
@${ECHO_MSG} " charting support"
@${ECHO_MSG} " WITHOUT_BUG_CHARTING_MODULES do not install perl modules required for bug"
@${ECHO_MSG} " charting support"
@${ECHO_MSG} ""
@${ECHO_MSG} " WITH_BUG_MAILING_MODULES install perl modules required for bug"
@${ECHO_MSG} " mailing support (contrib/bug_email.pl) interface"
@${ECHO_MSG} " WITH_BUG_MAILING_MODULES install perl modules required for bug mailing"
@${ECHO_MSG} " support (contrib/bug_email.pl) interface"
@${ECHO_MSG} ""
@${ECHO_MSG} " WITH_BUG_EXPORT_AND_IMPORT install perl modules required for bug"
@${ECHO_MSG} " export/import feature to move bugs to or from"
@${ECHO_MSG} " other bugzilla installations"
@${ECHO_MSG} " WITH_BUG_EXPORT_AND_IMPORT install perl modules required for bug"
@${ECHO_MSG} " export/import feature to move bugs to or from"
@${ECHO_MSG} " other bugzilla installations"
@${ECHO_MSG} ""
post-patch:
@ -67,6 +68,10 @@ post-patch:
@${PERL} -pi -e 's@#!/usr/bonsaitools/bin/perl@#!/usr/bin/perl@' \
${WRKSRC}/$i
.endfor
.for i in ${SENDMAILWC}
@${PERL} -pi -e 's@/usr/lib/sendmail@/usr/sbin/sendmail@' \
${WRKSRC}/$i
.endfor
pre-install:
@find ${WRKSRC}/docs -type d -exec ${CHMOD} 755 {} \;

View File

@ -1,11 +0,0 @@
--- contrib/mysqld-watcher.pl~ Mon Dec 17 20:38:32 2001
+++ contrib/mysqld-watcher.pl Mon Dec 17 20:38:41 2001
@@ -40,7 +40,7 @@
#
# mail transfer agent. this should probably really be converted to a Param().
#
-my $mta_program = "/usr/lib/sendmail -t -ODeliveryMode=deferred";
+my $mta_program = "/usr/sbin/sendmail -t -ODeliveryMode=deferred";
# and STDIN is where we get the info about running threads
#

View File

@ -1,12 +0,0 @@
diff -u CGI.pl~ CGI.pl
--- CGI.pl~ Mon Dec 17 20:32:31 2001
+++ CGI.pl Mon Dec 17 20:33:02 2001
@@ -735,7 +735,7 @@
"login" => $login,
"password" => $password});
- open SENDMAIL, "|/usr/lib/sendmail -t";
+ open SENDMAIL, "|/usr/sbin/sendmail -t";
print SENDMAIL $msg;
close SENDMAIL;

View File

@ -1,21 +0,0 @@
diff -u Token.pm~ Token.pm
--- Token.pm~ Mon Dec 17 20:32:32 2001
+++ Token.pm Mon Dec 17 20:34:20 2001
@@ -102,7 +102,7 @@
my $emailsuffix = &::Param('emailsuffix');
$token = &::url_quote($token);
- open SENDMAIL, "|/usr/lib/sendmail -t";
+ open SENDMAIL, "|/usr/sbin/sendmail -t";
print SENDMAIL qq|From: bugzilla-daemon
To: $emailaddress$emailsuffix
@@ -145,7 +145,7 @@
my $username = $realname ? $realname . " <" . $loginname . ">" : $loginname;
# Notify the user via email about the cancellation.
- open SENDMAIL, "|/usr/lib/sendmail -t";
+ open SENDMAIL, "|/usr/sbin/sendmail -t";
print SENDMAIL qq|From: bugzilla-daemon
To: $username
Subject: "$tokentype" token cancelled

View File

@ -1,12 +0,0 @@
diff -u globals.pl~ globals.pl
--- globals.pl~ Mon Dec 17 20:32:32 2001
+++ globals.pl Mon Dec 17 20:34:30 2001
@@ -1243,7 +1243,7 @@
if (Param('sendmailnow')) {
$sendmailparm = '';
}
- if (open(SENDMAIL, "|/usr/lib/sendmail $sendmailparm -t")) {
+ if (open(SENDMAIL, "|/usr/sbin/sendmail $sendmailparm -t")) {
my %substs;
$substs{"to"} = $name;

View File

@ -1,12 +0,0 @@
diff -u importxml.pl~ importxml.pl
--- importxml.pl~ Mon Dec 17 20:32:32 2001
+++ importxml.pl Mon Dec 17 20:34:34 2001
@@ -108,7 +108,7 @@
$header.= "Subject: $subject\n\n";
open(SENDMAIL,
- "|/usr/lib/sendmail -ODeliveryMode=background -t") ||
+ "|/usr/sbin/sendmail -ODeliveryMode=background -t") ||
die "Can't open sendmail";
print SENDMAIL $header . $message . "\n";
close SENDMAIL;

View File

@ -1,12 +0,0 @@
diff -u move.pl~ move.pl
--- move.pl~ Mon Dec 17 20:32:32 2001
+++ move.pl Mon Dec 17 20:34:43 2001
@@ -147,7 +147,7 @@
$msg .= $xml . "\n";
open(SENDMAIL,
- "|/usr/lib/sendmail -ODeliveryMode=background -t") ||
+ "|/usr/sbin/sendmail -ODeliveryMode=background -t") ||
die "Can't open sendmail";
print SENDMAIL $msg;
close SENDMAIL;

View File

@ -1,12 +0,0 @@
diff -u processmail~ processmail
--- processmail~ Mon Dec 17 20:32:32 2001
+++ processmail Mon Dec 17 20:34:47 2001
@@ -742,7 +742,7 @@
}
if ($enableSendMail == 1) {
- open(SENDMAIL, "|/usr/lib/sendmail $sendmailparam -t") ||
+ open(SENDMAIL, "|/usr/sbin/sendmail $sendmailparam -t") ||
die "Can't open sendmail";
print SENDMAIL trim($msg) . "\n";

View File

@ -1,12 +0,0 @@
diff -u whineatnews.pl~ whineatnews.pl
--- whineatnews.pl~ Mon Dec 17 20:32:33 2001
+++ whineatnews.pl Mon Dec 17 20:33:18 2001
@@ -62,7 +62,7 @@
foreach my $i (@{$bugs{$email}}) {
$msg .= " ${urlbase}show_bug.cgi?id=$i\n"
}
- open(SENDMAIL, "|/usr/lib/sendmail -t") || die "Can't open sendmail";
+ open(SENDMAIL, "|/usr/sbin/sendmail -t") || die "Can't open sendmail";
print SENDMAIL $msg;
close SENDMAIL;
print "$email " . join(" ", @{$bugs{$email}}) . "\n";

View File

@ -40,21 +40,22 @@ PERL_SITEDIR= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
BUGZILLADIR= ${PREFIX}/www/data.default/bugzilla
BUGZILLADOCS= html images txt rel_notes.txt
BONSAIPERLWC= *.cgi *.pl *.pm processmail syncshadowdb
BONSAIPERLWC= *.cgi *.pl *.pm processmail syncshadowdb contrib/*.pl
SENDMAILWC= *.pl *.pm processmail contrib/*.pl
pre-everything::
@${ECHO_MSG} ""
@${ECHO_MSG} "You may use the following options:"
@${ECHO_MSG} ""
@${ECHO_MSG} " WITHOUT_BUG_CHARTING_MODULES do not install perl modules required for bug"
@${ECHO_MSG} " charting support"
@${ECHO_MSG} " WITHOUT_BUG_CHARTING_MODULES do not install perl modules required for bug"
@${ECHO_MSG} " charting support"
@${ECHO_MSG} ""
@${ECHO_MSG} " WITH_BUG_MAILING_MODULES install perl modules required for bug"
@${ECHO_MSG} " mailing support (contrib/bug_email.pl) interface"
@${ECHO_MSG} " WITH_BUG_MAILING_MODULES install perl modules required for bug mailing"
@${ECHO_MSG} " support (contrib/bug_email.pl) interface"
@${ECHO_MSG} ""
@${ECHO_MSG} " WITH_BUG_EXPORT_AND_IMPORT install perl modules required for bug"
@${ECHO_MSG} " export/import feature to move bugs to or from"
@${ECHO_MSG} " other bugzilla installations"
@${ECHO_MSG} " WITH_BUG_EXPORT_AND_IMPORT install perl modules required for bug"
@${ECHO_MSG} " export/import feature to move bugs to or from"
@${ECHO_MSG} " other bugzilla installations"
@${ECHO_MSG} ""
post-patch:
@ -67,6 +68,10 @@ post-patch:
@${PERL} -pi -e 's@#!/usr/bonsaitools/bin/perl@#!/usr/bin/perl@' \
${WRKSRC}/$i
.endfor
.for i in ${SENDMAILWC}
@${PERL} -pi -e 's@/usr/lib/sendmail@/usr/sbin/sendmail@' \
${WRKSRC}/$i
.endfor
pre-install:
@find ${WRKSRC}/docs -type d -exec ${CHMOD} 755 {} \;

View File

@ -1,11 +0,0 @@
--- contrib/mysqld-watcher.pl~ Mon Dec 17 20:38:32 2001
+++ contrib/mysqld-watcher.pl Mon Dec 17 20:38:41 2001
@@ -40,7 +40,7 @@
#
# mail transfer agent. this should probably really be converted to a Param().
#
-my $mta_program = "/usr/lib/sendmail -t -ODeliveryMode=deferred";
+my $mta_program = "/usr/sbin/sendmail -t -ODeliveryMode=deferred";
# and STDIN is where we get the info about running threads
#

View File

@ -1,12 +0,0 @@
diff -u CGI.pl~ CGI.pl
--- CGI.pl~ Mon Dec 17 20:32:31 2001
+++ CGI.pl Mon Dec 17 20:33:02 2001
@@ -735,7 +735,7 @@
"login" => $login,
"password" => $password});
- open SENDMAIL, "|/usr/lib/sendmail -t";
+ open SENDMAIL, "|/usr/sbin/sendmail -t";
print SENDMAIL $msg;
close SENDMAIL;

View File

@ -1,21 +0,0 @@
diff -u Token.pm~ Token.pm
--- Token.pm~ Mon Dec 17 20:32:32 2001
+++ Token.pm Mon Dec 17 20:34:20 2001
@@ -102,7 +102,7 @@
my $emailsuffix = &::Param('emailsuffix');
$token = &::url_quote($token);
- open SENDMAIL, "|/usr/lib/sendmail -t";
+ open SENDMAIL, "|/usr/sbin/sendmail -t";
print SENDMAIL qq|From: bugzilla-daemon
To: $emailaddress$emailsuffix
@@ -145,7 +145,7 @@
my $username = $realname ? $realname . " <" . $loginname . ">" : $loginname;
# Notify the user via email about the cancellation.
- open SENDMAIL, "|/usr/lib/sendmail -t";
+ open SENDMAIL, "|/usr/sbin/sendmail -t";
print SENDMAIL qq|From: bugzilla-daemon
To: $username
Subject: "$tokentype" token cancelled

View File

@ -1,12 +0,0 @@
diff -u globals.pl~ globals.pl
--- globals.pl~ Mon Dec 17 20:32:32 2001
+++ globals.pl Mon Dec 17 20:34:30 2001
@@ -1243,7 +1243,7 @@
if (Param('sendmailnow')) {
$sendmailparm = '';
}
- if (open(SENDMAIL, "|/usr/lib/sendmail $sendmailparm -t")) {
+ if (open(SENDMAIL, "|/usr/sbin/sendmail $sendmailparm -t")) {
my %substs;
$substs{"to"} = $name;

View File

@ -1,12 +0,0 @@
diff -u importxml.pl~ importxml.pl
--- importxml.pl~ Mon Dec 17 20:32:32 2001
+++ importxml.pl Mon Dec 17 20:34:34 2001
@@ -108,7 +108,7 @@
$header.= "Subject: $subject\n\n";
open(SENDMAIL,
- "|/usr/lib/sendmail -ODeliveryMode=background -t") ||
+ "|/usr/sbin/sendmail -ODeliveryMode=background -t") ||
die "Can't open sendmail";
print SENDMAIL $header . $message . "\n";
close SENDMAIL;

View File

@ -1,12 +0,0 @@
diff -u move.pl~ move.pl
--- move.pl~ Mon Dec 17 20:32:32 2001
+++ move.pl Mon Dec 17 20:34:43 2001
@@ -147,7 +147,7 @@
$msg .= $xml . "\n";
open(SENDMAIL,
- "|/usr/lib/sendmail -ODeliveryMode=background -t") ||
+ "|/usr/sbin/sendmail -ODeliveryMode=background -t") ||
die "Can't open sendmail";
print SENDMAIL $msg;
close SENDMAIL;

View File

@ -1,12 +0,0 @@
diff -u processmail~ processmail
--- processmail~ Mon Dec 17 20:32:32 2001
+++ processmail Mon Dec 17 20:34:47 2001
@@ -742,7 +742,7 @@
}
if ($enableSendMail == 1) {
- open(SENDMAIL, "|/usr/lib/sendmail $sendmailparam -t") ||
+ open(SENDMAIL, "|/usr/sbin/sendmail $sendmailparam -t") ||
die "Can't open sendmail";
print SENDMAIL trim($msg) . "\n";

View File

@ -1,12 +0,0 @@
diff -u whineatnews.pl~ whineatnews.pl
--- whineatnews.pl~ Mon Dec 17 20:32:33 2001
+++ whineatnews.pl Mon Dec 17 20:33:18 2001
@@ -62,7 +62,7 @@
foreach my $i (@{$bugs{$email}}) {
$msg .= " ${urlbase}show_bug.cgi?id=$i\n"
}
- open(SENDMAIL, "|/usr/lib/sendmail -t") || die "Can't open sendmail";
+ open(SENDMAIL, "|/usr/sbin/sendmail -t") || die "Can't open sendmail";
print SENDMAIL $msg;
close SENDMAIL;
print "$email " . join(" ", @{$bugs{$email}}) . "\n";