[73418] trunk/dports/devel/qtscriptgenerator

[michaelld at macports.org]

Revision: 73418
          http://trac.macports.org/changeset/73418
Author:   michaelld at macports.org
Date:     2010-11-12 18:09:45 -0800 (Fri, 12 Nov 2010)
Log Message:
-----------
qtscriptgenerator changes:
* correct use of qt_arch_types
* correct setting of build type
* if +debug selected, make sure phonon also is +debug (at least)
* automoc is a build dependency, not a library one
* rev bump for changes to take effect

Modified Paths:
--------------
    trunk/dports/devel/qtscriptgenerator/Portfile
    trunk/dports/devel/qtscriptgenerator/files/patch-generator.diff
    trunk/dports/devel/qtscriptgenerator/files/patch-qtbindings.diff

Modified: trunk/dports/devel/qtscriptgenerator/Portfile
===================================================================
--- trunk/dports/devel/qtscriptgenerator/Portfile	2010-11-13 02:05:55 UTC (rev 73417)
+++ trunk/dports/devel/qtscriptgenerator/Portfile	2010-11-13 02:09:45 UTC (rev 73418)
@@ -6,7 +6,7 @@
 
 name                qtscriptgenerator
 version             0.1.0
-revision            3
+revision            4
 categories          devel kde4
 maintainers         michaelld openmaintainer
 description         QtScript bindings generator.
@@ -21,32 +21,54 @@
                     sha1    eeae733106369e289f257b754822bc372fd6ba75 \
                     rmd160  a02ce6fea2fbc3d3a6ae9e51c6b563ef4bcd51f3 
 
-depends_lib-append  port:phonon port:automoc
+depends_build-append port:automoc
+depends_lib-append  port:phonon
 
 patchfiles          patch-generator.diff \
                     patch-qtbindings.diff
 
+# check for +debug variant of this port, and make sure phonon was
+# installed with +debug as well; if not, error out.  phonon checks to
+# make sure Qt was installed with +debug, so it is OK if this stage
+# overrides that provided in the qt4 portgroup.
+pre-extract {
+    if {[variant_exists debug] && \
+        [variant_isset debug] && \
+       ![info exists building_qt4]} {
+        if {![file exists ${prefix}/lib/libphonon_debug.dylib]} {
+            return -code error "\n\nERROR:\n\
+In order to install this port as +debug,
+Phonon \(and Qt4\) must also be installed with +debug.\n"
+        }
+    }
+}
+
 post-patch {
     # copy the QMake build script into place
     copy ${filespath}/qtsg.pro ${worksrcpath}
+
+    # allow for universal and non-native building if just the
+    # qtbinding scripts, not the generator (which is solely used for
+    # generating the scripts)
+    reinplace "s/@ARCHES@/${qt_arch_types}/" \
+        ${worksrcpath}/qtbindings/qtbindingsbase.pri
+
+    # fix up qtbindings QMake build file to handle debug and release
+    set build_type "release"
+    if {[variant_isset debug]} {
+        set build_type "debug_and_release build_all"
+    }
+    reinplace "s/@BUILD_TYPE@/${build_type}/" \
+        ${worksrcpath}/qtbindings/qtbindingsbase.pri
 }
 
 # set up to use the installed QMake files
 configure.cmd       ${qt_qmake_cmd}
-configure.pre_args  CONFIG+="${qt_arch_types}"
+configure.pre_args
 configure.args      "-o Makefile qtsg.pro"
+configure.post_args
+configure.universal_args
 
-# allow for debug variant
-if {[variant_isset debug]} {
-    configure.pre_args-append CONFIG+=debug_and_release
-} else {
-    configure.pre_args-append CONFIG+=release
-}
-
-# qmake does not handle these flags flags
-configure.universal_args-delete --disable-dependency-tracking
-configure.args-delete           --disable-dependency-tracking
-
 # allow ccache, if specified by the user
 pre-build {
     if {[tbool configure.ccache]} {

Modified: trunk/dports/devel/qtscriptgenerator/files/patch-generator.diff
===================================================================
--- trunk/dports/devel/qtscriptgenerator/files/patch-generator.diff	2010-11-13 02:05:55 UTC (rev 73417)
+++ trunk/dports/devel/qtscriptgenerator/files/patch-generator.diff	2010-11-13 02:09:45 UTC (rev 73418)
@@ -5,7 +5,7 @@
          docgenerator.cpp
  
 -CONFIG -= debug
-+CONFIG -= debug debug_and_release
++CONFIG +=
  CONFIG += release
 --- generator/generator.pri.orig	2010-11-03 13:59:49.000000000 -0400
 +++ generator/generator.pri	2010-11-03 14:00:59.000000000 -0400

Modified: trunk/dports/devel/qtscriptgenerator/files/patch-qtbindings.diff
===================================================================
--- trunk/dports/devel/qtscriptgenerator/files/patch-qtbindings.diff	2010-11-13 02:05:55 UTC (rev 73417)
+++ trunk/dports/devel/qtscriptgenerator/files/patch-qtbindings.diff	2010-11-13 02:09:45 UTC (rev 73418)
@@ -5,7 +5,7 @@
  DESTDIR = $$PWD/../plugins/script
  QT += script
 -CONFIG += debug_and_release
-+
++CONFIG += @ARCHES@ @BUILD_TYPE@
  GENERATEDCPP = $$PWD/../generated_cpp
  TARGET=$$qtLibraryTarget($$TARGET)
 +target.path = $$[QT_INSTALL_PLUGINS]/script
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101112/42669f43/attachment.html>