From owner-cvs-all@FreeBSD.ORG  Wed Oct 26 21:15:46 2011
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0AA93106564A;
	Wed, 26 Oct 2011 21:15:46 +0000 (UTC)
	(envelope-from beat@FreeBSD.org)
Received: from marvin.chruetertee.ch (marvin.chruetertee.ch [217.150.245.55])
	by mx1.freebsd.org (Postfix) with ESMTP id 8AAEF8FC13;
	Wed, 26 Oct 2011 21:15:45 +0000 (UTC)
Received: from [192.168.1.38] (152-110.78-83.cust.bluewin.ch [83.78.110.152])
	(authenticated bits=0)
	by marvin.chruetertee.ch (8.14.4/8.14.3) with ESMTP id p9QLFhk4082294
	(version=TLSv1/SSLv3 cipher=DHE-DSS-AES128-SHA bits=128 verify=NO);
	Wed, 26 Oct 2011 21:15:44 GMT (envelope-from beat@FreeBSD.org)
Mime-Version: 1.0 (Apple Message framework v1251.1)
Content-Type: text/plain; charset=us-ascii
From: =?iso-8859-1?Q?Beat_G=E4tzi?= <beat@FreeBSD.org>
In-Reply-To: <86zkgnzi4u.fsf@gmail.com>
Date: Wed, 26 Oct 2011 23:15:43 +0200
Content-Transfer-Encoding: 7bit
Message-Id: <BCA23613-FB54-404C-81BF-08760D1BB156@FreeBSD.org>
References: <201110261824.p9QIOLpU034143__7819.91560147635$1319653488$gmane$org@repoman.freebsd.org>
	<86zkgnzi4u.fsf@gmail.com>
To: Nali Toja <nalitoja@gmail.com>
X-Mailer: Apple Mail (2.1251.1)
Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org
Subject: Re: cvs commit: ports/www/seamonkey Makefile
	ports/www/seamonkey/files extra-patch-bridge-bridge.mk
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the entire tree
	<cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2011 21:15:46 -0000

On Oct 26, 2011, at 9:07 PM, Nali Toja wrote:
> Beat Gaetzi <beat@FreeBSD.org> writes:
> 
>>  FreeBSD ports repository
>> 
>>  Modified files:
>>    www/seamonkey        Makefile 
>>  Added files:
>>    www/seamonkey/files  extra-patch-bridge-bridge.mk 
>>  Log:
>>  - Fix build with WITHOUT_LDAP
>>  - Mark WITHOUT_MAILNEWS as BROKEN
> [...]
>> @@ -84,11 +84,12 @@ LIB_DEPENDS+=	glitz.1:${PORTSDIR}/graphi
>> 
>> .if defined(WITHOUT_MAILNEWS)
>> MOZ_OPTIONS+=	--disable-ldap --disable-mailnews
>> +BROKEN=		Does not build
>> .else
>> # mail and news desired, but not LDAP
>> .if defined(WITHOUT_LDAP)
>> +EXTRA_PATCHES+=	${FILESDIR}/extra-patch-bridge-bridge.mk
>> MOZ_OPTIONS+=	--disable-ldap --enable-mailnews
>> -BROKEN=		Does not build
>> .else
>> MOZ_OPTIONS+=	--enable-ldap --enable-mailnews
>> .endif
> 
> If you apply patches conditionally fix --disable-mailnews case, too.

I just committed your patch.

Thanks,
Beat

> --- bridge/bridge.mk~
> +++ bridge/bridge.mk
> @@ -43,7 +43,7 @@ APP_LIBXUL_STATICDIRS += $(DEPTH)$(SUBDI
> APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/ldap/xpcom
> endif
> 
> -ifdef MOZ_MAIL_NEWS
> +ifdef disabled
> APP_LIBXUL_DIRS += \
>   $(DEPTH)$(SUBDIR)/mailnews/base \
>   $(DEPTH)$(SUBDIR)/mailnews/mime/public \