Ticket #13190: Portfile.patch

Portfile

@@ -3 +3 @@
 PortSystem 1.0
 name            g95
 version         0.90
-revision        1
+revision        2
 platforms       darwin
 categories      lang
 maintainers     takeshi@mac.com
@@ -34 +34 @@
 
 pre-configure {
     file mkdir ${workpath}/gcc-${version_gcc}/${name}
-    reinplace "s|/usr/bin/libtool|${prefix}/bin/odlibtool|" ${workpath}/gcc-${version_gcc}/gcc/config/darwin.h
-    system "unset CPPFLAGS; unset LDFLAGS; \ 
-           cd ${workpath}/gcc-${version_gcc}/${name}; \
-           ../configure --prefix=${prefix}/${gcclib} --enable-languages=c --with-as=${prefix}/bin/odas --with-ld=${prefix}/bin/odld --with-nm=${prefix}/bin/odnm --with-included-gettext; \ 
-           make"
+    if {[variant_isset darwin_9]} {
+        reinplace "s|i686|i386|" ${workpath}/gcc-${version_gcc}/gcc/config/i386/darwin.h
+        reinplace "s|tjmp %%edx|tjmp *%%edx|" ${workpath}/gcc-${version_gcc}/gcc/config/i386/i386.c
+        set gcc_configargs "--with-as=/usr/bin/as --with-ld=/usr/bin/ld --with-nm=/usr/bin/nm"
+                } else {
+        reinplace "s|/usr/bin/libtool|${prefix}/bin/odlibtool|" ${workpath}/gcc-${version_gcc}/gcc/config/darwin.h
+        set gcc_configargs "--with-as=${prefix}/bin/odas --with-ld=${prefix}/bin/odld --with-nm=${prefix}/bin/odnm"
+          }
+    system "unset CPPFLAGS; unset LDFLAGS; \
+            cd ${workpath}/gcc-${version_gcc}/${name}; \
+            ../configure --prefix=${prefix}/${gcclib} \
+            --enable-languages=c ${gcc_configargs} --with-included-gettext \
+            --with-gmp=${prefix} --with-mpfr=${prefix}; \
+            make"
 }
 
-configure.cppflags      ""
-configure.ldflags       ""
+#configure.cppflags     ""
+#configure.ldflags      ""
 configure.args  --with-gcc-dir=${workpath}/gcc-${version_gcc}
 
 post-build {
@@ -72 +81 @@
     system "ln -sf ${prefix}/${gcclib}/libgcc_s.1.0.dylib ${destroot}${prefix}/${gcclib}/lib/libgcc_s.1.0.dylib"
     system "ln -sf ${prefix}/${gcclib}/libgcc_s.1.0.dylib ${destroot}${prefix}/${gcclib}/lib/libgcc_s.dylib"
 }
+
+platform darwin 9 {
+    patchfiles-append patch-host-darwin.c patch-darwin-fallback.c
+    depends_lib-delete port:odcctools
+}