Index: head/mail/ricochet/Makefile
===================================================================
--- head/mail/ricochet/Makefile	(revision 90585)
+++ head/mail/ricochet/Makefile	(revision 90586)
@@ -1,36 +1,36 @@
 # New ports collection makefile for:	ricochet
 # Date created:				02 September 2001
 # Whom:	      				Yen-Ming Lee <leeym@leeym.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ricochet
 PORTVERSION=    0.98
-PORTREVISION=   1
+PORTREVISION=   2
 CATEGORIES=	mail
 MASTER_SITES=	http://vipul.net/perl/sources/spamcontrol/ricochet/
 
 MAINTAINER=     ache@FreeBSD.org
 COMMENT=	An automated agent for tracing and reporting internet junk mail
 
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Template.pm:${PORTSDIR}/textproc/p5-Text-Template \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/XWhois.pm:${PORTSDIR}/net/p5-Net-XWhois \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
 
 NO_BUILD=	yes
 PERL_CONFIGURE= yes
 
 do-configure:
 .for file in install ricochet
 	${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},g' ${WRKSRC}/${file}
 	${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/${file}
 	${REINPLACE_CMD} -e 's,%%INSTALL_DATA%%,${INSTALL_DATA},g' ${WRKSRC}/${file}
 .endfor
 
 do-install:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ./install
 
 .include <bsd.port.mk>

Property changes on: head/mail/ricochet/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.17
\ No newline at end of property
+1.18
\ No newline at end of property
Index: head/mail/ricochet/files/patch-complaint
===================================================================
--- head/mail/ricochet/files/patch-complaint	(nonexistent)
+++ head/mail/ricochet/files/patch-complaint	(revision 90586)
@@ -0,0 +1,9 @@
+--- complaint-template.bak	Thu Feb  8 18:09:41 2001
++++ complaint-template	Wed Oct  8 06:50:31 2003
+@@ -14,5 +14,5 @@
+ 
+ ------------ unsolicited commercial mail follows -----------
+ 
+-{return $self->spam} 
++>{return $self->spam}
+ 

Property changes on: head/mail/ricochet/files/patch-complaint
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/mail/ricochet/files/patch-ricochet
===================================================================
--- head/mail/ricochet/files/patch-ricochet	(revision 90585)
+++ head/mail/ricochet/files/patch-ricochet	(revision 90586)
@@ -1,31 +1,41 @@
---- ricochet.old	Tue Jun 24 22:40:18 2003
-+++ ricochet	Wed Sep 24 16:33:42 2003
+--- ricochet.orig	Tue Jun 24 22:40:18 2003
++++ ricochet	Wed Oct  8 06:42:08 2003
 @@ -566,15 +566,14 @@
      my ( $domain ) = @_;
      $ua = new LWP::UserAgent;
      $ua->agent("Ricochet/0.1 " . $ua->agent);
 -    my $req = new HTTP::Request POST => 'http://www.abuse.net/lookup.phtml'; 
 -    $req->content_type('application/x-www-form-urlencoded');
 -    $req->content("DOMAIN=$domain");
 +    my $req = new HTTP::Request GET => "http://www.abuse.net/lookup.phtml?DOMAIN=$domain";
 +    $ua->timeout(20);
      my $res = $ua->request($req);
  
     if ($res->is_success) {
          my $content = $res->content;
          return undef if $content =~ /no information for this domain/;
 -        my @matches = $content =~ /(\S+\@\S+)\s*<BR>/ig; 
 +	my @matches = $content =~ /<tt>(\S+\@\S+)<\/tt>/g;
          return \@matches;
     } else {
          return undef;
-@@ -607,7 +606,8 @@
+@@ -607,13 +606,17 @@
  
  sub initialize { 
      my $self = shift; 
 -    my $rc = "$ENV{RICOCHET}" || "$ENV{HOME}/.ricochet"; $rc .= "/ricochetrc"; 
 +    my $rc = "$ENV{RICOCHET}" || -d "$ENV{HOME}/.ricochet" ? "$ENV{HOME}/.ricochet" : "%%PREFIX%%/share/ricochet";
 +    $rc .= "/ricochetrc"; 
      Carp::croak "** Ricochet configuration file $rc doesn't exist. Aborting.\n" unless -e $rc; 
      open (RC, $rc); 
      grep { 
+         chomp; 
+         s/#.*$//; 
+-        my ($field, $value) = split /:/, $_, 2; $value =~ s/\s//g; $field =~ s/\s//g; 
++	my ($field, $value) = split /:/, $_, 2;
++	$value =~ s/^\s+//;
++	$value =~ s/\s+$//;
++	$field =~ s/\s//g;
+         $self->{$field} = $value unless $field ne "SENDMAIL" && defined $self->{$field}; 
+     } (<RC>); 
+     close RC; 

Property changes on: head/mail/ricochet/files/patch-ricochet
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.11
\ No newline at end of property
+1.12
\ No newline at end of property