[SVN-Commit] r100 - in branches/experimental/www/kompozer: . files

[svn-freebsd-gecko at chruetertee.ch]

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 <bsd.port.pre.mk>
 
 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