Subject: Re: pkg/29430
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: Jeremy C. Reed <reed@NetBSD.org>
List: pkgsrc-bugs
Date: 02/18/2005 15:50:01
The following reply was made to PR pkg/29430; it has been noted by GNATS.
From: "Jeremy C. Reed" <reed@NetBSD.org>
To: almeyers@consult-meyers.com
Cc: gnats-bugs@netbsd.org
Subject: Re: pkg/29430
Date: Fri, 18 Feb 2005 07:49:18 -0800 (PST)
On Fri, 18 Feb 2005, A L Meyers wrote:
> Something apparently went wrong with mk/platform/Linux.mk
>
> Here is the error output, same from two tested builds:
>
> [root@localhost tcp_wrappers]# [root@localhost tcp_wrappers]# bmake
> update clean
> bmake: "/usr/pkgsrc/security/tcp_wrappers/../../mk/platform/Linux.mk"
> line 1: Need an operator
> bmake: "/usr/pkgsrc/security/tcp_wrappers/../../mk/platform/Linux.mk"
> line 3: Makefile appears to contain unresolved cvs/rcs/??? merge conflicts
Manually edit your mk/platform/Linux.mk and clean up the broken lines.
See in that file some lines with
<<<<<<<
remove the lines here
=======
>>>>>>>
Those are from a cvs update conflict.
Either clean it up manually (and also remove the <<<<<<<, ======= and
>>>>>>>).
Or remove the file and cvs update the file again.
Jeremy C. Reed
``Of course it runs NetBSD.''
http://www.NetBSD.org/