Release FreeBSD 1.1.5.1upstream/1.1.5.1_cvsrelease/1.1.5.1_cvsreleng/1

This commit was manufactured to restore the state of the 1.1.5.1-RELEASE image.
Releases prior to 5.3-RELEASE are omitting the secure/ and crypto/ subdirs.

22 files changed, 49 insertions, 2 deletions

diff --git a/gnu/usr.bin/groff/Makefile.cfg b/gnu/usr.bin/groff/Makefile.cfg
index ffeba9ce6dd6..6ef2ce2956e1 100644
--- a/gnu/usr.bin/groff/Makefile.cfg
+++ b/gnu/usr.bin/groff/Makefile.cfg
@@ -11,7 +11,7 @@ LIBDRIVER=	$(.CURDIR)/../libdriver/libdriver.a
 LIBBIB=		$(.CURDIR)/../libbib/libbib.a
 .endif
 
-CFLAGS+=	-DHAVE_UNISTD_H=1\
+DEFINES=	-DHAVE_UNISTD_H=1\
 		-DHAVE_DIRENT_H=1\
 		-DHAVE_LIMITS_H=1\
 		-DHAVE_STDLIB_H=1\
@@ -28,6 +28,9 @@ CFLAGS+=	-DHAVE_UNISTD_H=1\
 		-DHAVE_SYS_SIGLIST=1\
 		-DARRAY_DELETE_NEEDS_SIZE=1
 
+CFLAGS+=$(DEFINES)
+CXXFLAGS+=$(DEFINES)
+
 .y.o:
 	$(YACC) $(YFLAGS) $(.IMPSRC)
 	mv y.tab.c $(.PREFIX).cc
diff --git a/gnu/usr.bin/groff/addftinfo/Makefile b/gnu/usr.bin/groff/addftinfo/Makefile
index 6b93a8305696..873b7e8f2c73 100644
--- a/gnu/usr.bin/groff/addftinfo/Makefile
+++ b/gnu/usr.bin/groff/addftinfo/Makefile
@@ -3,6 +3,7 @@
 PROG=		addftinfo
 SRCS=		addftinfo.cc guess.cc
 CFLAGS+=	-I$(.CURDIR)/../include
+CXXFLAGS+=	-I$(.CURDIR)/../include
 LDADD+=		$(LIBGROFF)
 DPADD+=		$(LIBGROFF)
 
diff --git a/gnu/usr.bin/groff/devices/devascii/R.proto b/gnu/usr.bin/groff/devices/devascii/R.proto
index 876c74c4a6d8..9a8909e85b79 100644
--- a/gnu/usr.bin/groff/devices/devascii/R.proto
+++ b/gnu/usr.bin/groff/devices/devascii/R.proto
@@ -3,11 +3,15 @@ internalname 0
 spacewidth 24
 charset
 !	24	0	0041
+r!	"
+TP	"
+Tp	"
 "	24	0	0042
 lq	"
 rq	"
 #	24	0	0043
 sh	"
+sc	"
 $	24	0	0044
 Do	"
 %	24	0	0045
@@ -16,12 +20,20 @@ Do	"
 aa	"
 fm	"
 aq	"
+ac	"
 (	24	0	0050
 )	24	0	0051
 *	24	0	0052
 **	"
+ho	"
 +	24	0	0053
 pl	"
+dg	"
+dd	"
+ad	"
+ah	"
+-D	"
+Sd	"
 ,	24	0	0054
 \-	24	0	0055
 hy	"
@@ -49,10 +61,12 @@ la	"
 fo	"
 =	24	0	0075
 eq	"
+ss	"
 >	24	0	0076
 ra	"
 fc	"
 ?	24	0	0077
+r?	"
 @	24	0	0100
 at	"
 A	24	0	0101
@@ -105,6 +119,8 @@ rB	"
 a^	24	0	0136
 ^	"
 ha	"
+ua	"
+de	"
 _	24	0	0137
 ru	"
 ul	"
@@ -128,6 +144,8 @@ m	24	0	0155
 n	24	0	0156
 o	24	0	0157
 *o	"
+a-	"
+ao	"
 p	24	0	0160
 q	24	0	0161
 r	24	0	0162
@@ -135,6 +153,7 @@ s	24	0	0163
 t	24	0	0164
 u	24	0	0165
 v	24	0	0166
+da	"
 w	24	0	0167
 x	24	0	0170
 mu	"
