Move majordomo's digest man page to section 8, so that it doesn't

conflict with digest(1)'s manual page.  The majordomo digest command
lives in libexec, anyway.

Bump version to majordomo-1.94.4nb1

Addresses PR 12385, from Jun-ichiro itojun Hagino

5 files changed, 53 insertions, 26 deletions

diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index fffd5b45fe0..e2904cca5ed 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2001/02/17 18:24:52 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2001/03/27 11:53:17 agc Exp $
 
 DISTNAME=		majordomo-1.94.4
+PKGNAME=		${DISTNAME}nb1
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.sgi.com/other/majordomo/1.94.4/ \
 			ftp://ftp-europe.sgi.com/other/majordomo/1.94.4/
diff --git a/mail/majordomo/files/patch-sum b/mail/majordomo/files/patch-sum
index 9dc7942dc19..50b48228229 100644
--- a/mail/majordomo/files/patch-sum
+++ b/mail/majordomo/files/patch-sum
@@ -1,13 +1,14 @@
-$NetBSD: patch-sum,v 1.2 1999/11/27 16:50:01 hubertf Exp $
+$NetBSD: patch-sum,v 1.3 2001/03/27 11:53:17 agc Exp $
 
-MD5 (patch-aa) = 94044f12ee176969ae848b178ff35eac
-MD5 (patch-ab) = 2b402722a80d10505bea3e74f7637f61
-MD5 (patch-ac) = 6d5bcab84fb2490ff669c6d81930b8f8
-MD5 (patch-ad) = 7adbce2cfcf4cf4d9d1803d4f2274538
-MD5 (patch-ae) = 011660d967abf5e9ca1401f0c86673de
-MD5 (patch-af) = 72407c59ed926f6127a14305fd2f6bb9
-MD5 (patch-ag) = ceee2c937b6c51af57247f5574ffea94
-MD5 (patch-ah) = 04da4a05cdc4bdc8896b1cca9d3df76e
-MD5 (patch-ai) = 2804603a33fecbf33f17c64cdaa13da6
-MD5 (patch-aj) = 10a5217309ce560b447aa860263235f2
-MD5 (patch-ak) = 7e224eb68b57c08340e8f0569cb9b488
+SHA1 (patch-aa) = 7e7c3230c707c48f402e06ec1f021af1c2ba988b
+SHA1 (patch-ab) = 68bdbd77029ebd8f113c492e50e60aa7efb35de9
+SHA1 (patch-ac) = bea997e785b2656b1660a11efce759a56a700ab2
+SHA1 (patch-ad) = 65370547240539128a405484e98c7ed15a869464
+SHA1 (patch-ae) = 692f5018cccef565bec3be0f24e7009ed1902edd
+SHA1 (patch-af) = 9f3d21953ada62876f7c2ba2be0fa5edb48335fb
+SHA1 (patch-ag) = b469a639270d369732e75e6ae4df7f559e9c436e
+SHA1 (patch-ah) = 666b52100cb50a948c145da0ba83c197386cbd1e
+SHA1 (patch-ai) = 771c487d1a3392bf3b523330b8d60fd9a190c58b
+SHA1 (patch-aj) = 6d4fe712af39cb986c24d0227f86aacb6d048870
+SHA1 (patch-ak) = 401da2e552ff92ef35a60e45d6b8994dfd091b49
+SHA1 (patch-al) = 776088c5916b1b0516e8abaecd69870ba57f4a76
diff --git a/mail/majordomo/patches/patch-aa b/mail/majordomo/patches/patch-aa
index 56226952092..3dedf9de183 100644
--- a/mail/majordomo/patches/patch-aa
+++ b/mail/majordomo/patches/patch-aa
@@ -1,15 +1,17 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
+$NetBSD: patch-aa,v 1.2 2001/03/27 11:53:18 agc Exp $
 
---- ./Makefile.orig	Wed Aug 27 09:56:21 1997
-+++ ./Makefile	Tue Jun  8 10:59:33 1999
-@@ -14,5 +14,5 @@
+--- Makefile.orig	Wed Aug 27 16:56:21 1997
++++ Makefile	Tue Mar 27 12:41:29 2001
+@@ -13,27 +13,29 @@
+ #
   
  # Put the location of your Perl binary here:
 -PERL = /bin/perl
 +PERL = @LOCALBASE@/bin/perl
  
  # What do you call your C compiler?
