Build in a different way to enable the use of the "-nP", "-P", and "-Pprinter"

flags.  This now matches the manpage.

PR:	3958

3 files changed, 40 insertions, 16 deletions

diff --git a/print/a2ps43-letter/files/patch-aa b/print/a2ps43-letter/files/patch-aa
index 6e66394132e1..46ebb8e77da0 100644
--- a/print/a2ps43-letter/files/patch-aa
+++ b/print/a2ps43-letter/files/patch-aa
@@ -1,6 +1,6 @@
 --- Makefile.orig	Mon Feb 14 07:09:33 1994
-+++ Makefile	Thu May 16 19:20:50 1996
-@@ -29,12 +29,16 @@
++++ Makefile	Sun May  9 13:50:34 1999
+@@ -29,12 +29,15 @@
  D	=.
  O	=.
  
@@ -16,8 +16,7 @@
 +MANDIR = $(PREFIX)/man/man$(MANEXT)
  
 -CFLAGS	= -DBSD -O -DLPR_PRINT
-+##CFLAGS	= -DBSD -O -DLPR_PRINT
-+CFLAGS = -DBSD -O -DWIDTH=$(WIDTH) -DHEIGHT=$(HEIGHT) -DA4_PAPERSIZE=$(A4_PAPERSIZE)
++CFLAGS	= -DBSD -O -DLPR_PRINT -DWIDTH=$(WIDTH) -DHEIGHT=$(HEIGHT) -DA4_PAPERSIZE=$(A4_PAPERSIZE)
  # Default values for HEIGHT, WIDTH, MARGIN and DIR_SEP (11.64, 8.27, 1.2, '/').
  # Default values for LPR_COMMAND and LPR_OPT ("lpr", "-l")
  # No values for TWOSIDED_DFLT, ONESIDED and TWOSIDED
diff --git a/print/a2ps43-letter/files/patch-ab b/print/a2ps43-letter/files/patch-ab
index 22d4155b8b9b..f6925c12ff22 100644
--- a/print/a2ps43-letter/files/patch-ab
+++ b/print/a2ps43-letter/files/patch-ab
@@ -1,6 +1,11 @@
 --- a2ps.c.orig	Tue Feb 15 01:14:59 1994
-+++ a2ps.c	Thu May 16 19:04:15 1996
-@@ -164,12 +164,17 @@
++++ a2ps.c	Sun May  9 13:46:38 1999
+@@ -1,4 +1,3 @@
+-/************************************************************************/
+ /*									*/
+ /* Description: Ascii to PostScript printer program.			*/
+ /* File: bounty:/archive/src/a2ps/Last/a2ps.c				*/
+@@ -164,12 +163,17 @@
  /*
   * Default page dimensions
   */
@@ -20,7 +25,16 @@
  #endif
  
  #ifndef MARGIN
-@@ -362,6 +367,8 @@
+@@ -311,7 +315,7 @@
+ int login_id = TRUE;		/* Print login ID at top of page */
+ #endif	
+ #if LPR_PRINT
+-int lpr_print = TRUE;		/* Fork a lpr process to do the printing */
++int lpr_print = FALSE;		/* Fork a lpr process to do the printing */
+ #ifdef RECTO_VERSO_PRINTING
+ int rectoverso = TWOSIDED_DFLT; /* Two-side printing */
+ #endif
+@@ -362,6 +366,8 @@
  /*
   * Sheet dimensions
   */
@@ -29,7 +43,7 @@
  double page_height = HEIGHT;	/* Paper height */
  double page_width = WIDTH;	/* Paper width */
  
-@@ -382,6 +389,11 @@
+@@ -382,6 +388,11 @@
      fprintf(stderr,"pos.   =  -#num\t\tnumber of copies to print\n");
      fprintf(stderr,"          -1\t\tone page per sheet\n");
      fprintf(stderr,"          -2\t\tTWIN PAGES per sheet\n");
@@ -41,7 +55,7 @@
      fprintf(stderr,"          -d\t-nd\tprint (DON'T PRINT) current date at the bottom\n");
      fprintf(stderr,"          -Fnum\t\tfont size, num is a float number\n");
      fprintf(stderr,"          -Hstr\t\tuse str like header title for subsequent files\n");
-@@ -464,6 +476,12 @@
+@@ -464,6 +475,12 @@
  	    usage(EXIT_FAILURE);
  	interpret = TRUE;
  	break;
@@ -54,7 +68,7 @@
      case 'n':
  	if (arg[2] == NUL)
  	    return;
-@@ -1471,8 +1489,8 @@
+@@ -1471,8 +1488,8 @@
      printf("\n%% Initialize page description variables.\n");
      printf("/x0 0 def\n");
      printf("/y0 0 def\n");
@@ -65,7 +79,7 @@
      printf("/margin %g inch def\n", (double)MARGIN);
      printf("/rm margin 3 div def\n");
      printf("/lm margin 2 mul 3 div def\n");
-@@ -1794,8 +1812,8 @@
+@@ -1794,8 +1811,8 @@
      /* Initialize variables not depending of positional options */
      landscape = twinpages = -1;	/* To force format switching */
      fontsize = -1.0;			/* To force fontsize switching */
diff --git a/print/a2ps43-letter/files/patch-ac b/print/a2ps43-letter/files/patch-ac
index 188afff0902b..1a2ef35e5e1a 100644
--- a/print/a2ps43-letter/files/patch-ac
+++ b/print/a2ps43-letter/files/patch-ac
@@ -1,12 +1,23 @@
 --- a2ps.1.orig	Tue Feb 15 01:15:16 1994
-+++ a2ps.1	Fri Apr  5 00:00:01 1996
-@@ -155,6 +155,9 @@
++++ a2ps.1	Sun May  9 12:20:19 1999
+@@ -97,8 +97,8 @@
+ Don't print non ascii characters as ISO Latin 1 characters (see -8 option).
+ .TP 0.6i
+ .B -P\fIprinter\fP
+-Send output to the named printer. The default option is send to the default
+-printer.
++Send output to the named printer. The default option is send the output to
++.B stdout.
+ .TP 0.6i
+ .B -q
+ Print files in quiet mode (no summary).
+@@ -154,6 +154,9 @@
+ .I num
  is the number of copies desired of each file named. By default, you get
  only one copy.
- .TP 0.6i
++.TP 0.6i
 +.B -a
 +Use the American paper size (8.5" x 11") as the basis for all calculations.
-+.TP 0.6i
+ .TP 0.6i
  .B -d
  Print the current date and time at the bottom of the page. This option
- is affected by the no surrounding border and the no header options.