upgrade to 0.46

5 files changed, 22 insertions, 29 deletions

diff --git a/mail/premail/Makefile b/mail/premail/Makefile
index da334875b381..83f805ea87b8 100644
--- a/mail/premail/Makefile
+++ b/mail/premail/Makefile
@@ -1,16 +1,18 @@
 # New ports collection makefile for: premail
-# Version required:     0.45
+# Version required:     0.46
 # Premail homepage is http://www.c2.net/~raph/premail.html
 #
 # Date created:         31 Jan 1997
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.8 1998/04/07 17:33:28 ache Exp $
+# $Id: Makefile,v 1.9 1998/10/02 06:31:03 ache Exp $
 #
 
-DISTNAME=       premail-0.45
+DISTNAME=       premail-0.46
 CATEGORIES=     security mail
-MASTER_SITES=   ftp://utopia.hacktic.nl/pub/replay/pub/remailer/premail/
+MASTER_SITES=   ftp://ftp.jpunix.com/pub/remailer-tools/ \
+		ftp://ftp.kiarchive.ru/unix/crypto/
+WRKSRC=         ${WRKDIR}/premail
 
 BUILD_DEPENDS+= pgp:${PORTSDIR}/security/pgp
 
@@ -29,7 +31,7 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_SCRIPT} premail ${PREFIX}/bin
 	install -d -m 555 ${PREFIX}/share/doc/premail
 	cd ${WRKSRC} && ${INSTALL_DATA} \
-	   preferences doc-0.45.html doc-0.45.txt ${PREFIX}/share/doc/premail
+	   preferences doc-0.46.html doc-0.46.txt ${PREFIX}/share/doc/premail
 	@echo
 	@echo "Check ${PREFIX}/share/doc/premail for further instructions"
 	@echo
diff --git a/mail/premail/distinfo b/mail/premail/distinfo
index 79c2ffbb5ee6..012566ca8357 100644
--- a/mail/premail/distinfo
+++ b/mail/premail/distinfo
@@ -1 +1 @@
-MD5 (premail-0.45.tar.gz) = 69ad558c76f9910390ee3072e40cb00c
+MD5 (premail-0.46.tar.gz) = 35883600d88011e78eeb43981419113f
diff --git a/mail/premail/files/patch-aa b/mail/premail/files/patch-aa
index 9bb78837519e..b503fa5bb7af 100644
--- a/mail/premail/files/patch-aa
+++ b/mail/premail/files/patch-aa
@@ -1,5 +1,5 @@
---- premail.orig	Thu Oct 31 06:25:10 1996
-+++ premail	Tue Oct  6 15:58:32 1998
+--- premail.orig	Sat Oct 25 02:19:07 1997
++++ premail	Tue Oct  6 18:59:57 1998
 @@ -1,4 +1,4 @@
 -#!/usr/local/bin/perl
 +#!%PERL5% -w
@@ -10,10 +10,10 @@
  
  $config{'rlist-valid'} = 300;
  
--$config{'rlist-url'} = 'http://kiwi.cs.berkeley.edu/rlist';
--$config{'pubring-url'} = 'http://kiwi.cs.berkeley.edu/pubring.pgp';
-+#$config{'rlist-url'} = 'http://www.cs.berkeley.edu/rlist';
-+#$config{'pubring-url'} = 'http://www.cs.berkeley.edu/pubring.pgp';
+-$config{'rlist-url'} = 'http://www.publius.net/rlist';
+-$config{'pubring-url'} = 'http://www.publius.net/pubring.pgp';
++#$config{'rlist-url'} = 'http://www.publius.net/rlist';
++#$config{'pubring-url'} = 'http://www.publius.net/pubring.pgp';
 +
 +$config{'rlist-url'} = 'finger:rlist@anon.lcs.mit.edu';
 +$config{'pubring-url'} = 'finger:pubring@anon.lcs.mit.edu';
@@ -517,7 +517,7 @@
 -    my ($fqdn, $aliases, $type, $len, $thataddr);
 +    my ($fqdn, $aliases, $type, $len);
      my ($name, $proto);
-     my ($that, $thataddr);
+     my ($that);
      my ($savesel, $gotsep);
 @@ -6330,7 +6375,7 @@
  	$host = $1;
@@ -537,15 +537,6 @@
  #	    bind(WWW, $this) || &die_disarm ("bind: $!\n");
  #	    &pdv ("bound the socket...\n");
  	    connect(WWW, $that) || &die_disarm ("connect: $!\n");
-@@ -6356,7 +6401,7 @@
- 	        ."User-Agent: premail/$version (perl; unix)\n"
- 		."\n";
- 	    $response = <WWW>;
--	    if ($response !~ /^HTTP\/1\.0 200/) {
-+	    if ($response !~ /^HTTP\/1\.[01] 200/) {
- 		&die_disarm ("Remote server error: $response");
- 	    }
- 	    $gotsep = 0;
 @@ -6368,6 +6413,21 @@
  	};
  	if ($@) { return &pdv ($@); }
diff --git a/mail/premail/pkg-descr b/mail/premail/pkg-descr
index 9a7424116ebb..40cfcc64c7bd 100644
--- a/mail/premail/pkg-descr
+++ b/mail/premail/pkg-descr
@@ -1,9 +1,9 @@
      The main function of premail is adding support for encrypted e-mail
-     to your mailer, using plain PGP, [20]PGP/MIME, [21]MOSS, or
-     [22]S/MIME.
+     to your mailer, using plain PGP, PGP/MIME, MOSS, or
+     S/MIME.
      
      In addition, premail provides a seamless, transparent interface to
-     the [23]anonymous remailers, including full support for Mixmaster
+     the anonymous remailers, including full support for Mixmaster
      remailers and the nymservers. Nymservers provide cryptographically
      protected, fully anonymous accounts for both sending and receiving
      e-mail.
@@ -11,10 +11,10 @@
      While premail can be used as a stand-alone application, it works
      best when integrated with your mailer. Currently, premail is
      integrated completely seamlessly and transparently only with
-     Netscape 3.0's built-in mailer. It works fairly well with [24]Pine
+     Netscape 3.0's built-in mailer. It works fairly well with Pine
      3.94 or later, as well (plain PGP is supported, but decryption of
      MIME-based e-mail encryption protocols is still missing).
      Transparent integration of outgoing mail only is supported for any
      mailer in which the mail sending program can be configured,
-     including Berkeley mail, most emacs mailers, and [25]MH. For these
+     including Berkeley mail, most emacs mailers, and MH. For these
      mailers, you can decode messages with a single command.
diff --git a/mail/premail/pkg-plist b/mail/premail/pkg-plist
index 64fe55be6b82..438509faf21b 100644
--- a/mail/premail/pkg-plist
+++ b/mail/premail/pkg-plist
@@ -1,5 +1,5 @@
 bin/premail
-share/doc/premail/doc-0.45.txt
-share/doc/premail/doc-0.45.html
+share/doc/premail/doc-0.46.txt
+share/doc/premail/doc-0.46.html
 share/doc/premail/preferences
 @exec echo "Check /usr/local/share/doc/premail for further instructions"