From owner-freebsd-openoffice Fri Nov 1 13: 0:22 2002 Delivered-To: freebsd-openoffice@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CFE0C37B415 for ; Fri, 1 Nov 2002 13:00:15 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4883E43E88 for ; Fri, 1 Nov 2002 13:00:15 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id gA1L0Fx3025298 for ; Fri, 1 Nov 2002 13:00:15 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id gA1L0F78025297; Fri, 1 Nov 2002 13:00:15 -0800 (PST) Date: Fri, 1 Nov 2002 13:00:15 -0800 (PST) Message-Id: <200211012100.gA1L0F78025297@freefall.freebsd.org> To: openoffice@FreeBSD.org Cc: From: Mike Durian Subject: Re: ports/44511: openoffice-devel won't build Reply-To: Mike Durian Sender: owner-freebsd-openoffice@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG The following reply was made to PR ports/44511; it has been noted by GNATS. From: Mike Durian To: freebsd-gnats-submit@FreeBSD.org, durian@boogie.com Cc: Subject: Re: ports/44511: openoffice-devel won't build Date: Fri, 1 Nov 2002 13:58:43 -0700 --------------Boundary-00=_VX0XGV51SO0B9A0TQ74G Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable I don't think this is the proper fix, but it does get things going. On Oct. 4, 2002, FreeBSD added the expat library to the base system, but named the include file bsdxml.h. There was no __FreeBSD_version bump for this. The closest was the change on Oct 15 from 500040 to 500041. The better fix is probably to check for the existance of bsdxml.h in one of the config files, but I didn't really want to dig into that right now. mike --------------Boundary-00=_VX0XGV51SO0B9A0TQ74G Content-Type: text/x-diff; charset="us-ascii"; name="ne_xml.c.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="ne_xml.c.patch" --- ne_xml.c.orig Fri Nov 1 13:35:21 2002 +++ ne_xml.c Fri Nov 1 13:54:07 2002 @@ -41,7 +41,16 @@ #if defined(HAVE_EXPAT_H) #include #elif defined(HAVE_XMLPARSE_H) +#if defined(__FreeBSD__) +#include +#if __FreeBSD_version >= 500041 +#include +#else #include +#endif /* __FreeBSD_version */ +#else +#include +#endif /* __FreeBSD__ */ #elif defined(HAVE_XMLTOK_XMLPARSE_H) #include #else --------------Boundary-00=_VX0XGV51SO0B9A0TQ74G-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-openoffice" in the body of the message