From owner-freebsd-ports@FreeBSD.ORG  Fri Jul 18 09:36:33 2003
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 7E32F37B401; Fri, 18 Jul 2003 09:36:33 -0700 (PDT)
Received: from mailout.informatik.tu-muenchen.de
	(mailout.informatik.tu-muenchen.de [131.159.0.5])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id D4B9D43F3F; Fri, 18 Jul 2003 09:36:32 -0700 (PDT)
	(envelope-from barner@in.tum.de)
Received: by zi025.glhnet.mhn.de (Postfix, from userid 1000)
	id 201D838759; Fri, 18 Jul 2003 18:36:31 +0200 (CEST)
Date: Fri, 18 Jul 2003 18:36:31 +0200
From: Simon Barner <barner@in.tum.de>
To: Kris Kennaway <kris@obsecurity.org>
Message-ID: <20030718163631.GB752@zi025.glhnet.mhn.de>
References: <20030718025200.GA36893@rot13.obsecurity.org>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="x4pBfXISqBoDm8sr"
Content-Disposition: inline
In-Reply-To: <20030718025200.GA36893@rot13.obsecurity.org>
User-Agent: Mutt/1.5.4i
X-Virus-Scanned: by amavisd-new at informatik.tu-muenchen.de
cc: ports@FreeBSD.org
cc: current@FreeBSD.org
Subject: Re: Fixing gcc 3.3 compile failures -- fix for games/battleball
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: Fri, 18 Jul 2003 16:36:33 -0000


--x4pBfXISqBoDm8sr
Content-Type: multipart/mixed; boundary="yVhtmJPUSI46BTXb"
Content-Disposition: inline


--yVhtmJPUSI46BTXb
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline



--yVhtmJPUSI46BTXb
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="Makefile.patch"
Content-Transfer-Encoding: quoted-printable

--- Makefile.orig	Fri Jul 18 17:46:10 2003
+++ Makefile	Fri Jul 18 17:46:39 2003
@@ -21,11 +21,9 @@
 MAKE_ENV=3D	PTHREAD_LIBS=3D"${PTHREAD_LIBS}" \
 		PTHREAD_CFLAGS=3D"${PTHREAD_CFLAGS}"
=20
-.include <bsd.port.pre.mk>
+CFLAGS +=3D -Wno-deprecated
=20
-.if ${OSVERSION} >=3D 500113
-BROKEN=3D         "Does not compile (bad C++ code)"
-.endif
+.include <bsd.port.pre.mk>
=20
 do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/battleball ${PREFIX}/bin

--yVhtmJPUSI46BTXb
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-lib3d-general.h"
Content-Transfer-Encoding: quoted-printable

--- lib3d/general.h.orig	Fri Sep  3 04:25:19 1999
+++ lib3d/general.h	Fri Jul 18 17:42:41 2003
@@ -25,9 +25,15 @@
 typedef unsigned int  uint;
 typedef unsigned long ulong;
=20
+#ifdef __GNUC__
+#if __GNUC__ < 3
 #define and &&
 #define or  ||
 #define not !
+#endif
+
+// TODO - what about non-GNU C++ compilers?
+#endif
=20
 #define forii(limit) for (int i=3D 0; i <limit; i++)
 #define forij(limit) for (int j=3D 0; j <limit; j++)

--yVhtmJPUSI46BTXb
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="patch-lib3d-xform.h"
Content-Transfer-Encoding: quoted-printable

--- lib3d/xform.h.orig	Fri Jul 18 17:28:08 2003
+++ lib3d/xform.h	Fri Jul 18 17:26:11 2003
@@ -64,6 +64,7 @@
=20
 //=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D
 class tmtrx {
+  friend struct player;
   typedef double fourby3[4][3];
   fourby3 m;
=20

--yVhtmJPUSI46BTXb--

--x4pBfXISqBoDm8sr
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

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

iD8DBQE/GCIOCkn+/eutqCoRArfOAKC+Fg4OdL8IElDG0QrP4sNHkyGYfwCfa5Ad
QJmPyxXjQ5PJJAHnRC5R13g=
=4niv
-----END PGP SIGNATURE-----

--x4pBfXISqBoDm8sr--