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

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Tue Nov 29 21:30:57 2011
New Revision: 681

Log:
- Unbreak WITHOUT_MAILNEWS option

PR:		ports/160444
Submitted by:	Riccardo Torrini <riccardo AT torrini.org>

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

Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile	Sun Nov 27 14:05:42 2011	(r680)
+++ branches/experimental/www/seamonkey/Makefile	Tue Nov 29 21:30:57 2011	(r681)
@@ -2,7 +2,7 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $FreeBSD: ports/www/seamonkey/Makefile,v 1.316 2011/11/27 13:52:57 beat Exp $
+# $FreeBSD: ports/www/seamonkey/Makefile,v 1.317 2011/11/29 21:27:59 beat Exp $
 #
 
 PORTNAME=	seamonkey
@@ -86,7 +86,6 @@
 .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)

Modified: branches/experimental/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk
==============================================================================
--- branches/experimental/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk	Sun Nov 27 14:05:42 2011	(r680)
+++ branches/experimental/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk	Tue Nov 29 21:30:57 2011	(r681)
@@ -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 += \

Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile	Sun Nov 27 14:05:42 2011	(r680)
+++ trunk/www/seamonkey/Makefile	Tue Nov 29 21:30:57 2011	(r681)
@@ -2,7 +2,7 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $FreeBSD: ports/www/seamonkey/Makefile,v 1.316 2011/11/27 13:52:57 beat Exp $
+# $FreeBSD: ports/www/seamonkey/Makefile,v 1.317 2011/11/29 21:27:59 beat Exp $
 #
 
 PORTNAME=	seamonkey
@@ -86,7 +86,6 @@
 .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)

Modified: trunk/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk
==============================================================================
--- trunk/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk	Sun Nov 27 14:05:42 2011	(r680)
+++ trunk/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk	Tue Nov 29 21:30:57 2011	(r681)
@@ -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 += \