-@@ -21,18 +21,20 @@
+ 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)
@@ -35,7 +37,9 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
 +MAN_MODE = 444
  EXEC_MODE = 755
  HOME_MODE = 751
-@@ -63,9 +65,9 @@
+ 
+@@ -62,11 +64,11 @@
+ # 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
@@ -48,14 +52,18 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
 +TMPDIR = @TMPDIR@
  
  #--------YOU SHOULDN'T HAVE TO CHANGE ANYTHING BELOW THIS LINE.-------------
-@@ -77,5 +79,5 @@
+ 
+@@ -76,7 +78,7 @@
+ SHELL = /bin/sh
  
  WRAPPER_FLAGS = -DBIN=\"$(W_HOME)\" -DPATH=\"PATH=$(W_PATH)\" \
 -	-DHOME=\"HOME=$(W_HOME)\" -DSHELL=\"SHELL=$(W_SHELL)\" \
 +	-DHOME=\"HOME=$(HOME)\" -DSHELL=\"SHELL=$(W_SHELL)\" \
  	-DMAJORDOMO_CF=\"MAJORDOMO_CF=$(W_MAJORDOMO_CF)\"      \
  	$(POSIX)
-@@ -145,11 +147,10 @@
+ 
+@@ -144,13 +146,12 @@
+ 
  install-scripts: config-scripts
  	$(INSTALL) -m $(HOME_MODE) $(INSTALL_FLAGS) . $(W_HOME)
 -	$(INSTALL) -m $(EXEC_MODE) $(INSTALL_FLAGS) . $(W_HOME)/bin
@@ -69,7 +77,9 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
 +			$(TMP)/$$file @PREFIX@/bin/$$file; \
  	done
  
-@@ -178,43 +179,37 @@
+ 	@echo "Copying Majordomo files to $(W_HOME)"
+@@ -177,45 +178,39 @@
+ # all cases, the sample.cf file must be installed so that config-test will
  # be able to check for new variables.
  install-cf:
 -	@if [ ! -f $(W_HOME)/majordomo.cf ]; \
@@ -108,10 +118,11 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
 +	@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
  		Doc/man/approve.1 $(MAN)/man1/approve.1
 -	@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
-+	@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
- 		Doc/man/digest.1 $(MAN)/man1/digest.1
+-		Doc/man/digest.1 $(MAN)/man1/digest.1
 -	@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
 +	@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
++		Doc/man/digest.1 $(MAN)/man8/digest.8
++	@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
  		Doc/man/bounce.1 $(MAN)/man1/bounce.1
 -	@$(INSTALL) -m $(FILE_MODE) $(INSTALL_FLAGS) \
 +	@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
@@ -126,3 +137,4 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/06/08 17:51:26 bad Exp $
 +	@$(INSTALL) -m $(MAN_MODE) $(INSTALL_FLAGS) \
  		Doc/man/resend.1 $(MAN)/man1/resend.1
  
+ wrapper: wrapper.c
diff --git a/mail/majordomo/patches/patch-al b/mail/majordomo/patches/patch-al
new file mode 100644
index 00000000000..d3c276439d5
--- /dev/null
+++ b/mail/majordomo/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2001/03/27 11:53:18 agc Exp $
+
+Change the manual page section, so that it doesn't conflict
+with the digest(1) manpage.
+
+--- Doc/man/digest.1	2001/03/27 11:46:32	1.1
++++ Doc/man/digest.1	2001/03/27 11:46:42
+@@ -1,4 +1,4 @@
+-.TH digest 1
++.TH digest 8
+ .SH NAME
+ digest \- receive a file for a digest, or create and mail a digest
+ .LP
diff --git a/mail/majordomo/pkg/PLIST b/mail/majordomo/pkg/PLIST
index d7704996987..8dcf11c82fc 100644
--- a/mail/majordomo/pkg/PLIST
+++ b/mail/majordomo/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/08/18 15:57:48 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/03/27 11:53:18 agc Exp $
 bin/approve
 bin/bounce
 bin/medit
@@ -26,7 +26,7 @@ libexec/majordomo/wrapper
 man/man1/approve.1
 man/man1/bounce-remind.1
 man/man1/bounce.1
-man/man1/digest.1
+man/man8/digest.8
 man/man1/resend.1
 man/man8/majordomo.8
 share/doc/majordomo/Changelog