diff --git a/gnu/usr.bin/groff/eqn/Makefile b/gnu/usr.bin/groff/eqn/Makefile
index c3c162989caf..3049a6874add 100644
--- a/gnu/usr.bin/groff/eqn/Makefile
+++ b/gnu/usr.bin/groff/eqn/Makefile
@@ -5,6 +5,7 @@ SRCS=		main.cc lex.cc  box.cc limit.cc list.cc over.cc text.cc\
 		script.cc mark.cc other.cc delim.cc sqrt.cc pile.cc special.cc
 OBJS=		eqn.o 
 CFLAGS+=	-I. -I$(.CURDIR)/../include
+CXXFLAGS+=	-I. -I$(.CURDIR)/../include
 LDADD+=		$(LIBGROFF)
 DPADD+=		$(LIBGROFF)
 
diff --git a/gnu/usr.bin/groff/grodvi/Makefile b/gnu/usr.bin/groff/grodvi/Makefile
index afa1b9cef5c1..2ceef51f7225 100644
--- a/gnu/usr.bin/groff/grodvi/Makefile
+++ b/gnu/usr.bin/groff/grodvi/Makefile
@@ -3,6 +3,7 @@
 PROG=		grodvi
 SRCS=		dvi.cc
 CFLAGS+=	-I$(.CURDIR)/../include
+CXXFLAGS+=	-I$(.CURDIR)/../include
 LDADD+=		$(LIBDRIVER) $(LIBGROFF) -lm
 DPADD+=		$(LIBDRIVER) $(LIBGROFF) $(LIBMATH)
 
diff --git a/gnu/usr.bin/groff/groff/Makefile b/gnu/usr.bin/groff/groff/Makefile
index 31b278637c72..b31f73d68e63 100644
--- a/gnu/usr.bin/groff/groff/Makefile
+++ b/gnu/usr.bin/groff/groff/Makefile
@@ -3,6 +3,7 @@
 PROG=		groff
 SRCS=		groff.cc pipeline.c
 CFLAGS+=	-I$(.CURDIR)/../include
+CXXFLAGS+=	-I$(.CURDIR)/../include
 LDADD+=		$(LIBGROFF) -lm
 DPADD+=		$(LIBGROFF) $(LIBMATH)
 
diff --git a/gnu/usr.bin/groff/grops/Makefile b/gnu/usr.bin/groff/grops/Makefile
index 2877e49a2cee..eba9bc72f898 100644
--- a/gnu/usr.bin/groff/grops/Makefile
+++ b/gnu/usr.bin/groff/grops/Makefile
@@ -3,6 +3,7 @@
 PROG=		grops
 SRCS=		ps.cc psrm.cc
 CFLAGS+=	-I$(.CURDIR)/../include
+CXXFLAGS+=	-I$(.CURDIR)/../include
 LDADD+=		$(LIBDRIVER) $(LIBGROFF) -lm
 DPADD+=		$(LIBDRIVER) $(LIBGROFF) $(LIBMATH)
 
