[comp.sources.misc] v14i092: Official patch #8 for mp v2.4; please apply it.

rburridge@Sun.COM (Rich Burridge) (09/16/90)

Posting-number: Volume 14, Issue 92
Submitted-by: rburridge@Sun.COM (Rich Burridge)
Archive-name: mp-2.4.5/patch03

[Brandon, could you please post this to comp.sources.misc when you get
 a spare moment?]

Mp is a Postscript pretty printer for mail,news and ordinary files.

This is official patch #8 for mp v2.4.

** Mp v2.4 was posted to comp.sources.misc two weeks ago at patchlevel #5. **

It makes the following changes:

    *  From Johan Vromans <jv@mh.nl>
       Introduces another PostScript prologue file for the Time/System
       International personal organiser. The prologue file is called
       mp.pro.timesys.ps. The command line option to invoke Time Manager
       output has been changed to -tm, and the Time/System output uses -ts.
       The MANIFEST and FILES files have been updated to mention this new
       file. The mailp shell script, Makefile.dist and mp manual pages
       have been adjusted accordingly.

    *  Not everybody wants the newsp, filep ... shell scripts installed.
       To prevent this, you will need to comment out some lines in your
       Makefile (after you copy it from Makefile.dist). This is now explicitly
       mentioned in the Makefile.dist file and in the README under the
       installation section.

    *  The -v and the -? command line options now both output the current
       mp version number and the usage message then exit.

    *  From Larry W. Virden <lwv27%cas.BITNET@CUNYVM.CUNY.Edu>
       Modifications to the mailp shell script to better handle the
       printing of the subject lines. Added a comment to the shell script
       to mention that banner printing is turned off by default. Most of
       the banner information is handled in the mp banners. Certain sites
       though, might wish to alter this by removing the -h switch to the
       lpr command.

    *  From Bill Houle <bhoule@se-sd.SanDiego.NCR.COM>
       Have added a SYSV definition to the Makefile.dist file which should
       be uncommented if you are compiling mp on a System V machine.
       
       In mp.h, compiling mp on an NCR Tower V.3 system, the compiler did
       not like the #include for sys/pathname.h, so it's been eliminated.
       [If this is a problem for any SysV sites, please let me know - Rich].
       
       cc complained about redefinition of sprintf et al, which were
       already defined in <string.h>. I fixed by bracketing with #ifndef:
       
       To get rid of the annoying warnings about illegal structure operations,+        I included definitions for getpwuid() and getpwnam(). On the SysV Tower+        at least, <pwd.h> defines the passwd structure, but not the functions.
       
    *  From Larry W. Virden <lwv27%cas.BITNET@CUNYVM.CUNY.Edu>
       The sprintf hard coded externs are in conflict with at least the
       SunOS 4.1 systme 5 declarations.
       
       Line 225 of misc.c is :   *ptr++ ;
       Why?  The * is never used - it just falls on the floor.
       
    *  From Jim Sanchez <syteke!jim@relay.EU.net>
       Please reduce the file name length on the mp.pro.filofax and
       mp.pro.timeman files for us system V guys. We are stuck with short
       file names and have to edit the source files each time you issue a
       patch.
       
       [For now, I've detailed this problem in the TODO file. When the next
        version of mp is released, I'll make sure that all the filenames are
        below 14 characters - Rich].

TO INSTALL:
-----------

A shar file is included below which contains patch #8 and the new prologue
file, mp.pro.timesys.ps. Unpack these (in the mp source directory) using sh.

Apply the patch with Larry Wall's patch program. Copy Makefile.dist to
Makefile and adjust for your site. Then do a "make". Check the paper size
in each of the prologue files that you use is correct for your site (US
Letter or A4), then do a "make install". You might wish to reread the
installation section in the README file to make sure you've adjusted
everything in the Makefile that you need to.

If you need to get patch #6 or #7, then it can be obtained from the automatic
mail archive server, by sending a message to rb-archive-server@Aus.Sun.COM
containing the line:

send mp patchn

where n is the patch number you require.

If this is all getting too confusing for you, then the latest complete mp
distribution can be obtained from the same address, by sending a message
containing the lines:

send mp part1
send mp part2

If the mail is likely to go back through any sites that impose a size limit,
then I suggest you divide the above request up into two separate mail
messages.

You can also include a path line in these requests to indicate the mail
path that the archive server should use to send the files to you. Such a
path line could be:

path uunet.uu.net!hostname!user

Note that this is uunet.uu.net and not just uunet. Sun.COM doesn't recognise
just uunet.

