From 6a934d9554e972145e90c5777a9da7550f9453c9 Mon Sep 17 00:00:00 2001 From: beat Date: Tue, 29 Nov 2011 21:27:59 +0000 Subject: - Unbreak WITHOUT_MAILNEWS option PR: ports/160444 Submitted by: Riccardo Torrini Feature safe: yes --- www/seamonkey/Makefile | 1 - www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'www') diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 2594379ea81d..dcc36f532f3b 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -86,7 +86,6 @@ LIB_DEPENDS+= glitz.1:${PORTSDIR}/graphics/glitz .if defined(WITHOUT_MAILNEWS) EXTRA_PATCHES+= ${FILESDIR}/extra-mailnews-patch-bridge-bridge.mk MOZ_OPTIONS+= --disable-ldap --disable-mailnews -BROKEN= Does not build .else # mail and news desired, but not LDAP .if defined(WITHOUT_LDAP) diff --git a/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk b/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk index 09e602a54249..24d849ebf680 100644 --- a/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk +++ b/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk @@ -1,6 +1,6 @@ --- bridge/bridge.mk.orig 2011-09-29 01:10:49.000000000 +0200 +++ bridge/bridge.mk 2011-10-26 22:21:47.000000000 +0200 -@@ -38,12 +38,12 @@ +@@ -38,16 +38,16 @@ APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/mozilla/xpfe/components/autocomplete @@ -10,7 +10,11 @@ APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/ldap/xpcom -#endif +endif - + + #ifdef MOZ_MORK + APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/db/mork + #endif + -ifdef MOZ_MAIL_NEWS +ifdef disabled APP_LIBXUL_DIRS += \ -- cgit