- Add note that majordom can be removed from /etc/group

 - Call 'digest' from correct dir. Addresses PR 8814 by Berndt Josef
   Wulf <wulf@dingo.ping.net.au>
 - Add some headers to wrapper.c to fix several compile time warnings;
   partly submitted in PR 8756 by Berndt Josef Wulf <wulf@dingo.ping.net.au>

4 files changed, 37 insertions, 8 deletions

diff --git a/mail/majordomo/files/patch-sum b/mail/majordomo/files/patch-sum
index 6878be49512..9dc7942dc19 100644
--- a/mail/majordomo/files/patch-sum
+++ b/mail/majordomo/files/patch-sum
@@ -1,12 +1,13 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:04 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/11/27 16:50:01 hubertf Exp $
 
 MD5 (patch-aa) = 94044f12ee176969ae848b178ff35eac
 MD5 (patch-ab) = 2b402722a80d10505bea3e74f7637f61
 MD5 (patch-ac) = 6d5bcab84fb2490ff669c6d81930b8f8
 MD5 (patch-ad) = 7adbce2cfcf4cf4d9d1803d4f2274538
 MD5 (patch-ae) = 011660d967abf5e9ca1401f0c86673de
-MD5 (patch-af) = 481e0c555d77d901486643961ba29dbd
+MD5 (patch-af) = 72407c59ed926f6127a14305fd2f6bb9
 MD5 (patch-ag) = ceee2c937b6c51af57247f5574ffea94
 MD5 (patch-ah) = 04da4a05cdc4bdc8896b1cca9d3df76e
 MD5 (patch-ai) = 2804603a33fecbf33f17c64cdaa13da6
 MD5 (patch-aj) = 10a5217309ce560b447aa860263235f2
+MD5 (patch-ak) = 7e224eb68b57c08340e8f0569cb9b488
diff --git a/mail/majordomo/patches/patch-af b/mail/majordomo/patches/patch-af
index 04f7d9cfcc7..507a3de6fc9 100644
--- a/mail/majordomo/patches/patch-af
+++ b/mail/majordomo/patches/patch-af
@@ -1,10 +1,19 @@
-$NetBSD: patch-af,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
-
---- ./majordomo.orig	Wed Aug 27 08:55:29 1997
-+++ ./majordomo	Tue Jun  8 10:55:13 1999
-@@ -59,4 +59,5 @@
+--- majordomo.orig	Sat Nov 27 17:28:39 1999
++++ majordomo	Sat Nov 27 17:29:16 1999
+@@ -58,6 +58,7 @@
+ print STDERR "$0: starting\n" if $DEBUG;
  
  # All these should be in the standard PERL library
 +unshift(@INC, $bindir);
  unshift(@INC, $homedir);
  require "ctime.pl";		# To get MoY definitions for month abbrevs
+ require "majordomo_version.pl";	# What version of Majordomo is this?
+@@ -1138,7 +1139,7 @@
+ 	# The password is valid, so run digest
+ 
+     	    open(DIGEST, 
+-		"$homedir/digest -m -C -l $list $list_outgoing 2>&1 |");
++		"$bindir/digest -m -C -l $list $list_outgoing 2>&1 |");
+ 	    @digest_errors = <DIGEST>;
+ 	    close(DIGEST);
+ 
diff --git a/mail/majordomo/patches/patch-ak b/mail/majordomo/patches/patch-ak
new file mode 100644
index 00000000000..4c6753d5b2b
--- /dev/null
+++ b/mail/majordomo/patches/patch-ak
@@ -0,0 +1,18 @@
+--- wrapper.c.orig	Sat Nov 27 17:43:56 1999
++++ wrapper.c	Sat Nov 27 17:45:54 1999
+@@ -16,10 +16,14 @@
+ #include <stdio.h>
+ #include <sysexits.h>
+ 
+-#if defined(sun) && defined(sparc)
++#if (defined(sun) && defined(sparc)) || defined(__NetBSD__)
+ #include <stdlib.h>
+ #endif
+ 
++#ifdef __NetBSD__
++#include <sys/types.h>
++#include <unistd.h>
++#endif
+ 
+ #ifndef STRCHR
+ #  include <string.h>
diff --git a/mail/majordomo/pkg/PLIST b/mail/majordomo/pkg/PLIST
index 8a1cabc89e7..33f3fbf9843 100644
--- a/mail/majordomo/pkg/PLIST
+++ b/mail/majordomo/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/06/08 17:51:27 bad Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/11/27 16:50:03 hubertf Exp $
 bin/approve
 bin/bounce
 bin/medit
@@ -64,3 +64,4 @@ share/examples/majordomo/majordomo.cf
 @unexec echo "If you are removing majordomo permanently, you may wish to"
 @unexec echo "  - remove @HOME@/@MAJORDOMO_USER@"
 @unexec echo "  - remove majordomo aliases from /etc/sendmail.cf and run newaliases"
+@unexec echo "  - remove group majordom from /etc/group"