Rich Burridge,          DOMAIN: richb@Aus.Sun.COM
Sun Microsystems.       ACSNET: richb@sunaus.sun.oz
PHONE: +61 2 413 2666   UUCP:   {uunet,mcvax,ukc}!munnari!sunaus.oz!richb

------CUT HERE------patch.8 + mp.pro.timesys.ps------CUT HERE------
#! /bin/sh
# this is a shell archive, meaning:
# 1. Remove everything above the #! /bin/sh line
# 2. Save the resulting text in a file.
# 3. Execute the file with /bin/sh to create the files:
#	patch.8
#	mp.pro.timesys.ps
# This archive created: Fri Sep 14 16:45:01 EST 1990
#
#
export PATH; PATH=/bin:$PATH
#
if [ -f patch.8 ]
then
echo shar: will not over-write existing file patch.8
else
echo shar: extracting 'patch.8',    22134 characters
cat > patch.8 <<'Funky_Stuff'

------- README -------
*** /tmp/da01101	Fri Sep 14 16:40:27 1990
--- README	Fri Sep 14 16:20:30 1990
***************
*** 63,68 ****
--- 63,75 ----
  size is defaulted to US Letter size, so this will work successfully on A4
  sized paper but not use all of the paper.
  
+ Before you install the mp files in the appropriate places, you should
+ consider whether you want the installation to install the newsp, filep ...
+ shell scripts. If this is not the case, then you will need to comment out
+ this section of the Makefile. Look for the comment beginning "NOTE:".
+ Alternatively you might only wish a subset to be installed, in which case
+ you should adjust the MAILPNAMES definition in the Makefile accordingly.
+ 
  This should be followed by a "make install" which will put the files in
  their default locations. You will probably have to be super-user when you do
  the "make install".
***************
*** 113,120 ****
        mp.pro.ps               standard prologue
        mp.pro.alt.ps           alternative prologue, page nos. bottom right
        mp.pro.l.ps             standard prologue, landscape, 2 columns
!       mp.pro.filofax.ps       filofax prologue
!       mp.pro.timeman.ps       time manager prologue
  
  
  4. Acknowledgements.
--- 120,128 ----
        mp.pro.ps               standard prologue
        mp.pro.alt.ps           alternative prologue, page nos. bottom right
        mp.pro.l.ps             standard prologue, landscape, 2 columns
!       mp.pro.filofax.ps       Filofax prologue
!       mp.pro.timeman.ps       Time Manager prologue
!       mp.pro.timesys.ps       Time/System International prologue.
  
  
  4. Acknowledgements.
***************
*** 144,151 ****
  Maureen Chew, Brian Kohn, Walter Underwood, Mike Khaw, Rick Gunderson, Johan
  Vromans, Brachet, Pierre Mareschal, Roger Riggs, Larry Tsui, Mike Bundschuh,
  Amos Shapir, Bruce G Barnett, Pauline van Winsen, James F. Blake, Bruno
! Pillard, Rainer Klute, Ran Ever-Hadani, Lupe Christoph and John Little for
! bug reports and/or bug fixes plus enhancements.
  
  My thanks also goes to Glenn Reid from Adobe Systems for the backspacefont.ps
  code used in the prologue files. I'm grateful to all these people, plus
--- 152,159 ----
  Maureen Chew, Brian Kohn, Walter Underwood, Mike Khaw, Rick Gunderson, Johan
  Vromans, Brachet, Pierre Mareschal, Roger Riggs, Larry Tsui, Mike Bundschuh,
  Amos Shapir, Bruce G Barnett, Pauline van Winsen, James F. Blake, Bruno
! Pillard, Rainer Klute, Ran Ever-Hadani, Lupe Christoph, John Little and
! Bill Houle for bug reports and/or bug fixes plus enhancements.
  
  My thanks also goes to Glenn Reid from Adobe Systems for the backspacefont.ps
  code used in the prologue files. I'm grateful to all these people, plus

------- mp.1 -------
*** /tmp/da01104	Fri Sep 14 16:40:27 1990
--- mp.1	Fri Sep 14 15:22:50 1990
***************
*** 1,5 ****
  .\" %Z%%M% %I% %E%
! .TH MP 1L "12 April 1990"
  .SH NAME
  mp \- Postscript pretty printer
  .SH SYNOPSIS
--- 1,5 ----
  .\" %Z%%M% %I% %E%
! .TH MP 1L "14 September 1990"
  .SH NAME
  mp \- Postscript pretty printer
  .SH SYNOPSIS
