From owner-freebsd-ports Tue Oct 23 9: 2: 7 2001 Delivered-To: freebsd-ports@freebsd.org Received: from mmu.edu.my (ext-dns.mmu.edu.my [203.106.62.11]) by hub.freebsd.org (Postfix) with ESMTP id 9118937B401; Tue, 23 Oct 2001 09:01:37 -0700 (PDT) Received: from venus.cyber.mmu.edu.my (venus.cyber.mmu.edu.my [203.106.62.12]) by mmu.edu.my (8.9.1b+Sun/8.9.1) with ESMTP id XAA10471; Tue, 23 Oct 2001 23:57:21 +0800 (MYT) Received: from there (hb2c-20.cyber.mmu.edu.my [10.100.99.40]) by venus.cyber.mmu.edu.my (8.8.8+Sun/8.8.8) with SMTP id XAA10752; Tue, 23 Oct 2001 23:57:16 +0800 (SGT) Message-Id: <200110231557.XAA10752@venus.cyber.mmu.edu.my> Content-Type: text/plain; charset="iso-8859-1" From: Nuzrin Yaapar Reply-To: p9711422@mmu.edu.my Organization: Multimedia University To: freebsd-ports@FreeBSD.ORG Subject: PATCH FOR MOZILLA-0.9.5 (was Re: ports/31443: mozilla-0.9.5 fails to build on -current) Date: Wed, 24 Oct 2001 00:12:25 +0800 X-Mailer: KMail [version 1.3.1] Cc: sobomax@FreeBSD.ORG References: <200110231206.f9NC6mQ93626@vega.vega.com> In-Reply-To: <200110231206.f9NC6mQ93626@vega.vega.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: owner-freebsd-ports@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/31443; it has been noted by > > > GNATS. > > > > > > > nsLDAPConnectionCallbacks.c: At top level: > > > > nsLDAPConnectionCallbacks.c:52: storage size of `kLDAPThreadFuncs' > > > > isn't known nsLDAPConnectionCallbacks.c:53: storage size of > > > > `kLDAPExtraThreadFuncs' isn't known gmake[3]: *** > > > > [nsLDAPConnectionCallbacks.o] Error 1 > > > > gmake[3]: Leaving directory > > > > `/usr/ports/www/mozilla/work/mozilla/directory/xpcom/base/src' Hi all, Based on the information provided by Maxim, I've created a patchset to allow mozilla-0.9.5 to recompile again with openldap installed. It can also be done using grep and sed in the Makefile. After applying this patch, mozilla will compile again happily ;) Now, should I file a PR? ============= [nuzrin@nuzrin /usr/ports/www]> diff -ruN mozilla mozilla-new diff -ruN mozilla/files/patch-directory::xpcom::base::src::nsLDAPConnection.h mozilla-new/files/patch-directory::xpcom::base::src::nsLDAPConnection.h --- mozilla/files/patch-directory::xpcom::base::src::nsLDAPConnection.h Thu Jan 1 07:30:00 1970 +++ mozilla-new/files/patch-directory::xpcom::base::src::nsLDAPConnection.h Tue Oct 23 23:20:34 2001 @@ -0,0 +1,11 @@ +--- directory/xpcom/base/src/nsLDAPConnection.h.orig Tue Oct 23 23:08:48 2001 ++++ directory/xpcom/base/src/nsLDAPConnection.h Tue Oct 23 23:09:01 2001 +@@ -37,7 +37,7 @@ + #define _nsLDAPConnection_h_ + + #include "nsILDAPConnection.h" +-#include "ldap.h" ++#include "../../../../dist/include/ldap/ldap.h" + #include "nsString.h" + #include "nsIThread.h" + #include "nsIRunnable.h" diff -ruN mozilla/files/patch-directory::xpcom::base::src::nsLDAPConnectionCallbacks.c mozilla-new/files/patch-directory::xpcom::base::src::nsLDAPConnectionCallbacks.c --- mozilla/files/patch-directory::xpcom::base::src::nsLDAPConnectionCallbacks.c Thu Jan 1 07:30:00 1970 +++ mozilla-new/files/patch-directory::xpcom::base::src::nsLDAPConnectionCallbacks.c Tue Oct 23 23:24:11 2001 @@ -0,0 +1,11 @@ +--- directory/xpcom/base/src/nsLDAPConnectionCallbacks.c.orig Tue Oct 23 23:02:45 2001 ++++ directory/xpcom/base/src/nsLDAPConnectionCallbacks.c Tue Oct 23 23:01:46 2001 +@@ -35,7 +35,7 @@ + */ + + #include "nspr.h" +-#include "ldap.h" ++#include "../../../../dist/include/ldap/ldap.h" + /* XXXdmose errno.h should go away, probably after ldap C SDK 4.1 lands */ + #include "errno.h" + diff -ruN mozilla/files/patch-directory::xpcom::base::src::nsLDAPMessage.h mozilla-new/files/patch-directory::xpcom::base::src::nsLDAPMessage.h --- mozilla/files/patch-directory::xpcom::base::src::nsLDAPMessage.h Thu Jan 1 07:30:00 1970 +++ mozilla-new/files/patch-directory::xpcom::base::src::nsLDAPMessage.h Tue Oct 23 23:26:07 2001 @@ -0,0 +1,11 @@ +--- directory/xpcom/base/src/nsLDAPMessage.h.orig Tue Oct 23 23:08:15 2001 ++++ directory/xpcom/base/src/nsLDAPMessage.h Tue Oct 23 23:08:26 2001 +@@ -35,7 +35,7 @@ + #ifndef _nsLDAPMessage_h_ + #define _nsLDAPMessage_h_ + +-#include "ldap.h" ++#include "../../../../dist/include/ldap/ldap.h" + #include "nsILDAPMessage.h" + #include "nsILDAPOperation.h" + #include "nsCOMPtr.h" diff -ruN mozilla/files/patch-directory::xpcom::base::src::nsLDAPOperation.h mozilla-new/files/patch-directory::xpcom::base::src::nsLDAPOperation.h --- mozilla/files/patch-directory::xpcom::base::src::nsLDAPOperation.h Thu Jan 1 07:30:00 1970 +++ mozilla-new/files/patch-directory::xpcom::base::src::nsLDAPOperation.h Tue Oct 23 23:26:47 2001 @@ -0,0 +1,11 @@ +--- directory/xpcom/base/src/nsLDAPOperation.h.orig Tue Oct 23 23:13:52 2001 ++++ directory/xpcom/base/src/nsLDAPOperation.h Tue Oct 23 23:14:02 2001 +@@ -35,7 +35,7 @@ + #ifndef _nsLDAPOperation_h_ + #define _nsLDAPOperation_h_ + +-#include "ldap.h" ++#include "../../../../dist/include/ldap/ldap.h" + #include "nsCOMPtr.h" + #include "nsILDAPConnection.h" + #include "nsILDAPOperation.h" diff -ruN mozilla/files/patch-directory::xpcom::base::src::nsLDAPService.h mozilla-new/files/patch-directory::xpcom::base::src::nsLDAPService.h --- mozilla/files/patch-directory::xpcom::base::src::nsLDAPService.h Thu Jan 1 07:30:00 1970 +++ mozilla-new/files/patch-directory::xpcom::base::src::nsLDAPService.h Tue Oct 23 23:27:23 2001 @@ -0,0 +1,11 @@ +--- directory/xpcom/base/src/nsLDAPService.h.orig Tue Oct 23 23:14:18 2001 ++++ directory/xpcom/base/src/nsLDAPService.h Tue Oct 23 23:14:32 2001 +@@ -33,7 +33,7 @@ + */ + + #include "nsLDAP.h" +-#include "ldap.h" ++#include "../../../../dist/include/ldap/ldap.h" + #include "nsString.h" + #include "nsSupportsArray.h" + #include "nsHashtable.h" diff -ruN mozilla/files/patch-directory::xpcom::base::src::nsLDAPURL.h mozilla-new/files/patch-directory::xpcom::base::src::nsLDAPURL.h --- mozilla/files/patch-directory::xpcom::base::src::nsLDAPURL.h Thu Jan 1 07:30:00 1970 +++ mozilla-new/files/patch-directory::xpcom::base::src::nsLDAPURL.h Tue Oct 23 23:28:12 2001 @@ -0,0 +1,11 @@ +--- directory/xpcom/base/src/nsLDAPURL.h.orig Tue Oct 23 23:05:47 2001 ++++ directory/xpcom/base/src/nsLDAPURL.h Tue Oct 23 23:07:49 2001 +@@ -34,7 +34,7 @@ + */ + + #include "nsLDAP.h" +-#include "ldap.h" ++#include "../../../../dist/include/ldap/ldap.h" + #include "nsString.h" + #include "nsVoidArray.h" + #include "nsILDAPURL.h" To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message