diff options
author | Alexey Zelkin <phantom@FreeBSD.org> | 2001-12-20 17:55:20 +0000 |
---|---|---|
committer | Alexey Zelkin <phantom@FreeBSD.org> | 2001-12-20 17:55:20 +0000 |
commit | 54b7c3fb35a7a8021b646889da675e38ecb53291 (patch) | |
tree | 5ab57f3cc627b5bcc9015d207df125001778c283 /devel/bugzilla2 | |
parent | fix previous commit (diff) |
Use perl expression to fix path to sendmail rather than using
plain patches for each case.
Also fix some whitespace.
Suggested by: nectar, lioux
Notes
Notes:
svn path=/head/; revision=51896
Diffstat (limited to 'devel/bugzilla2')
-rw-r--r-- | devel/bugzilla2/Makefile | 21 | ||||
-rw-r--r-- | devel/bugzilla2/files/patch-ab | 11 | ||||
-rw-r--r-- | devel/bugzilla2/files/patch-ac | 12 | ||||
-rw-r--r-- | devel/bugzilla2/files/patch-ad | 21 | ||||
-rw-r--r-- | devel/bugzilla2/files/patch-ae | 12 | ||||
-rw-r--r-- | devel/bugzilla2/files/patch-af | 12 | ||||
-rw-r--r-- | devel/bugzilla2/files/patch-ag | 12 | ||||
-rw-r--r-- | devel/bugzilla2/files/patch-ah | 12 | ||||
-rw-r--r-- | devel/bugzilla2/files/patch-ai | 12 |
9 files changed, 13 insertions, 112 deletions
diff --git a/devel/bugzilla2/Makefile b/devel/bugzilla2/Makefile index 728930158e4f..97a76b905795 100644 --- a/devel/bugzilla2/Makefile +++ b/devel/bugzilla2/Makefile @@ -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 {} \; diff --git a/devel/bugzilla2/files/patch-ab b/devel/bugzilla2/files/patch-ab deleted file mode 100644 index 8ba2476cf295..000000000000 --- a/devel/bugzilla2/files/patch-ab +++ /dev/null @@ -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 - # diff --git a/devel/bugzilla2/files/patch-ac b/devel/bugzilla2/files/patch-ac deleted file mode 100644 index 80adea038bd0..000000000000 --- a/devel/bugzilla2/files/patch-ac +++ /dev/null @@ -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; - diff --git a/devel/bugzilla2/files/patch-ad b/devel/bugzilla2/files/patch-ad deleted file mode 100644 index 10f939b593b3..000000000000 --- a/devel/bugzilla2/files/patch-ad +++ /dev/null @@ -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 diff --git a/devel/bugzilla2/files/patch-ae b/devel/bugzilla2/files/patch-ae deleted file mode 100644 index 4efd3707c51b..000000000000 --- a/devel/bugzilla2/files/patch-ae +++ /dev/null @@ -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; diff --git a/devel/bugzilla2/files/patch-af b/devel/bugzilla2/files/patch-af deleted file mode 100644 index c0a75c2507ce..000000000000 --- a/devel/bugzilla2/files/patch-af +++ /dev/null @@ -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; diff --git a/devel/bugzilla2/files/patch-ag b/devel/bugzilla2/files/patch-ag deleted file mode 100644 index 47a4e02977da..000000000000 --- a/devel/bugzilla2/files/patch-ag +++ /dev/null @@ -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; diff --git a/devel/bugzilla2/files/patch-ah b/devel/bugzilla2/files/patch-ah deleted file mode 100644 index 8fa58c7dcddc..000000000000 --- a/devel/bugzilla2/files/patch-ah +++ /dev/null @@ -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"; diff --git a/devel/bugzilla2/files/patch-ai b/devel/bugzilla2/files/patch-ai deleted file mode 100644 index 67ad92845cea..000000000000 --- a/devel/bugzilla2/files/patch-ai +++ /dev/null @@ -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"; |