Date: Wed, 26 Oct 2011 19:05:15 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r666 - 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 Message-ID: <201110261905.p9QJ5FbS055070@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat Date: Wed Oct 26 19:05:15 2011 New Revision: 666 Log: - Fix build with WITHOUT_LDAP - Mark WITHOUT_MAILNEWS as BROKEN PR: ports/160444 Submitted by: J. Altman <freebsd-announce AT chthonic.com> and many others Patch by: Nali Toja <nalitoja AT gmail.com> Tested by: Alexey Shuvaev <shuvaev AT physik.uni-wuerzburg.de> Added: branches/experimental/www/seamonkey-beta/files/extra-patch-bridge-bridge.mk branches/experimental/www/seamonkey/files/extra-patch-bridge-bridge.mk trunk/www/seamonkey/files/extra-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 Mon Oct 24 21:54:02 2011 (r665) +++ branches/experimental/www/seamonkey-beta/Makefile Wed Oct 26 19:05:15 2011 (r666) @@ -85,11 +85,12 @@ .if defined(WITHOUT_MAILNEWS) MOZ_OPTIONS+= --disable-ldap --disable-mailnews +BROKEN= Does not build .else # mail and news desired, but not LDAP .if defined(WITHOUT_LDAP) +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bridge-bridge.mk MOZ_OPTIONS+= --disable-ldap --enable-mailnews -BROKEN= Does not build .else MOZ_OPTIONS+= --enable-ldap --enable-mailnews .endif Added: branches/experimental/www/seamonkey-beta/files/extra-patch-bridge-bridge.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-beta/files/extra-patch-bridge-bridge.mk Wed Oct 26 19:05:15 2011 (r666) @@ -0,0 +1,15 @@ +--- bridge/bridge.mk.orig 2011-10-24 10:44:24.000000000 +0200 ++++ bridge/bridge.mk 2011-10-24 10:44:56.000000000 +0200 +@@ -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_MAIL_NEWS + APP_LIBXUL_DIRS += \ Modified: branches/experimental/www/seamonkey/Makefile ============================================================================== --- branches/experimental/www/seamonkey/Makefile Mon Oct 24 21:54:02 2011 (r665) +++ branches/experimental/www/seamonkey/Makefile Wed Oct 26 19:05:15 2011 (r666) @@ -2,7 +2,7 @@ # Date created: 31 Mar 1998 # Whom: eivind/dima/jseger # -# $FreeBSD: ports/www/seamonkey/Makefile,v 1.312 2011/10/19 15:05:41 beat Exp $ +# $FreeBSD: ports/www/seamonkey/Makefile,v 1.313 2011/10/26 18:24:21 beat Exp $ # PORTNAME= seamonkey @@ -84,11 +84,12 @@ .if defined(WITHOUT_MAILNEWS) MOZ_OPTIONS+= --disable-ldap --disable-mailnews +BROKEN= Does not build .else # mail and news desired, but not LDAP .if defined(WITHOUT_LDAP) +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bridge-bridge.mk MOZ_OPTIONS+= --disable-ldap --enable-mailnews -BROKEN= Does not build .else MOZ_OPTIONS+= --enable-ldap --enable-mailnews .endif Added: branches/experimental/www/seamonkey/files/extra-patch-bridge-bridge.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey/files/extra-patch-bridge-bridge.mk Wed Oct 26 19:05:15 2011 (r666) @@ -0,0 +1,15 @@ +--- bridge/bridge.mk.orig 2011-10-24 10:44:24.000000000 +0200 ++++ bridge/bridge.mk 2011-10-24 10:44:56.000000000 +0200 +@@ -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_MAIL_NEWS + APP_LIBXUL_DIRS += \ Modified: trunk/www/seamonkey/Makefile ============================================================================== --- trunk/www/seamonkey/Makefile Mon Oct 24 21:54:02 2011 (r665) +++ trunk/www/seamonkey/Makefile Wed Oct 26 19:05:15 2011 (r666) @@ -2,7 +2,7 @@ # Date created: 31 Mar 1998 # Whom: eivind/dima/jseger # -# $FreeBSD: ports/www/seamonkey/Makefile,v 1.312 2011/10/19 15:05:41 beat Exp $ +# $FreeBSD: ports/www/seamonkey/Makefile,v 1.313 2011/10/26 18:24:21 beat Exp $ # PORTNAME= seamonkey @@ -84,11 +84,12 @@ .if defined(WITHOUT_MAILNEWS) MOZ_OPTIONS+= --disable-ldap --disable-mailnews +BROKEN= Does not build .else # mail and news desired, but not LDAP .if defined(WITHOUT_LDAP) +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-bridge-bridge.mk MOZ_OPTIONS+= --disable-ldap --enable-mailnews -BROKEN= Does not build .else MOZ_OPTIONS+= --enable-ldap --enable-mailnews .endif Added: trunk/www/seamonkey/files/extra-patch-bridge-bridge.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/seamonkey/files/extra-patch-bridge-bridge.mk Wed Oct 26 19:05:15 2011 (r666) @@ -0,0 +1,15 @@ +--- bridge/bridge.mk.orig 2011-10-24 10:44:24.000000000 +0200 ++++ bridge/bridge.mk 2011-10-24 10:44:56.000000000 +0200 +@@ -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_MAIL_NEWS + APP_LIBXUL_DIRS += \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201110261905.p9QJ5FbS055070>