[SVN-Commit] r1605 - in trunk: mail/thunderbird www/seamonkey

[svn-freebsd-gecko at chruetertee.ch]

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