Get groff to compile by adding to CXXFLAGS in the same way as CFLAGS.

There are probably better ways of getting it to work, but this does it.

diff --git a/gnu/usr.bin/groff/Makefile.cfg b/gnu/usr.bin/groff/Makefile.cfg
index ffeba9c..6ef2ce2 100644 (file)
--- 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
 
 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\
                -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
 
                -DHAVE_SYS_SIGLIST=1\
                -DARRAY_DELETE_NEEDS_SIZE=1
 

+CFLAGS+=$(DEFINES)
+CXXFLAGS+=$(DEFINES)
+

 .y.o:
        $(YACC) $(YFLAGS) $(.IMPSRC)
        mv y.tab.c $(.PREFIX).cc
 .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 6b93a83..873b7e8 100644 (file)
--- 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
 PROG=          addftinfo
 SRCS=          addftinfo.cc guess.cc
 CFLAGS+=       -I$(.CURDIR)/../include

+CXXFLAGS+=     -I$(.CURDIR)/../include

 LDADD+=                $(LIBGROFF)
 DPADD+=                $(LIBGROFF)
 
 LDADD+=                $(LIBGROFF)
 DPADD+=                $(LIBGROFF)
 

diff --git a/gnu/usr.bin/groff/eqn/Makefile b/gnu/usr.bin/groff/eqn/Makefile
index c3c1629..3049a68 100644 (file)
--- 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
                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)
 
 LDADD+=                $(LIBGROFF)
 DPADD+=                $(LIBGROFF)
 

diff --git a/gnu/usr.bin/groff/grodvi/Makefile b/gnu/usr.bin/groff/grodvi/Makefile
index afa1b9c..2ceef51 100644 (file)
--- 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
 PROG=          grodvi
 SRCS=          dvi.cc
 CFLAGS+=       -I$(.CURDIR)/../include

+CXXFLAGS+=     -I$(.CURDIR)/../include

 LDADD+=                $(LIBDRIVER) $(LIBGROFF) -lm
 DPADD+=                $(LIBDRIVER) $(LIBGROFF) $(LIBMATH)
 
 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 31b2786..b31f73d 100644 (file)
--- 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
 PROG=          groff
 SRCS=          groff.cc pipeline.c
 CFLAGS+=       -I$(.CURDIR)/../include

+CXXFLAGS+=     -I$(.CURDIR)/../include

 LDADD+=                $(LIBGROFF) -lm
 DPADD+=                $(LIBGROFF) $(LIBMATH)
 
 LDADD+=                $(LIBGROFF) -lm
 DPADD+=                $(LIBGROFF) $(LIBMATH)
 

diff --git a/gnu/usr.bin/groff/grops/Makefile b/gnu/usr.bin/groff/grops/Makefile
index 2877e49..eba9bc7 100644 (file)
--- 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
 PROG=          grops
 SRCS=          ps.cc psrm.cc
 CFLAGS+=       -I$(.CURDIR)/../include

+CXXFLAGS+=     -I$(.CURDIR)/../include

 LDADD+=                $(LIBDRIVER) $(LIBGROFF) -lm
 DPADD+=                $(LIBDRIVER) $(LIBGROFF) $(LIBMATH)
 
 LDADD+=                $(LIBDRIVER) $(LIBGROFF) -lm
 DPADD+=                $(LIBDRIVER) $(LIBGROFF) $(LIBMATH)
 

diff --git a/gnu/usr.bin/groff/grotty/Makefile b/gnu/usr.bin/groff/grotty/Makefile
index a6e3e81..585cd9b 100644 (file)
--- 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
 PROG=          grotty
 SRCS=          tty.cc
 CFLAGS+=       -I$(.CURDIR)/../include

+CXXFLAGS+=     -I$(.CURDIR)/../include

 LDADD+=                $(LIBDRIVER) $(LIBGROFF) -lm
 DPADD+=                $(LIBDRIVER) $(LIBGROFF) $(LIBMATH)
 
 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 578f60e..a39aa45 100644 (file)
--- 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
 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)
 
 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 45b80e4..a84c268 100644 (file)
--- 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
 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
 
 NOMAN=         noman
 NOPROFILE=     noprofile

