Upgrade to majordomo v1.94.1.

7 files changed, 73 insertions, 77 deletions

diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index a7f0e53013da..ac0f9c40dfd0 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	majordomo
-# Version required:	1.94
+# Version required:	1.94.1
 # Date created:		23 October 1996
 # Whom:			jfitz@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.6 1996/12/08 01:44:53 max Exp $
+# $Id: Makefile,v 1.7 1996/12/20 03:32:37 jfitz Exp $
 #
 
-DISTNAME=	majordomo-1.94
+DISTNAME=	majordomo-1.94.1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.greatcircle.com/pub/majordomo/ \
 		ftp://ftp.sgi.com/other/majordomo/ \
@@ -31,8 +31,7 @@ pre-install:
 		@ ${CP} ${WRKSRC}/sample.cf ${WRKSRC}/majordomo.cf
 
 post-install:
-		@ ln -sf ${PREFIX}/majordomo/Tools/digest ${PREFIX}/majordomo
-		@ ln -sf ${PREFIX}/majordomo/Tools/archive2.pl ${PREFIX}/majordomo/archive
+		@ ln -sf ${PREFIX}/majordomo/archive2.pl ${PREFIX}/majordomo/archive
 		@ for dir in tmp lists/test-l.archive lists/test-l-digest.archive digests/test-l-digest doc; do \
 			${MKDIR} -p ${PREFIX}/majordomo/$$dir; \
 		done
diff --git a/mail/majordomo/distinfo b/mail/majordomo/distinfo
index 87fc80d5d9db..c5fc7a3fcc5e 100644
--- a/mail/majordomo/distinfo
+++ b/mail/majordomo/distinfo
@@ -1 +1 @@
-MD5 (majordomo-1.94.tar.Z) = bbe4136d19b6ef640006890c251e29cb
+MD5 (majordomo-1.94.1.tar.Z) = ae40ce0aeafb9364b97ae9d59740e711
diff --git a/mail/majordomo/files/patch-aa b/mail/majordomo/files/patch-aa
index 120331739208..fd32471c6b3c 100644
--- a/mail/majordomo/files/patch-aa
+++ b/mail/majordomo/files/patch-aa
@@ -1,54 +1,39 @@
---- Makefile.orig	Sun Oct 20 09:23:18 1996
-+++ Makefile	Wed Oct 23 15:56:10 1996
-@@ -12,7 +12,7 @@
+--- Makefile.orig	Mon Dec  9 10:41:18 1996
++++ Makefile	Fri Dec 27 00:25:07 1996
+@@ -12,22 +12,22 @@
  #
- # Where is Perl located?
+  
+ # Put the location of your Perl binary here:
+-PERL = /bin/perl
++PERL = ${PREFIX}/bin/perl
  
--PERL = 		/bin/perl5
-+PERL = 		${PREFIX}/bin/perl
+ # What do you call your C compiler?
+ CC = cc
+  
+ # Where do you want Majordomo to be installed?  This CANNOT be the
+ # current directory (where you unpacked the distribution)
+-W_HOME = /usr/test/majordomo-$(VERSION)
++W_HOME = ${PREFIX}/majordomo
+  
+ # Where do you want man pages to be installed?
+-MAN = $(W_HOME)/man
++MAN = ${PREFIX}/man
+  
+ # You need to have or create a user and group which majordomo will run as.
+ # Enter the numeric UID and GID (not their names!) here:
+-W_USER = 123
+-W_GROUP = 45
++W_USER = %%MJUID%%
++W_GROUP = %%MJGID%%
  
- # 
- # If your default 'chown' doesn't support the USER.GROUP syntax,
-@@ -23,15 +23,15 @@
- #  
- # The location of Majordomo.  Wrapper looks here for programs to run.
- 
--W_HOME	=	/usr/test/majordomo-$(VERSION)
-+W_HOME	=	${PREFIX}/majordomo
- 
- # 
- # Where do you want the manual pages installed?  By default, this is 
- # $(W_HOME)/man/man[18]
- #
--W_MAN = $(W_HOME)/man
--MAN1 = $(W_HOME)/man/man1
--MAN8 = $(W_HOME)/man/man8
-+W_MAN = ${PREFIX}/man
-+MAN1 = ${PREFIX}/man/man1
-+MAN8 = $(PREFIX)/man/man8
- 
- # What permissions does wrapper need?   
- # (6755 = -rwsr-s-r-x, 4755 = -rwsr-xr-x)
-@@ -43,7 +43,7 @@
+ # These set the permissions for all installed files and executables (except
+ # the wrapper), respectively.  Some sites may wish to make these more
+@@ -61,7 +61,7 @@
  # parent process, and without the leading "W_" in the variable names) gets
  # passed to processes run by "wrapper"
