Ticket #16859: patch-Portfile.diff

Portfile

@@ -5 +5 @@
 
 name                qt4-mac
 version             4.4.3
+revision            1
 categories          aqua
 platforms           macosx
 maintainers         erickt clubjuggler@gmail.com openmaintainer
@@ -58 +59 @@
     -optimized-qmake    -debug-and-release        -shared         -stl      \
     -no-openssl         -largefile                                          \
     -system-libpng      -system-libjpeg -system-libmng  -system-libtiff     \
-    -system-zlib        -qt-gif                                             \
+    -system-zlib        -qt-gif         -iconv                              \
     -no-sql-ibase       -no-sql-mysql   -no-sql-odbc    -no-sql-psql        \
     -no-sql-sqlite      -no-nis         -no-cups                            \
-    -framework          -libdir '${frameworkdir}'                           \
+    -no-webkit          -no-assistant-webkit  -no-svg                       \
+    -no-phonon          -no-phonon-backend          -no-xmlpatterns         \
+     -framework          -libdir '${frameworkdir}'                           \
     -make libs          -make tools                                         \
     -I${worksrcpath}/include \
     -L${worksrcpath}/lib -L${prefix}/lib
@@ -116 +119 @@
 
 default_variants +docs +dbus
 
-variant dbus description "Include DBus support" {
+variant dbus description {Include DBus support} {
     depends_lib-append      port:dbus
     configure.args-append   -dbus-linked
 }
 
-variant noframework description "Do not build frameworks" {
+variant noframework description {Do not build frameworks} {
     configure.args-delete   -framework -libdir '${frameworkdir}'
     configure.args-append   -no-framework
 }
 
-variant nis description "Include Network Information Service (NIS) support" {
+variant nis description {Include Network Information Service (NIS) support} {
     configure.args-delete   -no-nis
     configure.args-append   -nis
 }
 
-variant cups description "Include Common Unix Printing System (CUPS) support" {
+variant cups description {Include Common Unix Printing System (CUPS) support} {
     configure.args-delete   -no-cups
     configure.args-append   -cups
 }
 
-variant mysql4 conflicts mysql5 description "Include support for SQL via mysql4 driver" {
+variant mysql4 conflicts mysql5 description {Include support for SQL via mysql4 driver} {
     depends_lib-append      lib:libmysqlclient.12:mysql4
     configure.args-delete   -no-sql-mysql
     configure.args-append   -qt-sql-mysql -plugin-sql-mysql \
                             -I${prefix}/include/mysql -L${prefix}/lib/mysql
 }
 
-variant mysql5 conflicts mysql4 description "Include support for SQL via mysql5 driver" {
+variant mysql5 conflicts mysql4 description {Include support for SQL via mysql5 driver} {
     depends_lib-append      lib:libmysqlclient.15:mysql5
     configure.args-delete   -no-sql-mysql
     configure.args-append   -qt-sql-mysql -plugin-sql-mysql \
                             -I${prefix}/include/mysql5/mysql -L${prefix}/lib/mysql5/mysql
 }
 
-variant psql description "Include support for SQL via postgresql driver" {
+variant psql description {Include support for SQL via postgresql driver} {
     depends_lib-append      port:postgresql83
         configure.args-delete   -no-sql-psql
         configure.args-append   -qt-sql-psql -plugin-sql-psql \
                             -I${prefix}/include/postgresql83 -L${prefix}/lib/postgresql83
 }
 
-variant sqlite description "Include support for SQL via sqlite driver" {
+variant sqlite description {Include support for SQL via sqlite driver} {
         configure.args-delete   -no-sql-sqlite
         configure.args-append   -qt-sql-sqlite -plugin-sql-sqlite
 }
 
-variant ssl description "Include OpenSSL support" {
+variant ssl description {Include OpenSSL support} {
     depends_lib-append      port:openssl
     configure.args-delete   -no-openssl
     configure.args-append   -openssl
 }
 
-variant examples description "Build Qt examples" {
+variant examples description {Build Qt examples} {
     # configure.args-delete   "-nomake examples"
     configure.args-append   -make examples -examplesdir ${prefix}/share/${portname}/examples
 }
 
-variant demos description "Build Qt demos" {
+variant demos description {Build Qt demos} {
     # configure.args-delete   "-nomake demos"
     configure.args-append   -make demos -demosdir ${prefix}/share/${portname}/demos
 }
 
-variant docs description "Include Qt Documentation" {
+variant docs description {Include Qt Documentation} {
     configure.args-append   -make docs
 }
 
+variant webkit description {Build webkit module and html rendering engine} {
+    configure.args-delete   -no-webkit  -no-assistant-webkit
+    configure.args-append   -webkit  -assistant-webkit
+}
+
+variant svg description {Build the SVG module} {
+    configure.args-delete   -no-svg
+    configure.args-append   -svg
+}
+
+variant phonon description {Build the Phonon module and platform phonon plugin} {
+    configure.args-delete   -no-phonon  -no-phonon-backend
+    configure.args-append   -phonon  -phonon-backend
+}
+
+variant xmlpatterns description {Build the QtXmlPatterns module} {
+    configure.args-delete   -no-xmlpatterns
+    configure.args-append   -xmlpatterns
+}
 
 livecheck.check     regex
-livecheck.url       http://trolltech.com/developer/downloads/qt/mac
-livecheck.regex     "The current version of Qt/Mac Open Source Edition is (4(?:\\.\\d+)*)"
+livecheck.url       http://trolltech.com/downloads/opensource/appdev/mac-os-cpp
+livecheck.regex     "qt-mac-opensource-src-(4(?:\\.\\d+)*).tar.gz"