Ticket #29184: patch-gcc46-4.6.1.diff

Portfile

@@ -4 +4 @@
 PortGroup select 1.0
 
 name                    gcc46
-version                 4.6-20110325
-revision                1
+epoch                   1
+version                 4.6.1
 platforms               darwin
 categories              lang
 maintainers             mww
 license                 GPLv3
-description             The GNU compiler collection, prerelease BETA
+description             The GNU compiler collection
 long_description        The GNU compiler collection, including front ends for \
-                        C, C++, Objective-C and Objective-C++. This is a \
-                        prerelease BETA version and does not have all \
-                        available language front ends enabled.
+                        C, C++, Objective-C, Objective-C++
 
 homepage                http://gcc.gnu.org/
-master_sites            ftp://ftp.gwdg.de/pub/linux/gcc/snapshots/${version}/:gcc \
-                        ftp://ftp.funet.fi/pub/mirrors/sources.redhat.com/pub/gcc/snapshots/${version}/:gcc \
-                        ftp://gcc.gnu.org/pub/gcc/snapshots/${version}/:gcc \
-                        ftp://sourceware.org/pub/java/:ecj \
-                        http://mirrors.kernel.org/sources.redhat.com/java/:ecj \
-                        http://www.mirrorservice.org/sites/sources.redhat.com/pub/java/:ecj \
-                        http://ftp-stud.fht-esslingen.de/pub/Mirrors/sourceware.org/java/:ecj
+master_sites            ftp://ftp.funet.fi/pub/mirrors/sources.redhat.com/pub/gcc/releases/gcc-${version}/:gcc \
+                        http://mirrors-us.seosue.com/gcc/releases/gcc-${version}/:gcc \
+                        http://fileboar.com/gcc/releases/gcc-${version}/:gcc \
+                        ftp://ftp.gwdg.de/pub/linux/gcc/releases/gcc-${version}/:gcc \
+                        ftp://gcc.ftp.nluug.nl/mirror/languages/gcc/releases/gcc-${version}/:gcc \
+                        ftp://gcc.gnu.org/pub/gcc/releases/gcc-${version}/:gcc \
+                        gnu:/gcc/gcc-${version}:gcc
 
 set dcore               gcc-core-${version}.tar.bz2
 set dfort               gcc-fortran-${version}.tar.bz2
@@ -34 +32 @@
 distfiles               ${dcore}:gcc ${dfort}:gcc ${dcxx}:gcc ${djava}:gcc ${dobjc}:gcc ${ecj}:ecj
 extract.only            ${dcore} ${dfort} ${dcxx} ${djava} ${dobjc}
 
-checksums           gcc-core-${version}.tar.bz2 \
-                    md5     248d44becf2a44003c6418b34790e991 \
-                    sha1    44d90a72938dae3f030e0d9add80d3bc5611c035 \
-                    rmd160  185b83d1f7d9fadf2467558c4f7e61265484ab0a \
-                    gcc-fortran-${version}.tar.bz2 \
-                    md5     54d8384ca06094fd22f7916cceef6c2a \
-                    sha1    b23551b2733cd7cec32fc99fb1543176102cc064 \
-                    rmd160  52392d790deb828ee9564ccd1e5bb56093a6f1a8 \
-                    gcc-g++-${version}.tar.bz2 \
-                    md5     ccf12496a86e8be199f0df921ebda353 \
-                    sha1    c7b2e57bc00f00abf7de6260a9c291255fc3819a \
-                    rmd160  54426dd2c2d9da2420a8810eef661af59387de82 \
-                    gcc-java-${version}.tar.bz2 \
-                    md5     847c0a3d625e1b8ef3deb002d80210d9 \
-                    sha1    200182e4c46acd50480eba3f93ec0ae641d70a18 \
-                    rmd160  41fdbe02af2e5b6d203b0043acba54f23e67e488 \
-                    gcc-objc-${version}.tar.bz2 \
-                    md5     7ab165c510808682773d68272f266375 \
-                    sha1    64a9f4faa6346087d21cecaba159900e5fd58307 \
-                    rmd160  afef759e65f3f9a7ace1164b15fa7fdf21cdf245 \
-                    ecj-4.5.jar \
-                    md5     d7cd6a27c8801e66cbaa964a039ecfdb \
-                    sha1    58c1d79c64c8cd718550f32a932ccfde8d1e6449 \
-                    rmd160  d3f4da657f086b6423f74e93f001132f4855368a
+checksums        gcc-core-${version}.tar.bz2 \
+                 sha1    9b766705f051ffb7321de58f247688b0ae661b98 \
+                 rmd160  bbe0b5127e584ad92516aff79bfa74ec30db2be4 \
+                 gcc-fortran-${version}.tar.bz2 \
+                 sha1    7cc945ac2e785607b20e1861ba89dfb7fa7b3320 \
+                 rmd160  bfe734ce44c6a3b0064f6e52ba94d95c42817699 \
+                 gcc-g++-${version}.tar.bz2 \
+                 sha1    043aa427ede603196588c2a2737c22e0d241ceca \
+                 rmd160  857253c13eb4177512fc1bc6d797af28dde60eeb \
+                 gcc-java-${version}.tar.bz2 \
+                 sha1    b1f3c9dd1c952638225370b9cac4395879f187f2 \
+                 rmd160  68c20b912aac281ad3cdf707c603ccd2f5569b96 \
+                 gcc-objc-${version}.tar.bz2 \
+                 sha1    ed6f640b62465999eb1439a4db6dda3c35b6d19d \
+                 rmd160  728e7ea55a04f28c6c3556c56213b2d9f023a0be \
+                 ecj-4.5.jar \
+                 sha1    58c1d79c64c8cd718550f32a932ccfde8d1e6449 \
+                 rmd160  d3f4da657f086b6423f74e93f001132f4855368a
 
 use_bzip2               yes
 
