A4/Letter papersize controlled by PAPERSIZE variable. Closes PR 1104 and

1106.

Submitted by:	David O'Brien (obrien@cs.ucdavis.edu)

6 files changed, 173 insertions, 115 deletions

diff --git a/print/a2ps43-letter/Makefile b/print/a2ps43-letter/Makefile
index 5b173cc32f53..17de636268fc 100644
--- a/print/a2ps43-letter/Makefile
+++ b/print/a2ps43-letter/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:    a2ps
 # Version required:     4.3
 # Date created:         6 November 1994
-# Whom:                 jmz
+# Whom:                 jmz & David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.5 1995/11/22 13:17:46 asami Exp $
+# $Id: Makefile,v 1.6 1996/04/02 20:33:42 jmz Exp $
 #
 
 DISTNAME=	a2ps
-PKGNAME=	a2ps-4.3
+PKGNAME=	a2ps-${PAPERSIZE}-4.3
 CATEGORIES+=	print
 MASTER_SITES=	ftp://ftp.imag.fr/archive/postscript/format.translators/
 DISTFILES=	a2ps.V4.3.tar.gz
@@ -16,9 +16,64 @@ MAINTAINER=	jmz@FreeBSD.org
 
 NO_WRKSUBDIR=	yes
 
+MAKE_FLAGS?=	WIDTH=${WIDTH} HEIGHT=${HEIGHT} A4_PAPERSIZE=${A4_PAPERSIZE} -f
+
+
+letter::
+	${MAKE} PAPERSIZE=letter
+
+letter-install::
+	${MAKE} PAPERSIZE=letter install
+
+a4::
+	${MAKE} PAPERSIZE=a4
+
+a4-install::
+	${MAKE} PAPERSIZE=a4 install
+
+
+.if !defined(PAPERSIZE)
+PAPERSIZE=a4
+WIDTH=8.27
+HEIGHT=11.64
+A4_PAPERSIZE=1
+PAPERSIZE_UNSPECIFIED=	yes
+.elif ${PAPERSIZE} == A4 || ${PAPERSIZE} == a4 
+PAPERSIZE=a4
+WIDTH=8.27
+HEIGHT=11.64
+A4_PAPERSIZE=1
+.elif ${PAPERSIZE} == letter || ${PAPERSIZE} == LETTER
+PAPERSIZE=letter
+WIDTH=8.5
+HEIGHT=11.0
+A4_PAPERSIZE=0
+.else
+PAPERSIZE_INVALID= yes
+.endif	# not defined PAPERSIZE
+
+
+pre-fetch:
+.if defined(PAPERSIZE_UNSPECIFIED)
+	@echo "Defaulting to ${PAPERSIZE} sized paper."
+	@echo ""
+	@echo "Set the environment variable PAPERSIZE if you want to use other sizes."
+	@echo "Possible values are:  A4 (default) or letter"
+.elif defined(PAPERSIZE_INVALID)
+	@echo "Error: invalid value for PAPERSIZE: \"${PAPERSIZE}\"" 
+	@echo "Possible values are:  A4 (default) or letter"
+	@/usr/bin/false
+.endif
+
 pre-install:
 	@mkdir -p  ${PREFIX}/bin
 	@mkdir -p  ${PREFIX}/man/man1
 	@(cd ${WRKSRC}; make install.man)
 
+post-install:
+.if !defined(NOMANCOMPRESS)
+	 gzip -nf ${PREFIX}/man/man1/a2ps.1
+.endif
+	strip ${PREFIX}/bin/a2ps
+
 .include <bsd.port.mk>
