[37370] trunk/dports/aqua/qt4-mac

[erickt at macports.org]

Revision: 37370
          http://trac.macosforge.org/projects/macports/changeset/37370
Author:   erickt at macports.org
Date:     2008-06-04 16:30:28 -0700 (Wed, 04 Jun 2008)

Log Message:
-----------
Make sure that qt builds bundles to prevent a resource leak.

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

Added Paths:
-----------
    trunk/dports/aqua/qt4-mac/files/
    trunk/dports/aqua/qt4-mac/files/patch-mac.conf.diff

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2008-06-04 23:30:27 UTC (rev 37369)
+++ trunk/dports/aqua/qt4-mac/Portfile	2008-06-04 23:30:28 UTC (rev 37370)
@@ -5,7 +5,7 @@
 
 name                qt4-mac
 version             4.4.0
-revision            2
+revision            3
 categories          aqua
 platforms           macosx
 maintainers         erickt clubjuggler at gmail.com openmaintainer
@@ -25,29 +25,25 @@
 
 depends_lib         port:libmng port:libpng port:jpeg port:tiff
 
+patchfiles          patch-mac.conf.diff
+
 # have to build with Apple gcc because of -fconstant-cfstrings
 configure.compiler  gcc-4.0
-configure.cmd       "echo yes | ./configure"
+configure.cmd       "CFLAGS=-isystem${prefix}/include CXXFLAGS=-isystem${prefix}/include ./configure"
 configure.pre_args
 
 # directory for .app and executable files
 # Once installed, they should not be moved so they can find each other
 # (e.g. assistant.app) and the examples directory
 set bindir ${prefix}/libexec/${name}/bin
+set frameworkdir ${prefix}/Library/Frameworks
 
-post-configure {
-    # Assures local header is included instead of one from PCRE and OpenJPEG (and perhaps others).
-    reinplace "s|\$(CFLAGS) \$(INCPATH)|\$(INCPATH) \$(CFLAGS)|g" ${worksrcpath}/src/3rdparty/webkit/WebCore/Makefile.Release
-    reinplace "s|\$(CXXFLAGS) \$(INCPATH)|\$(INCPATH) \$(CXXFLAGS)|g" ${worksrcpath}/src/3rdparty/webkit/WebCore/Makefile.Release
-    reinplace "s|\$(CFLAGS) \$(INCPATH)|\$(INCPATH) \$(CFLAGS)|g" ${worksrcpath}/src/3rdparty/webkit/WebCore/Makefile.Debug
-    reinplace "s|\$(CXXFLAGS) \$(INCPATH)|\$(INCPATH) \$(CXXFLAGS)|g" ${worksrcpath}/src/3rdparty/webkit/WebCore/Makefile.Debug
-}
-
 # See
 #   http://doc.trolltech.com/qtopia4.3/buildsystem/over-configure-options-qt-1.html
 # for options
 configure.args \
     -v         \
+    -confirm-license \
     -prefix         '${prefix}'                            \
     -bindir         '${bindir}'                            \
     -docdir         '${prefix}/share/doc/${portname}'      \
@@ -55,17 +51,20 @@
     -headerdir      '${prefix}/include/${portname}'        \
     -plugindir      '${prefix}/lib/${portname}-plugins'    \
     -translationdir '${prefix}/share/${portname}/translations' \
-    -optimized-qmake    -release        -shared         -stl                \
+    -optimized-qmake    -debug-and-release        -shared         -stl      \
     -no-openssl         -largefile                                          \
     -system-libpng      -system-libjpeg -system-libmng  -system-libtiff     \
     -system-zlib        -qt-gif                                             \
     -no-sql-ibase       -no-sql-mysql   -no-sql-odbc    -no-sql-psql        \
     -no-sql-sqlite      -no-nis         -no-cups                            \
-    -framework          -libdir '${prefix}/Library/Frameworks'              \
+    -framework          -libdir '${frameworkdir}'                           \
     -make libs          -make tools                                         \
-    -I${worksrcpath}/include -I${prefix}/include \
+    -I${worksrcpath}/include \
     -L${worksrcpath}/lib -L${prefix}/lib
 
+    # Take care of this with the CXXFLAGS=-isystem${prefix}/include
+    # this puts the include at the end so that qt's include files are found first.
+    # -I${prefix}/include
     # not made by default, anyway: -nomake demos -nomake examples
 
 build.target        first
@@ -101,6 +100,9 @@
         }
     }
     
+    # Put pkgconfig directory in correct place (Fix Ticket #15353)
+    system "mv ${destroot}${frameworkdir}/pkgconfig ${destroot}/${prefix}/lib/"
+
     # install documentation
     foreach doc {INSTALL LICENSE.GPL2 LICENSE.GPL3 OPENSOURCE-NOTICE.TXT README \
                  GPL_EXCEPTION_ADDENDUM.TXT GPL_EXCEPTION.TXT} {
@@ -116,7 +118,7 @@
 }
 
 variant noframework description "Do not build frameworks" {
-    configure.args-delete   -framework -libdir '${prefix}/Library/Frameworks'
+    configure.args-delete   -framework -libdir '${frameworkdir}'
     configure.args-append   -no-framework
 }
 

Added: trunk/dports/aqua/qt4-mac/files/patch-mac.conf.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-mac.conf.diff	                        (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/patch-mac.conf.diff	2008-06-04 23:30:28 UTC (rev 37370)
@@ -0,0 +1,25 @@
+Index: mkspecs/common/mac.conf
+===================================================================
+--- mkspecs/common/mac.conf	(revision 814547)
++++ mkspecs/common/mac.conf	(working copy)
+@@ -5,6 +5,7 @@
+ QMAKE_RESOURCE		= /Developer/Tools/Rez
+ 
+ QMAKE_EXTENSION_SHLIB	= dylib
++QMAKE_EXTENSION_PLUGIN	= bundle
+ 
+ QMAKE_LIBDIR		=
+ QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
+Index: mkspecs/common/mac-g++.conf
+===================================================================
+--- mkspecs/common/mac-g++.conf	(revision 814547)
++++ mkspecs/common/mac-g++.conf	(working copy)
+@@ -55,7 +55,7 @@
+ QMAKE_LFLAGS_DEBUG	+=
+ QMAKE_LFLAGS_APP	+=
+ QMAKE_LFLAGS_SHLIB	+= -single_module -dynamiclib
+-QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB
++QMAKE_LFLAGS_PLUGIN	+= -bundle -flat_namespace
+ QMAKE_LFLAGS_THREAD	+=
+ QMAKE_LFLAGS_INCREMENTAL+= -undefined suppress -flat_namespace
+ QMAKE_LFLAGS_SONAME	+= -install_name$${LITERAL_WHITESPACE}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080604/5a16de53/attachment.htm