From owner-freebsd-gecko@FreeBSD.ORG Fri Aug 31 18:39:32 2012 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 E6EE9106564A for ; Fri, 31 Aug 2012 18:39:32 +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 58DC18FC14 for ; Fri, 31 Aug 2012 18:39:31 +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 q7VIdUGY092128 for ; Fri, 31 Aug 2012 18:39:30 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q7VIdPC5091323 for freebsd-gecko@freebsd.org; Fri, 31 Aug 2012 18:39:25 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Fri, 31 Aug 2012 18:39:25 GMT Message-Id: <201208311839.q7VIdPC5091323@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] r970 - in 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: Fri, 31 Aug 2012 18:39:33 -0000 Author: jbeich Date: Fri Aug 31 18:39:24 2012 New Revision: 970 Log: unbreak unsetting LDAP and MAILNEWS options after bug 707305 Deleted: trunk/www/seamonkey/files/extra-patch-bridge-bridge.mk Modified: trunk/www/seamonkey/Makefile trunk/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Fri Aug 31 14:00:45 2012 (r969) +++ trunk/www/seamonkey/Makefile Fri Aug 31 18:39:24 2012 (r970) @@ -77,7 +77,6 @@ .else # mail and news desired, but not LDAP .if ! ${PORT_OPTIONS:MLDAP} -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bridge-bridge.mk MOZ_OPTIONS+= --disable-ldap --enable-mailnews .else MOZ_OPTIONS+= --enable-ldap --enable-mailnews Modified: trunk/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk ============================================================================== --- trunk/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk Fri Aug 31 14:00:45 2012 (r969) +++ trunk/www/seamonkey/files/extra-mailnews-patch-bridge-bridge.mk Fri Aug 31 18:39:24 2012 (r970) @@ -1,17 +1,6 @@ --- bridge/bridge.mk.orig 2012-03-13 06:23:10.000000000 +0100 +++ bridge/bridge.mk 2012-03-14 12:28:03.000000000 +0100 -@@ -38,17 +38,19 @@ - - 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_MORK +@@ -47,8 +47,10 @@ APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/db/mork #endif Deleted: trunk/www/seamonkey/files/extra-patch-bridge-bridge.mk ============================================================================== --- trunk/www/seamonkey/files/extra-patch-bridge-bridge.mk Fri Aug 31 18:39:24 2012 (r969) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,15 +0,0 @@ ---- 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 - --#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_MORK - APP_LIBXUL_DIRS += $(DEPTH)$(SUBDIR)/db/mork