Ticket #36090: root.diff

Portfile

@@ -338 +338 @@
     }
 }
 
-variant gcc45 conflicts gcc46 gcc47 clang31 description {Compile using MacPorts gcc 4.5} {
+variant gcc45 conflicts gcc46 gcc47 gcc48 clang31 description {Compile using MacPorts gcc 4.5} {
     configure.compiler      macports-gcc-4.5
     depends_lib-append      port:gcc45
 }
 
-variant gcc46 conflicts gcc45 gcc47 clang31 description {Compile using MacPorts gcc 4.6} {
+variant gcc46 conflicts gcc45 gcc47 gcc48 clang31 description {Compile using MacPorts gcc 4.6} {
     configure.compiler      macports-gcc-4.6
     depends_lib-append      port:gcc46
 }
 
-variant gcc47 conflicts gcc45 gcc46 clang31 description {Compile using MacPorts gcc 4.7} {
+variant gcc47 conflicts gcc45 gcc46 gcc48 clang31 description {Compile using MacPorts gcc 4.7} {
     configure.compiler      macports-gcc-4.7
     depends_lib-append      port:gcc47
 }
 
+variant gcc48 conflicts gcc45 gcc46 gcc47 clang31 description {Compile using MacPorts gcc 4.8} {
+    configure.compiler      macports-gcc-4.8
+    depends_lib-append      port:gcc48
+}
+
 variant clang31 conflicts gcc47 gcc46 gcc45 description {Compile using MacPorts clang 3.1} {
      configure.compiler      macports-clang-3.1
      depends_lib-append      port:clang-3.1
      configure.args-append   --with-llvm-config="${prefix}/bin/llvm-config-mp-3.1"
 }
 
+if {[variant_isset qt_mac]} {
+    PortGroup qt4 1.0
+}
+
+variant qt_mac description {Builds port with Qt support via Mac UI} {
+    post-patch {
+        # fix where "qglobal.h" is found in all files that use or reference it
+        foreach tpf { configure graf2d/qt/src/TGQt.cxx } {
+            reinplace "s@Qt/qglobal\\.h@QtCore/qglobal\\.h@g" \
+                ${worksrcpath}/${tpf}
+        }
+        reinplace "/qttestdir/s@Qt@QtCore@g" ${worksrcpath}/configure
+
+        # fix library search extensions to include ".la"
+        # for Qt framework libraries (only)
+        reinplace "s@\\(\\.so \\.sl \\.dylib \\.dll\\.a\\)@\\1 \\.la@g" \
+            ${worksrcpath}/configure
+    }
+
+    configure.args-delete   --disable-qt
+    configure.args-delete   --disable-qtgsi
+    configure.args-append   --enable-qt --enable-qtgsi \
+                            --with-qt-incdir="${prefix}/include" \
+                            --with-qt-libdir="${prefix}/lib"
+    depends_lib-append      port:qt4-mac
+
+    post-configure {
+        # patch up the Makefile.config to handle the QTLIB frameworks correctly
+        reinplace "/QTLIB\[ \]/s@:= @:= -F${qt_libs_dir} @" \
+            ${worksrcpath}/config/Makefile.config
+        reinplace "/QTLIB\[ \]/s@\\(Qt\[^ \]*\\).la@-framework \\1@g" \
+            ${worksrcpath}/config/Makefile.config
+    }
+}
+
 livecheck.type              regex
 livecheck.url               [lindex ${master_sites} 0]
 livecheck.regex             ${name}_v(\[0-9a-z.\]+)\\.source
@@ -405 +445 @@
 #                             --with-qt-libdir="${prefix}/lib"
 #     depends_lib-append      port:qt4-x11
 # }
-
-# if {[variant_isset qt_mac]} {
-#     PortGroup qt4 1.0
-# }
-
-# variant qt_mac conflicts qt_x11 description {Builds port with Qt support via Mac UI} {
-#     post-patch {
-#         # fix where "qglobal.h" is found in all files that use or reference it
-#         foreach tpf { configure graf2d/qt/src/TGQt.cxx } {
-#             reinplace "s@Qt/qglobal\\.h@QtCore/qglobal\\.h@g" \
-#                 ${worksrcpath}/${tpf}
-#         }
-#         reinplace "/qttestdir/s@Qt@QtCore@g" ${worksrcpath}/configure
-
-#         # fix library search extensions to include ".la"
-#         # for Qt framework libraries (only)
-#         reinplace "s@\\(\\.so \\.sl \\.dylib \\.dll\\.a\\)@\\1 \\.la@g" \
-#             ${worksrcpath}/configure
-#     }
-
-#     configure.args-delete   --disable-qt
-#     configure.args-delete   --disable-qtgsi
-#     configure.args-append   --enable-qt --enable-qtgsi \
-#                             --with-qt-incdir="${prefix}/include" \
-#                             --with-qt-libdir="${prefix}/lib"
-#     depends_lib-append      port:qt4-mac
-
-#     post-configure {
-#         # patch up the Makefile.config to handle the QTLIB frameworks correctly
-#         reinplace "/QTLIB\[ \]/s@:= @:= -F${qt_libs_dir} @" \
-#             ${worksrcpath}/config/Makefile.config
-#         reinplace "/QTLIB\[ \]/s@\\(Qt\[^ \]*\\).la@-framework \\1@g" \
-#             ${worksrcpath}/config/Makefile.config
-#     }
-# }