[47866] trunk/dports/aqua

illogic-al at macports.org illogic-al at macports.org
Sun Mar 8 16:39:52 PDT 2009


Revision: 47866
          http://trac.macports.org/changeset/47866
Author:   illogic-al at macports.org
Date:     2009-03-08 16:39:51 -0700 (Sun, 08 Mar 2009)
Log Message:
-----------
Add Qt 4.5.0 as unstable portfile. KDE 4.2.0 is reportedly more stable with Qt 4.4 so we'll keep that as main dependency now. Also add to test KDE with raster graphics and using Qt's phonon.

Added Paths:
-----------
    trunk/dports/aqua/qt4-mac-devel/
    trunk/dports/aqua/qt4-mac-devel/Portfile
    trunk/dports/aqua/qt4-mac-devel/files/
    trunk/dports/aqua/qt4-mac-devel/files/patch-compile.test.diff
    trunk/dports/aqua/qt4-mac-devel/files/patch-configure.diff
    trunk/dports/aqua/qt4-mac-devel/files/patch-mac.conf.diff
    trunk/dports/aqua/qt4-mac-devel/files/qt4-mac

Added: trunk/dports/aqua/qt4-mac-devel/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/Portfile	                        (rev 0)
+++ trunk/dports/aqua/qt4-mac-devel/Portfile	2009-03-08 23:39:51 UTC (rev 47866)
@@ -0,0 +1,194 @@
+# -*- coding: utf-8; mode: tcl; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; truncate-lines: t -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem          1.0
+
+name                qt4-mac-devel
+version             4.5.0
+revision            0
+categories          aqua
+platforms           macosx
+maintainers         illogic-al openmaintainer
+
+homepage            http://www.trolltech.com/
+description         Qt Tool Kit (Native Aqua Version)
+long_description    This is Qt, TrollTech's C++ toolkit for writing cross-platform GUI applications. \
+                    This version uses the native Aqua UI. For a X11 version, see qt4-x11.
+master_sites        ftp://ftp.trolltech.com/qt/source/ \
+                    http://wftp.tu-chemnitz.de/pub/Qt/qt/source/ \
+                    http://ftp.heanet.ie/mirrors/ftp.trolltech.com/pub/qt/source/
+distname            qt-mac-opensource-src-${version}
+checksums           \
+    md5 c66a3f3211529b456086284f87f17393 \
+    sha1 7b4f0a2512352bda9ae90e4bcfdb5ee621ab27e1 \
+    rmd160 3abcf1a3b917a6dbbbbc4d915db3fbb538262c70
+
+depends_build       port:pkgconfig
+
+depends_lib                                \
+    port:zlib                              \
+    port:tiff                              \
+    port:libpng                            \
+    port:libmng                            \
+    port:jpeg                              \
+    port:dbus                              \
+    port:unixODBC                          \
+    port:openssl                           \
+    port:sqlite3
+
+patchfiles          patch-compile.test.diff patch-mac.conf.diff patch-configure.diff
+
+# have to build with Apple gcc because of -fconstant-cfstrings
+# configure.compiler should therefore not be one of the MacPorts compilers
+
+# --prefix is not recognized
+configure.pre_args-delete  --prefix=${prefix}
+# -I${prefix}/include and -L${prefix}/lib must be set in ${configure.args}
+#    or else some generated Makefiles will not seem them
+configure.cppflags
+configure.ldflags
+
+set dirname qt4-mac
+set qt_dir ${prefix}/libexec/${dirname}
+
+# See
+#   http://doc.trolltech.com/qtopia4.3/buildsystem/over-configure-options-qt-1.html
+# for options
+#
+# -isystem is used instead of -I to avoid conflicts with other ports (e.g. pcre).
+#  See http://trac.macports.org/ticket/15219 and http://trac.macports.org/ticket/18723.
+#
+# -dbus-linked prevends qt4 from trying to dynamically load libdbus-1,
+#     which it is not able to find in ${prefix}
+# -openssl-linked ensures that the MacPorts openssl is used
+configure.args                                                 \
+    -v                                                         \
+    -debug-and-release                                         \
+    -framework                                                 \
+    -confirm-license                                           \
+    -prefix          ${qt_dir}                                 \
+    -docdir          ${prefix}/share/doc/${dirname}            \
+    -examplesdir     ${prefix}/share/${dirname}/examples       \
+    -demosdir        ${prefix}/share/${dirname}/demos          \
+    -system-sqlite                                             \
+    -openssl-linked                                            \
+    -dbus-linked                                               \
+    -isystem${prefix}/include                                  \
+    -L${prefix}/lib
+
+build.target        first
+use_parallel_build  yes
+
+destroot.destdir    INSTALL_ROOT="${destroot}"
+
+post-patch {
+    # ensure that the MacPorts odbc is used
+    reinplace "s|-liodbc|-lodbc|" \
+        ${worksrcpath}/src/plugins/sqldrivers/odbc/odbc.pro
+
+    # ensure that securesocketclient demo is built
+    reinplace "s|contains(QT_CONFIG, openssl)|contains(QT_CONFIG, openssl) \\| contains(QT_CONFIG, openssl-linked)|" \
+        ${worksrcpath}/examples/network/network.pro
+
+    # ensure that MacPorts compilers are used
+    reinplace "s| gcc\$| ${configure.cc}|" ${worksrcpath}/mkspecs/common/mac-g++.conf
+    reinplace "s| g++\$| ${configure.cxx}|" ${worksrcpath}/mkspecs/common/mac-g++.conf
+}
+
+post-destroot {
+    # install documentation
+    foreach doc {INSTALL LICENSE.GPL2 LICENSE.GPL3 OPENSOURCE-NOTICE.TXT README \
+                     GPL_EXCEPTION_ADDENDUM.TXT GPL_EXCEPTION.TXT} {
+        xinstall -c -m 644 ${worksrcpath}/$doc ${destroot}${prefix}/share/doc/${portname}
+    }
+
+    # create link in ${prefix}/bin to executable files in ${qt_dir}/bin
+    foreach bin [glob -type f -directory ${destroot}${qt_dir}/bin *] {
+        ln -s ${qt_dir}/bin/[file tail ${bin}] ${destroot}${prefix}/bin
+    }
+
+    xinstall -d -m 0755 ${destroot}${applications_dir}/Qt
+    # create link in ${applications_dir}/Qt to .app directories in ${qt_dir}/bin/
+    # create link in ${prefix}/bin to all *.app/Contents/MacOS/*
+    foreach app [glob -type d -directory ${destroot}${qt_dir}/bin *.app] {
+        ln -s ${qt_dir}/bin/[file tail ${app}] ${destroot}${applications_dir}/Qt
+        foreach bin [glob -tails -type f -directory ${app}/Contents/MacOS *] {
+            ln -s ${qt_dir}/bin/[file tail ${app}]/Contents/MacOS/${bin} ${destroot}${prefix}/bin
+        }
+    }
+
+    # avoid conflict with other qt packages
+    # ensure lower case names
+    foreach bin [glob ${destroot}${prefix}/bin/*] {
+        file rename ${bin} [string tolower ${bin}]-mac
+    }
+
+    # Fix the .pc and .prl files by removing ${destroot}
+    foreach fixfile [glob -directory ${destroot}${qt_dir}/lib/pkgconfig *.pc] {
+        reinplace \
+            "s|[regsub ${prefix} ${worksrcpath} {}]/bin|[regsub ${prefix} ${qt_dir}/bin {}]|g" \
+            ${fixfile}
+    }
+    foreach fixfile [glob -nocomplain -directory ${destroot} ${qt_dir}/lib/pkgconfig/*.pc ${qt_dir}/lib/*.prl ${qt_dir}/lib/*/*.prl ${prefix}/share/${dirname}/demos/shared/*.prl] {
+        reinplace  \
+            "s|-L${worksrcpath}/lib|-L${qt_dir}/lib|g" \
+            ${fixfile}
+        reinplace  \
+            "s|-F${worksrcpath}/lib|-F${qt_dir}/lib|g" \
+            ${fixfile}
+    }
+
+    # Create link to Frameworks in Frameworks directory
+    xinstall -d -m 0755 ${destroot}${frameworks_dir}
+    foreach fdir [glob -tails -directory ${destroot}${qt_dir}/lib -nocomplain *.framework] {
+        ln -s ${qt_dir}/lib/${fdir} ${destroot}${frameworks_dir}
+    }
+
+    # The debug .pc files have no counterpart in qt4-x11, so set a link to them in the pkgconfig directory
+    xinstall -d -m 0755 ${destroot}${prefix}/lib/pkgconfig
+    foreach fl [glob -tails -directory ${destroot}${qt_dir}/lib/pkgconfig *_debug.pc] {
+        ln -s ${qt_dir}/lib/pkgconfig/${fl} ${destroot}${prefix}/lib/pkgconfig/
+    }
+
+    # install select file for qt4_select
+    xinstall -m 755 -d ${destroot}${prefix}/etc/select/qt4
+    xinstall -m 644 ${filespath}/${dirname} ${destroot}${prefix}/etc/select/qt4/
+}
+
+variant cocoa description {Build the Cocoa version of Qt} {
+    configure.args-append   -cocoa
+}
+
+variant nomysql description {Disable mysql} {
+    depends_lib-delete      path:lib/mysql5:mysql5
+    configure.args-delete   -isystem${prefix}/include/mysql5/mysql  \
+                            -L${prefix}/lib/mysql5/mysql
+}
+
+variant nopostgresql description {Disable postgresql support} {
+    depends_lib-delete      port:postgresql83
+    configure.args-delete   -isystem${prefix}/include/postgresql83  \
+                            -L${prefix}/lib/postgresql83
+}
+
+variant noframework conflicts cocoa description {Do not build frameworks} {
+    configure.args-delete   -framework
+    configure.args-append   -no-framework
+}
+
+variant raster description {Use raster graphics system by default} {
+    configure.args-append   -graphicssystem  raster
+}
+
+variant webkit description {Use WebKit as html rendering engine in Assistant} {
+    configure.args-append   -assistant-webkit
+}
+
+variant universal {
+    configure.universal_args-delete --disable-dependency-tracking
+    configure.args-append           -universal
+}
+
+livecheck.check     regex
+livecheck.url       http://trolltech.com/downloads/opensource/appdev/mac-os-cpp
+livecheck.regex     "qt-mac-opensource-src-(4(?:\\.\\d+)*)${extract.suffix}"


Property changes on: trunk/dports/aqua/qt4-mac-devel/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/aqua/qt4-mac-devel/files/patch-compile.test.diff
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/files/patch-compile.test.diff	                        (rev 0)
+++ trunk/dports/aqua/qt4-mac-devel/files/patch-compile.test.diff	2009-03-08 23:39:51 UTC (rev 47866)
@@ -0,0 +1,13 @@
+--- config.tests/unix/compile.test.orig	2008-09-27 04:58:41.000000000 -0400
++++ config.tests/unix/compile.test	2008-10-27 00:46:48.000000000 -0400
+@@ -32,6 +32,10 @@
+         INC=`echo $PARAM | sed -e 's/^-I//'`
+         INCLUDEPATH="$INCLUDEPATH $INC"
+         ;;
++    -isystem*)
++        INC=`echo $PARAM | sed -e 's/^-isystem//'`
++        INCLUDEPATH="$INCLUDEPATH $INC"
++        ;;
+     -f*|-D*)
+         CXXFLAGS="$CXXFLAGS $PARAM"
+         ;;

Added: trunk/dports/aqua/qt4-mac-devel/files/patch-configure.diff
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/aqua/qt4-mac-devel/files/patch-configure.diff	2009-03-08 23:39:51 UTC (rev 47866)
@@ -0,0 +1,28 @@
+--- configure.orig	2009-03-03 18:48:59.000000000 -0500
++++ configure	2009-03-03 18:50:00.000000000 -0500
+@@ -802,6 +802,15 @@
+             VAL=`echo $1 | sed 's,-I,,'`
+         fi
+         ;;
++    -isystem?*|-isystem)
++        VAR="add_ipath_system"
++        if [ "$1" = "-isystem" ]; then
++            shift
++            VAL="$1"
++        else
++            VAL=`echo $1 | sed 's,-isystem,,'`
++        fi
++        ;;
+     -L?*|-L)
+         VAR="add_lpath"
+         if [ "$1" = "-L" ]; then
+@@ -1700,6 +1709,9 @@
+     add_ipath)
+         I_FLAGS="$I_FLAGS -I\"${VAL}\""
+         ;;
++    add_ipath_system)
++        I_FLAGS="$I_FLAGS -isystem\"${VAL}\""
++        ;;
+     add_lpath)
+         L_FLAGS="$L_FLAGS -L\"${VAL}\""
+         ;;

Added: trunk/dports/aqua/qt4-mac-devel/files/patch-mac.conf.diff
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/files/patch-mac.conf.diff	                        (rev 0)
+++ trunk/dports/aqua/qt4-mac-devel/files/patch-mac.conf.diff	2009-03-08 23:39:51 UTC (rev 47866)
@@ -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}

Added: trunk/dports/aqua/qt4-mac-devel/files/qt4-mac
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/files/qt4-mac	                        (rev 0)
+++ trunk/dports/aqua/qt4-mac-devel/files/qt4-mac	2009-03-08 23:39:51 UTC (rev 47866)
@@ -0,0 +1,42 @@
+libexec/qt4-mac/bin/assistant
+libexec/qt4-mac/bin/assistant_adp
+libexec/qt4-mac/bin/designer
+libexec/qt4-mac/bin/linguist
+libexec/qt4-mac/bin/lrelease
+libexec/qt4-mac/bin/lupdate
+libexec/qt4-mac/bin/moc
+libexec/qt4-mac/bin/pixeltool
+libexec/qt4-mac/bin/qcollectiongenerator
+libexec/qt4-mac/bin/qdbus
+libexec/qt4-mac/bin/qdbuscpp2xml
+libexec/qt4-mac/bin/qdbusviewer
+libexec/qt4-mac/bin/qdbusxml2cpp
+libexec/qt4-mac/bin/qhelpconverter
+libexec/qt4-mac/bin/qhelpgenerator
+libexec/qt4-mac/bin/qmake
+libexec/qt4-mac/bin/qt3to4
+libexec/qt4-mac/bin/qtdemo
+libexec/qt4-mac/bin/rcc
+libexec/qt4-mac/bin/uic
+libexec/qt4-mac/bin/uic3
+libexec/qt4-mac/bin/xmlpatterns
+libexec/qt4-mac/lib/pkgconfig/Qt3Support.pc
+libexec/qt4-mac/lib/pkgconfig/QtAssistant.pc
+libexec/qt4-mac/lib/pkgconfig/QtCLucene.pc
+libexec/qt4-mac/lib/pkgconfig/QtCore.pc
+libexec/qt4-mac/lib/pkgconfig/QtDBus.pc
+libexec/qt4-mac/lib/pkgconfig/QtDesigner.pc
+libexec/qt4-mac/lib/pkgconfig/QtDesignerComponents.pc
+libexec/qt4-mac/lib/pkgconfig/QtGui.pc
+libexec/qt4-mac/lib/pkgconfig/QtHelp.pc
+libexec/qt4-mac/lib/pkgconfig/QtNetwork.pc
+libexec/qt4-mac/lib/pkgconfig/QtOpenGL.pc
+libexec/qt4-mac/lib/pkgconfig/QtScript.pc
+libexec/qt4-mac/lib/pkgconfig/QtSql.pc
+libexec/qt4-mac/lib/pkgconfig/QtSvg.pc
+libexec/qt4-mac/lib/pkgconfig/QtTest.pc
+libexec/qt4-mac/lib/pkgconfig/QtUiTools.pc
+libexec/qt4-mac/lib/pkgconfig/QtWebKit.pc
+libexec/qt4-mac/lib/pkgconfig/QtXml.pc
+libexec/qt4-mac/lib/pkgconfig/QtXmlPatterns.pc
+libexec/qt4-mac/lib/pkgconfig/phonon.pc
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090308/43faea6a/attachment.html>


More information about the macports-changes mailing list