Pass output to groff instead of troff so we end up with postscript

output by default, not the ditroff intermediate format.  Remove the
-t option as modern troff does not send the output directly to a device
and add -T so the user can specify the typesetting device to use.
OK deraadt@ jmc@

2 files changed, 23 insertions, 10 deletions

diff --git a/usr.bin/vgrind/vgrind.1 b/usr.bin/vgrind/vgrind.1
index e04dc31d96e..4b4fe6d1795 100644
--- a/usr.bin/vgrind/vgrind.1
+++ b/usr.bin/vgrind/vgrind.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vgrind.1,v 1.12 2007/05/31 19:20:19 jmc Exp $
+.\"	$OpenBSD: vgrind.1,v 1.13 2008/04/11 14:24:29 millert Exp $
 .\"	$NetBSD: vgrind.1,v 1.4 1994/11/17 08:28:04 jtc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)vgrind.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: April 11 2008 $
 .Dt VGRIND 1
 .Os
 .Sh NAME
@@ -38,10 +38,11 @@
 .Nd grind nice listings of programs
 .Sh SYNOPSIS
 .Nm vgrind
-.Op Fl fnstWx
+.Op Fl fnsWx
 .Op Fl d Ar file
 .Op Fl h Ar header
 .Op Fl l Ar language
+.Op Fl T Ar device
 .Ar
 .Sh DESCRIPTION
 .Nm
@@ -134,10 +135,11 @@ Forces no keyword bolding.
 .It Fl s
 Specifies a point size to use on output (exactly the same as the argument
 of a .ps).
-.It Fl t
-Similar to the same option in
-.Xr troff 1
-causing formatted text to go to the standard output
+.It Fl T Ar dev
+Use
+.Ar dev
+as the output device.
+The default device is ps (PostScript).
 .It Fl W
 Forces output to the (wide) Versatec printer rather than the (narrow)
 Varian.
diff --git a/usr.bin/vgrind/vgrind.sh b/usr.bin/vgrind/vgrind.sh
index 4c3b9dc9e7e..a7448322a0c 100644
--- a/usr.bin/vgrind/vgrind.sh
+++ b/usr.bin/vgrind/vgrind.sh
@@ -1,6 +1,6 @@
 #!/bin/csh -f
 #
-#	$OpenBSD: vgrind.sh,v 1.4 2003/06/03 02:56:21 millert Exp $
+#	$OpenBSD: vgrind.sh,v 1.5 2008/04/11 14:24:29 millert Exp $
 #	$NetBSD: vgrind.sh,v 1.3 1994/11/17 08:28:06 jtc Exp $
 #
 # Copyright (c) 1980, 1993
@@ -37,7 +37,7 @@
 if ( $?TROFF ) then
 	set troff = "$TROFF"
 else
-	set troff = "troff"
+	set troff = "groff"
 endif
 
 set vf=/usr/libexec/vfontedpr
@@ -59,8 +59,19 @@ if ($#argv > 0) then
 	shift
 	goto top
 
+    case -T:
+	if ($#argv < 2) then
+	    echo "vgrind: $1:q option must have argument"
+	    goto done
+	else
+	    set voptions = ($voptions $1:q $2)
+	    shift
+	    shift
+	    goto top
+	endif
+
     case -t:
-	set voptions = "$voptions -t"
+	# ignore for backwards compatibility
 	shift
 	goto top