From owner-freebsd-gecko@FreeBSD.ORG Wed Sep 2 14:53:49 2009 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 64FCC106566B for ; Wed, 2 Sep 2009 14:53:49 +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 10A9E8FC22 for ; Wed, 2 Sep 2009 14:53:48 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.3/8.14.3) with ESMTP id n82Erl4B011085 for ; Wed, 2 Sep 2009 14:53:47 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id n82Erg8T010094 for freebsd-gecko@freebsd.org; Wed, 2 Sep 2009 14:53:42 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Wed, 2 Sep 2009 14:53:42 GMT Message-Id: <200909021453.n82Erg8T010094@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] r100 - in branches/experimental/www/kompozer: . 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, 02 Sep 2009 14:53:49 -0000 Author: beat Date: Wed Sep 2 14:53:42 2009 New Revision: 100 Log: - Fix build on FreeBSD 6.x Added: branches/experimental/www/kompozer/files/patch-js-src-Makefile.in branches/experimental/www/kompozer/files/patch-storage_build_Makefile.in Modified: branches/experimental/www/kompozer/Makefile branches/experimental/www/kompozer/files/patch-config_autoconf.mk.in Modified: branches/experimental/www/kompozer/Makefile ============================================================================== --- branches/experimental/www/kompozer/Makefile Wed Sep 2 13:24:08 2009 (r99) +++ branches/experimental/www/kompozer/Makefile Wed Sep 2 14:53:42 2009 (r100) @@ -39,6 +39,8 @@ .include post-patch: + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${WRKSRC}/storage/build/Makefile.in @${RM} -f ${WRKSRC}/config.status ${WRKSRC}/config.cache @${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/toolkit/components/Makefile.in @${ECHO_CMD} "LDFLAGS += -L${LOCALBASE}/lib" >> ${WRKSRC}/toolkit/components/gnome/Makefile.in Modified: branches/experimental/www/kompozer/files/patch-config_autoconf.mk.in ============================================================================== --- branches/experimental/www/kompozer/files/patch-config_autoconf.mk.in Wed Sep 2 13:24:08 2009 (r99) +++ branches/experimental/www/kompozer/files/patch-config_autoconf.mk.in Wed Sep 2 14:53:42 2009 (r100) @@ -1,6 +1,6 @@ ---- config/autoconf.mk.in.orig 2007-08-22 07:20:23.000000000 -0400 -+++ config/autoconf.mk.in 2007-10-08 12:39:06.000000000 -0400 -@@ -32,13 +32,13 @@ +--- config/autoconf.mk.in.orig 2009-09-02 15:38:49.000000000 +0200 ++++ config/autoconf.mk.in 2009-09-02 15:39:44.000000000 +0200 +@@ -57,13 +57,13 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ @@ -17,3 +17,12 @@ mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) mrelibdir = $(mredir)/lib +@@ -251,7 +251,7 @@ + OS_CPPFLAGS = @CPPFLAGS@ + OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@ + OS_CXXFLAGS = $(OS_CPPFLAGS) @CXXFLAGS@ +-OS_LDFLAGS = @LDFLAGS@ ++OS_LDFLAGS = @LDFLAGS@ -lc + + OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@ + OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@ Added: branches/experimental/www/kompozer/files/patch-js-src-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/kompozer/files/patch-js-src-Makefile.in Wed Sep 2 14:53:42 2009 (r100) @@ -0,0 +1,11 @@ +--- js/src/Makefile.in.orig 2009-05-02 18:40:20.000000000 +0200 ++++ js/src/Makefile.in 2009-09-02 12:20:39.000000000 +0200 +@@ -260,7 +260,7 @@ + endif # WINNT + + ifeq ($(OS_ARCH),FreeBSD) +-LDFLAGS += -pthread ++LDFLAGS += -pthread -lc + endif + ifeq ($(OS_ARCH),IRIX) + ifdef USE_N32 Added: branches/experimental/www/kompozer/files/patch-storage_build_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/kompozer/files/patch-storage_build_Makefile.in Wed Sep 2 14:53:42 2009 (r100) @@ -0,0 +1,10 @@ +--- storage/build/Makefile.in.orig Tue Feb 21 11:18:56 2006 ++++ storage/build/Makefile.in Sun Nov 5 16:16:06 2006 +@@ -77,6 +77,7 @@ + $(EXTRA_DSO_LIBS) \ + $(MOZ_COMPONENT_LIBS) \ + $(MOZ_JS_LIBS) \ ++ %%PTHREAD_LIBS%% \ + $(NULL) + + include $(topsrcdir)/config/rules.mk