[97960] trunk/dports/aqua/qt4-mac-mysql55-plugin/Portfile

[michaelld at macports.org]

Revision: 97960
          http://trac.macports.org//changeset/97960
Author:   michaelld at macports.org
Date:     2012-09-20 18:14:18 -0700 (Thu, 20 Sep 2012)
Log Message:
-----------
qt4-mac-mysql55-plugin : fix +debug and +universal variants.  Addresses ticket #35827.

Modified Paths:
--------------
    trunk/dports/aqua/qt4-mac-mysql55-plugin/Portfile

Modified: trunk/dports/aqua/qt4-mac-mysql55-plugin/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac-mysql55-plugin/Portfile	2012-09-21 01:06:51 UTC (rev 97959)
+++ trunk/dports/aqua/qt4-mac-mysql55-plugin/Portfile	2012-09-21 01:14:18 UTC (rev 97960)
@@ -21,7 +21,6 @@
 master_sites        trolltech
 distname            qt-everywhere-opensource-src-${version}
 
-
 checksums           sha1    bc352a283610e0cd2fe0dbedbc45613844090fcb \
                     rmd160  fe56e5da874503a79d6f84a1e15460eba5a6feae
 
@@ -55,6 +54,7 @@
 
     lappend mp.names "qt4-mac-${mp.port}-plugin"
 }
+
 foreach mp.name ${mp.names} {
 
     set idx [lsearch ${mp.names} ${mp.name}]
@@ -67,9 +67,23 @@
         long_description    ${description}
         conflicts-append    ${mp.conflicts}
         depends_lib-append  port:${mp.port}
-        configure.args      INCLUDEPATH+="${prefix}/include ${prefix}/include/${mp.port}/mysql ${prefix}/include/Qt" \
-                            LIBS+="-L${prefix}/lib -L${prefix}/lib/${mp.port} -L${prefix}/lib/${mp.port}/mysql -lmysqlclient_r" \
-                            mysql.pro
+        configure.args      INCLUDEPATH+="${prefix}/include ${prefix}/include/${mp.port}/mysql" \
+                            LIBS+="-L${prefix}/lib -L${prefix}/lib/${mp.port} -L${prefix}/lib/${mp.port}/mysql -lmysqlclient_r"
+        configure.post_args mysql.pro
+
+        variant debug description {Build both release and debug plugin} {}
+
+        pre-configure {
+            configure.args-append CONFIG+=\"${qt_arch_types}\"
+        }
+
+        post-patch {
+            if {![variant_isset debug]} {
+                reinplace "s at debug_and_release@release@" \
+                    ${worksrcpath}/src/plugins/qpluginbase.pri
+            }
+        }
+
     } else {
 
         subport ${mp.name} {
@@ -78,11 +92,24 @@
             long_description    ${description}
             conflicts-append    ${mp.conflicts}
             depends_lib-append  port:${mp.port}
-            configure.args      INCLUDEPATH+="${prefix}/include ${prefix}/include/${mp.port}/mysql ${prefix}/include/Qt" \
-                                LIBS+="-L${prefix}/lib -L${prefix}/lib/${mp.port} -L${prefix}/lib/${mp.port}/mysql -lmysqlclient_r" \
-                                mysql.pro
+            configure.args      INCLUDEPATH+="${prefix}/include ${prefix}/include/${mp.port}/mysql" \
+                                LIBS+="-L${prefix}/lib -L${prefix}/lib/${mp.port} -L${prefix}/lib/${mp.port}/mysql -lmysqlclient_r"
+            configure.post_args mysql.pro
+
+            variant debug description \
+                {Build both release and debug plugin} {}
+
+            pre-configure {
+                configure.args-append CONFIG+=\"${qt_arch_types}\"
+            }
+
+            post-patch {
+                if {![variant_isset debug]} {
+                    reinplace "s at debug_and_release@release@" \
+                        ${worksrcpath}/src/plugins/qpluginbase.pri
+                }
+            }
         }
-    
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120920/c222d240/attachment-0001.html>