Date: Tue, 1 Dec 2009 14:30:17 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r179 - in branches/experimental/www/seamonkey-devel: . files Message-ID: <200912011430.nB1EUHAc058815@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: beat Date: Tue Dec 1 14:30:16 2009 New Revision: 179 Log: - Remove bogus dependency on OpenLDAP Added: branches/experimental/www/seamonkey-devel/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in Modified: branches/experimental/www/seamonkey-devel/Makefile branches/experimental/www/seamonkey-devel/files/patch-directory-c-sdk-ldap-libraries-libprldap-Makefile.in branches/experimental/www/seamonkey-devel/files/patch-directory-xpcom-base-src-Makefile.in Modified: branches/experimental/www/seamonkey-devel/Makefile ============================================================================== --- branches/experimental/www/seamonkey-devel/Makefile Tue Dec 1 07:49:25 2009 (r178) +++ branches/experimental/www/seamonkey-devel/Makefile Tue Dec 1 14:30:16 2009 (r179) @@ -91,7 +91,6 @@ .if defined(WITHOUT_LDAP) MOZ_OPTIONS+= --disable-ldap --enable-mailnews .else -USE_OPENLDAP= yes MOZ_OPTIONS+= --enable-ldap --enable-mailnews .endif .endif Added: branches/experimental/www/seamonkey-devel/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/seamonkey-devel/files/patch-directory-c-sdk-ldap-libraries-libldap-Makefile.in Tue Dec 1 14:30:16 2009 (r179) @@ -0,0 +1,13 @@ +--- directory/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2009-11-10 09:56:42.000000000 +0100 ++++ directory/c-sdk/ldap/libraries/libldap/Makefile.in 2009-11-10 09:58:15.000000000 +0100 +@@ -254,6 +254,10 @@ + EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe + endif + ++ifeq ($(OS_ARCH), FreeBSD) ++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread ++endif ++ + ifeq ($(OS_ARCH), NetBSD) + EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) + endif Modified: branches/experimental/www/seamonkey-devel/files/patch-directory-c-sdk-ldap-libraries-libprldap-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey-devel/files/patch-directory-c-sdk-ldap-libraries-libprldap-Makefile.in Tue Dec 1 07:49:25 2009 (r178) +++ branches/experimental/www/seamonkey-devel/files/patch-directory-c-sdk-ldap-libraries-libprldap-Makefile.in Tue Dec 1 14:30:16 2009 (r179) @@ -1,13 +1,14 @@ ---- directory/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2009-09-10 15:53:09.000000000 +0200 -+++ directory/c-sdk/ldap/libraries/libprldap/Makefile.in 2009-09-10 15:53:30.000000000 +0200 -@@ -152,6 +152,10 @@ +--- directory/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2008-09-11 16:38:35.000000000 +0200 ++++ directory/c-sdk/ldap/libraries/libprldap/Makefile.in 2009-12-01 10:18:43.000000000 +0100 +@@ -147,6 +147,11 @@ CUSTOM_LIBS=1 endif +ifeq ($(OS_ARCH), FreeBSD) ++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread +CUSTOM_LIBS=1 +endif + - # if you need to do something extra for extra_libs or extra_dll_libs for a - # specific platform, do them above according the other ones for WINNT, OS2, etc. - # then define CUSTOM_LIBS=1 - if you just want the standard ones as defined + # no extra libs on HP-UX + ifeq ($(OS_ARCH), HP-UX) + CUSTOM_LIBS=1 Modified: branches/experimental/www/seamonkey-devel/files/patch-directory-xpcom-base-src-Makefile.in ============================================================================== --- branches/experimental/www/seamonkey-devel/files/patch-directory-xpcom-base-src-Makefile.in Tue Dec 1 07:49:25 2009 (r178) +++ branches/experimental/www/seamonkey-devel/files/patch-directory-xpcom-base-src-Makefile.in Tue Dec 1 14:30:16 2009 (r179) @@ -1,11 +1,13 @@ ---- directory/xpcom/base/src/Makefile.in.orig 2009-09-10 17:51:54.000000000 +0200 -+++ directory/xpcom/base/src/Makefile.in 2009-09-10 17:52:01.000000000 +0200 -@@ -91,7 +91,7 @@ +--- directory/xpcom/base/src/Makefile.in.orig 2009-11-22 03:44:31.000000000 +0100 ++++ directory/xpcom/base/src/Makefile.in 2009-11-26 13:06:53.000000000 +0100 +@@ -97,6 +97,10 @@ $(NULL) endif --EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(LDAP_LIBS) -+EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(LDAP_LIBS) -lldap -llber ++ifeq ($(OS_ARCH), FreeBSD) ++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread ++endif ++ + EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(LDAP_LIBS) include $(topsrcdir)/config/rules.mk -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912011430.nB1EUHAc058815>