***************
*** 31,39 ****
  .I subject
  ]
  [
! .B \-t
  ]
  [
  .B \-v
  ]
  [
--- 31,42 ----
  .I subject
  ]
  [
! .B \-tm
  ]
  [
+ .B \-ts
+ ]
+ [
  .B \-v
  ]
  [
***************
*** 105,112 ****
  The file on standard input is a digest so print accordingly.
  .TP
  .B \-f
! The file on standard input is printed specifically was use with Filofax,
! a personal organiser.
  .TP
  .B \-l
  Prints output in landscape mode. Two pages of text will be printed per
--- 108,115 ----
  The file on standard input is a digest so print accordingly.
  .TP
  .B \-f
! The file on standard input is printed specifically for use with the
! Filofax personal organiser.
  .TP
  .B \-l
  Prints output in landscape mode. Two pages of text will be printed per
***************
*** 128,143 ****
  prologue file is determined by first looking for the environment variable
  .IR MP_PROLOGUE .
  This will be the directory where the mp prologue files are to be found.
! Three different prologue files are used. Normally the prologue file is
  .I mp.pro.ps
  but if the
  .I \-f
  option is used, then the prologue file is called
  .I mp.pro.filofax.ps
! and if the
! .I \-t
  option is used, then the prologue file is
  .I mp.pro.timeman.ps
  If
  .I MP_PROLOGUE
  isn't found, then the default location is used. The default location is
--- 131,153 ----
  prologue file is determined by first looking for the environment variable
  .IR MP_PROLOGUE .
  This will be the directory where the mp prologue files are to be found.
! Five different prologue files are used. Normally the prologue file is
  .I mp.pro.ps
  but if the
  .I \-f
  option is used, then the prologue file is called
  .I mp.pro.filofax.ps
! or if the
! .I \-tm
  option is used, then the prologue file is
  .I mp.pro.timeman.ps
+ or if the
+ .I \-ts
+ option is used, then the prologue file is
+ .I mp.pro.timesys.ps.
+ There is an alternative "standard" prologue file called
+ .I mp.pro.alt.ps
+ which outputs the page number in the right corner of the bottom banner.
  If
  .I MP_PROLOGUE
  isn't found, then the default location is used. The default location is
***************
*** 150,159 ****
  files which have been specified on the command line, the the subject will
  default to the name of each of these files.
  .TP
! .B \-t
! The file on standard input is printed specifically for use with Time Manager,
! a personal organiser.
  .TP
  .B \-v
  Print the version number of this release of the
  .B mp
--- 160,173 ----
  files which have been specified on the command line, the the subject will
  default to the name of each of these files.
  .TP
! .B \-tm
! The file on standard input is printed specifically for use with the
! Time Manager personal organiser.
  .TP
+ .B \-ts
+ The file on standard input is printed specifically for use with the
+ Time/System International personal organiser.
+ .TP
  .B \-v
  Print the version number of this release of the
  .B mp
***************
*** 174,184 ****
--- 188,209 ----
  Editing this file will allow you to introduce some stylistic variation
  in the printing of mail.
  .TP
+ .B /usr/local/lib/mp.pro.l.ps
+ The PostScript prologue file for outputing in landscape format.
+ .TP
+ .B /usr/local/lib/mp.pro.alt.ps
+ An alternative "standard" PostScript prologue file which outputs page
+ numbers in the bottom right corner of each page.
+ .TP
  .B /usr/local/lib/mp.pro.filofax.ps
  Postscript prologue used to print out files in Filofax format.
  .TP
  .B /usr/local/lib/mp.pro.timeman.ps
  PostScript prologue used to print out files in Time Manager format.
+ .TP
+ .B /usr/local/lib/mp.pro.timesys.ps
+ PostScript prologue used to print out files in Time/System International
+ format.
  .SH "SEE ALSO"
  mail(1)
  .SH AUTHORS
***************
*** 202,207 ****
--- 227,235 ----
  ordinary files added by Sam Manoharan, Edinburgh University.
  .PP
  Support for landscape mode written by Michael Tuciarone.
+ .PP
+ Revision of the PostScript structuring and the way that the prologue files
+ are handled was included by Johan Vromans
  .PP
  Rich Burridge,             Domain: richb@Aus.Sun.COM
  .nf

------- mailp -------
*** /tmp/da01107	Fri Sep 14 16:40:28 1990
--- mailp	Fri Sep 14 15:50:26 1990
***************
*** 2,33 ****
  #
  #  %Z%%M% %I% %E%
  #
! #  mailp, newsp, filep, digestp, filofaxp and timemanp
  #  shell script de lancement de mp
! #  (mail/news/file/digest/filofax/time-manager pretty printer)
  #
  #  Original: Bruno Pillard - October 1988.
  #  Modified: Rich Burridge - June 1989.
  
  BIN=/usr/local/bin
  
  case $0 in
  	*mailp)    PROG=mp       ;; 
  	*newsp)	   PROG="mp -a"  ;;
  	*digestp)  PROG="mp -d"	 ;;
