[68915] trunk/dports

[jmr at macports.org]

Revision: 68915
          http://trac.macports.org/changeset/68915
Author:   jmr at macports.org
Date:     2010-06-17 13:41:10 -0700 (Thu, 17 Jun 2010)
Log Message:
-----------
swig-gcj: use gcc44 by default, support gcc43 with a variant

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/swigbinding-1.0.tcl
    trunk/dports/devel/swig-gcj/Portfile

Modified: trunk/dports/_resources/port1.0/group/swigbinding-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/swigbinding-1.0.tcl	2010-06-17 20:27:35 UTC (rev 68914)
+++ trunk/dports/_resources/port1.0/group/swigbinding-1.0.tcl	2010-06-17 20:41:10 UTC (rev 68915)
@@ -36,7 +36,7 @@
     array set bindings { \
         python      {port:python_select     python=${prefix}/bin/python} \
         perl        {path:bin/perl:perl5    perl5=${prefix}/bin/perl} \
-        gcj         {port:gcc43             "gcj=${prefix}/bin/gcj-mp-4.3 --with-gcjh=${prefix}/bin/gcjh-mp-4.3"} \
+        gcj         {port:gcc44             "gcj=${prefix}/bin/gcj-mp-4.4 --with-gcjh=${prefix}/bin/gcjh-mp-4.4"} \
         guile       {port:guile             guile} \
         mzscheme    {port:mzscheme          mzscheme} \
         ruby        {port:ruby              ruby} \

Modified: trunk/dports/devel/swig-gcj/Portfile
===================================================================
--- trunk/dports/devel/swig-gcj/Portfile	2010-06-17 20:27:35 UTC (rev 68914)
+++ trunk/dports/devel/swig-gcj/Portfile	2010-06-17 20:41:10 UTC (rev 68915)
@@ -12,3 +12,18 @@
 checksums           md5     36ee2d9974be46a9f0a36460af928eb9 \
                     sha1    60faa84a326e5aa8a94f290e9debed4551c1b1e7 \
                     rmd160  853677ea19307428983034265fb37ce0f4f8a464
+
+variant gcc43 conflicts gcc44 description {build using GCJ 4.3} {
+    depends_lib-delete port:gcc44
+    depends_lib-append port:gcc43
+    configure.args-delete --with-gcj=${prefix}/bin/gcj-mp-4.4 --with-gcjh=${prefix}/bin/gcjh-mp-4.4
+    configure.args-append --with-gcj=${prefix}/bin/gcj-mp-4.3 --with-gcjh=${prefix}/bin/gcjh-mp-4.3
+}
+
+# just a placeholder variant until gcc45 gets added
+# default values get set in the portgroup
+variant gcc44 conflicts gcc43 description {build using GCJ 4.4} {}
+
+if {![variant_isset gcc43]} {
+    default_variants +gcc44
+}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100617/32a2e680/attachment.html>