[SVN-Commit] r52 - in trunk/www: firefox3 firefox3/files firefox35

[svn-freebsd-gecko at chruetertee.ch]

Author: flo
Date: Sun Jul  5 12:28:25 2009
New Revision: 52

Log:
- sync firefox3 and firefox35 with what is in CVS before working further on these ports

Modified:
   trunk/www/firefox3/Makefile
   trunk/www/firefox3/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
   trunk/www/firefox35/Makefile

Modified: trunk/www/firefox3/Makefile
==============================================================================
--- trunk/www/firefox3/Makefile	Wed Jul  1 11:01:22 2009	(r51)
+++ trunk/www/firefox3/Makefile	Sun Jul  5 12:28:25 2009	(r52)
@@ -2,8 +2,8 @@
 # Date created:			2002/10/21
 # Whom:				Alan Eldridge <alane at FreeBSD.org>
 #
-# $FreeBSD: ports/www/firefox3/Makefile,v 1.17 2009/04/12 19:27:12 miwi Exp $
-#
+# $FreeBSD: ports/www/firefox3/Makefile,v 1.22 2009/06/13 06:44:37 beat Exp $
+#   $MCom: ports-stable/www/firefox3/Makefile,v 1.20 2008/12/31 01:52:03 mezz Exp $
 #
 
 PORTNAME=	firefox
@@ -21,6 +21,7 @@
 
 LATEST_LINK=	firefox3
 USE_GECKO=	gecko
+CONFLICTS=	firefox-3.[1-5]*
 MOZ_PKGCONFIG_FILES=	# empty
 USE_MOZILLA=	-png -nss -dbm -jpeg
 MOZILLA_NAME=	Firefox${MOZILLA_SUFX}
@@ -40,7 +41,6 @@
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 NO_MOZPKGINSTALL=yes
-CONFLICTS=      firefox-3.[1-5]*
 
 FIREFOX_ICON=		${MOZILLA}.png
 FIREFOX_ICON_SRC=	${PREFIX}/lib/${MOZILLA}/chrome/icons/default/default48.png
@@ -90,6 +90,13 @@
 		/dom.disable_window_open_feature.toolbar/s/false/true/' \
 		${WRKSRC}/${ii}/all.js
 .endfor
+.if ${ARCH} == "sparc64"
+	@(cd ${WRKSRC}/xpcom/reflect/xptcall/src/md/unix && \
+	    ${LN} -s xptcstubs_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_freebsd.s && \
+	    ${LN} -s xptcstubs_sparc64_openbsd.cpp xptcstubs_sparc64_freebsd.cpp && \
+	    ${LN} -s xptcinvoke_sparc64_openbsd.cpp xptcinvoke_sparc64_freebsd.cpp && \
+	    ${LN} -s xptcinvoke_asm_sparc64_openbsd.s xptcinvoke_asm_sparc64_freebsd.s)
+.endif
 
 port-pre-install:
 #	${SED} -e 's|1.9a7|0|' ${WRKSRC}/dist/bin/application.ini ${FAKEDIR}/lib

Modified: trunk/www/firefox3/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in
==============================================================================
--- trunk/www/firefox3/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in	Wed Jul  1 11:01:22 2009	(r51)
+++ trunk/www/firefox3/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in	Sun Jul  5 12:28:25 2009	(r52)
@@ -1,5 +1,5 @@
---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig	2008-04-09 08:34:20.000000000 +0200
-+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in	2009-04-22 13:51:00.672853850 +0200
+--- xpcom/reflect/xptcall/src/md/unix/Makefile.in
++++ xpcom/reflect/xptcall/src/md/unix/Makefile.in
 @@ -70,6 +70,9 @@
  ifeq (Darwin,$(OS_ARCH))
  DEFINES		+= -DKEEP_STACK_16_BYTE_ALIGNED
@@ -53,8 +53,8 @@
 +#
 +ifeq ($(OS_ARCH),FreeBSD)
 +ifneq (,$(findstring sparc,$(OS_TEST)))
-+CPPSRCS                := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp
-+ASFILES                := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s
++CPPSRCS		:= xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp
++ASFILES		:= xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s
 +endif
 +endif
 +#

Modified: trunk/www/firefox35/Makefile
==============================================================================
--- trunk/www/firefox35/Makefile	Wed Jul  1 11:01:22 2009	(r51)
+++ trunk/www/firefox35/Makefile	Sun Jul  5 12:28:25 2009	(r52)
@@ -2,7 +2,7 @@
 # Date created:			2002/10/21
 # Whom:				Alan Eldridge <alane at FreeBSD.org>
 #
-# $FreeBSD: ports/www/firefox35/Makefile,v 1.175 2009/06/30 19:44:48 miwi Exp $
+# $FreeBSD: ports/www/firefox35/Makefile,v 1.177 2009/07/03 13:38:45 miwi Exp $
 #
 
 PORTNAME=	firefox
@@ -19,7 +19,7 @@
 BUILD_DEPENDS=	nspr>=4.8:${PORTSDIR}/devel/nspr
 
 USE_AUTOTOOLS=	autoconf:213:run
-LATEST_LINK=	firefox3-devel
+LATEST_LINK=	firefox35
 USE_GECKO=	gecko
 MOZ_PKGCONFIG_FILES=	# empty
 USE_MOZILLA=	-png -nss -dbm -jpeg -xft
@@ -124,5 +124,6 @@
 	${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop ${PREFIX}/share/applications/
 	${MKDIR} ${PREFIX}/lib/${MOZILLA}/chrome/icons/default
 	${LN} -sf ${FIREFOX_ICON_SRC} ${PREFIX}/share/pixmaps/${FIREFOX_ICON}
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>