[SVN-Commit] r680 - 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: Sun Nov 27 14:05:42 2011
New Revision: 680

Log:
- Fix build with WITHOUT_LDAP
- Mark WITHOUT_MAILNEWS as BROKEN

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

Modified: branches/experimental/www/seamonkey/Makefile
==============================================================================
--- branches/experimental/www/seamonkey/Makefile	Sun Nov 27 13:59:36 2011	(r679)
+++ branches/experimental/www/seamonkey/Makefile	Sun Nov 27 14:05:42 2011	(r680)
@@ -2,7 +2,7 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $FreeBSD: ports/www/seamonkey/Makefile,v 1.315 2011/11/22 20:52:36 beat Exp $
+# $FreeBSD: ports/www/seamonkey/Makefile,v 1.316 2011/11/27 13:52:57 beat Exp $
 #
 
 PORTNAME=	seamonkey
@@ -86,6 +86,7 @@
 .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-patch-bridge-bridge.mk
==============================================================================
--- branches/experimental/www/seamonkey/files/extra-patch-bridge-bridge.mk	Sun Nov 27 13:59:36 2011	(r679)
+++ branches/experimental/www/seamonkey/files/extra-patch-bridge-bridge.mk	Sun Nov 27 14:05:42 2011	(r680)
@@ -1,5 +1,5 @@
---- bridge/bridge.mk.orig	2011-10-24 10:44:24.000000000 +0200
-+++ bridge/bridge.mk	2011-10-24 10:44:56.000000000 +0200
+--- bridge/bridge.mk.orig	2011-11-24 18:31:11.000000000 +0100
++++ bridge/bridge.mk	2011-11-24 18:31:23.000000000 +0100
 @@ -38,10 +38,10 @@
  
  APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/mozilla/xpfe/components/autocomplete
@@ -11,5 +11,5 @@
 -#endif
 +endif
  
- ifdef MOZ_MAIL_NEWS
- APP_LIBXUL_DIRS += \
+ #ifdef MOZ_MORK
+ APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/db/mork

Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile	Sun Nov 27 13:59:36 2011	(r679)
+++ trunk/www/seamonkey/Makefile	Sun Nov 27 14:05:42 2011	(r680)
@@ -2,7 +2,7 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $FreeBSD: ports/www/seamonkey/Makefile,v 1.315 2011/11/22 20:52:36 beat Exp $
+# $FreeBSD: ports/www/seamonkey/Makefile,v 1.316 2011/11/27 13:52:57 beat Exp $
 #
 
 PORTNAME=	seamonkey
@@ -86,6 +86,7 @@
 .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-patch-bridge-bridge.mk
==============================================================================
--- trunk/www/seamonkey/files/extra-patch-bridge-bridge.mk	Sun Nov 27 13:59:36 2011	(r679)
+++ trunk/www/seamonkey/files/extra-patch-bridge-bridge.mk	Sun Nov 27 14:05:42 2011	(r680)
@@ -1,5 +1,5 @@
---- bridge/bridge.mk.orig	2011-10-24 10:44:24.000000000 +0200
-+++ bridge/bridge.mk	2011-10-24 10:44:56.000000000 +0200
+--- bridge/bridge.mk.orig	2011-11-24 18:31:11.000000000 +0100
++++ bridge/bridge.mk	2011-11-24 18:31:23.000000000 +0100
 @@ -38,10 +38,10 @@
  
  APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/mozilla/xpfe/components/autocomplete
@@ -11,5 +11,5 @@
 -#endif
 +endif
  
- ifdef MOZ_MAIL_NEWS
- APP_LIBXUL_DIRS += \
+ #ifdef MOZ_MORK
+ APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/db/mork