diff --git a/print/a2ps43-letter/files/patch-aa b/print/a2ps43-letter/files/patch-aa
index 816678edba77..1129ffb60d1c 100644
--- a/print/a2ps43-letter/files/patch-aa
+++ b/print/a2ps43-letter/files/patch-aa
@@ -1,14 +1,23 @@
-*** a2ps.1.orig	Tue Feb 15 01:15:16 1994
---- a2ps.1	Tue Feb 21 16:56:19 1995
-***************
-*** 155,160 ****
---- 155,163 ----
-  is the number of copies desired of each file named. By default, you get
-  only one copy.
-  .TP 0.6i
-+ .B -a
-+ Use the American paper size (8.5" x 11") as the basis for all calculations.
-+ .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.
+--- Makefile.orig	Mon Feb 14 07:09:33 1994
++++ Makefile	Thu May 16 19:20:50 1996
+@@ -29,12 +29,16 @@
+ D	=.
+ O	=.
+ 
+-BINDIR	=/usr/local/bin
++##BINDIR	=/usr/local/bin
++BINDIR = $(PREFIX)/bin
+ 
+-MANDIR	=/usr/man/mann
+-MANEXT	=n
++##MANDIR	=/usr/man/mann
++##MANEXT	=n
++MANEXT = 1
++MANDIR = $(PREFIX)/man/man$(MANEXT)
+ 
+-CFLAGS	= -DBSD -O -DLPR_PRINT
++##CFLAGS	= -DBSD -O -DLPR_PRINT
++CFLAGS = -DBSD -O -DWIDTH=$(WIDTH) -DHEIGTH=$(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 75d6ca852483..22d4155b8b9b 100644
--- a/print/a2ps43-letter/files/patch-ab
+++ b/print/a2ps43-letter/files/patch-ab
@@ -1,89 +1,78 @@
-*** a2ps.c.orig	Tue Feb 15 01:14:59 1994
---- a2ps.c	Tue Feb 21 16:56:19 1995
-***************
-*** 166,175 ****
---- 166,177 ----
-   */
-  #ifndef WIDTH
-  #define	WIDTH	8.27
-+ #define USA_WIDTH 8.5
-  #endif
-  
-  #ifndef HEIGHT
-  #define	HEIGHT	11.64
-+ #define USA_HEIGHT 11.0
-  #endif
-  
-  #ifndef MARGIN
-***************
-*** 362,367 ****
---- 364,371 ----
-  /*
-   * Sheet dimensions
-   */
-+ double paper_height = HEIGHT;	/* Paper height */
-+ double paper_width = WIDTH;	/* Paper width */
-  double page_height = HEIGHT;	/* Paper height */
-  double page_width = WIDTH;	/* Paper width */
-  
-***************
-*** 382,387 ****
---- 386,392 ----
-      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");
-+     fprintf(stderr,"          -a\t\tUse USA paper size (8.5 x 11)\n");
-      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,469 ****
---- 469,478 ----
-  	    usage(EXIT_FAILURE);
-  	interpret = TRUE;
-  	break;
-+     case 'a':			/* American paper sizes */
-+ 	paper_height = USA_HEIGHT;
-+ 	paper_width = USA_WIDTH;
-+ 	break;
-      case 'n':
-  	if (arg[2] == NUL)
-  	    return;
-***************
-*** 1471,1478 ****
-      printf("\n%% Initialize page description variables.\n");
-      printf("/x0 0 def\n");
-      printf("/y0 0 def\n");
-!     printf("/sh %g inch def\n", (double)HEIGHT);
-!     printf("/sw %g inch def\n", (double)WIDTH);
-      printf("/margin %g inch def\n", (double)MARGIN);
-      printf("/rm margin 3 div def\n");
-      printf("/lm margin 2 mul 3 div def\n");
---- 1480,1487 ----
-      printf("\n%% Initialize page description variables.\n");
-      printf("/x0 0 def\n");
-      printf("/y0 0 def\n");
-!     printf("/sh %g inch def\n", (double)paper_height);
-!     printf("/sw %g inch def\n", (double)paper_width);
-      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,1801 ****
-      /* Initialize variables not depending of positional options */
-      landscape = twinpages = -1;	/* To force format switching */
-      fontsize = -1.0;			/* To force fontsize switching */
-!     page_height = (double)(HEIGHT - MARGIN) * PIXELS_INCH;
-!     page_width = (double)(WIDTH - MARGIN) * PIXELS_INCH;
-      
-      /* Postcript prologue printing */
-      print_prologue();
---- 1803,1810 ----
-      /* Initialize variables not depending of positional options */
-      landscape = twinpages = -1;	/* To force format switching */
-      fontsize = -1.0;			/* To force fontsize switching */
-!     page_height = (double)(paper_height - MARGIN) * PIXELS_INCH;
-!     page_width = (double)(paper_width - MARGIN) * PIXELS_INCH;
-      
-      /* Postcript prologue printing */
-      print_prologue();
+--- a2ps.c.orig	Tue Feb 15 01:14:59 1994
++++ a2ps.c	Thu May 16 19:04:15 1996
+@@ -164,12 +164,17 @@
+ /*
+  * Default page dimensions
+  */
++#define USA_WIDTH	8.5
++#define USA_HEIGHT	11.0
++#define	A4_WIDTH	8.27
++#define	A4_HEIGHT	11.64
++
+ #ifndef WIDTH
+-#define	WIDTH	8.27
++#define	WIDTH	A4_WIDTH
+ #endif
+ 
+ #ifndef HEIGHT
+-#define	HEIGHT	11.64
++#define	HEIGHT	A4_HEIGHT
+ #endif
+ 
+ #ifndef MARGIN
+@@ -362,6 +367,8 @@
+ /*
+  * Sheet dimensions
+  */
++double paper_height = HEIGHT;	/* Paper height */
++double paper_width = WIDTH;	/* Paper width */
+ double page_height = HEIGHT;	/* Paper height */
+ double page_width = WIDTH;	/* Paper width */
+ 
+@@ -382,6 +389,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");
++#if A4_PAPERSIZE == 1
++    fprintf(stderr,"          -a\t\tUse USA paper size (8.5\" x 11\")\n");
++#else
++    fprintf(stderr,"          -a\t\tUse A4 paper size (21cm x 29.56cm (8.27\" x 11.64\"))\n");
++#endif
+     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 @@
+ 	    usage(EXIT_FAILURE);
+ 	interpret = TRUE;
+ 	break;
++    case 'a':			/* American paper sizes */
++#if 	defined(USA_HEIGHT) && defined(USA_WIDTH)
++	paper_height = USA_HEIGHT;
++	paper_width = USA_WIDTH;
++#	endif
++	break;
+     case 'n':
+ 	if (arg[2] == NUL)
+ 	    return;
+@@ -1471,8 +1489,8 @@
+     printf("\n%% Initialize page description variables.\n");
+     printf("/x0 0 def\n");
+     printf("/y0 0 def\n");
+-    printf("/sh %g inch def\n", (double)HEIGHT);
+-    printf("/sw %g inch def\n", (double)WIDTH);
++    printf("/sh %g inch def\n", (double)paper_height);
++    printf("/sw %g inch def\n", (double)paper_width);
+     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 @@
+     /* Initialize variables not depending of positional options */
+     landscape = twinpages = -1;	/* To force format switching */
+     fontsize = -1.0;			/* To force fontsize switching */
+-    page_height = (double)(HEIGHT - MARGIN) * PIXELS_INCH;
+-    page_width = (double)(WIDTH - MARGIN) * PIXELS_INCH;
++    page_height = (double)(paper_height - MARGIN) * PIXELS_INCH;
++    page_width = (double)(paper_width - MARGIN) * PIXELS_INCH;
+     
+     /* Postcript prologue printing */
+     print_prologue();
diff --git a/print/a2ps43-letter/files/patch-ac b/print/a2ps43-letter/files/patch-ac
new file mode 100644
index 000000000000..188afff0902b
--- /dev/null
+++ b/print/a2ps43-letter/files/patch-ac
@@ -0,0 +1,12 @@
+--- a2ps.1.orig	Tue Feb 15 01:15:16 1994
++++ a2ps.1	Fri Apr  5 00:00:01 1996
+@@ -155,6 +155,9 @@
+ is the number of copies desired of each file named. By default, you get
+ only one copy.
+ .TP 0.6i
++.B -a
++Use the American paper size (8.5" x 11") as the basis for all calculations.
++.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.
diff --git a/print/a2ps43-letter/pkg-plist b/print/a2ps43-letter/pkg-plist
index 5b3576e3316c..89c69615c441 100644
--- a/print/a2ps43-letter/pkg-plist
+++ b/print/a2ps43-letter/pkg-plist
@@ -1,6 +1,2 @@
-@cd /usr/local
-@owner bin
-@mode 755
 bin/a2ps
-@mode 644
-man/man1/a2ps.1
+man/man1/a2ps.1.gz
diff --git a/print/a2ps43-letter/scripts/configure b/print/a2ps43-letter/scripts/configure
index 04369818f2a2..b99a44d794f8 100644
--- a/print/a2ps43-letter/scripts/configure
+++ b/print/a2ps43-letter/scripts/configure
@@ -4,10 +4,7 @@ cd $WRKSRC || exit 1;
 
 cat >> Makefile << END
 
-CFLAGS= -DBSD -O
-BINDIR= $PREFIX/bin
-MANDIR= $PREFIX/man/man1
-MANEXT= 1
+PREFIX= $PREFIX
 
 END
 exit 0;