Ticket #37479: Portfile.patch

Portfile

@@ -4 +4 @@
 PortGroup select 1.0
 
 name                    apple-gcc42
+subport                 apple-gcc42-4.2.4 {}
 version                 5666.3
-set gcc_version         4.2.1
 revision                9
 categories              lang
 platforms               darwin
+installs_libs   no
+
+if {${subport} == "apple-gcc42"} {
+conflicts               apple-gcc42-4.2.4
+set gcc_version         4.2.1
 license         GPL-2
 maintainers             jeremyhu openmaintainer
-installs_libs   no
 
 description             Apple's version of gcc 4.2
 long_description        Apple's version of the GNU compiler collection, \
                         version 4.2. Supports C, Objective-C, anc C++
+} elseif {${subport} == "apple-gcc42-4.2.4"} {
+conflicts               apple-gcc42
+set gcc_version         4.2.4
+license         GPL-3
+maintainers             openmaintainer
+
+description             Apple's version of gcc 4.2, merged with GNU gcc 4.2.4
+long_description        Apple's version of the GNU compiler collection, \
+                        version 4.2. Supports C, Objective-C, anc C++. \
+                        Missing bug fixes from GNU gcc 4.2.2 up to 4.2.4 \
+                        are applied to this release
+}
 
 homepage                http://opensource.apple.com/
-master_sites            gnu:/gcc/gcc-4.2.1:gnu \
+master_sites            gnu:/gcc/gcc-${gcc_version}:gnu \
                         http://opensource.apple.com/tarballs/gcc/:apple
 
 distname                gcc-${version}
@@ -44 +60 @@
 #                    sha1    4615c85ef9010304bf412adc2f2c33d256e177fd \
 #                    rmd160  bb4b256f7e7779361214593343821a127ee78d1a
 
+#                    gcc-fortran-4.2.4.tar.bz2 \
+#                    md5     d8896f33f91eca12135df2c1e5aa0887 \
+#                    sha1    ? \
+#                    rmd160  ? \
+#                    gcc-java-4.2.4.tar.bz2 \
+#                    md5     dd05ac72f8563c98af6946f9334668f1 \
+#                    sha1    ? \
+#                    rmd160  ?
+
 # Needed for gfortran:
 #files/other_langs.patch:
 #+  --with-gmp=$DEST_ROOT \
@@ -84 +109 @@
         driverdriver-num_infiles.patch \
         driverdriver-armcheck.patch
 
+if {${subport} == "apple-gcc42-4.2.4"} {
+    patchfiles-append    gcc-4.2.1-4.2.4.patch
+}
+
 # gcj fails to build:
 # gcc/java/lang.c: In function 'java_init':
 # gcc/java/lang.c:378: error: 'force_align_functions_log' undeclared (first use in this function)
@@ -226 +255 @@
 destroot {}
 post-destroot {
     if {[string match "*i386*" ${build_targets}]} {
-        delete ${destroot}${prefix}/libexec/${name}/gcc/i686-apple-darwin${os.major}/4.2.1/as
-        ln -s ../../../../../bin/as ${destroot}${prefix}/libexec/${name}/gcc/i686-apple-darwin${os.major}/4.2.1/as
-        delete ${destroot}${prefix}/libexec/${name}/gcc/i686-apple-darwin${os.major}/4.2.1/ld
-        ln -s ../../../../../bin/ld ${destroot}${prefix}/libexec/${name}/gcc/i686-apple-darwin${os.major}/4.2.1/ld
+        delete ${destroot}${prefix}/libexec/${name}/gcc/i686-apple-darwin${os.major}/${gcc_version}/as
+        ln -s ../../../../../bin/as ${destroot}${prefix}/libexec/${name}/gcc/i686-apple-darwin${os.major}/${gcc_version}/as
+        delete ${destroot}${prefix}/libexec/${name}/gcc/i686-apple-darwin${os.major}/${gcc_version}/ld
+        ln -s ../../../../../bin/ld ${destroot}${prefix}/libexec/${name}/gcc/i686-apple-darwin${os.major}/${gcc_version}/ld
 
         # http://trac.macports.org/ticket/35770
-        delete  ${destroot}${prefix}/lib/${name}/gcc/i686-apple-darwin${os.major}/4.2.1/libstdc++.dylib
-        ln -s /usr/lib/libstdc++.6.dylib ${destroot}${prefix}/lib/${name}/gcc/i686-apple-darwin${os.major}/4.2.1/libstdc++.dylib
+        delete  ${destroot}${prefix}/lib/${name}/gcc/i686-apple-darwin${os.major}/${gcc_version}/libstdc++.dylib
+        ln -s /usr/lib/libstdc++.6.dylib ${destroot}${prefix}/lib/${name}/gcc/i686-apple-darwin${os.major}/${gcc_version}/libstdc++.dylib
     }
 
     if {[string match "*ppc*" ${build_targets}]} {
-        delete ${destroot}${prefix}/libexec/${name}/gcc/powerpc-apple-darwin${os.major}/4.2.1/as
-        ln -s ../../../../../bin/as ${destroot}${prefix}/libexec/${name}/gcc/powerpc-apple-darwin${os.major}/4.2.1/as
-        delete ${destroot}${prefix}/libexec/${name}/gcc/powerpc-apple-darwin${os.major}/4.2.1/ld
-        ln -s ../../../../../bin/ld ${destroot}${prefix}/libexec/${name}/gcc/powerpc-apple-darwin${os.major}/4.2.1/ld
+        delete ${destroot}${prefix}/libexec/${name}/gcc/powerpc-apple-darwin${os.major}/${gcc_version}/as
+        ln -s ../../../../../bin/as ${destroot}${prefix}/libexec/${name}/gcc/powerpc-apple-darwin${os.major}/${gcc_version}/as
+        delete ${destroot}${prefix}/libexec/${name}/gcc/powerpc-apple-darwin${os.major}/${gcc_version}/ld
+        ln -s ../../../../../bin/ld ${destroot}${prefix}/libexec/${name}/gcc/powerpc-apple-darwin${os.major}/${gcc_version}/ld
 
         # http://trac.macports.org/ticket/35770
-        delete  ${destroot}${prefix}/lib/${name}/gcc/powerpc-apple-darwin${os.major}/4.2.1/libstdc++.dylib
-        ln -s /usr/lib/libstdc++.6.dylib ${destroot}${prefix}/lib/${name}/gcc/powerpc-apple-darwin${os.major}/4.2.1/libstdc++.dylib
+        delete  ${destroot}${prefix}/lib/${name}/gcc/powerpc-apple-darwin${os.major}/${gcc_version}/libstdc++.dylib
+        ln -s /usr/lib/libstdc++.6.dylib ${destroot}${prefix}/lib/${name}/gcc/powerpc-apple-darwin${os.major}/${gcc_version}/libstdc++.dylib
     }
 }