From owner-cvs-all@FreeBSD.ORG  Wed Oct 26 19:37:26 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 AB0EF1065670;
	Wed, 26 Oct 2011 19:37:26 +0000 (UTC)
	(envelope-from nalitoja@gmail.com)
Received: from mail-bw0-f54.google.com (mail-bw0-f54.google.com
	[209.85.214.54])
	by mx1.freebsd.org (Postfix) with ESMTP id A70AC8FC0A;
	Wed, 26 Oct 2011 19:37:25 +0000 (UTC)
Received: by bkbzt4 with SMTP id zt4so2328756bkb.13
	for <multiple recipients>; Wed, 26 Oct 2011 12:37:24 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=from:to:cc:subject:in-reply-to:date:message-id:references
	:user-agent:mime-version:content-type;
	bh=Et8v9jxtGnKqpW+qTAxYGxUPY+vh2tmS0Bw/YbIOfHE=;
	b=GIq2OEH+EmRIV1UkVlMioL4CgY6gwOYgEj9q7qz/gLC4Sybuwtw/B6MhaHYKWHZy6h
	3+s/zANEp1bebsqCbudt3D6is1qP90QRzHfy9cAzCjzGCv5Wo4nyFrMtOh1+b1Al8qxr
	4fGSo7ojZhFgCZEpeLoHtggUOCqw7p0GsnRzg=
Received: by 10.204.129.22 with SMTP id m22mr26212053bks.22.1319656078859;
	Wed, 26 Oct 2011 12:07:58 -0700 (PDT)
Received: from nil (tor3.anonymizer.ccc.de. [80.237.226.73])
	by mx.google.com with ESMTPS id z9sm3164196bkn.7.2011.10.26.12.07.49
	(version=SSLv3 cipher=OTHER); Wed, 26 Oct 2011 12:07:58 -0700 (PDT)
From: Nali Toja <nalitoja@gmail.com>
To: Beat Gaetzi <beat@FreeBSD.org>
In-Reply-To: <201110261824.p9QIOLpU034143__7819.91560147635$1319653488$gmane$org@repoman.freebsd.org>
	(Beat Gaetzi's message of "Wed, 26 Oct 2011 18:24:21 +0000 (UTC)")
Date: Wed, 26 Oct 2011 19:07:29 +0000
Message-ID: <86zkgnzi4u.fsf@gmail.com>
References: <201110261824.p9QIOLpU034143__7819.91560147635$1319653488$gmane$org@repoman.freebsd.org>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.90 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain
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 19:37:26 -0000

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.

--- 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 \