+ W_SHELL = /bin/sh
+-W_PATH = /bin:/usr/bin:/usr/ucb
++W_PATH = /bin:/usr/bin
+ W_MAJORDOMO_CF = $(W_HOME)/majordomo.cf
  
--W_PATH = 	/bin:/usr/bin:/usr/ucb
-+W_PATH = 	/bin:/usr/bin
- W_BIN =		$(W_HOME)
- W_SHELL =	/bin/csh
- W_MAJORDOMO_CF =	$(W_BIN)/majordomo.cf
-@@ -53,11 +53,11 @@
- 
- # majordomo on my system
- #
--W_USER =	443
-+W_USER =	%%MJUID%%
- #
- # daemon on my system
- #
--W_GROUP =       1
-+W_GROUP =       %%MJGID%%
- #
- # You might need to change : to .
- #
+ # A directory for temp files..
diff --git a/mail/majordomo/files/patch-ab b/mail/majordomo/files/patch-ab
index 80f44cc40c37..bebb70c0d150 100644
--- a/mail/majordomo/files/patch-ab
+++ b/mail/majordomo/files/patch-ab
@@ -1,9 +1,10 @@
---- sample.cf.orig	Tue Oct  8 15:02:14 1996
-+++ sample.cf	Sat Oct 26 13:19:04 1996
-@@ -1,23 +1,19 @@
+--- sample.cf.orig	Mon Dec 23 10:05:15 1996
++++ sample.cf	Fri Dec 27 00:31:03 1996
+@@ -6,11 +6,11 @@
+ 
  # $whereami -- What machine am I running on?
  #
--$whereami = "foo.NOWHERE.COM";
+-$whereami = "example.com";
 +$whereami = "%%HOSTNAME%%";
  
  # $whoami -- Who do users send requests to me as?
@@ -13,9 +14,7 @@
  
  # $whoami_owner -- Who is the owner of the above, in case of problems?
  #
--$whoami_owner = "Majordomo-Owner\@$whereami";
-+$whoami_owner = "majordomo-owner\@$whereami";
- 
+@@ -19,11 +19,7 @@
  # $homedir -- Where can I find my extra .pl files, like majordomo.pl?
  # the environment variable HOME is set by the wrapper
  #
@@ -28,16 +27,16 @@
  
  # $listdir -- Where are the mailing lists?
  #
-@@ -29,7 +25,7 @@
+@@ -35,7 +31,7 @@
  # 	/usr/local/mail/digest/bblisa
  # as its directory.
  #
--$digest_work_dir = '/usr/local/mail/digest';
+-$digest_work_dir = "/usr/local/mail/digest";
 +$digest_work_dir = "%%PREFIX%%/majordomo/digests";
  
  # $log -- Where do I write my log?
  #
-@@ -39,8 +35,8 @@
+@@ -45,8 +41,8 @@
  #                      usually /usr/lib/sendmail, but some newer BSD systems
  #                      seem to prefer /usr/sbin/sendmail
  #
@@ -48,12 +47,24 @@
  
  # $mailer -- What program and args do I use to send mail to the list?
  # $bounce_mailer -- What is used to send mail anywhere else?
-@@ -152,7 +148,7 @@
+@@ -82,9 +78,9 @@
+ # returns a string like:
+ #   5:23pm  up  5:51,  9 users,  load average: 0.19, 0.25, 0.33
+ #
+-#$max_loadavg = 10;                 # Choose the maximum allowed load
++$max_loadavg = 10;                 # Choose the maximum allowed load
+ #
+-#$uptime = `/usr/bin/uptime` if -x </usr/bin/uptime>;     # Get system uptime
++$uptime = `/usr/bin/uptime` if -x </usr/bin/uptime>;     # Get system uptime
+ #$uptime = `/usr/bsd/uptime` if -x </usr/bsd/uptime>;     # or uptime is over here.
+ #
+ #($avg_1_minute, $avg_5_minutes, $avg_15_minutes) = 
+@@ -181,7 +177,7 @@
  # majordomo has r/w permission to.
  # Uses the environment variable TMPDIR, since that's pretty common
  #
