Date: Fri, 31 Aug 2012 18:39:25 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r970 - in trunk/www/seamonkey: . files Message-ID: <201208311839.q7VIdPC5091323@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208311839.q7VIdPC5091323>