Fix conflicts which arose during import, also add $FreeBSD$.

2 files changed, 18 insertions, 2 deletions

diff --git a/contrib/groff/nroff/nroff.man b/contrib/groff/nroff/nroff.man
index 6d64bea..d8d9816 100644
--- a/contrib/groff/nroff/nroff.man
+++ b/contrib/groff/nroff/nroff.man
@@ -1,5 +1,5 @@
 .ig \"-*- nroff -*-
-Copyright (C) 1989-1995 Free Software Foundation, Inc.
+Copyright (C) 1989-1999 Free Software Foundation, Inc.
 
 Permission is granted to make and distribute verbatim copies of
 this manual provided the copyright notice and this permission notice
@@ -94,6 +94,13 @@ silently ignores options of
 .B \-q
 or
 .BR \-s .
+Options 
+.B \-S
+(safer) and
+.B \-U
+(unsafe) are passed to groff. 
+.B \-S
+is passed by default.
 .SH "SEE ALSO"
 .BR groff (@MAN1EXT@),
 .BR @g@troff (@MAN1EXT@),
diff --git a/contrib/groff/nroff/nroff.sh b/contrib/groff/nroff/nroff.sh
index 57e5d45..12f3fd1 100755
--- a/contrib/groff/nroff/nroff.sh
+++ b/contrib/groff/nroff/nroff.sh
@@ -17,6 +17,7 @@ else
 fi
 fi
 opts=
+safer=-S
 
 for i
 do
@@ -41,6 +42,14 @@ do
 	-T*)
 		# ignore other devices
 		;;
+	-S)
+		# safer behaviour
+		safer=-S
+		;;
+	-U)
+		# unsafe behaviour
+		safer=-U
+		;;
 	-u*)
 		# Solaris 2.2 `man' uses -u0; ignore it,
 		# since `less' and `more' can use the emboldening info.
@@ -65,4 +74,4 @@ done
 
 # This shell script is intended for use with man, so warnings are
 # probably not wanted.  Also load nroff-style character definitions.
-exec groff -S -Wall -mtty-char $T $opts ${1+"$@"}
+exec groff $safer -Wall -mtty-char $T $opts ${1+"$@"}