--$TMPDIR = $ENV{'TMPDIR'} || '/usr/tmp';
+-$TMPDIR = $ENV{'TMPDIR'} || "/usr/tmp";
 +$TMPDIR = '%%PREFIX%%/majordomo/tmp';
  
- # Tune the number of retries that shlock does before aborting.
- # This defaults to 600, with a random sleep from 1-10 seconds between
+ # Tune how long set_lock tries to obtain a lock before giving up. Each
+ # attempt waits 1 to 10 seconds before trying again and waittime is
diff --git a/mail/majordomo/files/patch-ac b/mail/majordomo/files/patch-ac
index efe35459933f..5acf2de7b243 100644
--- a/mail/majordomo/files/patch-ac
+++ b/mail/majordomo/files/patch-ac
@@ -1,11 +1,11 @@
---- contrib/digest.orig	Sat Oct 26 13:53:02 1996
-+++ contrib/digest	Sat Oct 26 13:53:23 1996
-@@ -318,7 +318,7 @@
+--- digest.orig	Mon Dec 23 10:41:51 1996
++++ digest	Fri Dec 27 00:34:39 1996
+@@ -317,7 +317,7 @@
  	    } else {
  		# Read and execute the .cf file
  		$cf = $ENV{"MAJORDOMO_CF"} || 
 -			"/etc/majordomo.cf";
 +			"%%PREFIX%%/majordomo/majordomo.cf";
- 		if (! -r $cf) {
- 		    &abort("$cf not readable; stopped");
- 		}
+ 		require "$cf";
+ 
+ 		chdir($homedir);
diff --git a/mail/majordomo/pkg-plist b/mail/majordomo/pkg-plist
index 5b73744187d3..ba81e39016cf 100644
--- a/mail/majordomo/pkg-plist
+++ b/mail/majordomo/pkg-plist
@@ -1,4 +1,5 @@
 majordomo/archive
+majordomo/archive2.pl
 majordomo/bin/approve
 majordomo/bin/bounce
 majordomo/bin/medit
@@ -12,7 +13,6 @@ majordomo/request-answer
 majordomo/resend
 majordomo/shlock.pl
 majordomo/config-test
-majordomo/Tools/archive2.pl
 majordomo/Tools/archive.pl
 majordomo/Tools/archive_mh.pl
 majordomo/Tools/digest.send
@@ -20,7 +20,6 @@ majordomo/Tools/makeindex.pl
 majordomo/Tools/logsummary.pl
 majordomo/Tools/new-list
 majordomo/Tools/sequencer
-majordomo/Tools/digest
 majordomo/majordomo.cf
 majordomo/sample.cf
 majordomo/wrapper
diff --git a/mail/majordomo/scripts/configure b/mail/majordomo/scripts/configure
index 1cad4b5af6b2..68dc3d105de9 100644
--- a/mail/majordomo/scripts/configure
+++ b/mail/majordomo/scripts/configure
@@ -24,4 +24,6 @@ chop( $hostname = `hostname` );
 system( "/usr/bin/perl -pi -e 's|%%MJUID%%|$mjUID|g' $ENV{'WRKSRC'}/Makefile" );
 system( "/usr/bin/perl -pi -e 's|%%MJGID%%|$mjGID|g' $ENV{'WRKSRC'}/Makefile" );
 system( "/usr/bin/perl -pi -e 's|%%HOSTNAME%%|$hostname|g' $ENV{'WRKSRC'}/sample.cf $ENV{'WRKSRC'}/aliases.majordomo" );
-system( "/usr/bin/perl -pi -e 's|%%PREFIX%%|$ENV{'PREFIX'}|g' $ENV{'WRKSRC'}/sample.cf $ENV{'WRKSRC'}/contrib/digest" );
+foreach $file( "bounce-remind", "contrib/archive_mh.pl", "archive2.pl", "digest", "contrib/digest.num", "contrib/new-list", "contrib/sequencer", "majordomo", "medit", "request-answer", "resend", "sample.cf" ) {
+	system( "/usr/bin/perl -pi -e 's|%%PREFIX%%|$ENV{'PREFIX'}|g' $ENV{'WRKSRC'}/$file" ); 
+}