Date: Wed, 26 Oct 2011 23:15:43 +0200 From: =?iso-8859-1?Q?Beat_G=E4tzi?= <beat@FreeBSD.org> To: Nali Toja <nalitoja@gmail.com> 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: <BCA23613-FB54-404C-81BF-08760D1BB156@FreeBSD.org> In-Reply-To: <86zkgnzi4u.fsf@gmail.com> References: <201110261824.p9QIOLpU034143__7819.91560147635$1319653488$gmane$org@repoman.freebsd.org> <86zkgnzi4u.fsf@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?BCA23613-FB54-404C-81BF-08760D1BB156>