Software Package:
	metamail

Release/Version:
	2.7

Retrieved from:
	ftp://ftp.bellcore.com/pub/nsb/

Bug reports:
	This software package is not supported.  Please send any
	bug reports to support@BSDI.COM and nsb@bellcore.com.

Comments:

=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
Modifications to this version made by BSDI:

Added: mailcap.bsdi makefile bin/makefile fonts/makefile man/makefile
       metamail/makefile richmail/makefile

Greatly modifid bin/* files to match the BSD/OS environment

===================================================================
RCS file: /master/contrib/metamail/Makefile,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 Makefile
*** 1.1.1.1	1995/12/09 17:00:51
--- Makefile	1995/12/09 17:05:24
***************
*** 1,3 ****
--- 1,5 ----
+ #	BSDI	BSDI_CONTRIB,v 1.2 1996/01/02 21:06:36 polk Exp
+ #
  # Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
  # 
  # Permission to use, copy, modify, and distribute this material 
***************
*** 38,44 ****
  
  STATICFLAG=FOOBAR${HOST_ARCH}
  
! CFLAGS = -g -I.  ${$(STATICFLAG)} 
  # The following is better if you want to make sure you run with SYSV defined
  # CFLAGS = -g -I.  ${$(STATICFLAG)}  -DSYSV
  # Also, for SGI Irix, compile in K&R mode
--- 40,46 ----
  
  STATICFLAG=FOOBAR${HOST_ARCH}
  
! CFLAGS = -O -I.  ${$(STATICFLAG)} 
  # The following is better if you want to make sure you run with SYSV defined
  # CFLAGS = -g -I.  ${$(STATICFLAG)}  -DSYSV
  # Also, for SGI Irix, compile in K&R mode
***************
*** 49,57 ****
  # LDLIBS variable.
  #
  # For Sun and BSD systems, the following should work...
! LDLIBS =
  # On BSD 4.4 systems, you will need the following
! # LDLIBS = -lcompat
  # On SGI machines, we need -lsun for getpw...(), and -lc_s saves some space.
  # LDLIBS = -lsun -lc_s
  # ISC SysVr3.2.2 has a shared C library and requires libinet.a to resolve
--- 51,59 ----
  # LDLIBS variable.
  #
  # For Sun and BSD systems, the following should work...
! # LDLIBS =
  # On BSD 4.4 systems, you will need the following
! LDLIBS = -lcompat
  # On SGI machines, we need -lsun for getpw...(), and -lc_s saves some space.
  # LDLIBS = -lsun -lc_s
  # ISC SysVr3.2.2 has a shared C library and requires libinet.a to resolve
***************
*** 75,81 ****
  INSTALL = install -c -s
  
  # Root of installation tree
! INSTROOT = /usr/local
  #
  # This is where binaries should be copied
  LOCALBINDIR = ${INSTROOT}/bin
--- 77,83 ----
  INSTALL = install -c -s
  
  # Root of installation tree
! INSTROOT = /usr/contrib
  #
  # This is where binaries should be copied
  LOCALBINDIR = ${INSTROOT}/bin
===================================================================
RCS file: /master/contrib/metamail/config.h,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 config.h
*** 1.1.1.1	1995/12/09 17:00:51
--- config.h	1995/12/09 17:05:25
***************
*** 1,3 ****
--- 1,5 ----
+ /*	BSDI	BSDI_CONTRIB,v 1.2 1996/01/02 21:06:36 polk Exp */
+ 
  /*
  Copyright (c) 1991 Bell Communications Research, Inc. (Bellcore)
  
***************
*** 78,83 ****
--- 80,90 ----
  #else
  #define RESET_PROGRAM "/usr/ucb/reset"
  #endif
+ #endif
+ 
+ #ifdef __bsdi__
+ #undef RESET_PROGRAM
+ #define RESET_PROGRAM "/bin/stty sane"
  #endif
  
  #ifdef __hpux
===================================================================
RCS file: /master/contrib/metamail/fonts/Xshownonascii,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 Xshownonascii
*** 1.1.1.1	1995/12/09 17:00:56
--- Xshownonascii	1995/12/10 06:26:36
***************
*** 1,31 ****
! #!/bin/csh -fb
! # (The "-fb" might need to be changed to "-f" on some systems)
  #
! set MYFONTDIR=/u/nsb/lib/fonts
  
! set CHARSET="$1"
  shift
! if ("$1" == "-e") then
      shift
!     set CMD="$*"
!     set RIGHTTERMCMD="$*"
  else
!     set CMD="more $* /dev/null"
!     set RIGHTTERMCMD="more $*"
! endif
! if ($?MM_CHARSET) then
!     if ($MM_CHARSET == "$CHARSET") then
  	$RIGHTTERMCMD
! 	exit
!     endif
! endif
! if ($?MM_AUXCHARSETS) then
!     if ($MM_AUXCHARSETS =~ *${CHARSET}*) then
  	$RIGHTTERMCMD
! 	exit
!     endif
! endif
! if (! -d $MYFONTDIR) then
      echo This message contains non-ASCII text, but the $CHARSET font
      echo has apparently not yet been installed on this machine.  
      echo "(There is no directory named ${MYFONTDIR}.)"
--- 1,31 ----
! #!/bin/sh
! #	BSDI	BSDI_CONTRIB,v 1.2 1996/01/02 21:06:36 polk Exp
  #
! MYFONTDIR=/usr/X11/lib/X11/fonts/misc
  
! CHARSET="$1"
  shift
! if [ "$1" == "-e" ]; then
      shift
!     CMD="$*"
!     RIGHTTERMCMD="$*"
  else
!     CMD="${PAGER:-more} $* /dev/null"
!     RIGHTTERMCMD="${PAGER:-more} $*"
! fi
! if [ "$MM_CHARSET" ]; then
!     if [ $MM_CHARSET == "$CHARSET" ]; then
  	$RIGHTTERMCMD
! 	exit $?
!     fi
! fi
! if [ "$MM_AUXCHARSETS" ]; then
!     if expr "$MM_AUXCHARSETS" : ".*${CHARSET}" > /dev/null; then
  	$RIGHTTERMCMD
! 	exit $?
!     fi
! fi
! if [ ! -d "$MYFONTDIR" ]; then
      echo This message contains non-ASCII text, but the $CHARSET font
      echo has apparently not yet been installed on this machine.  
      echo "(There is no directory named ${MYFONTDIR}.)"
***************
*** 34,64 ****
      echo ""
      cat $*
      exit 0
! endif
  
! if (! $?DISPLAY) then
      echo This message contains non-ASCII text, which can only be displayed
      echo properly if you are running X11.  What follows
      echo "may be partially unreadable, but the English (ASCII) parts"
      echo "should still be readable."
      cat $*
      exit 0
! endif
! set FPGREP=`xset q | grep $MYFONTDIR`
! if ("$FPGREP" == "") then
      echo Adding $MYFONTDIR to your font path.
      xset +fp $MYFONTDIR
  else
      echo Your font path appears to be correctly set.
! endif
  echo Running xterm to display text in $CHARSET, please wait...
! unsetenv MM_NOTTTY
  
  # The following line might work better on IBM RT and other machines that 
  #      think it smart inhibit 8 bit chars in xterms.
  # xterm -fn $CHARSET -tm litout -e $CMD
! set XCHARSET=\*`echo $CHARSET | sed -e s/iso-/iso/`
  xterm -fn "$XCHARSET" -e $CMD
- 
- 
- 
--- 34,61 ----
      echo ""
      cat $*
      exit 0
! fi
  
! if [ -z "$DISPLAY" ]; then
      echo This message contains non-ASCII text, which can only be displayed
      echo properly if you are running X11.  What follows
      echo "may be partially unreadable, but the English (ASCII) parts"
      echo "should still be readable."
      cat $*
      exit 0
! fi
! FPGREP=`xset q | grep $MYFONTDIR`
! if [ "$FPGREP" == "" ]; then
      echo Adding $MYFONTDIR to your font path.
      xset +fp $MYFONTDIR
  else
      echo Your font path appears to be correctly set.
! fi
  echo Running xterm to display text in $CHARSET, please wait...
! unset MM_NOTTTY
  
  # The following line might work better on IBM RT and other machines that 
  #      think it smart inhibit 8 bit chars in xterms.
  # xterm -fn $CHARSET -tm litout -e $CMD
! XCHARSET=\*`echo $CHARSET | sed -e s/iso-/iso/`
  xterm -fn "$XCHARSET" -e $CMD
===================================================================
RCS file: /master/contrib/metamail/metamail/Makefile,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 Makefile
*** 1.1.1.1	1995/12/09 17:00:53
--- Makefile	1995/12/09 17:17:07
***************
*** 15,23 ****
  
  STATICFLAG=FOOBAR${HOST_ARCH}
  
! CFLAGS = -g -I.  ${$(STATICFLAG)} 
  
! LDLIBS =
  
  CONFIGDIR = ..
  
--- 15,23 ----
  
  STATICFLAG=FOOBAR${HOST_ARCH}
  
! CFLAGS = -O -I.  ${$(STATICFLAG)} 
  
! LDLIBS = -lcompat
  
  CONFIGDIR = ..
  
===================================================================
RCS file: /master/contrib/metamail/richmail/Makefile,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 Makefile
*** 1.1.1.1	1995/12/09 17:00:54
--- Makefile	1995/12/09 21:25:51
***************
*** 17,23 ****
  
  STATICFLAG=FOOBAR${HOST_ARCH}
  
! CFLAGS = -g -I.  ${$(STATICFLAG)} 
  
  LDLIBS =
  
--- 17,23 ----
  
  STATICFLAG=FOOBAR${HOST_ARCH}
  
! CFLAGS = -O -I.  ${$(STATICFLAG)} 
  
  LDLIBS =
  
===================================================================
RCS file: /master/contrib/metamail/metamail/mailto.c,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 mailto.c
*** mailto.c	1995/12/09 17:00:53	1.1.1.1
--- mailto.c	1996/01/02 21:00:30
***************
*** 1791,1797 ****
                  int ct;
                  printf("\nEnter the MIME Content-type value for the data from file %s\n    (type '?' for a list of locally-valid content-types): ", sdum);
                  fflush(stdout);
!                 gets(LineBuf);
                  if (index(LineBuf, '/')) {
                      char lc[100], *s, AnsBuf[100];
                      strcpy(lc, LineBuf);
--- 1791,1797 ----
                  int ct;
                  printf("\nEnter the MIME Content-type value for the data from file %s\n    (type '?' for a list of locally-valid content-types): ", sdum);
                  fflush(stdout);
!                 fgets(LineBuf,MAX_LINELENGTH,stdin);
                  if (index(LineBuf, '/')) {
                      char lc[100], *s, AnsBuf[100];
                      strcpy(lc, LineBuf);
***************
*** 1809,1815 ****
                      }
                      if (mc) break;
                      printf("The MIME content-type '%s' is not listed in your local mailcap files,\nand may not be a valid MIME type.  Do you want to use it anyway [no] ? ", LineBuf);
!                     s = gets(AnsBuf);
                      while (s && *s && isspace((unsigned char) *s)) ++s;
                      if (s && (*s == 'y' || *s == 'Y')) break;
                      continue;
--- 1809,1815 ----
                      }
                      if (mc) break;
                      printf("The MIME content-type '%s' is not listed in your local mailcap files,\nand may not be a valid MIME type.  Do you want to use it anyway [no] ? ", LineBuf);
!                     s = fgets(AnsBuf,sizeof(AnsBuf),stdin);
                      while (s && *s && isspace((unsigned char) *s)) ++s;
                      if (s && (*s == 'y' || *s == 'Y')) break;
                      continue;
===================================================================
RCS file: /master/contrib/metamail/metamail/metamail.c,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 metamail.c
*** metamail.c	1995/12/09 17:00:52	1.1.1.1
--- metamail.c	1996/01/02 21:02:11
***************
*** 579,585 ****
                                  int overwriteans = -1;
                                  do {
                                      printf("File %s exists.  Do you want to overwrite it (y/n) ?\n", Fname);
!                                     s = gets(AnsBuf);
                                      if (!s) {
                                          overwriteans = 0;
                                      } else {
--- 579,585 ----
                                  int overwriteans = -1;
                                  do {
                                      printf("File %s exists.  Do you want to overwrite it (y/n) ?\n", Fname);
!                                     s = fgets(AnsBuf,sizeof(AnsBuf),stdin);
                                      if (!s) {
                                          overwriteans = 0;
                                      } else {
***************
*** 1823,1829 ****
          } else {
              printf("This message contains '%s'-format data.\nDo you want to view it using the '%s' command (y/n) [y] ? ", ctype, ShortCommand(progname));
          }
!         s = gets(AnsBuf);
          if (!s) return(0); /* EOF */
  	while (s && *s && isspace((unsigned char) *s)) ++s;
  	if (*s == 'y' || *s == 'Y' || !*s || *s == '\n') return(1);
--- 1823,1829 ----
          } else {
              printf("This message contains '%s'-format data.\nDo you want to view it using the '%s' command (y/n) [y] ? ", ctype, ShortCommand(progname));
          }
!         s = fgets(AnsBuf,sizeof(AnsBuf),stdin);
          if (!s) return(0); /* EOF */
  	while (s && *s && isspace((unsigned char) *s)) ++s;
  	if (*s == 'y' || *s == 'Y' || !*s || *s == '\n') return(1);