diff --git a/gnu/usr.bin/groff/libdriver/Makefile b/gnu/usr.bin/groff/libdriver/Makefile
index aafc6fe..3158982 100644 (file)
--- 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
 LIB=           driver
 SRCS=          input.cc printer.cc
 CFLAGS+=       -I$(.CURDIR)/../include

+CXXFLAGS+=     -I$(.CURDIR)/../include

 
 NOMAN=         noman
 NOPROFILE=     noprofile
 
 NOMAN=         noman
 NOPROFILE=     noprofile

diff --git a/gnu/usr.bin/groff/libgroff/Makefile b/gnu/usr.bin/groff/libgroff/Makefile
index 8cb9db3..ab21f75 100644 (file)
--- 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
                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       
 
 NOMAN=         noman
 NOPROFILE=     noprofile       

diff --git a/gnu/usr.bin/groff/lkbib/Makefile b/gnu/usr.bin/groff/lkbib/Makefile
index 4551f97..57fadd6 100644 (file)
--- 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
 PROG=          lkbib
 SRCS=          lkbib.cc
 CFLAGS+=       -I$(.CURDIR)/../include

+CXXFLAGS+=     -I$(.CURDIR)/../include

 LDADD+=                $(LIBBIB) $(LIBGROFF) -lm
 DPADD+=                $(LIBBIB) $(LIBGROFF) $(LIBMATH)
 
 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 685f2f3..94d832c 100644 (file)
--- 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
 PROG=          lookbib
 SRCS=          lookbib.cc
 CFLAGS+=       -I$(.CURDIR)/../include

+CXXFLAGS+=     -I$(.CURDIR)/../include

 LDADD+=                $(LIBBIB) $(LIBGROFF) -lm
 DPADD+=                $(LIBBIB) $(LIBGROFF) $(LIBMATH)
 
 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 f715721..16a5ed3 100644 (file)
--- 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
 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)
 
 LDADD+=                $(LIBGROFF) -lm
 DPADD+=                $(LIBGROFF) $(LIBMATH)
 

diff --git a/gnu/usr.bin/groff/refer/Makefile b/gnu/usr.bin/groff/refer/Makefile
index c6bb691..7bbdd99 100644 (file)
--- 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
 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)
 
 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 7666562..aad2e1f 100644 (file)
--- 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
 PROG=          soelim
 SRCS=          soelim.cc
 CFLAGS+=       -I$(.CURDIR)/../include

+CXXFLAGS+=     -I$(.CURDIR)/../include

 LDADD+=                $(LIBGROFF)
 DPADD+=                $(LIBGROFF)
 
 LDADD+=                $(LIBGROFF)
 DPADD+=                $(LIBGROFF)
 

diff --git a/gnu/usr.bin/groff/tbl/Makefile b/gnu/usr.bin/groff/tbl/Makefile
index 86b4b8c..3000af7 100644 (file)
--- 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
 PROG=          tbl
 SRCS=          main.cc table.cc
 CFLAGS+=       -I$(.CURDIR)/../include

+CXXFLAGS+=     -I$(.CURDIR)/../include

 LDADD+=                $(LIBGROFF) -lm
 DPADD+=                $(LIBGROFF) $(LIBMATH)
 
 LDADD+=                $(LIBGROFF) -lm
 DPADD+=                $(LIBGROFF) $(LIBMATH)
 

diff --git a/gnu/usr.bin/groff/tfmtodit/Makefile b/gnu/usr.bin/groff/tfmtodit/Makefile
index ee28efe..6e81c27 100644 (file)
--- 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
 PROG=          tfmtodit
 SRCS=          tfmtodit.cc
 CFLAGS+=       -I$(.CURDIR)/../include

+CXXFLAGS+=     -I$(.CURDIR)/../include

 LDADD+=                $(LIBGROFF) -lm
 DPADD+=                $(LIBGROFF) $(LIBMATH)
 
 LDADD+=                $(LIBGROFF) -lm
 DPADD+=                $(LIBGROFF) $(LIBMATH)
 

diff --git a/gnu/usr.bin/groff/troff/Makefile b/gnu/usr.bin/groff/troff/Makefile
index 5e8290b..a7401a2 100644 (file)
--- 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
 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
 LDADD+=                $(LIBGROFF) -lm
 DPADD+=                $(LIBGROFF) $(LIBMATH)
 tmacdir?=      /usr/share/tmac