diff --git a/gnu/usr.bin/groff/grops/psrm.cc b/gnu/usr.bin/groff/grops/psrm.cc
index e26acf4b15c5..5abe683f7213 100644
--- a/gnu/usr.bin/groff/grops/psrm.cc
+++ b/gnu/usr.bin/groff/grops/psrm.cc
@@ -873,9 +873,10 @@ void resource_manager::process_file(int rank, FILE *fp, const char *filename,
   
   const int NHEADER_COMMENTS = (sizeof(header_comment_table)
 				/ sizeof(header_comment_table[0]));
+  typedef (resource_manager::*resource_manager_mfp)(const char *, int, FILE *, FILE *);
   struct comment_info {
     const char *name;
-    int (resource_manager::*proc)(const char *, int, FILE *, FILE *);
+    resource_manager_mfp proc;
   };
 
   static comment_info comment_table[] = {
diff --git a/gnu/usr.bin/groff/grotty/Makefile b/gnu/usr.bin/groff/grotty/Makefile
index a6e3e815aef4..585cd9bdd575 100644
--- a/gnu/usr.bin/groff/grotty/Makefile
+++ b/gnu/usr.bin/groff/grotty/Makefile
@@ -3,6 +3,7 @@
 PROG=		grotty
 SRCS=		tty.cc
 CFLAGS+=	-I$(.CURDIR)/../include
+CXXFLAGS+=	-I$(.CURDIR)/../include
 LDADD+=		$(LIBDRIVER) $(LIBGROFF) -lm
 DPADD+=		$(LIBDRIVER) $(LIBGROFF) $(LIBMATH)
 
diff --git a/gnu/usr.bin/groff/indxbib/Makefile b/gnu/usr.bin/groff/indxbib/Makefile
index 578f60efb834..a39aa4546286 100644
--- a/gnu/usr.bin/groff/indxbib/Makefile
+++ b/gnu/usr.bin/groff/indxbib/Makefile
@@ -3,6 +3,7 @@
 PROG=		indxbib
 SRCS=		indxbib.cc dirnamemax.c signal.c
 CFLAGS+=	-I$(.CURDIR)/../include
+CXXFLAGS+=	-I$(.CURDIR)/../include
 LDADD+= 	$(LIBBIB) $(LIBGROFF) -lm
 DPADD+= 	$(LIBBIB) $(LIBGROFF) $(LIBMATH)
 
diff --git a/gnu/usr.bin/groff/libbib/Makefile b/gnu/usr.bin/groff/libbib/Makefile
index 45b80e416903..a84c26866265 100644
--- a/gnu/usr.bin/groff/libbib/Makefile
+++ b/gnu/usr.bin/groff/libbib/Makefile
@@ -3,6 +3,7 @@
 LIB=		bib
 SRCS=		common.cc index.cc linear.cc search.cc map.c
 CFLAGS+=	-I$(.CURDIR)/../include
+CXXFLAGS+=	-I$(.CURDIR)/../include
 
 NOMAN=		noman
 NOPROFILE=	noprofile
diff --git a/gnu/usr.bin/groff/libdriver/Makefile b/gnu/usr.bin/groff/libdriver/Makefile
index aafc6fe3c3fb..3158982c8ba4 100644
--- a/gnu/usr.bin/groff/libdriver/Makefile
+++ b/gnu/usr.bin/groff/libdriver/Makefile
@@ -3,6 +3,7 @@
 LIB=		driver
 SRCS=		input.cc printer.cc
 CFLAGS+=	-I$(.CURDIR)/../include
+CXXFLAGS+=	-I$(.CURDIR)/../include
 
 NOMAN=		noman
 NOPROFILE=	noprofile
diff --git a/gnu/usr.bin/groff/libgroff/Makefile b/gnu/usr.bin/groff/libgroff/Makefile
index 8cb9db360e0d..ab21f755f09e 100644
--- a/gnu/usr.bin/groff/libgroff/Makefile
+++ b/gnu/usr.bin/groff/libgroff/Makefile
@@ -8,6 +8,7 @@ SRCS=		assert.cc change_lf.cc cmap.cc cset.cc device.cc errarg.cc\
 		tmpfile.cc illegal.cc version.cc
 SRCS+=		iftoa.c itoa.c matherr.c
 CFLAGS+=	-I$(.CURDIR)/../include
+CXXFLAGS+=	-I$(.CURDIR)/../include
 
 NOMAN=		noman
 NOPROFILE=	noprofile	
diff --git a/gnu/usr.bin/groff/lkbib/Makefile b/gnu/usr.bin/groff/lkbib/Makefile
index 4551f973ce18..57fadd64aa72 100644
--- a/gnu/usr.bin/groff/lkbib/Makefile
+++ b/gnu/usr.bin/groff/lkbib/Makefile
@@ -3,6 +3,7 @@
 PROG=		lkbib
 SRCS=		lkbib.cc
 CFLAGS+=	-I$(.CURDIR)/../include
+CXXFLAGS+=	-I$(.CURDIR)/../include
 LDADD+=		$(LIBBIB) $(LIBGROFF) -lm
 DPADD+=		$(LIBBIB) $(LIBGROFF) $(LIBMATH)
 
diff --git a/gnu/usr.bin/groff/lookbib/Makefile b/gnu/usr.bin/groff/lookbib/Makefile
index 685f2f35ce1f..94d832c0a2d8 100644
--- a/gnu/usr.bin/groff/lookbib/Makefile
+++ b/gnu/usr.bin/groff/lookbib/Makefile
@@ -3,6 +3,7 @@
 PROG=		lookbib
 SRCS=		lookbib.cc
 CFLAGS+=	-I$(.CURDIR)/../include
+CXXFLAGS+=	-I$(.CURDIR)/../include
 LDADD+=		$(LIBBIB) $(LIBGROFF) -lm
 DPADD+=		$(LIBBIB) $(LIBGROFF) $(LIBMATH)
 
diff --git a/gnu/usr.bin/groff/pic/Makefile b/gnu/usr.bin/groff/pic/Makefile
index f7157213ea64..16a5ed39f56e 100644
--- a/gnu/usr.bin/groff/pic/Makefile
+++ b/gnu/usr.bin/groff/pic/Makefile
@@ -4,6 +4,7 @@ PROG=		pic
 SRCS=		lex.cc main.cc object.cc common.cc troff.cc tex.cc
 OBJS=		pic.o
 CFLAGS+=	-I. -I$(.CURDIR)/../include
+CXXFLAGS+=	-I. -I$(.CURDIR)/../include
 LDADD+=		$(LIBGROFF) -lm
 DPADD+=		$(LIBGROFF) $(LIBMATH)
 
diff --git a/gnu/usr.bin/groff/refer/Makefile b/gnu/usr.bin/groff/refer/Makefile
index c6bb691b1588..7bbdd99f3f09 100644
--- a/gnu/usr.bin/groff/refer/Makefile
+++ b/gnu/usr.bin/groff/refer/Makefile
@@ -4,6 +4,7 @@ PROG=		refer
 SRCS=		command.cc ref.cc refer.cc token.cc
 OBJS=		label.o
 CFLAGS+=	-I. -I$(.CURDIR)/../include
+CXXFLAGS+=	-I. -I$(.CURDIR)/../include
 LDADD+=		$(LIBBIB) $(LIBGROFF) -lm
 DPADD+=		$(LIBBIB) $(LIBGROFF) $(LIBMATH)
 
diff --git a/gnu/usr.bin/groff/soelim/Makefile b/gnu/usr.bin/groff/soelim/Makefile
index 76665627a6c8..aad2e1f0362a 100644
--- a/gnu/usr.bin/groff/soelim/Makefile
+++ b/gnu/usr.bin/groff/soelim/Makefile
@@ -3,6 +3,7 @@
 PROG=		soelim
 SRCS=		soelim.cc
 CFLAGS+=	-I$(.CURDIR)/../include
+CXXFLAGS+=	-I$(.CURDIR)/../include
 LDADD+=		$(LIBGROFF)
 DPADD+=		$(LIBGROFF)
 
diff --git a/gnu/usr.bin/groff/tbl/Makefile b/gnu/usr.bin/groff/tbl/Makefile
index 86b4b8c1a313..3000af7697b9 100644
--- a/gnu/usr.bin/groff/tbl/Makefile
+++ b/gnu/usr.bin/groff/tbl/Makefile
@@ -3,6 +3,7 @@
 PROG=		tbl
 SRCS=		main.cc table.cc
 CFLAGS+=	-I$(.CURDIR)/../include
+CXXFLAGS+=	-I$(.CURDIR)/../include
 LDADD+=		$(LIBGROFF) -lm
 DPADD+=		$(LIBGROFF) $(LIBMATH)
 
diff --git a/gnu/usr.bin/groff/tfmtodit/Makefile b/gnu/usr.bin/groff/tfmtodit/Makefile
index ee28efe36159..6e81c27b4ab8 100644
--- a/gnu/usr.bin/groff/tfmtodit/Makefile
+++ b/gnu/usr.bin/groff/tfmtodit/Makefile
@@ -3,6 +3,7 @@
 PROG=		tfmtodit
 SRCS=		tfmtodit.cc
 CFLAGS+=	-I$(.CURDIR)/../include
+CXXFLAGS+=	-I$(.CURDIR)/../include
 LDADD+=		$(LIBGROFF) -lm
 DPADD+=		$(LIBGROFF) $(LIBMATH)
 
diff --git a/gnu/usr.bin/groff/troff/Makefile b/gnu/usr.bin/groff/troff/Makefile
index 5e8290b6f4b9..a7401a2646ec 100644
--- a/gnu/usr.bin/groff/troff/Makefile
+++ b/gnu/usr.bin/groff/troff/Makefile
@@ -4,6 +4,7 @@ PROG=		troff
 SRCS=		env.cc node.cc input.cc div.cc symbol.cc dictionary.cc reg.cc \
 		number.cc majorminor.cc
 CFLAGS+=	-I$(.CURDIR)/../include
+CXXFLAGS+=	-I$(.CURDIR)/../include
 LDADD+=		$(LIBGROFF) -lm
 DPADD+=		$(LIBGROFF) $(LIBMATH)
 tmacdir?=	/usr/share/tmac
diff --git a/gnu/usr.bin/groff/xditview/device.c b/gnu/usr.bin/groff/xditview/device.c
index 45cce4c6cf98..740f93f72b29 100644
--- a/gnu/usr.bin/groff/xditview/device.c
+++ b/gnu/usr.bin/groff/xditview/device.c
@@ -23,8 +23,14 @@ searching for device and font description files. */
 #define WS " \t\r\n"
 
 /* Minimum and maximum values a `signed int' can hold.  */
+
+#ifndef INT_MIN
 #define INT_MIN (-INT_MAX-1)
+#endif
+#ifndef INT_MAX
 #define INT_MAX 2147483647
+#endif
+
 
 #define CHAR_TABLE_SIZE 307