cvs commit: ports/www/seamonkey Makefile ports/www/seamonkey/files extra-patch-bridge-bridge.mk

[Beat Gätzi]

On Oct 26, 2011, at 9:07 PM, Nali Toja wrote:
> Beat Gaetzi <beat at 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 \