Remove an OpenBSD-specific tweak regarding .Xr spacing

and make it compatible with bsd.lv mandoc and with groff-1.21.
This tweak was originally added for compatibility with groff-1.15,
which is no longer needed.

ok jmc@ kristaps@

3 files changed, 8 insertions, 15 deletions

diff --git a/regress/usr.bin/mandoc/mdoc/Xr/Makefile b/regress/usr.bin/mandoc/mdoc/Xr/Makefile
index 47de1d1c8b8..fb494d29804 100644
--- a/regress/usr.bin/mandoc/mdoc/Xr/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Xr/Makefile
@@ -1,9 +1,5 @@
-# $OpenBSD: Makefile,v 1.2 2011/11/17 16:28:46 schwarze Exp $
+# $OpenBSD: Makefile,v 1.3 2011/12/03 23:01:21 schwarze Exp $
 
 REGRESS_TARGETS=args
 
-# groff 1.21 inserts a space after the second argument
-
-SKIP_GROFF ?= args
-
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/mdoc/Xr/args.in b/regress/usr.bin/mandoc/mdoc/Xr/args.in
index e3939ae3991..8dece170483 100644
--- a/regress/usr.bin/mandoc/mdoc/Xr/args.in
+++ b/regress/usr.bin/mandoc/mdoc/Xr/args.in
@@ -1,4 +1,4 @@
-.Dd April 23, 2010
+.Dd December 3, 2011
 .Dt XR-ARGS 1
 .Os OpenBSD
 .Sh NAME
@@ -7,13 +7,11 @@
 .Sh DESCRIPTION
 One single
 .Xr echo 1
-is fine.
+is fine, and so is an
+.Xr echo 1 followed by something else.
 .Pp
 But listen for multiple
-.Xr echo 1 s .
-.Pp
-Listen for those
-.Xr echo 1 s really hard .
+.Xr echo 1 Ns s .
 .Pp
 A call, an
 .Xr echo 1 , and
diff --git a/regress/usr.bin/mandoc/mdoc/Xr/args.out_ascii b/regress/usr.bin/mandoc/mdoc/Xr/args.out_ascii
index 5d310004cb5..170d5bb7bde 100644
--- a/regress/usr.bin/mandoc/mdoc/Xr/args.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Xr/args.out_ascii
@@ -4,14 +4,13 @@ NNAAMMEE
      XXrr--aarrggss - additional arguments to cross references
 
 DDEESSCCRRIIPPTTIIOONN
-     One single echo(1) is fine.
+     One single echo(1) is fine, and so is an echo(1) followed by something
+     else.
 
      But listen for multiple echo(1)s.
 
-     Listen for those echo(1)s really hard.
-
      A call, an echo(1), and another echo(1).
 
      Finally, half an echo and no echo at all.
 
-OpenBSD                         April 23, 2010                         OpenBSD
+OpenBSD                        December 3, 2011                        OpenBSD