From owner-freebsd-gecko@FreeBSD.ORG Wed Oct 26 21:14:22 2011 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C8D7C106564A for ; Wed, 26 Oct 2011 21:14:22 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 6B7BF8FC19 for ; Wed, 26 Oct 2011 21:14:22 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id p9QLEL77078272 for ; Wed, 26 Oct 2011 21:14:21 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id p9QLEGtT076828 for freebsd-gecko@freebsd.org; Wed, 26 Oct 2011 21:14:16 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 26 Oct 2011 21:14:16 GMT Message-Id: <201110262114.p9QLEGtT076828@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [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 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Oct 2011 21:14:22 -0000 Author: beat Date: Wed Oct 26 21:14:15 2011 New Revision: 667 Log: - Unbreak WITHOUT_MAILNEWS option Submitted by: Nali Toja 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 \