3 files changed, 56 insertions, 68 deletions

diff --git a/mail/adcomplain/Makefile b/mail/adcomplain/Makefile
index 3bd738199817..e906a5e7b803 100644
--- a/mail/adcomplain/Makefile
+++ b/mail/adcomplain/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:    adcomplain
 # http://www.rdrop.com/users/billmc/adcomplain.html
-# Version required:     2.56
+# Version required:     2.74
 # Date created: 13 Sep 1997
 # Whom:         ache@FreeBSD.org
 #
-# $Id: Makefile,v 1.2 1997/09/13 21:31:54 max Exp $
+# $Id: Makefile,v 1.4 1997/10/07 21:34:06 ache Exp $
 #
 
-DISTNAME=      adcomplain.pl.uu
-PKGNAME=       adcomplain-2.56
+DISTNAME=       adcomplain.pl.uu
+PKGNAME=        adcomplain-2.74
 CATEGORIES=     mail news
 MASTER_SITES=   http://www.rdrop.com/users/billmc/
 EXTRACT_SUFX=	# none
diff --git a/mail/adcomplain/distinfo b/mail/adcomplain/distinfo
index d3753a460df2..f84f5a44bbee 100644
--- a/mail/adcomplain/distinfo
+++ b/mail/adcomplain/distinfo
@@ -1 +1 @@
-MD5 (adcomplain.pl.uu) = e8cf94c7c57056a1267d590f74be2ea3
+MD5 (adcomplain.pl.uu) = 0ace1f3e56f9d005cc94925ab3ccf7bf
diff --git a/mail/adcomplain/files/patch-aa b/mail/adcomplain/files/patch-aa
index 8029756ef758..72c23586ce8d 100644
--- a/mail/adcomplain/files/patch-aa
+++ b/mail/adcomplain/files/patch-aa
@@ -1,50 +1,50 @@
-*** adcomplain.pl.orig	Wed Oct  8 02:02:29 1997
---- adcomplain.pl	Wed Oct  8 02:13:15 1997
+*** adcomplain.pl.bak	Sat Nov  8 18:32:40 1997
+--- adcomplain.pl	Sat Nov  8 18:45:04 1997
 ***************
-*** 1,4 ****
-! #! /bin/sh -- # -*- perl -*-
-! eval 'exec perl $0 ${1+"$@"}'
-! if 0;
-  
---- 1,2 ----
-! #!/usr/bin/perl
+*** 1,3 ****
+--- 1,4 ----
++ #!/usr/bin/perl
+  #! /bin/sh -- # -*- perl -*-
+  # first line invokes sh.  Some systems may need to refer to perl directly, i.e.:
   
 ***************
-*** 172,178 ****
-  $noinclude = 1;
+*** 7,14 ****
+  # allows perl to be _anywhere_ in the user's path.  The intent is to reduce
+  # the need to edit this file.
   
-  # comment this if your mailer automatically adds your .signature
-! $addsig = 1;
+! eval 'exec perl $0 ${1+"$@"}'
+! if 0;  # tee hee! This is on a separate line, so /bin/sh never sees it.
   
-  # this is the default name of the file to use for the complaint text
-  # if the file name is empty, the default text will be used
---- 170,176 ----
-  $noinclude = 1;
+  #-----------------------------------------------
+  # DESCRIPTION
+--- 8,15 ----
+  # allows perl to be _anywhere_ in the user's path.  The intent is to reduce
+  # the need to edit this file.
   
-  # comment this if your mailer automatically adds your .signature
-! $addsig = 0;
+! #eval 'exec perl $0 ${1+"$@"}'
+! #if 0;  # tee hee! This is on a separate line, so /bin/sh never sees it.
   
-  # this is the default name of the file to use for the complaint text
-  # if the file name is empty, the default text will be used
+  #-----------------------------------------------
+  # DESCRIPTION
 ***************
-*** 180,186 ****
+*** 252,258 ****
   
   # this is the name of the mail utility (see sendmail(8) man page)
-  # type "which sendmail" to find out where sendmail is on your system
+  # type "/bin/which sendmail" to find out where sendmail is on your system
 ! $mailcmd = "/usr/lib/sendmail -t";
   
   # this is a list of domain names for your system (e.g., "compuserve.com")
   # Names in this list are considered "friendly".  Including your own system
