From owner-freebsd-gecko@FreeBSD.ORG Thu Nov 26 12:43:30 2009 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 05D77106568B for ; Thu, 26 Nov 2009 12:43:30 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 84A8E8FC16 for ; Thu, 26 Nov 2009 12:43:29 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id nAQChShB050607 for ; Thu, 26 Nov 2009 12:43:28 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id nAQChN3k049441 for freebsd-gecko@freebsd.org; Thu, 26 Nov 2009 12:43:23 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Thu, 26 Nov 2009 12:43:23 GMT Message-Id: <200911261243.nAQChN3k049441@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [SVN-Commit] r174 - in branches/experimental/mail/thunderbird-devel: . files X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Nov 2009 12:43:30 -0000 Author: beat Date: Thu Nov 26 12:43:22 2009 New Revision: 174 Log: - Remove bogus dependency on OpenLDAP - Add ftp to MOZ_PROTOCOLS Added: branches/experimental/mail/thunderbird-devel/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in Modified: branches/experimental/mail/thunderbird-devel/Makefile branches/experimental/mail/thunderbird-devel/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in branches/experimental/mail/thunderbird-devel/files/patch-directory_xpcom_base_src_Makefile.in Modified: branches/experimental/mail/thunderbird-devel/Makefile ============================================================================== --- branches/experimental/mail/thunderbird-devel/Makefile Thu Nov 26 12:26:52 2009 (r173) +++ branches/experimental/mail/thunderbird-devel/Makefile Thu Nov 26 12:43:22 2009 (r174) @@ -32,9 +32,8 @@ HAS_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes -USE_OPENLDAP= yes -MOZ_PROTOCOLS= http,file,viewsource,res,data +MOZ_PROTOCOLS= http,ftp,file,viewsource,res,data MOZ_GRAPHICS= default,-xbm MOZ_OPTIONS= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --enable-single-profile --disable-profilesharing \ Added: branches/experimental/mail/thunderbird-devel/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/mail/thunderbird-devel/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in Thu Nov 26 12:43:22 2009 (r174) @@ -0,0 +1,13 @@ +--- directory/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2009-11-10 09:56:42.000000000 +0100 ++++ directory/c-sdk/ldap/libraries/libldap/Makefile.in 2009-11-10 09:58:15.000000000 +0100 +@@ -254,6 +254,10 @@ + EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe + endif + ++ifeq ($(OS_ARCH), FreeBSD) ++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread ++endif ++ + ifeq ($(OS_ARCH), NetBSD) + EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) + endif Modified: branches/experimental/mail/thunderbird-devel/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-devel/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in Thu Nov 26 12:26:52 2009 (r173) +++ branches/experimental/mail/thunderbird-devel/files/patch-directory_c-sdk_ldap_libraries_libprldap_Makefile.in Thu Nov 26 12:43:22 2009 (r174) @@ -1,11 +1,11 @@ ---- directory/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2009-08-13 11:52:42.922173050 +0200 -+++ directory/c-sdk/ldap/libraries/libprldap/Makefile.in 2009-08-13 11:57:37.154368482 +0200 +--- directory/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2009-11-26 12:47:13.000000000 +0100 ++++ directory/c-sdk/ldap/libraries/libprldap/Makefile.in 2009-11-26 12:47:48.000000000 +0100 @@ -125,6 +125,11 @@ CUSTOM_LIBS=1 endif +ifeq ($(OS_ARCH), FreeBSD) -+EXTRA_LIBS += -lpthread ++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread +CUSTOM_LIBS=1 +endif + Modified: branches/experimental/mail/thunderbird-devel/files/patch-directory_xpcom_base_src_Makefile.in ============================================================================== --- branches/experimental/mail/thunderbird-devel/files/patch-directory_xpcom_base_src_Makefile.in Thu Nov 26 12:26:52 2009 (r173) +++ branches/experimental/mail/thunderbird-devel/files/patch-directory_xpcom_base_src_Makefile.in Thu Nov 26 12:43:22 2009 (r174) @@ -1,12 +1,11 @@ ---- directory/xpcom/base/src/Makefile.in.orig 2009-08-13 20:38:29.973580082 +0200 -+++ directory/xpcom/base/src/Makefile.in 2009-08-13 20:38:38.111342004 +0200 -@@ -91,6 +91,11 @@ +--- directory/xpcom/base/src/Makefile.in.orig 2009-11-22 03:44:31.000000000 +0100 ++++ directory/xpcom/base/src/Makefile.in 2009-11-26 13:06:53.000000000 +0100 +@@ -97,6 +97,10 @@ $(NULL) endif +ifeq ($(OS_ARCH), FreeBSD) -+EXTRA_LIBS += -llber -+CUSTOM_LIBS=1 ++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread +endif + EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(LDAP_LIBS)