Date: Wed, 26 Oct 2011 19:07:29 +0000 From: Nali Toja <nalitoja@gmail.com> To: Beat Gaetzi <beat@FreeBSD.org> 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 Message-ID: <86zkgnzi4u.fsf@gmail.com> 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 %2B0000 (UTC)") References: <201110261824.p9QIOLpU034143__7819.91560147635$1319653488$gmane$org@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86zkgnzi4u.fsf>