From owner-freebsd-ports@FreeBSD.ORG  Sat Apr 10 16:17:15 2004
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: freebsd-ports@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0404816A4CE
	for <ports@FreeBSD.org>; Sat, 10 Apr 2004 16:17:15 -0700 (PDT)
Received: from mta4.rcsntx.swbell.net (mta4.rcsntx.swbell.net [151.164.30.28])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C64F943D31
	for <ports@FreeBSD.org>; Sat, 10 Apr 2004 16:17:14 -0700 (PDT)
	(envelope-from kris@obsecurity.org)
Received: from obsecurity.dyndns.org
	(1feee7fc2f2d7584cf7bb635a6dfe0f8@adsl-67-115-73-128.dsl.lsan03.pacbell.net
	[67.115.73.128])i3ANHDWh007444;	Sat, 10 Apr 2004 18:17:13 -0500 (CDT)
Received: by obsecurity.dyndns.org (Postfix, from userid 1000)
	id 88A4253760; Sat, 10 Apr 2004 16:17:12 -0700 (PDT)
Date: Sat, 10 Apr 2004 16:17:12 -0700
From: Kris Kennaway <kris@obsecurity.org>
To: "Luka Kodric(" <luka182@siol.net>
Message-ID: <20040410231712.GA80843@xor.obsecurity.org>
References: <40784870.5020002@siol.net>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="5mCyUwZo2JvN/JJP"
Content-Disposition: inline
In-Reply-To: <40784870.5020002@siol.net>
User-Agent: Mutt/1.4.2.1i
cc: ports@FreeBSD.org
Subject: Re: !!!broken!!!
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
	<mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Apr 2004 23:17:15 -0000


--5mCyUwZo2JvN/JJP
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sat, Apr 10, 2004 at 09:18:08PM +0200, Luka Kodric( wrote:
> i get this error:
>=20
> [daemon:~] root# cd /usr/ports && make index && portsdb -u
> Generating INDEX-5 - please wait..=3D=3D=3D> devel/apr failed:
> "Makefile", line 48: Need an operator
> "Makefile", line 53: Makefile appears to contain unresolved cvs/rcs/???=
=20
> merge conflicts
> "Makefile", line 54: Need an operator
> make: fatal errors encountered -- cannot continue
> *** Error code 1
> 1 error

As you can see, make thinks that file contains a CVS conflict; does
it?

Kris

--5mCyUwZo2JvN/JJP
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)

iD8DBQFAeIB4Wry0BWjoQKURAsCJAJ0VaaLMsSO6rELfTAskJRO8/6+8PgCgtIIJ
LpjpxuQvCnWTvA2jl1J6Djs=
=41HF
-----END PGP SIGNATURE-----

--5mCyUwZo2JvN/JJP--