[100204] trunk/dports/aqua/qt4-mac-sqlite2-plugin/Portfile

[michaelld at macports.org]

Revision: 100204
          https://trac.macports.org/changeset/100204
Author:   michaelld at macports.org
Date:     2012-12-03 10:00:04 -0800 (Mon, 03 Dec 2012)
Log Message:
-----------
qt4-mac-sqlite plugin : add subport for sqlite3.

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

Modified: trunk/dports/aqua/qt4-mac-sqlite2-plugin/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac-sqlite2-plugin/Portfile	2012-12-03 17:58:28 UTC (rev 100203)
+++ trunk/dports/aqua/qt4-mac-sqlite2-plugin/Portfile	2012-12-03 18:00:04 UTC (rev 100204)
@@ -27,93 +27,86 @@
 dist_subdir         qt4-mac
 depends_lib-append  port:qt4-mac
 
-set DB              sqlite2
-set DRIVER          src/sql/drivers/${DB}
-set PLUGIN          src/plugins/sqldrivers/${DB}
-
-extract.post_args   | tar -xf - \
-                    ${distname}/${DRIVER} \
-                    ${distname}/${PLUGIN} \
-                    ${distname}/src/plugins/sqldrivers/qsqldriverbase.pri \
-                    ${distname}/src/plugins/qpluginbase.pri \
-                    ${distname}/src/qt_targets.pri \
-                    ${distname}/include/QtSql/private \
-                    ${distname}/src/sql/kernel
-
-configure.dir       ${worksrcpath}/${PLUGIN}
-configure.env-append \
-                    QMAKESPEC=${qt_mkspecs_dir}/macx-g++
-configure.cmd       ${qt_qmake_cmd}
-configure.pre_args  PREFIX=${prefix}
-
 if {[variant_isset universal]} {
 
     configure.universal_args-delete --disable-dependency-tracking
 }
 
-set mp.ports        {sqlite2}
-foreach mp.port ${mp.ports} {
+if {${name} == ${subport}} {
 
-    lappend mp.names "qt4-mac-${mp.port}-plugin"
-}
-foreach mp.name ${mp.names} {
+    set DB              sqlite2
 
-    set idx             [lsearch ${mp.names} ${mp.name}]
-    set mp.port     [lindex ${mp.ports} $idx]
-    set mp.conflicts  [lreplace ${mp.names} $idx $idx]
+    description         Qt sqlite database plugin for sqlite2
+    long_description    ${description}
+    conflicts-append    qt4-mac-sqlite3-plugin
+    depends_lib-append  port:sqlite2
+    configure.args-append \
+                        INCLUDEPATH+=${worksrcpath}/include \
+                        LIBS+="-L${prefix}/lib -lsqlite"
 
-    if {[string compare ${mp.name} ${name}] == 0 && [string compare ${mp.name} ${subport}] == 0} {
+    configure.post_args sqlite2.pro
 
-        description         Qt sqlite database plugin for ${mp.port}
-        long_description    ${description}
-        conflicts-append    ${mp.conflicts}
-        depends_lib-append  port:${mp.port}
-        configure.args      INCLUDEPATH+=${worksrcpath}/include \
-                            LIBS+="-L${prefix}/lib -lsqlite"
-        configure.post_args sqlite2.pro
+    variant debug description {Build both release and debug plugin} {}
 
-        variant debug description {Build both release and debug plugin} {}
+    pre-configure {
+        configure.args-append CONFIG+=\"${qt_arch_types}\"
+    }
 
-        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
         }
+    }
 
-        post-patch {
-            if {![variant_isset debug]} {
-                reinplace "s at debug_and_release@release@" \
-                    ${worksrcpath}/src/plugins/qpluginbase.pri
-            }
-        }
+}
 
-    } else {
+subport qt4-mac-sqlite3-plugin {
 
-        subport ${mp.name} {
-        
-            description         Qt sqlite database plugin for ${mp.port}
-            long_description    ${description}
-            conflicts-append    ${mp.conflicts}
-            depends_lib-append  port:${mp.port}
-            configure.args      INCLUDEPATH+=${worksrcpath}/include \
-                                LIBS+="-L${prefix}/lib -lsqlite"
-            configure.post_args sqlite2.pro
+    set DB              sqlite
 
-            variant debug description \
-                {Build both release and debug plugin} {}
+    description         Qt sqlite database plugin for sqlite3
+    long_description    ${description}
+    conflicts-append    qt4-mac-sqlite2-plugin
+    depends_lib-append  port:sqlite3
+    configure.args      INCLUDEPATH+=${worksrcpath}/include \
+                        LIBS+="-L${prefix}/lib -lsqlite3"
+    configure.post_args sqlite.pro
 
-            pre-configure {
-                configure.args-append CONFIG+=\"${qt_arch_types}\"
-            }
+    variant debug description \
+        {Build both release and debug plugin} {}
 
-            post-patch {
-                if {![variant_isset debug]} {
-                    reinplace "s at debug_and_release@release@" \
-                        ${worksrcpath}/src/plugins/qpluginbase.pri
-                }
-            }
+    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
         }
     }
 }
 
+set DRIVER          src/sql/drivers/${DB}
+set PLUGIN          src/plugins/sqldrivers/${DB}
+
+extract.post_args   | tar -xf - \
+                    ${distname}/${DRIVER} \
+                    ${distname}/${PLUGIN} \
+                    ${distname}/src/plugins/sqldrivers/qsqldriverbase.pri \
+                    ${distname}/src/plugins/qpluginbase.pri \
+                    ${distname}/src/qt_targets.pri \
+                    ${distname}/include/QtSql/private \
+                    ${distname}/src/sql/kernel
+
+configure.dir       ${worksrcpath}/${PLUGIN}
+configure.env-append \
+                    QMAKESPEC=${qt_mkspecs_dir}/macx-g++
+
+configure.cmd       ${qt_qmake_cmd}
+configure.pre_args  PREFIX=${prefix}
+
 build.dir           ${worksrcpath}/${PLUGIN}
 build.target        {}
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121203/119e48d8/attachment.html>