Change default pager from /usr/bin/pg to /usr/bin/more. As before,

$PAGER overrides.
(Requested by:	dcs)

One patch per modified file.

One modified file per patch.

Honor CC, CFLAGS.

Use BSD_INSTALL_FOO and, as a side effect, install with our customary
ownerships.

No response from:	maintainer

4 files changed, 64 insertions, 42 deletions

diff --git a/print/dvi2tty/files/patch-aa b/print/dvi2tty/files/patch-aa
index 9dffcb02b3e9..e9ac71517cef 100644
--- a/print/dvi2tty/files/patch-aa
+++ b/print/dvi2tty/files/patch-aa
@@ -1,13 +1,20 @@
-
---- Makefile.orig	Fri Mar 12 01:05:10 1993
-+++ Makefile	Mon May  6 03:03:51 1996
-@@ -6,17 +6,20 @@
+--- Makefile.orig	Thu Mar 11 06:00:00 1993
++++ Makefile	Mon Oct 16 11:41:01 2000
+@@ -1,4 +1,5 @@
+ # Makefile for dvi2tty and disdvi       23/01/89   M.J.E. Mol
++# Modified by Joel Sutton <suttonj@interconnect.com.au> 8th Feb, 1997
+ #
+ # For BSD Unix use the following CFLAGS definition
+ # CFLAGS = -Dstrchr=index
+@@ -6,17 +7,26 @@
  # This Makefile does not work for MSDOS. Make your 
  # own one, or compile by hand.
  #
 -CFLAGS = 
-+CFLAGS = -O2
-+CC     = gcc
++
++PREFIX?=	/usr/local
++BINDIR=		${PREFIX}/bin/
++MANDIR=		${PREFIX}/man/man
  
  all:	dvi2tty disdvi
  
@@ -25,41 +32,9 @@
  
  dvistuff.o: dvistuff.c dvi2tty.h commands.h
  
++install: all
++	${BSD_INSTALL_PROGRAM} dvi2tty ${BINDIR}
++	${BSD_INSTALL_MAN} dvi2tty.1 ${MANDIR}1/
++
 +clean:
 +	rm -f dvi2tty disdvi *.o
---- dvistuff.c.orig	Fri Mar 12 01:05:35 1993
-+++ dvistuff.c	Mon May  6 04:48:49 1996
-@@ -996,13 +996,14 @@
-     }
-     else
-         free(fnt->name);    /* free old name */
--    if ((name = (char *) malloc(namelen * sizeof(char))) == NULL) {
-+    if ((name = (char *) malloc((namelen + 1) * sizeof(char))) == NULL) {
-         perror("fontdef");
-         exit(1);
-     }
-     
-     for (i = 0; i < namelen; i++)
-         name[i] = get1();
-+    name[namelen] = '\0';
-     fnt->name = name;
-     if (new) {
-         fnt->next = fonts;
---- disdvi.c.orig	Fri Mar 12 01:05:11 1993
-+++ disdvi.c	Mon May  6 04:47:36 1996
-@@ -348,13 +348,14 @@
-     }
-     else
-         free(fnt->name);    /* free old name */
--    if ((name = (char *) malloc(namelen * sizeof(char))) == NULL) {
-+    if ((name = (char *) malloc((namelen + 1) * sizeof(char))) == NULL) {
-         perror("fontdef");
-         exit(1);
-     }
-     
-     for (i = 0; i < namelen; i++)
-         name[i] = get1();
-+    name[namelen] = '\0';
-     fnt->name = name;
-     if (new) {
-         fnt->next = fonts;
diff --git a/print/dvi2tty/files/patch-ac b/print/dvi2tty/files/patch-ac
new file mode 100644
index 000000000000..6e98a9b1d58e
--- /dev/null
+++ b/print/dvi2tty/files/patch-ac
@@ -0,0 +1,11 @@
+--- dvi2tty.c.orig	Mon Oct 16 09:35:23 2000
++++ dvi2tty.c	Mon Oct 16 09:35:39 2000
+@@ -114,7 +114,7 @@
+                               /* don't have terminals with Scand. nat. chars */
+ #define WANTPAGER   TRUE      /* default: try to pipe through a pager (like  */
+                               /* more) if stdout is tty and no -o switch     */
+-#define DEFPAGER    "/usr/bin/pg"   /* CHANGE TO YOUR LOCAL PAGER            */
++#define DEFPAGER    "/usr/bin/more"   /* CHANGE TO YOUR LOCAL PAGER            */
+ 
+     /*------------------ end of customization constants ---------------------*/
+ 
diff --git a/print/dvi2tty/files/patch-ad b/print/dvi2tty/files/patch-ad
new file mode 100644
index 000000000000..eadeb64707ac
--- /dev/null
+++ b/print/dvi2tty/files/patch-ad
@@ -0,0 +1,18 @@
+--- dvistuff.c.orig	Fri Mar 12 01:05:35 1993
++++ dvistuff.c	Mon May  6 04:48:49 1996
+@@ -996,13 +996,14 @@
+     }
+     else
+         free(fnt->name);    /* free old name */
+-    if ((name = (char *) malloc(namelen * sizeof(char))) == NULL) {
++    if ((name = (char *) malloc((namelen + 1) * sizeof(char))) == NULL) {
+         perror("fontdef");
+         exit(1);
+     }
+     
+     for (i = 0; i < namelen; i++)
+         name[i] = get1();
++    name[namelen] = '\0';
+     fnt->name = name;
+     if (new) {
+         fnt->next = fonts;
diff --git a/print/dvi2tty/files/patch-ae b/print/dvi2tty/files/patch-ae
new file mode 100644
index 000000000000..e070d983dcf0
--- /dev/null
+++ b/print/dvi2tty/files/patch-ae
@@ -0,0 +1,18 @@
+--- disdvi.c.orig	Fri Mar 12 01:05:11 1993
++++ disdvi.c	Mon May  6 04:47:36 1996
+@@ -348,13 +348,14 @@
+     }
+     else
+         free(fnt->name);    /* free old name */
+-    if ((name = (char *) malloc(namelen * sizeof(char))) == NULL) {
++    if ((name = (char *) malloc((namelen + 1) * sizeof(char))) == NULL) {
+         perror("fontdef");
+         exit(1);
+     }
+     
+     for (i = 0; i < namelen; i++)
+         name[i] = get1();
++    name[namelen] = '\0';
+     fnt->name = name;
+     if (new) {
+         fnt->next = fonts;