freebsd stable - Dec 2005 - problems with groff in FreeBSD 6.0 buildworld

I have heads up my source tree to RELENG_6, and for the `make
buildworld` I have got a compile error, last message of which is that:

c++ -O2 -fno-strict-aliasing -pipe -O -pipe -DHAVE_CONFIG_H
-I/usr/src/gnu/usr.bin/groff/src/preproc/grn/../../../../../../contrib/groff/src/include
-I/usr/src/gnu/usr.bin/groff/src/preproc/grn/../../../src/include
-I/usr/obj/usr/src/tmp/legacy/usr/include -fno-rtti -fno-exceptions
-c
/usr/src/gnu/usr.bin/groff/src/preproc/grn/../../../../../../contrib/groff/src/preproc/grn/main.cpp
 /usr/src/gnu/usr.bin/groff/src/preproc/grn/../../../../../../contrib/groff/src/preproc/grn/main.cpp:
In function `void savebounds(double,double)':
 /usr/src/gnu/usr.bin/groff/src/preproc/grn/../../../../../../contrib/groff/src/preproc/grn/main.cpp:692:
error: expected primary-expression before '<'token
 /usr/src/gnu/usr.bin/groff/src/preproc/grn/../../../../../../contrib/groff/src/preproc/grn/main.cpp:693:
error: expected primary-expression before ';' token
/usr/src/gnu/usr.bin/groff/src/preproc/grn/../../../../../../contrib/groff/src/preproc/grn/main.cpp:694:
error: expected primary-expression before '>' token
 /usr/src/gnu/usr.bin/groff/src/preproc/grn/../../../../../../contrib/groff/src/preproc/grn/main.cpp:695:
error: expected primary-expression before ';' token
 *** Error code 1
Stop in /usr/src/gnu/usr.bin/groff/src/preproc/grn.

I was trying change CFLAGS, COPTFLAGS in /etc/make.conf to `+= -0
-pipe`, or comment it, but the result were not changed. Here
the /etc/make.conf, which I use now:

CFLAGS += -O -pipe
COPTFLAGS += -O -pipe
NO_PROFILECOMPAT3x=YES
COMPAT4x=YES
BSDPORTMK?=     ${PORTSDIR}/devel/portmk/Mk/bsd.port.mk
BSDPORTSUBDIRMK?=   ${PORTSDIR}/devel/portmk/Mk/bsd.port.subdir.mk
PERL_VER=5.8.7
PERL_VERSION=5.8.7

My current system is FreeBSD 5.4.

In what a problem?

On Friday 23 December 2005 20:54, Telegin Gennady wrote:
> /usr/src/gnu/usr.bin/groff/src/preproc/grn/../../../../../../contrib/groff/
>src/preproc/grn/main.cpp:692: error: expected primary-expression before
> '<'token
> /usr/src/gnu/usr.bin/groff/src/preproc/grn/../../../../../../contrib/groff/
>src/preproc/grn/main.cpp:694: error: expected primary-expression before
'>'
> token
> 
Can you paste line 690-700. This looks like a cvs merge conflict to me.
-- 
Melvyn Sopacua
freebsd.stable@melvyn.homeunix.org

FreeBSD 6.0-STABLE
Qt: 3.3.5
KDE: 3.4.3

Lines from 688 to 700:

void
savebounds(double x,
	   double y)
{
  if (x < leftpoint)
    leftpoint = x;
  if (x > rightpoint)
    rightpoint = x;
  if (y < toppoint)
    toppoint = y;
  if (y > bottompoint)
    bottompoint = y;
}

Lines from 688 to 700:

void
savebounds(double x,
	   double y)
{
  if (x < leftpoint)
    leftpoint = x;
  if (x > rightpoint)
    rightpoint = x;
  if (y < toppoint)
    toppoint = y;
  if (y > bottompoint)
    bottompoint = y;
}