! 	*filep)	   PROG="mp -o"  ;;
  	*filofaxp) PROG="mp -f"	 ;;
! 	*timemanp) PROG="mp -t"	 ;;
  	*)	echo Unknown pretty printer: $0
  		exit;;
  esac
  
  if    [ $# -eq 0 ]
  then
  	set - " - "
  fi
  while [ $# -gt 0 ]
  do
! 	/bin/cat $1 | ${BIN}/${PROG} | lpr -h -P${PRINTER:-ps}
  	shift
  done
--- 2,59 ----
  #
  #  %Z%%M% %I% %E%
  #
! #  mailp, newsp, filep, digestp, filofaxp, timemanp and timesysp
  #  shell script de lancement de mp
! #  (mail/news/file/digest/filofax/time-manager/time-system pretty printer)
  #
  #  Original: Bruno Pillard - October 1988.
  #  Modified: Rich Burridge - June 1989.
+ #
  
  BIN=/usr/local/bin
  
+ FLAG=''
  case $0 in
  	*mailp)    PROG=mp       ;; 
  	*newsp)	   PROG="mp -a"  ;;
  	*digestp)  PROG="mp -d"	 ;;
! 	*filep)	   PROG="mp -o"  FLAG='-s $1' ;;
  	*filofaxp) PROG="mp -f"	 ;;
! 	*timemanp) PROG="mp -tm" ;;
! 	*timesysp) PROG="mp -ts" ;;
  	*)	echo Unknown pretty printer: $0
  		exit;;
  esac
  
+ if	[ "$#" -ge 1 ] ; then
+ 	case    "$1" in
+ 	-s*)
+ 		if [ "$1" = "-s" ] ; then
+ 			FLAG="-s $2"
+ 			shift ; shift
+ 		else
+ 			FLAG="$1"
+ 			shift
+ 		fi
+ 		;;
+ 	* )
+ 		;;
+ 	esac
+ fi
+ 
  if    [ $# -eq 0 ]
  then
  	set - " - "
+ 	FLAG='-s "stdin"'
  fi
+ 
+ #  NOTE: Banner printing is disabled below, by the inclusion of the -h
+ #        switch to the lpr command. Most of the information that typically
+ #        appears on the banner sheet, is output in the mp banners. If you
+ #        wish to enable banner printing, then you should remove the -h switch.
+ 
  while [ $# -gt 0 ]
  do
! 	/bin/cat $1 | eval ${BIN}/${PROG} $FLAG | lpr -h -P${PRINTER:-ps}
  	shift
  done

------- misc.c -------
*** /tmp/da01110	Fri Sep 14 16:40:29 1990
--- misc.c	Fri Sep 14 16:23:38 1990
***************
*** 124,135 ****
          case 's' : if (strlen(optarg))
                       gsubject = optarg ;        /* New subject line. */
                     break ;
!         case 't' :                              /* Time Manager output. */
!                    SPRINTF(proname, "%s/mp.pro.timeman.ps", prologue) ;
                     break ;
!         case 'v' : FPRINTF(stderr,
!                            "%s version 2.4.%1d\n", progname, PATCHLEVEL) ;                         exit(1) ;
!         case '?' : usage() ;
        }
  }
  
--- 124,136 ----
          case 's' : if (strlen(optarg))
                       gsubject = optarg ;        /* New subject line. */
                     break ;
!         case 't' :      if (!strcmp(optarg, "m"))     /* Time Manager. */
!                      SPRINTF(proname, "%s/mp.pro.timeman.ps", prologue) ;
!                    else if (!strcmp(optarg, "s"))     /* Time/System Int. */
!                      SPRINTF(proname, "%s/mp.pro.timesys.ps", prologue) ;
                     break ;
!         case '?' :
!         case 'v' : usage() ;
        }
  }
  
***************
*** 142,148 ****
    int i ;
    int namefields ;      /* Number of "words" from passwd gecos. */
    int namelength ;      /* Maximum number of characters from passwd gecos. */
!   struct passwd *pp ;
  
  #ifdef GECOSFIELDS
    namefields = GECOSFIELDS ;  /* New no. of "words" from passwd gecos. */
--- 143,149 ----
    int i ;
    int namefields ;      /* Number of "words" from passwd gecos. */
    int namelength ;      /* Maximum number of characters from passwd gecos. */
