From owner-freebsd-gecko@FreeBSD.ORG Sun Oct 4 18:37:06 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 92AF31065672 for ; Sun, 4 Oct 2009 18:37:06 +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 3EEC78FC12 for ; Sun, 4 Oct 2009 18:37:06 +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 n94Ib5hr071395 for ; Sun, 4 Oct 2009 18:37:05 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.3/8.14.3/Submit) id n94Ib0oo070382 for freebsd-gecko@freebsd.org; Sun, 4 Oct 2009 18:37:00 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sun, 4 Oct 2009 18:37:00 GMT Message-Id: <200910041837.n94Ib0oo070382@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] r129 - in branches/experimental/www/firefox3-devel: . 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: Sun, 04 Oct 2009 18:37:06 -0000 Author: andreast Date: Sun Oct 4 18:36:59 2009 New Revision: 129 Log: Fix config bits for amd64. Add MAKE_JOBS_SAFE=yes. Added: branches/experimental/www/firefox3-devel/files/patch-configure.in Deleted: branches/experimental/www/firefox3-devel/files/patch-configure Modified: branches/experimental/www/firefox3-devel/Makefile branches/experimental/www/firefox3-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Modified: branches/experimental/www/firefox3-devel/Makefile ============================================================================== --- branches/experimental/www/firefox3-devel/Makefile Sun Oct 4 07:56:09 2009 (r128) +++ branches/experimental/www/firefox3-devel/Makefile Sun Oct 4 18:36:59 2009 (r129) @@ -19,7 +19,7 @@ BUILD_DEPENDS= nspr>=4.8:${PORTSDIR}/devel/nspr LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify -USE_AUTOTOOLS= autoconf:213:run +USE_AUTOTOOLS= autoconf:213 LATEST_LINK= firefox3-devel USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty @@ -40,6 +40,7 @@ HAS_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes +MAKE_JOBS_SAFE= yes NO_MOZPKGINSTALL=yes CONFLICTS= firefox-3.[0,5].* @@ -85,7 +86,6 @@ .endif post-extract:: - @(cd ${WRKSRC} && ${AUTOCONF}) @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ <${FILESDIR}/firefox.desktop.in >${WRKDIR}/${MOZILLA}.desktop @@ -104,6 +104,9 @@ s|/usr/X11R6|${LOCALBASE}|g' \ ${WRKSRC}/js/src/configure +pre-configure: + (cd ${WRKSRC} && ${AUTOCONF}) + port-pre-install: # ${SED} -e 's|1.9a7|0|' ${WRKSRC}/dist/bin/application.ini ${FAKEDIR}/lib ${ECHO_CMD} 'share/applications/${MOZILLA}.desktop' >> ${PLISTF} Deleted: branches/experimental/www/firefox3-devel/files/patch-configure ============================================================================== --- branches/experimental/www/firefox3-devel/files/patch-configure Sun Oct 4 18:36:59 2009 (r128) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- configure.orig 2009-07-24 11:36:04.000000000 +0200 -+++ configure 2009-07-24 11:36:16.000000000 +0200 -@@ -5502,7 +5502,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - esac Added: branches/experimental/www/firefox3-devel/files/patch-configure.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/experimental/www/firefox3-devel/files/patch-configure.in Sun Oct 4 18:36:59 2009 (r129) @@ -0,0 +1,11 @@ +--- configure.in.orig 2009-10-03 20:24:11.000000000 +0200 ++++ configure.in 2009-10-03 20:24:43.000000000 +0200 +@@ -1352,7 +1352,7 @@ + CPU_ARCH=sparc + ;; + +-x86_64 | ia64) ++amd64 | x86_64 | ia64) + CPU_ARCH="$OS_TEST" + ;; + Modified: branches/experimental/www/firefox3-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in ============================================================================== --- branches/experimental/www/firefox3-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Sun Oct 4 07:56:09 2009 (r128) +++ branches/experimental/www/firefox3-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in Sun Oct 4 18:36:59 2009 (r129) @@ -1,16 +1,16 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2009-03-05 22:32:55.000000000 +0100 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2009-04-21 14:15:46.135700268 +0200 -@@ -70,6 +70,9 @@ - ifeq (Darwin,$(OS_ARCH)) +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2009-09-16 04:41:25.000000000 +0200 ++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2009-10-03 21:30:21.000000000 +0200 +@@ -73,6 +73,9 @@ DEFINES += -DKEEP_STACK_16_BYTE_ALIGNED + CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp endif +ifeq (x86_64,$(OS_TEST)) +CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp +endif endif endif - # -@@ -87,7 +90,7 @@ + +@@ -96,7 +99,7 @@ endif endif # IA64 Linux @@ -19,20 +19,18 @@ ifneq (,$(findstring ia64,$(OS_TEST))) CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -100,6 +103,12 @@ - CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp - endif +@@ -111,8 +114,8 @@ # -+# FreeBSD/amd64 -+# + # FreeBSD/amd64 + # +-ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDx86_64) +-CPPSRCS := xptcinvoke_amd64_linux.cpp xptcstubs_amd64_linux.cpp +ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64) +CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp -+endif -+# - # BeOS/Intel (uses the same unixish_x86 code) + endif # - ifeq ($(OS_ARCH)$(OS_TEST),BeOSBePC) -@@ -150,9 +159,15 @@ + # BeOS/Intel (uses the same unixish_x86 code) +@@ -165,9 +168,15 @@ ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s endif # @@ -49,7 +47,7 @@ CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp endif # -@@ -307,7 +322,7 @@ +@@ -322,7 +331,7 @@ # # Linux/PPC # @@ -58,7 +56,7 @@ CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s AS := $(CC) -c -x assembler-with-cpp -@@ -385,6 +400,15 @@ +@@ -400,6 +409,15 @@ ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s endif #