Enable MSGS_DYNAMIC and read the right rc files.

4 files changed, 34 insertions, 17 deletions

diff --git a/mail/mush/patches/patch-af b/mail/mush/patches/patch-af
index 8db2913ca2d..f19cbd44114 100644
--- a/mail/mush/patches/patch-af
+++ b/mail/mush/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 1998/09/04 18:33:47 christos Exp $
+$NetBSD: patch-af,v 1.2 1998/09/04 19:29:06 christos Exp $
 
 *** old/commands.c	Fri Sep  4 11:22:06 1998
 --- commands.c	Fri Sep  4 11:21:28 1998
@@ -508,27 +508,24 @@ $NetBSD: patch-af,v 1.1 1998/09/04 18:33:47 christos Exp $
   	    turnon(glob_flags, READ_ONLY);
   	    had_error = 0;	/* return successfully anyway */
   
-*** old/version.h	Fri Sep  4 11:22:09 1998
---- version.h	Fri Sep  4 11:21:28 1998
+*** version.h	Fri Sep  4 14:29:25 1998
+--- old/version.h	Fri Sep  4 15:08:46 1998
 ***************
 *** 1,7 ****
+--- 1,11 ----
   /* @(#)version.h	(c) Copyright 1989, 1990, 1991 (Dan Heller) */
   
   #define MUSHNAME	"Mail User's Shell"
-! #define RELEASE_DATE	"beta(4) 03/19/98"
-  #define RELEASE		7
-  #define REVISION	"2"
-  #define PATCHLEVEL	6
---- 1,7 ----
-  /* @(#)version.h	(c) Copyright 1989, 1990, 1991 (Dan Heller) */
-  
-  #define MUSHNAME	"Mail User's Shell"
-! #define RELEASE_DATE	"beta(4)+dynamic 03/19/98"
++ #ifdef MSGS_DYNAMIC
++ #define RELEASE_DATE	"beta(4)+dynamic 03/19/98"
++ #else
+  #define RELEASE_DATE	"beta(4) 03/19/98"
++ #endif
   #define RELEASE		7
   #define REVISION	"2"
   #define PATCHLEVEL	6
 
-*** pick.c.orig	Fri Sep  4 12:07:59 1998
+*** old/pick.c	Fri Sep  4 12:07:59 1998
 --- pick.c	Fri Sep  4 13:12:17 1998
 ***************
 *** 11,19 ****
diff --git a/mail/mush/patches/patch-ag b/mail/mush/patches/patch-ag
index 28413dac55e..168419a24fa 100644
--- a/mail/mush/patches/patch-ag
+++ b/mail/mush/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.1 1998/09/04 18:33:48 christos Exp $
+$NetBSD: patch-ag,v 1.2 1998/09/04 19:29:06 christos Exp $
 
 *** /dev/null	Fri Sep  4 13:38:54 1998
 --- makefile.netbsd	Fri Sep  4 13:36:36 1998
@@ -26,7 +26,7 @@ $NetBSD: patch-ag,v 1.1 1998/09/04 18:33:48 christos Exp $
 + 
 + MAKES= makefile.bsdi makefile.bsd makefile.xenix makefile.sys.v makefile.hpux makefile.sun makefile.solaris makefile.freebsd
 + 
-+ CFLAGS= -O2 -DPOSIX -DCURSES -DBSD -DBSD44 -DSIGRET=void -DBASENAME -DENV_MAIL
++ CFLAGS= -O2 -DPOSIX -DCURSES -DBSD -DBSD44 -DSIGRET=void -DBASENAME -DENV_MAIL -DMSGS_DYNAMIC
 + LDFLAGS= 
 + LINTFLAGS= -bxah -Dlint -DCURSES -DBSD
 + LIBS= -lcurses -ltermlib
diff --git a/mail/mush/patches/patch-ah b/mail/mush/patches/patch-ah
index ec93cc332ef..1e6c33a6156 100644
--- a/mail/mush/patches/patch-ah
+++ b/mail/mush/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1 1998/09/04 18:33:48 christos Exp $
+$NetBSD: patch-ah,v 1.2 1998/09/04 19:29:06 christos Exp $
 
 *** old/config.h-dist	Fri Sep  4 11:21:28 1998
 --- config.h-dist	Fri Sep  4 11:21:28 1998
@@ -21,7 +21,7 @@ $NetBSD: patch-ah,v 1.1 1998/09/04 18:33:48 christos Exp $
   /* Default names and locations for files */
   #define MAILRC		".mushrc"
   #define ALTERNATE_RC	".mailrc"
-! #define DEFAULT_RC	"__PREFIX/etc/Mushrc"
+! #define DEFAULT_RC	"__PREFIX/share/misc/Mushrc"
 ! #define ALT_DEF_RC	"/etc/Mail.rc"
   #define SIGNATURE	".signature"
   #define FORTUNE		"/usr/games/fortune"
diff --git a/mail/mush/patches/patch-ai b/mail/mush/patches/patch-ai
new file mode 100644
index 00000000000..887999855ce
--- /dev/null
+++ b/mail/mush/patches/patch-ai
@@ -0,0 +1,20 @@
+$NetBSD: patch-ai,v 1.1 1998/09/04 19:29:06 christos Exp $
+*** old/Mushrc	Sun Oct 21 22:24:37 1990
+--- Mushrc	Fri Sep  4 15:13:56 1998
+***************
+*** 6,12 ****
+  set \
+  	MAILRC =	".mushrc" \
+  	ALTERNATE_RC =	".mailrc" \
+! 	ALT_DEF_RC =	"/usr/lib/Mail.rc"
+  
+  # Set up the display early to allow quick exit in headers-only mode.
+  # The hdrs_only flag is true if the command line was: "mush -H".
+--- 6,12 ----
+  set \
+  	MAILRC =	".mushrc" \
+  	ALTERNATE_RC =	".mailrc" \
+! 	ALT_DEF_RC =	"/etc/mail.rc"
+  
+  # Set up the display early to allow quick exit in headers-only mode.
+  # The hdrs_only flag is true if the command line was: "mush -H".