!   struct passwd *pp, *getpwuid(), *getpwnam() ;
  
  #ifdef GECOSFIELDS
    namefields = GECOSFIELDS ;  /* New no. of "words" from passwd gecos. */
***************
*** 222,228 ****
            if (islower(c[0])) owner[n++] = toupper(c[0]) ;
            for (j = 1; j < strlen(c); j++)
              owner[n++] = c[j] ;
!           *ptr++ ;
          } 
        else if (*ptr == ' ')
          {
--- 223,229 ----
            if (islower(c[0])) owner[n++] = toupper(c[0]) ;
            for (j = 1; j < strlen(c); j++)
              owner[n++] = c[j] ;
!           ptr++ ;
          } 
        else if (*ptr == ' ')
          {
***************
*** 239,246 ****
  
  usage()     /* Print usage message and exit. */
  {
!   FPRINTF(stderr,"Usage: %s [-a] [-d] [-f] [-l] [-m] ", progname) ;
!   FPRINTF(stderr, "[-o] [-p prologue] [-s subject] [-t] [-v] [-?]\n") ;
    exit(1) ;
  }
  
--- 240,248 ----
  
  usage()     /* Print usage message and exit. */
  {
!   FPRINTF(stderr, "%s version 2.4.%1d\n\n", progname, PATCHLEVEL) ;
!   FPRINTF(stderr, "Usage: %s [-a] [-d] [-f] [-l] [-m] [-o]\n", progname) ;
!   FPRINTF(stderr, "\t[-p prologue] [-s subject] [-t] [-v] [-?]\n") ;
    exit(1) ;
  }
  

------- CHANGES -------
*** /tmp/da01116	Fri Sep 14 16:40:30 1990
--- CHANGES	Fri Sep 14 16:30:31 1990
***************
*** 217,219 ****
--- 217,279 ----
         The NAME environment variable (if set) should be processed the same
         way as the GECOS passwd field. See the GECOSFIELDS and GECOSLENGTH
         definitions in Makefile.dist for more details.
+ 
+ v2.4 - patchlevel 8. - 14th September 1990.
+ 
+     *  From Johan Vromans <jv@mh.nl>
+        Introduces another PostScript prologue file for the Time/System
+        International personal organiser. The prologue file is called
+        mp.pro.timesys.ps. The command line option to invoke Time Manager
+        output has been changed to -tm, and the Time/System output uses -ts.
+        The MANIFEST and FILES files have been updated to mention this new
+        file. The mailp shell script, Makefile.dist and mp manual pages
+        have been adjusted accordingly.
+ 
+     *  Not everybody wants the newsp, filep ... shell scripts installed.
+        To prevent this, you will need to comment out some lines in your
+        Makefile (after you copy it from Makefile.dist). This is now explicitly
+        mentioned in the Makefile.dist file and in the README under the
+        installation section.
+ 
+     *  The -v and the -? command line options now both output the current
+        mp version number and the usage message then exit.
+ 
+     *  From Larry W. Virden <lwv27%cas.BITNET@CUNYVM.CUNY.Edu>
+        Modifications to the mailp shell script to better handle the
+        printing of the subject lines. Added a comment to the shell script
+        to mention that banner printing is turned off by default. Most of
+        the banner information is handled in the mp banners. Certain sites
+        though, might wish to alter this by removing the -h switch to the
+        lpr command.
+ 
+     *  From Bill Houle <bhoule@se-sd.SanDiego.NCR.COM>
+        Have added a SYSV definition to the Makefile.dist file which should
+        be uncommented if you are compiling mp on a System V machine.
+ 
+        In mp.h, compiling mp on an NCR Tower V.3 system, the compiler did
+        not like the #include for sys/pathname.h, so it's been eliminated.
+        [If this is a problem for any SysV sites, please let me know - Rich].
+ 
+        cc complained about redefinition of sprintf et al, which were
+        already defined in <string.h>. I fixed by bracketing with #ifndef:
+ 
+        To get rid of the annoying warnings about illegal structure operations,
+        I included definitions for getpwuid() and getpwnam(). On the SysV Tower
+        at least, <pwd.h> defines the passwd structure, but not the functions.
+ 
+     *  From Larry W. Virden <lwv27%cas.BITNET@CUNYVM.CUNY.Edu>
+        The sprintf hard coded externs are in conflict with at least the
+        SunOS 4.1 systme 5 declarations.
+ 
+        Line 225 of misc.c is :   *ptr++ ;
+        Why?  The * is never used - it just falls on the floor.
+ 
+     *  From Jim Sanchez <syteke!jim@relay.EU.net>
+        Please reduce the file name length on the mp.pro.filofax and
+        mp.pro.timeman files for us system V guys. We are stuck with short
+        file names and have to edit the source files each time you issue a
+        patch.
+ 
+        [For now, I've detailed this problem in the TODO file. When the next
+         version of mp is released, I'll make sure that all the filenames are
+         below 14 characters - Rich].

------- patchlevel.h -------
*** /tmp/da01119	Fri Sep 14 16:40:31 1990
--- patchlevel.h	Fri Sep 14 14:31:13 1990
***************
*** 14,17 ****
   *  reported to me then an attempt will be made to fix them.
   */
  
! #define  PATCHLEVEL  7
--- 14,17 ----
   *  reported to me then an attempt will be made to fix them.
   */
  
! #define  PATCHLEVEL  8

------- mp.h -------
*** /tmp/da01122	Fri Sep 14 16:40:31 1990
--- mp.h	Fri Sep 14 16:15:41 1990
***************
*** 23,29 ****
  #include <pwd.h>
  
  #ifdef   SYSV
- #include <sys/pathname.h>
  #include <string.h>
  #endif /*SYSV*/
  
--- 23,28 ----
***************
*** 79,85 ****
--- 78,87 ----
  FILE *fopen() ;
  void exit() ;
  char *asctime(), *getenv(), *getlogin(), *gets(), *index(), *malloc() ;
+ 
+ #ifndef SYSV
  char *realloc(), *sprintf(), *strchr(), *strcpy(), *strncpy() ;
+ #endif /*SYSV*/
  
  void do_date(), get_header(), get_mult_hdr(), init_setup() ;
  void parse_headers(), readline(), reset_headers(), set_defs() ;

------- Makefile.dist -------
*** /tmp/da01125	Fri Sep 14 16:40:32 1990
--- Makefile.dist	Fri Sep 14 16:05:30 1990
***************
*** 46,51 ****
--- 46,56 ----
  #  definition below.
  #
  #NOINDEX         = -DNOINDEX
+ #---------------------------------------------------------------------
+ #  If you are running on a Unix System V machine, then you should
+ #  uncomment the next definition.
+ #
+ #SYSV           = -DSYSV
  #=====================================================================
  #
  #  Default locations where mp files will be installed.
***************
*** 58,64 ****
  #---------------------------------------------------------------------
  #  Alternate names for the mailp frontend
  #
! MAILPNAMES = newsp digestp filep filofaxp timemanp
  #---------------------------------------------------------------------
  #  Compilation flags and standard macro definitions.
  #
--- 63,69 ----
  #---------------------------------------------------------------------
  #  Alternate names for the mailp frontend
  #
! MAILPNAMES = newsp digestp filep filofaxp timemanp timesysp
  #---------------------------------------------------------------------
  #  Compilation flags and standard macro definitions.
  #
***************
*** 77,87 ****
  OTHERS   = README Makefile.dist mailp mp.1 \
  	   MANIFEST FILES CHANGES TODO \
  	   mp.el mp.pro.ps mp.pro.alt.ps mp.pro.l.ps \
! 	   mp.pro.filofax.ps mp.pro.timeman.ps Data
  
  SFILES1  = $(SRCS) $(HDRS) README MANIFEST FILES CHANGES TODO
  SFILES2  = Makefile.dist mailp mp.1 mp.el Data mp.pro.ps mp.pro.l.ps \
! 	   mp.pro.alt.ps mp.pro.filofax.ps mp.pro.timeman.ps
  
  all:       $(BINARIES)
  
--- 82,93 ----
  OTHERS   = README Makefile.dist mailp mp.1 \
  	   MANIFEST FILES CHANGES TODO \
  	   mp.el mp.pro.ps mp.pro.alt.ps mp.pro.l.ps \
! 	   mp.pro.filofax.ps mp.pro.timeman.ps mp.pro.timesys.ps Data
  
  SFILES1  = $(SRCS) $(HDRS) README MANIFEST FILES CHANGES TODO
  SFILES2  = Makefile.dist mailp mp.1 mp.el Data mp.pro.ps mp.pro.l.ps \
! 	   mp.pro.alt.ps mp.pro.filofax.ps \
! 	   mp.pro.timeman.ps mp.pro.timesys.ps
  
  all:       $(BINARIES)
  
***************
*** 104,110 ****
--- 110,122 ----
  	   -install -c -m 644 mp.pro.alt.ps $(LIBDIR)
  	   -install -c -m 644 mp.pro.filofax.ps $(LIBDIR)
  	   -install -c -m 644 mp.pro.timeman.ps $(LIBDIR)
+ 	   -install -c -m 644 mp.pro.timesys.ps $(LIBDIR)
  	   -install -c -m 755 mailp $(BINDIR)
+ 
+ #
+ #  NOTE: If you don't want the newsp, filep ... shell scripts installed,
+ #        then you should comment out the following seven lines.
+ 
  	   @echo Making mailp links
  	   -@for name in $(MAILPNAMES); do \
  		echo -n $$name " "; \

------- TODO -------
*** /tmp/da01128	Fri Sep 14 16:40:33 1990
--- TODO	Fri Sep 14 16:39:35 1990
***************
*** 51,53 ****
--- 51,81 ----
  7/ From Johan Vromans <jv@mh.nl>
     A command line option to have page numbers reset to 1 when printing a
     new element of a mailfolder or digest.
+ 
+ 8/ From Michael J. Tuciarone <tooch@plan9.Sun.COM>
+    With landscape mode: There are a few things I don't like still, and chief
+    among them is that the last page printed "wins" and gets its subject
+    printed in the banner. It actually should (I think) be either the left-hand
+    message, or better yet, if the subjects are different then print a
+    different subject under each message.
+ 
+ 9/ From Jim Sanchez <syteke!jim@relay.EU.net>
+    Please reduce the file name length on the mp.pro.filofax and
+    mp.pro.timeman files for us system V guys. We are stuck with short file
+    names and have to edit the source files each time you issue a patch.
+ 
+    In the next release of mp, I will make the following changes:
+ 
+      mp.pro.filofax.ps ==> mp.pro.f.ps
+      mp.pro.timeman.ps ==> mp.pro.tm.ps
+      mp.pro.timesys.ps ==> mp.pro.ts.ps
+ 
+ 10/ From Bruno Pillard <bp@chorus.fr>
+     The opportunity to change the location of the LIBDIR is given in the
+     Makefile, so you should update the Makefile to update the man page
+     accordingly; For example in the Makefile:
+ 
+     man:;      sed -e s,LIBDIR,$$LIBDIR,g mp.man > mp.1
+ 
+     Of course, you have to change the name of mp.1 to mp.man in the
+     distribution and all occurrence of /usr/local/lib by LIBDIR.

------- MANIFEST -------
*** /tmp/da01131	Fri Sep 14 16:40:33 1990
--- MANIFEST	Fri Sep 14 14:37:11 1990
***************
*** 25,30 ****
--- 25,31 ----
  mp.pro.alt.ps                          |    2
  mp.pro.filofax.ps                      |    2
  mp.pro.timeman.ps                      |    2
+ mp.pro.timesys.ps                      |    2
  Data/Mail                              |    2
  Data/MailFolder                        |    2
  Data/NewsArticle1                      |    2

------- FILES -------
*** /tmp/da01134	Fri Sep 14 16:40:34 1990
--- FILES	Fri Sep 14 14:37:57 1990
***************
*** 28,33 ****
--- 28,34 ----
  mp.pro.alt.ps       - alternative mp prologue file.
  mp.pro.filofax.ps   - mp Filofax prologue file.
  mp.pro.timeman.ps   - mp Time Manager prologue file.
+ mp.pro.timesys.ps   - mp Time/System International prologue file.
  
  Sub-directory Data: test data files for new versions of mp.
  -----------------------------------------------------------
Funky_Stuff
len=`wc -c < patch.8`
if [ $len !=    22134 ] ; then
echo error: patch.8 was $len bytes long, should have been    22134
fi
fi # end of overwriting check
if [ -f mp.pro.timesys.ps ]
then
echo shar: will not over-write existing file mp.pro.timesys.ps
else
echo shar: extracting 'mp.pro.timesys.ps',     4396 characters
cat > mp.pro.timesys.ps <<'Funky_Stuff'
%!PS-Adobe-1.0
%%Creator: Johan Vromans
%%Title: @(#)mp.pro.timesys.ps 1.1 90/09/14
%%CreationDate: see above
%%PageLength 80
%%LineLength 80
%%NumCols 2
%%DocumentFonts: Times-Bold Times-Roman Courier
%%Pages: (atend)
%%EndComments

%% MP profile for European Time/system format, yet another personal
%% organizer.
%%
%% Time/system (c) Time/system International a/s

%Title: backspacefont.ps suggested by Glenn Reid (Adobe Systems).

/backspacefont {
    /Courier findfont dup length dict begin
        { %forall
            1 index /FID eq { pop pop } { def } ifelse
        } forall
        currentdict /UniqueID known { %if
              /UniqueID UniqueID 16#800000 xor def
        } if
        CharStrings length 1 add dict begin
            CharStrings { def } forall
          /backspace { -600 0 setcharwidth } bind def
            currentdict
      end
        /CharStrings exch def
        /Encoding Encoding 256 array copy def
        Encoding 8 /backspace put
        currentdict
    end
    definefont
} bind def
 
/CourierBack backspacefont
 
/FontSize 11 def
/font1d /Times-Bold            findfont def
/font2d /Times-Roman           findfont def
/font3d /CourierBack           findfont def
/fontHd /Helvetica-BoldOblique findfont 15 scalefont def
/fontH2 /Helvetica-BoldOblique findfont 10 scalefont def
/fontNd /Times-Bold            findfont 12 scalefont def

/BoldFont      { font1d FontSize scalefont setfont } def
/pf            { font2d FontSize scalefont setfont } def
/sf            { font3d 12       scalefont setfont } def
/fontH         { fontHd setfont } def
/fontD         { fontH2 setfont } def
/fontN         { fontNd setfont } def


sf
%% stick in all the fudge factors here. May need changing for page sizes,
%% laserwriter setups etc?
%%
/binderspace 150 def
/tmsyswidth 750 def
/tmsysheight 1150 def
/margin 60 def
/yco tmsysheight 50 sub def			% space at the top
/xright tmsyswidth binderspace add margin sub def	% space at right
/xleft binderspace def

0.5 0.5 scale
90 rotate
-50 tmsysheight neg translate

/newpage		% page_number newpage --
{ pop

  gsave			% save state for easy restore
  margin 0 translate
  /ypos tmsysheight 110 sub def
  xleft ypos moveto
} def

/endpage		% page_number endpage --
{ pop 			% get rid of page_number
  showpage
  grestore
} def

/endfile { } def	% -- endfile --

/endcol			% page_number column_number endcol --
{
  /thiscol exch def	% column_number
  gsave
    fontH
    % draw the top for owner
    newpath
      xleft 10 sub yco moveto
      xleft yco 20 sub 10 180 270 arc
      xright yco 20 sub 10 270 0 arc
      xright yco 10 0 90 arc
      xleft yco 10 90 180 arc
    closepath
    0.90 setgray fill
    0 setgray stroke
    xleft yco 16 sub moveto
    MailFor show
    User show
%   fontD
    TimeNow stringwidth pop neg xright add yco 16 sub moveto TimeNow show
    fontN
    % dup stringwidth pop 2 div neg 318 add 858 moveto show
    fontH
    % lower box for subject etc
    newpath
      xleft 10 sub 60 moveto
      xleft 40 10 180 270 arc
      xright 40 10 270 0 arc
      xright 60 10 0 90 arc
      xleft 60 10 90 180 arc
    closepath
    0.90 setgray fill
    % stick the page number just a few points in from the right hand edge
    newpath
      xright 10 sub 50 15 0 360 arc
      gsave
        1 setgray fill
      grestore
    closepath
    0 setgray stroke
    xleft 44 moveto Subject show
    fontN
    % position and print the page number
    dup stringwidth pop 2 div neg xright 10 sub add 46 moveto show
    fontH
  grestore
  thiscol 1 eq { tmsyspage } if	% draw neccessary page breaks
  grestore gsave		% back to default
  tmsyswidth thiscol mul margin add 0 translate
  /ypos tmsysheight 110 sub def
  xleft ypos moveto
} def

/tmsyspage
{ gsave
  drawholes
  [1 4] 0 setdash	% use dashed lines for marker
  newpath
  binderspace margin 2 div sub tmsyswidth add 0 moveto
  0 tmsysheight rlineto
  stroke
  grestore
} def

/showline
{
  show
  /ypos ypos 12 sub def
  xleft ypos moveto
} def


/xo 44 def

/drawhole		% draw one little hole
{ newpath
  xo yo 12 0 360 arc
  closepath
  0.24 setlinewidth
  stroke
} def

/drawholes		% show where the holes should be punched
{
  /ydisp 105.5 def
  /yo 154 def
  drawhole
  /yo yo ydisp add def
  drawhole
  /yo yo ydisp add def
  drawhole
  /yo 768 def
  drawhole
  /yo yo ydisp add def
  drawhole
  /yo yo ydisp add def
  drawhole
} def
Funky_Stuff
len=`wc -c < mp.pro.timesys.ps`
if [ $len !=     4396 ] ; then
echo error: mp.pro.timesys.ps was $len bytes long, should have been     4396
fi
fi # end of overwriting check