Changeset 80165

Timestamp:

07/05/11 10:45:34 (4 years ago)

Author:

jeremyhu@…

Message:

firefox-x11: Version bump to 5.0 to allow building with clang

File:

• trunk/dports/www/firefox-x11/Portfile (modified) (4 diffs)

trunk/dports/www/firefox-x11/Portfile

@@ -8 +8 @@
 set component   firefox
 categories      www x11
-version         4.0.1
+version         5.0
 platforms       darwin
 maintainers     jeremyhu openmaintainer
-description     Mozilla.org's popular stand-alone web browser, Beta and Release Candidates
+description     Mozilla.org's popular stand-alone web browser
 
 long_description \
@@ -27 +27 @@
 use_bzip2       yes
 
-checksums           md5     9abda7d23151e97913c8555a64c13f34 \
-                    sha1    c89bc5106266aa0097a7be15be84555bd2649f03 \
-                    rmd160  63faaae78b56db407a34454986361212382c838e
-
-worksrcdir      mozilla-2.0
+checksums           md5     9f64a01e86a5d424e12a8e3305c5debe \
+                    sha1    22b7b4751173c2142a0f09cca1aebc717d97b45a \
+                    rmd160  93d97a01f572f3688b0065c903afc3d7f9260179
+
+worksrcdir      mozilla-release
 
 depends_build \
@@ -114 +114 @@
 # xpctools and necko-wifi broke in 3.6b1
 
+# BUILD FIX TODO: test clang in XCode 4.0.x
 # gcc-4.0 has issues, so force gcc-4.2 on Leopard
-# BUILD FIX TODO:
-# llvm-gcc-4.2 and clang fail to build due to bad inline asm as of 2011.06.24
-# This is an error in the package. 
+# llvm-gcc-4.2 has trouble with some of the mmx asm
+# recent versions of clang build fine, but older versions were not tested, so
+# not falling forward to clang yet
 if {${configure.compiler} == "gcc-4.0" ||
-    ${configure.compiler} == "llvm-gcc-4.2" ||
-    ${configure.compiler} == "clang"} {
-    configure.compiler gcc-4.2 
+    ${configure.compiler} == "llvm-gcc-4.2"} {
+    configure.compiler gcc-4.2
+    if {![file executable ${configure.cc}]} {
+        depends_build-append port:apple-gcc42
+        configure.compiler apple-gcc-4.2
+    }
 }
 
@@ -229 +233 @@
 
     reinplace "s:/etc/gre\.:${prefix}/etc/gre.:g" \
-        ${worksrcpath}/xpcom/build/nsXPCOMPrivate.h \
-        ${worksrcpath}/xulrunner/app/nsRegisterGREUnix.cpp \
-        ${worksrcpath}/xulrunner/installer/Makefile.in
+        ${worksrcpath}/xpcom/build/nsXPCOMPrivate.h
 }