From owner-freebsd-gecko@FreeBSD.ORG  Fri Jun 13 00:14:01 2014
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E3FE550D
 for <freebsd-gecko@freebsd.org>; Fri, 13 Jun 2014 00:14:01 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
 [217.150.244.247])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7857C29B0
 for <freebsd-gecko@freebsd.org>; Fri, 13 Jun 2014 00:14:01 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.244.247])
 by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id s5D0Dxvg005459
 for <freebsd-gecko@freebsd.org>; Fri, 13 Jun 2014 00:13:59 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
 by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id s5D0DsUh004822
 for freebsd-gecko@freebsd.org; Fri, 13 Jun 2014 00:13:54 GMT
 (envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Fri, 13 Jun 2014 00:13:54 GMT
Message-Id: <201406130013.s5D0DsUh004822@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
Subject: [SVN-Commit] r1605 - in trunk: mail/thunderbird www/seamonkey
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Reply-To: freebsd-gecko@freebsd.org
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko/>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
 <mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Jun 2014 00:14:02 -0000

Author: jbeich
Date: Fri Jun 13 00:13:54 2014
New Revision: 1605

Log:
workaround for symbol clash: openldap vs. ldap/c-sdk

PR:		165263

Modified:
   trunk/mail/thunderbird/Makefile
   trunk/www/seamonkey/Makefile

Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile	Fri Jun 13 00:13:39 2014	(r1604)
+++ trunk/mail/thunderbird/Makefile	Fri Jun 13 00:13:54 2014	(r1605)
@@ -30,6 +30,9 @@
 EM_VERSION=	1.6
 L_VERSION=	2.6.5
 
+# XXX make bug 292127 workaround local to ldap/c-sdk
+CFLAGS+=	-Dldap_str2charray=moz_ldap_str2charray
+
 SSP_UNSAFE=	yes
 USE_AUTOTOOLS=	autoconf213:env
 USE_PYTHON_BUILD=2

Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile	Fri Jun 13 00:13:39 2014	(r1604)
+++ trunk/www/seamonkey/Makefile	Fri Jun 13 00:13:54 2014	(r1605)
@@ -118,6 +118,8 @@
 MOZ_OPTIONS+=	--disable-ldap --enable-mailnews
 .else
 MOZ_OPTIONS+=	--enable-ldap --enable-mailnews
+# XXX make bug 292127 workaround local to ldap/c-sdk
+CFLAGS+=	-Dldap_str2charray=moz_ldap_str2charray
 .endif
 .if ${PORT_OPTIONS:MENIGMAIL}
 #MASTER_SITES+=	https://www.enigmail.net/download/source/:enigmail