[SVN-Commit] r667 - branches/experimental/www/seamonkey branches/experimental/www/seamonkey-beta branches/experimental/www/seamonkey-beta/files branches/experimental/www/seamonkey/files trunk/www/seamonkey trunk/www/seamonkey/files

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Wed Oct 26 21:14:15 2011
New Revision: 667

Log:
- Unbreak WITHOUT_MAILNEWS option

Submitted by:	Nali Toja <nalitoja AT gmail.com>

Added:
   branches/experimental/www/seamonkey-beta/files/extra-mailnews-patch-bridge-bridge.mk
   branches/experimental/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk
   trunk/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk
Modified:
   branches/experimental/www/seamonkey-beta/Makefile
   branches/experimental/www/seamonkey/Makefile
   trunk/www/seamonkey/Makefile

Modified: branches/experimental/www/seamonkey-beta/Makefile
==============================================================================
--- branches/experimental/www/seamonkey-beta/Makefile	Wed Oct 26 19:05:15 2011	(r666)
+++ branches/experimental/www/seamonkey-beta/Makefile	Wed Oct 26 21:14:15 2011	(r667)
@@ -84,8 +84,8 @@
 .endif
 
 .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)

Added: branches/experimental/www/seamonkey-beta/files/extra-mailnews-patch-bridge-bridge.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/seamonkey-beta/files/extra-mailnews-patch-bridge-bridge.mk	Wed Oct 26 21:14:15 2011	(r667)
@@ -0,0 +1,18 @@
+--- 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 @@
+ 
+ APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/mozilla/xpfe/components/autocomplete
+ 
+-#ifdef MOZ_LDAP_XPCOM
++ifdef MOZ_LDAP_XPCOM
+ APP_LIBXUL_STATICDIRS += $(DEPTH)$(SUBDIR)/ldap/sdks/c-sdk
+ APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/ldap/xpcom
+-#endif
++endif
+ 
+-ifdef MOZ_MAIL_NEWS
++ifdef disabled
+ APP_LIBXUL_DIRS += \
+   $(DEPTH)$(SUBDIR)/mailnews/base \
+   $(DEPTH)$(SUBDIR)/mailnews/mime/public \

Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile	Wed Oct 26 19:05:15 2011	(r666)
+++ branches/experimental/www/seamonkey/Makefile	Wed Oct 26 21:14:15 2011	(r667)
@@ -2,7 +2,7 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $FreeBSD: ports/www/seamonkey/Makefile,v 1.313 2011/10/26 18:24:21 beat Exp $
+# $FreeBSD: ports/www/seamonkey/Makefile,v 1.314 2011/10/26 21:11:39 beat Exp $
 #
 
 PORTNAME=	seamonkey
@@ -83,8 +83,8 @@
 .endif
 
 .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)

Added: branches/experimental/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk	Wed Oct 26 21:14:15 2011	(r667)
@@ -0,0 +1,18 @@
+--- 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 @@
+ 
+ APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/mozilla/xpfe/components/autocomplete
+ 
+-#ifdef MOZ_LDAP_XPCOM
++ifdef MOZ_LDAP_XPCOM
+ APP_LIBXUL_STATICDIRS += $(DEPTH)$(SUBDIR)/ldap/sdks/c-sdk
+ APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/ldap/xpcom
+-#endif
++endif
+ 
+-ifdef MOZ_MAIL_NEWS
++ifdef disabled
+ APP_LIBXUL_DIRS += \
+   $(DEPTH)$(SUBDIR)/mailnews/base \
+   $(DEPTH)$(SUBDIR)/mailnews/mime/public \

Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile	Wed Oct 26 19:05:15 2011	(r666)
+++ trunk/www/seamonkey/Makefile	Wed Oct 26 21:14:15 2011	(r667)
@@ -2,7 +2,7 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $FreeBSD: ports/www/seamonkey/Makefile,v 1.313 2011/10/26 18:24:21 beat Exp $
+# $FreeBSD: ports/www/seamonkey/Makefile,v 1.314 2011/10/26 21:11:39 beat Exp $
 #
 
 PORTNAME=	seamonkey
@@ -83,8 +83,8 @@
 .endif
 
 .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)

Added: trunk/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk	Wed Oct 26 21:14:15 2011	(r667)
@@ -0,0 +1,18 @@
+--- 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 @@
+ 
+ APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/mozilla/xpfe/components/autocomplete
+ 
+-#ifdef MOZ_LDAP_XPCOM
++ifdef MOZ_LDAP_XPCOM
+ APP_LIBXUL_STATICDIRS += $(DEPTH)$(SUBDIR)/ldap/sdks/c-sdk
+ APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/ldap/xpcom
+-#endif
++endif
+ 
+-ifdef MOZ_MAIL_NEWS
++ifdef disabled
+ APP_LIBXUL_DIRS += \
+   $(DEPTH)$(SUBDIR)/mailnews/base \
+   $(DEPTH)$(SUBDIR)/mailnews/mime/public \