@@ -68 +60 @@
 
 worksrcdir              build
 
-post-extract {
-        file mkdir ${worksrcpath}
-        copy ${distpath}/${ecj} ${workpath}/gcc-${version}/ecj.jar
-}
-
 # the generated compiler doesn't accept -arch
 configure.cc_archflags
 configure.cxx_archflags
@@ -82 +69 @@
     configure.pre_args-append --build=${build_arch}-apple-darwin${os.major}
 }
 
+post-extract {
+        copy ${distpath}/${ecj} ${workpath}/gcc-${version}/ecj.jar
+}
+
+pre-configure {
+        file mkdir ${worksrcpath}
+}
+
 configure.cmd   ../gcc-${version}/configure
-configure.args  --enable-languages=c,c++,objc,obj-c++ \
+configure.args  --enable-languages=c,c++,objc,obj-c++,fortran,java \
                 --libdir=${prefix}/lib/${name} \
                 --includedir=${prefix}/include/${name} \
                 --infodir=${prefix}/share/info \
@@ -130 +125 @@
 select.group    gcc
 select.file     ${filespath}/mp-${name}
 
+platform darwin 8 {
+        # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=45248
+        configure.args-append --with-dwarf2
+}
 platform darwin 10 {
         configure.args-append --enable-fully-dynamic-string
 }
@@ -138 +137 @@
         configure.args-append --enable-fully-dynamic-string
 }
 
-# due to popular request - untested for the BETA; will be removed as soon as other languages than C compile successfuly
-variant gfortran conflicts java \
-        description "Enables Fortran/gfortran; this language will be enabled in the final version - this variant is completely untested!" {
-        configure.args-delete --enable-languages=c,c++,objc,obj-c++
-        configure.args-append --enable-languages=c,c++,objc,obj-c++,fortran
-}
-
-# due to popular request - untested for the BETA; will be removed as soon as other languages than C compile successfuly
-variant java conflicts gfortran \
-        description "Enables Java/gcj; this language will be enabled in the final version - this variant is completely untested!" {
-        configure.args-delete --enable-languages=c,c++,objc,obj-c++
-        configure.args-append --enable-languages=c,c++,objc,obj-c++,java
-        post-destroot {
-                file rename ${destroot}${prefix}/share/python/aotcompile.py \
-                        ${destroot}${prefix}/share/python/aotcompile-46.py
-                file rename ${destroot}${prefix}/share/python/classfile.py \
-                        ${destroot}${prefix}/share/python/classfile-46.py
-        }
-}
-
 platform powerpc {
     configure.universal_archs ppc ppc64
 }
@@ -172 +151 @@
     configure.args-delete --disable-multilib
 }
 
-livecheck.type  regex
-livecheck.url   ftp://gcc.gnu.org/pub/gcc/snapshots/
-livecheck.regex LATEST-4.6 -> (4.6-\[0-9\]+)
+livecheck.type  regex
+livecheck.url   http://gcc.gnu.org/gcc-4.6/
+livecheck.regex GCC (4\\.6\\.\[0-9\])