---- 178,184 ----
+--- 253,259 ----
   
   # this is the name of the mail utility (see sendmail(8) man page)
-  # type "which sendmail" to find out where sendmail is on your system
+  # type "/bin/which sendmail" to find out where sendmail is on your system
 ! $mailcmd = "/usr/sbin/sendmail -t";
   
   # this is a list of domain names for your system (e.g., "compuserve.com")
   # Names in this list are considered "friendly".  Including your own system
 ***************
-*** 198,207 ****
+*** 270,279 ****
   # If you have external executables that allow you to confirm host
   # addresses and names (i.e., gethostbyaddr and gethostbyname don't do it),
   # put them here, otherwise leave them empty.
@@ -55,7 +55,7 @@
   
   # Well, it works at GemStone.  Your mileage may vary :-(.
   #if (-x "/bin/remsh") { # HP-UX
---- 196,205 ----
+--- 271,280 ----
   # If you have external executables that allow you to confirm host
   # addresses and names (i.e., gethostbyaddr and gethostbyname don't do it),
   # put them here, otherwise leave them empty.
@@ -67,7 +67,7 @@
   # Well, it works at GemStone.  Your mileage may vary :-(.
   #if (-x "/bin/remsh") { # HP-UX
 ***************
-*** 315,321 ****
+*** 398,404 ****
     }
   
   # Make sure critical messages are seen
@@ -75,7 +75,7 @@
     print "Press enter to continue.... ";
     $ans = <STDIN>;
     }
---- 313,319 ----
+--- 399,405 ----
     }
   
   # Make sure critical messages are seen
@@ -84,20 +84,8 @@
     $ans = <STDIN>;
     }
 ***************
-*** 381,386 ****
---- 379,387 ----
-    $cc = "$complain_to$cc";
-    }
-  $header .= "Cc: $cc\n" if $cc ne "";
-+ if ($quiet) {
-+   print "$header";
-+ }
-  $subject = "no subject" if $subject eq "";
-  $header .= "Subject: ";
-  if ($recipient == $complain_to_only) {
-***************
-*** 406,411 ****
---- 407,413 ----
+*** 489,494 ****
+--- 490,496 ----
   close TEXTFILE;
   $response = ""; # garbage collection
   
@@ -106,32 +94,32 @@
   print "\n";
   $pager = $ENV{"PAGER"};
 ***************
-*** 440,445 ****
---- 442,451 ----
+*** 523,528 ****
+--- 525,534 ----
     } # for
   
   print "\n";
 + } else {
-+     system "$mailcmd <$tempname"; # Unix dependent
-+     print "sent\n";
++   system "$mailcmd <$tempname"; # Unix dependent
++   print "sent\n";
 + }
   unlink $tempname;
   close STDIN;
   exit 0;
 ***************
-*** 685,691 ****
-    local ($probe, $each, $result);
-  
-    $probe = $text;
-!   $probe =~ s/^\s*(\S\S\S).*/$1/;
-    foreach $each ("Mon", "Tue", "Wed", "Thu", "Fri", "Sat",  "Sun") {
-      return 1 if $each =~ /$probe/i;
-      }
---- 691,697 ----
-    local ($probe, $each, $result);
-  
-    $probe = $text;
-!   $probe =~ s/^\s*(\w\w\w).*/$1/;
-    foreach $each ("Mon", "Tue", "Wed", "Thu", "Fri", "Sat",  "Sun") {
-      return 1 if $each =~ /$probe/i;
-      }
+*** 1974,1980 ****
+      "0200", "EET, MET DST, METDST, MEST, MESZ, SST, FST, O",
+  				# Middle Europe Daylight
+  				# Swedish Summer Time, French Summer Time
+!     "0300", "EET DST, IST, BT, P", # Turkey, Israel
+      "0330", "IT",		# Iran?
+      "0400", "IDT, MSD, ZP4, Q",
+      "0500", "ZP5, R",		# USSR Zone 4
+--- 1980,1986 ----
+      "0200", "EET, MET DST, METDST, MEST, MESZ, SST, FST, O",
+  				# Middle Europe Daylight
+  				# Swedish Summer Time, French Summer Time
+!     "0300", "EET DST, IST, MSK, BT, P", # Turkey, Moscow, Israel
+      "0330", "IT",		# Iran?
+      "0400", "IDT, MSD, ZP4, Q",
+      "0500", "ZP5, R",		# USSR Zone 4