Index: mail/gotmail/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/gotmail/Makefile,v
retrieving revision 1.2
diff -u -3 -r1.2 Makefile
--- mail/gotmail/Makefile	1 Apr 2002 02:39:19 -0000	1.2
+++ mail/gotmail/Makefile	22 May 2002 18:49:42 -0000
@@ -6,32 +6,36 @@
 #
 
 PORTNAME=	gotmail
-PORTVERSION=	0.6.6
-PORTREVISION=	1
+PORTVERSION=	0.7.1
 CATEGORIES=	mail perl5
-MASTER_SITES=	http://www.hawkins.emu.id.au/gotmail/
+MASTER_SITES=	http://ssl.usu.edu/paul/gotmail/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@geeksrus.net
 
 RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/libnet.cfg:${PORTSDIR}/net/p5-Net
 
-USE_PERL5=	yes
+MAN1=		${PORTNAME}.1
 NO_BUILD=	yes
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
+USE_PERL5=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 pre-patch:
-	${PERL} -pi -e 's|\r$$||' ${WRKSRC}/${PORTNAME}.pl
+	${PERL} -pi -e 's|\r$$||' ${WRKSRC}/${PORTNAME}
+	${PERL} -pi -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/${PORTNAME}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${PREFIX}/bin/${PORTNAME}
+.for i in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/${i} ${MANPREFIX}/man/man1
+.endfor
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
-.for i in COPYING ChangeLog README TODO sample.gotmailrc
+.for i in ChangeLog README sample.gotmailrc
 	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/${PORTNAME}
 .endfor
 .endif
Index: mail/gotmail/distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/gotmail/distinfo,v
retrieving revision 1.1
diff -u -3 -r1.1 distinfo
--- mail/gotmail/distinfo	19 Dec 2001 02:58:45 -0000	1.1
+++ mail/gotmail/distinfo	22 May 2002 18:33:34 -0000
@@ -1 +1 @@
-MD5 (gotmail_0.6.6.tar.gz) = fd529e6b5d7258ad6fb6dbf05c0fa694
+MD5 (gotmail_0.7.1.tar.gz) = 46fd92313a3d8f4c9145bf7a5750bbd3
Index: mail/gotmail/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/mail/gotmail/pkg-plist,v
retrieving revision 1.2
diff -u -3 -r1.2 pkg-plist
--- mail/gotmail/pkg-plist	1 Apr 2002 02:39:19 -0000	1.2
+++ mail/gotmail/pkg-plist	22 May 2002 18:38:33 -0000
@@ -1,7 +1,5 @@
 bin/gotmail
-%%PORTDOCS%%share/doc/gotmail/COPYING
 %%PORTDOCS%%share/doc/gotmail/ChangeLog
 %%PORTDOCS%%share/doc/gotmail/README
-%%PORTDOCS%%share/doc/gotmail/TODO
 %%PORTDOCS%%share/doc/gotmail/sample.gotmailrc
 %%PORTDOCS%%@dirrm share/doc/gotmail
Index: mail/gotmail/files/patch-gotmail.pl
===================================================================
RCS file: mail/gotmail/files/patch-gotmail.pl
diff -N mail/gotmail/files/patch-gotmail.pl
--- mail/gotmail/files/patch-gotmail.pl	1 Apr 2002 02:39:19 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
---- gotmail.pl.orig	Mon Jul 23 20:04:47 2001
-+++ gotmail.pl	Sun Mar 31 19:47:52 2002
-@@ -462,6 +462,8 @@
- 	
- 	if ($page =~ m/<meta(.*)content=\"(.*)url=(\S+)\">/i) {
- 		$redirect_location = $3;
-+	} elsif ($page =~ m/\w+\.location\.replace\s*\(\"([^\"]+)\"/i) {
-+		$redirect_location = $1;
- 	}
- 
- 	if ($redirect_location eq "")
-@@ -577,6 +579,10 @@
- 	if ($stripmboxheader)
- 	{
-  	    s/^From (.*)\n//;
-+	}
-+	else
-+	{
-+	    s/^From\s+(\S+)\s+(\w+),\s+(\d+)\s+(\w+)\s+(\d+)\s+(\d+:\d+:\d+)/From $1 $2 $4 $3 $6 $5/;
- 	}
- 
- 	# Strip any HTML artifacts from the message body.
==8<====8<====8<====8<====8<====8<====8<====8<====8<====8<==