Diff
Modified: trunk/dports/aqua/qt4-mac/Portfile (69276 => 69277)
--- trunk/dports/aqua/qt4-mac/Portfile 2010-06-29 07:24:45 UTC (rev 69276)
+++ trunk/dports/aqua/qt4-mac/Portfile 2010-06-29 07:32:38 UTC (rev 69277)
@@ -2,32 +2,42 @@
# $Id$
PortSystem 1.0
+PortGroup select 1.0
-name qt4-mac
-conflicts qt4-mac-devel kdelibs3 kdelibs4 libevent xmlrpcxx
+set select_group qt4
+set select_branch mac
+set select_port ${select_group}_select
+set select_name ${select_group}-${select_branch}
+select.group ${select_group}
+
+name ${select_name}
+#conflicts kdelibs3 kdelibs4 xmlrpcxx
version 4.6.3
-revision 0
+revision 1
categories aqua
platforms macosx
-maintainers nomaintainer
+maintainers michaelld
homepage http://qt.nokia.com/
description Qt Tool Kit (Native Aqua Version)
-long_description Qt is a cross-platform application and UI framework for writing cross-platform GUI applications. \
- This version uses the native Aqua UI. For a X11 version, see qt4-x11.
+long_description \
+ Qt is a cross-platform application and UI framework for writing \
+ cross-platform GUI applications. This version uses the native Aqua UI. \
+ For a X11 version, see qt4-x11\[-devel\].
+
master_sites trolltech
distname qt-everywhere-opensource-src-${version}
-
checksums md5 5c69f16d452b0bb3d44bc3c10556c072 \
sha1 1c18a564df9296c7cb0e0dedde40b9843e1b30e8 \
rmd160 ceb3ca78263d0d9cdf92fef903e30c0026db6bff
-depends_build port:pkgconfig
+depends_build port:pkgconfig port:${select_port}
depends_lib port:zlib port:dbus port:openssl port:sqlite3 \
port:tiff port:libpng port:libmng port:jpeg
-# Test for Precompiled-headers support requires a C++ compiler, but configure calls it, by default, with a C compiler.
+# Test for Precompiled-headers support requires a C++ compiler,
+# but configure calls it, by default, with a C compiler.
patchfiles patch-precomp.test.diff
# The build process uses -fconstant-cfstrings.
@@ -56,52 +66,45 @@
configure.ld_archflags
}
-set dirname qt4-mac
+set dirname ${name}
set qt_dir ${prefix}/libexec/${dirname}
+#
+# use compiler.cpath and compiler.library_path, as per
+# http://trac.macports.org/ticket/25321 for all -I and -L entries,
+# so-as to avoid conflicts with already-installed headers and
+# libraries (giving preference to internal-to-this-port first)
+#
# CPATH is used instead of -I to avoid conflicts with other ports.
-# See http://trac.macports.org/ticket/15219 and http://trac.macports.org/ticket/18723.
+# See http://trac.macports.org/ticket/15219 and
+# http://trac.macports.org/ticket/18723.
#
# -system-sqlite ensures the use SQLite provided by MacPorts instead of Qt.
#
# -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 \
-confirm-license \
-opensource \
-prefix ${qt_dir} \
- -docdir ${prefix}/share/doc/${dirname} \
- -examplesdir ${prefix}/share/${dirname}/examples \
- -demosdir ${prefix}/share/${dirname}/demos \
+ -docdir ${qt_dir}/share/doc/${dirname} \
+ -examplesdir ${qt_dir}/share/${dirname}/examples \
+ -demosdir ${qt_dir}/share/${dirname}/demos \
-cocoa \
-system-sqlite \
-openssl-linked \
-dbus-linked \
- -L${prefix}/lib \
-arch \"${build_arch}\"
-lappend cpath ${prefix}/include
-lappend library_path ${prefix}/lib
-
-pre-configure {
- configure.env-append \
- CPATH=[join ${cpath} :] \
- LIBRARY_PATH=[join ${library_path} :]
-}
-
-pre-build {
- build.env-append \
- CPATH=[join ${cpath} :] \
- LIBRARY_PATH=[join ${library_path} :]
-}
-
# Stop configure script from searching for SQL Drivers
# not available from MacPorts.
-foreach driver {db2 ibase oci tds} {
+foreach driver {db2 ibase oci sqlite_symbian tds} {
configure.args-append -no-sql-${driver}
}
@@ -113,23 +116,11 @@
configure.args-append -no-sql-${driver}
}
-platform darwin 8 {
- configure.args-delete -cocoa
- post-configure {
- fs-traverse item ${worksrcpath} {
- if {"Makefile" == [file tail ${item}]} {
- reinplace "s|-framework QtHelp|-framework QtHelp -lQtCLucene|" ${item}
- }
- }
- }
-}
-
variant mysql description {Enable MySQL SQL Driver} {
depends_lib-append path:lib/mysql5:mysql5
-
- lappend cpath ${prefix}/include/mysql5/mysql
- lappend library_path ${prefix}/lib/mysql5/mysql
-
+ # reverse the search paths, such that the defaults are searched last
+ compiler.cpath ${prefix}/include/mysql5/mysql:${compiler.cpath}
+ compiler.library_path ${prefix}/lib/mysql5/mysql:${compiler.library_path}
configure.args-delete -no-sql-mysql
}
@@ -140,10 +131,9 @@
variant psql description {Enable PostgreSQL SQL Driver} {
depends_lib-append port:postgresql83
-
- lappend cpath ${prefix}/include/postgresql83
- lappend library_path ${prefix}/lib/postgresql83
-
+ # reverse the search paths, such that the defaults are searched last
+ compiler.cpath ${prefix}/include/postgresql83:${compiler.cpath}
+ compiler.library_path ${prefix}/lib/postgresql83:${compiler.library_path}
configure.args-delete -no-sql-psql
}
@@ -152,6 +142,59 @@
configure.args-delete -no-sql-sqlite2
}
+variant raster description {Use raster graphics system by default} {
+ configure.args-append -graphicssystem raster
+}
+
+variant no_demos description {Do not build demo programs} {
+ configure.args-append -nomake demos
+}
+
+variant no_examples description {Do not build example programs} {
+ configure.args-append -nomake examples
+}
+
+variant no_debug description {Do not include debugging libraries and pkgconfig files} {
+ configure.args-delete -debug-and-release
+ configure.args-append -release
+}
+
+variant universal {
+ configure.universal_args-delete --disable-dependency-tracking
+ configure.args-delete -arch \"${build_arch}\"
+ configure.args-append -arch \"${universal_archs}\"
+ if {[info exists universal_sysroot]} {
+ configure.args-append -sdk ${universal_sysroot}
+ }
+}
+
+# use the 10.4 SDK (the default) for 10.4 only.
+# and, build as Carbon by disabling Cocoa.
+platform darwin 8 {
+ configure.args-delete -cocoa
+ post-configure {
+ fs-traverse item ${worksrcpath} {
+ if {"Makefile" == [file tail ${item}]} {
+ reinplace "s|-framework QtHelp|-framework QtHelp -lQtCLucene|" ${item}
+ }
+ }
+ }
+}
+
+# use the 10.5 SDK for 10.5 or 10.6,
+# but only if not (doing universal and the universal sysroot is set)
+platform darwin 9 {
+ if {![variant_isset universal] || ![info exists universal_sysroot]} {
+ configure.args-append -sdk /Developer/SDKs/MacOSX10.5.sdk/
+ }
+}
+
+platform darwin 10 {
+ if {![variant_isset universal] || ![info exists universal_sysroot]} {
+ configure.args-append -sdk /Developer/SDKs/MacOSX10.5.sdk/
+ }
+}
+
build.target first
use_parallel_build yes
@@ -166,80 +209,45 @@
}
post-destroot {
- # Install documentation.
- foreach doc { INSTALL LGPL_EXCEPTION.txt LICENSE.GPL3 LICENSE.LGPL README } {
- xinstall -c -m 644 ${worksrcpath}/$doc ${destroot}${prefix}/share/doc/${name}
- }
-
- # 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} ${destroot}${prefix}/bin/[string tolower [file tail ${bin}]]-mac
- }
-
- # Fix the .pc and .prl files by removing ${destroot}.
- 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] {
+ # Fix .pc and .prl files by changing ${destroot}/lib to ${qt_dir}/lib
+ foreach fixfile [glob -nocomplain -directory ${destroot} ${qt_dir}/lib/pkgconfig/* ${qt_dir}/lib/*.prl ${qt_dir}/lib/*/*.prl ${qt_dir}/share/${dirname}/demos/shared/*.prl] {
reinplace \
- "s|-L${worksrcpath}/lib|-L${qt_dir}/lib|g" \
+ "s|${worksrcpath}/lib|${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}
+ # Install documentation.
+ foreach doc { INSTALL LGPL_EXCEPTION.txt LICENSE.GPL3 LICENSE.LGPL README } {
+ xinstall -c -m 644 ${worksrcpath}/${doc} \
+ ${destroot}${qt_dir}/share/doc/${name}
}
-
- # 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 raster description {Use raster graphics system by default} {
- configure.args-append -graphicssystem raster
-}
-
-variant no_demos description {Do not build demo programs} {
- configure.args-append -nomake demos
-}
-
-variant no_examples description {Do not build example programs} {
- configure.args-append -nomake examples
-}
-
-variant universal {
- configure.universal_args-delete --disable-dependency-tracking
- configure.args-delete -arch \"${build_arch}\"
- configure.args-append -arch \"${universal_archs}\"
- if {[info exists universal_sysroot]} {
- configure.args-append -sdk ${universal_sysroot}
+post-activate {
+ # install the appropriate select file
+ if {[variant_isset no_debug]} {
+ xinstall -c -m 644 ${filespath}/${select_name}-no-debug \
+ ${prefix}/etc/select/${select_port}/${select_name}
+ } else {
+ xinstall -c -m 644 ${filespath}/${select_name} \
+ ${prefix}/etc/select/${select_port}/${select_name}
}
+ # If this is the first qt4-* installed, select it.
+ set current_select [exec ${prefix}/bin/${select_port} -s]
+ if {${current_select} == "none"} {
+ system "${prefix}/bin/${select_port} ${select_name}"
+ } else {
+ if {${current_select} != ${select_name}} {
+ # Print out the 'select' info.
+ ui_msg "\
+Port ${current_select} is already selected.\n \
+To fully complete this installation and make ${name} the default,\n \
+please run:\n \
+\tsudo ${select_port} ${select_name}"
+ }
+ }
}
livecheck.type regex
-livecheck.url http://qt.nokia.com/downloads/mac-os-cpp
-livecheck.regex "qt-everywhere-opensource-src-(4(?:\\.\\d+)*)${extract.suffix}"
+livecheck.url http://get.qt.nokia.com/qt/source/
+livecheck.regex "qt-everywhere-opensource-src-(\[0-9a-z.-\]+)${extract.suffix}"
Modified: trunk/dports/aqua/qt4-mac/files/qt4-mac (69276 => 69277)
--- trunk/dports/aqua/qt4-mac/files/qt4-mac 2010-06-29 07:24:45 UTC (rev 69276)
+++ trunk/dports/aqua/qt4-mac/files/qt4-mac 2010-06-29 07:32:38 UTC (rev 69277)
@@ -1,42 +1,124 @@
-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/Assistant.app
+libexec/qt4-mac/bin/Assistant_adp.app
+libexec/qt4-mac/bin/Designer.app
+libexec/qt4-mac/bin/Linguist.app
+-
+libexec/qt4-mac/bin/pixeltool.app
+libexec/qt4-mac/bin/qdbusviewer.app
+libexec/qt4-mac/bin/qhelpconverter.app
+libexec/qt4-mac/bin/qtdemo.app
+libexec/qt4-mac/bin/qttracereplay.app
+libexec/qt4-mac/lib/Qt3Support.framework
+libexec/qt4-mac/lib/QtAssistant.framework
+libexec/qt4-mac/lib/QtCore.framework
+libexec/qt4-mac/lib/QtDBus.framework
+-
+libexec/qt4-mac/lib/QtDesigner.framework
+libexec/qt4-mac/lib/QtDesignerComponents.framework
+libexec/qt4-mac/lib/QtGui.framework
+libexec/qt4-mac/lib/QtHelp.framework
+-
+libexec/qt4-mac/lib/QtMultimedia.framework
+libexec/qt4-mac/lib/QtNetwork.framework
+libexec/qt4-mac/lib/QtOpenGL.framework
+libexec/qt4-mac/lib/QtScript.framework
+libexec/qt4-mac/lib/QtScriptTools.framework
+libexec/qt4-mac/lib/QtSql.framework
+libexec/qt4-mac/lib/QtSvg.framework
+libexec/qt4-mac/lib/QtTest.framework
+libexec/qt4-mac/lib/QtWebKit.framework
+libexec/qt4-mac/lib/QtXml.framework
+libexec/qt4-mac/lib/QtXmlPatterns.framework
+libexec/qt4-mac/lib/phonon.framework
+libexec/qt4-mac/bin/Assistant.app/Contents/MacOS/Assistant
+libexec/qt4-mac/bin/Assistant.app
+libexec/qt4-mac/bin/Assistant_adp.app/Contents/MacOS/Assistant_adp
+libexec/qt4-mac/bin/Assistant_adp.app
+libexec/qt4-mac/bin/Designer.app/Contents/MacOS/Designer
+libexec/qt4-mac/bin/Designer.app
+libexec/qt4-mac/bin/Linguist.app/Contents/MacOS/Linguist
+libexec/qt4-mac/bin/Linguist.app
+-
+-
+libexec/qt4-mac/bin/pixeltool.app/Contents/MacOS/pixeltool
+libexec/qt4-mac/bin/pixeltool.app
+libexec/qt4-mac/bin/qdbusviewer.app/Contents/MacOS/qdbusviewer
+libexec/qt4-mac/bin/qdbusviewer.app
+libexec/qt4-mac/bin/qhelpconverter.app/Contents/MacOS/qhelpconverter
+libexec/qt4-mac/bin/qhelpconverter.app
+libexec/qt4-mac/bin/qtdemo.app/Contents/MacOS/qtdemo
+libexec/qt4-mac/bin/qtdemo.app
+libexec/qt4-mac/bin/qttracereplay.app/Contents/MacOS/qttracereplay
+libexec/qt4-mac/bin/qttracereplay.app
+libexec/qt4-mac/bin/lconvert
libexec/qt4-mac/bin/lrelease
libexec/qt4-mac/bin/lupdate
+libexec/qt4-mac/bin/macdeployqt
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/qdoc3
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/bin/xmlpatternsvalidator
libexec/qt4-mac/lib/pkgconfig/Qt3Support.pc
+libexec/qt4-mac/lib/pkgconfig/Qt3Support_debug.pc
libexec/qt4-mac/lib/pkgconfig/QtAssistant.pc
+libexec/qt4-mac/lib/pkgconfig/QtAssistant_debug.pc
+-
+-
libexec/qt4-mac/lib/pkgconfig/QtCLucene.pc
+libexec/qt4-mac/lib/pkgconfig/QtCLucene_debug.pc
libexec/qt4-mac/lib/pkgconfig/QtCore.pc
+libexec/qt4-mac/lib/pkgconfig/QtCore_debug.pc
libexec/qt4-mac/lib/pkgconfig/QtDBus.pc
+libexec/qt4-mac/lib/pkgconfig/QtDBus_debug.pc
+-
+-
libexec/qt4-mac/lib/pkgconfig/QtDesigner.pc
+libexec/qt4-mac/lib/pkgconfig/QtDesigner_debug.pc
libexec/qt4-mac/lib/pkgconfig/QtDesignerComponents.pc
+libexec/qt4-mac/lib/pkgconfig/QtDesignerComponents_debug.pc
libexec/qt4-mac/lib/pkgconfig/QtGui.pc
+libexec/qt4-mac/lib/pkgconfig/QtGui_debug.pc
libexec/qt4-mac/lib/pkgconfig/QtHelp.pc
+libexec/qt4-mac/lib/pkgconfig/QtHelp_debug.pc
+-
+-
+libexec/qt4-mac/lib/pkgconfig/QtMultimedia.pc
+libexec/qt4-mac/lib/pkgconfig/QtMultimedia_debug.pc
libexec/qt4-mac/lib/pkgconfig/QtNetwork.pc
+libexec/qt4-mac/lib/pkgconfig/QtNetwork_debug.pc
libexec/qt4-mac/lib/pkgconfig/QtOpenGL.pc
+libexec/qt4-mac/lib/pkgconfig/QtOpenGL_debug.pc
libexec/qt4-mac/lib/pkgconfig/QtScript.pc
+libexec/qt4-mac/lib/pkgconfig/QtScript_debug.pc
+libexec/qt4-mac/lib/pkgconfig/QtScriptTools.pc
+libexec/qt4-mac/lib/pkgconfig/QtScriptTools_debug.pc
libexec/qt4-mac/lib/pkgconfig/QtSql.pc
+libexec/qt4-mac/lib/pkgconfig/QtSql_debug.pc
libexec/qt4-mac/lib/pkgconfig/QtSvg.pc
+libexec/qt4-mac/lib/pkgconfig/QtSvg_debug.pc
libexec/qt4-mac/lib/pkgconfig/QtTest.pc
+libexec/qt4-mac/lib/pkgconfig/QtTest_debug.pc
libexec/qt4-mac/lib/pkgconfig/QtUiTools.pc
+libexec/qt4-mac/lib/pkgconfig/QtUiTools_debug.pc
libexec/qt4-mac/lib/pkgconfig/QtWebKit.pc
+libexec/qt4-mac/lib/pkgconfig/QtWebKit_debug.pc
libexec/qt4-mac/lib/pkgconfig/QtXml.pc
+libexec/qt4-mac/lib/pkgconfig/QtXml_debug.pc
libexec/qt4-mac/lib/pkgconfig/QtXmlPatterns.pc
+libexec/qt4-mac/lib/pkgconfig/QtXmlPatterns_debug.pc
libexec/qt4-mac/lib/pkgconfig/phonon.pc
+libexec/qt4-mac/lib/pkgconfig/phonon_debug.pc
+libexec/qt4-mac/share/doc/qt4-mac
+libexec/qt4-mac/share/qt4-mac
+libexec/qt4-mac
Added: trunk/dports/aqua/qt4-mac/files/qt4-mac-no-debug (0 => 69277)
--- trunk/dports/aqua/qt4-mac/files/qt4-mac-no-debug (rev 0)
+++ trunk/dports/aqua/qt4-mac/files/qt4-mac-no-debug 2010-06-29 07:32:38 UTC (rev 69277)
@@ -0,0 +1,124 @@
+libexec/qt4-mac/bin/Assistant.app
+libexec/qt4-mac/bin/Assistant_adp.app
+libexec/qt4-mac/bin/Designer.app
+libexec/qt4-mac/bin/Linguist.app
+-
+libexec/qt4-mac/bin/pixeltool.app
+libexec/qt4-mac/bin/qdbusviewer.app
+libexec/qt4-mac/bin/qhelpconverter.app
+libexec/qt4-mac/bin/qtdemo.app
+libexec/qt4-mac/bin/qttracereplay.app
+libexec/qt4-mac/lib/Qt3Support.framework
+libexec/qt4-mac/lib/QtAssistant.framework
+libexec/qt4-mac/lib/QtCore.framework
+libexec/qt4-mac/lib/QtDBus.framework
+-
+libexec/qt4-mac/lib/QtDesigner.framework
+libexec/qt4-mac/lib/QtDesignerComponents.framework
+libexec/qt4-mac/lib/QtGui.framework
+libexec/qt4-mac/lib/QtHelp.framework
+-
+libexec/qt4-mac/lib/QtMultimedia.framework
+libexec/qt4-mac/lib/QtNetwork.framework
+libexec/qt4-mac/lib/QtOpenGL.framework
+libexec/qt4-mac/lib/QtScript.framework
+libexec/qt4-mac/lib/QtScriptTools.framework
+libexec/qt4-mac/lib/QtSql.framework
+libexec/qt4-mac/lib/QtSvg.framework
+libexec/qt4-mac/lib/QtTest.framework
+libexec/qt4-mac/lib/QtWebKit.framework
+libexec/qt4-mac/lib/QtXml.framework
+libexec/qt4-mac/lib/QtXmlPatterns.framework
+libexec/qt4-mac/lib/phonon.framework
+libexec/qt4-mac/bin/Assistant.app/Contents/MacOS/Assistant
+libexec/qt4-mac/bin/Assistant.app
+libexec/qt4-mac/bin/Assistant_adp.app/Contents/MacOS/Assistant_adp
+libexec/qt4-mac/bin/Assistant_adp.app
+libexec/qt4-mac/bin/Designer.app/Contents/MacOS/Designer
+libexec/qt4-mac/bin/Designer.app
+libexec/qt4-mac/bin/Linguist.app/Contents/MacOS/Linguist
+libexec/qt4-mac/bin/Linguist.app
+-
+-
+libexec/qt4-mac/bin/pixeltool.app/Contents/MacOS/pixeltool
+libexec/qt4-mac/bin/pixeltool.app
+libexec/qt4-mac/bin/qdbusviewer.app/Contents/MacOS/qdbusviewer
+libexec/qt4-mac/bin/qdbusviewer.app
+libexec/qt4-mac/bin/qhelpconverter.app/Contents/MacOS/qhelpconverter
+libexec/qt4-mac/bin/qhelpconverter.app
+libexec/qt4-mac/bin/qtdemo.app/Contents/MacOS/qtdemo
+libexec/qt4-mac/bin/qtdemo.app
+libexec/qt4-mac/bin/qttracereplay.app/Contents/MacOS/qttracereplay
+libexec/qt4-mac/bin/qttracereplay.app
+libexec/qt4-mac/bin/lconvert
+libexec/qt4-mac/bin/lrelease
+libexec/qt4-mac/bin/lupdate
+libexec/qt4-mac/bin/macdeployqt
+libexec/qt4-mac/bin/moc
+libexec/qt4-mac/bin/qcollectiongenerator
+libexec/qt4-mac/bin/qdbus
+libexec/qt4-mac/bin/qdbuscpp2xml
+libexec/qt4-mac/bin/qdbusxml2cpp
+libexec/qt4-mac/bin/qdoc3
+libexec/qt4-mac/bin/qhelpgenerator
+libexec/qt4-mac/bin/qmake
+libexec/qt4-mac/bin/qt3to4
+-
+libexec/qt4-mac/bin/rcc
+libexec/qt4-mac/bin/uic
+libexec/qt4-mac/bin/uic3
+libexec/qt4-mac/bin/xmlpatterns
+libexec/qt4-mac/bin/xmlpatternsvalidator
+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/QtMultimedia.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/QtScriptTools.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
+-
+libexec/qt4-mac/share/doc/qt4-mac
+libexec/qt4-mac/share/qt4-mac
+libexec/qt4-mac
Modified: trunk/dports/aqua/qt4-mac-devel/Portfile (69276 => 69277)
--- trunk/dports/aqua/qt4-mac-devel/Portfile 2010-06-29 07:24:45 UTC (rev 69276)
+++ trunk/dports/aqua/qt4-mac-devel/Portfile 2010-06-29 07:32:38 UTC (rev 69277)
@@ -2,36 +2,42 @@
# $Id$
PortSystem 1.0
+PortGroup select 1.0
-name qt4-mac-devel
-conflicts qt4-mac kdelibs3 kdelibs4 libevent xmlrpcxx
-epoch 1
-version 4.6.2
+set select_group qt4
+set select_branch mac-devel
+set select_port ${select_group}_select
+set select_name ${select_group}-${select_branch}
+select.group ${select_group}
+
+name ${select_name}
+#conflicts kdelibs3 kdelibs4 xmlrpcxx
+version 4.7.0-beta1
categories aqua
platforms macosx
-maintainers nomaintainer
+maintainers michaelld
homepage http://qt.nokia.com/
description Qt Tool Kit (Native Aqua Version)
-long_description Qt is a cross-platform application and UI framework for writing cross-platform GUI applications. \
- This version uses the native Aqua UI. For a X11 version, see qt4-x11.
+long_description \
+ Qt is a cross-platform application and UI framework for writing \
+ cross-platform GUI applications. This version uses the native Aqua UI. \
+ For a X11 version, see qt4-x11\[-devel\].
+
master_sites trolltech
distname qt-everywhere-opensource-src-${version}
-dist_subdir qt4-mac
+checksums md5 1a863712da64dd2c1d08380075b74f39 \
+ sha1 ae3c3b0fa6e50d333c4bcac7ecd8c50078273046 \
+ rmd160 ebcca033b22d5919097c111731a61aa3ac37316c
-checksums md5 eb651ee4b157c01696aa56777fc6e0e5 \
- sha1 977c10b88a2230e96868edc78a9e3789c0fcbf70 \
- rmd160 5f3fea120f2dba274c4150b02162bba40b65a872
+depends_build port:pkgconfig port:${select_port}
-depends_build port:pkgconfig
-
depends_lib port:zlib port:dbus port:openssl port:sqlite3 \
port:tiff port:libpng port:libmng port:jpeg
-# Build plugins as bundle files instead of dylib files.
-# Test for Precompiled-headers support requires a C++ compiler, but configure calls it, by default, with a C compiler.
-patchfiles patch-mac.conf.diff \
- patch-precomp.test.diff
+# Test for Precompiled-headers support requires a C++ compiler,
+# but configure calls it, by default, with a C compiler.
+patchfiles patch-precomp.test.diff
# The build process uses -fconstant-cfstrings.
# configure.compiler should therefore not be one of the MacPorts compilers.
@@ -59,52 +65,45 @@
configure.ld_archflags
}
-set dirname qt4-mac
+set dirname ${name}
set qt_dir ${prefix}/libexec/${dirname}
+#
+# use compiler.cpath and compiler.library_path, as per
+# http://trac.macports.org/ticket/25321 for all -I and -L entries,
+# so-as to avoid conflicts with already-installed headers and
+# libraries (giving preference to internal-to-this-port first)
+#
# CPATH is used instead of -I to avoid conflicts with other ports.
-# See http://trac.macports.org/ticket/15219 and http://trac.macports.org/ticket/18723.
+# See http://trac.macports.org/ticket/15219 and
+# http://trac.macports.org/ticket/18723.
#
# -system-sqlite ensures the use SQLite provided by MacPorts instead of Qt.
#
# -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 \
-confirm-license \
-opensource \
-prefix ${qt_dir} \
- -docdir ${prefix}/share/doc/${dirname} \
- -examplesdir ${prefix}/share/${dirname}/examples \
- -demosdir ${prefix}/share/${dirname}/demos \
+ -docdir ${qt_dir}/share/doc/${dirname} \
+ -examplesdir ${qt_dir}/share/${dirname}/examples \
+ -demosdir ${qt_dir}/share/${dirname}/demos \
-cocoa \
-system-sqlite \
-openssl-linked \
-dbus-linked \
- -L${prefix}/lib \
-arch \"${build_arch}\"
-lappend cpath ${prefix}/include
-lappend library_path ${prefix}/lib
-
-pre-configure {
- configure.env-append \
- CPATH=[join ${cpath} :] \
- LIBRARY_PATH=[join ${library_path} :]
-}
-
-pre-build {
- build.env-append \
- CPATH=[join ${cpath} :] \
- LIBRARY_PATH=[join ${library_path} :]
-}
-
# Stop configure script from searching for SQL Drivers
# not available from MacPorts.
-foreach driver {db2 ibase oci tds} {
+foreach driver {db2 ibase oci sqlite_symbian tds} {
configure.args-append -no-sql-${driver}
}
@@ -116,23 +115,11 @@
configure.args-append -no-sql-${driver}
}
-platform darwin 8 {
- configure.args-delete -cocoa
- post-configure {
- fs-traverse item ${worksrcpath} {
- if {"Makefile" == [file tail ${item}]} {
- reinplace "s|-framework QtHelp|-framework QtHelp -lQtCLucene|" ${item}
- }
- }
- }
-}
-
variant mysql description {Enable MySQL SQL Driver} {
depends_lib-append path:lib/mysql5:mysql5
-
- lappend cpath ${prefix}/include/mysql5/mysql
- lappend library_path ${prefix}/lib/mysql5/mysql
-
+ # reverse the search paths, such that the defaults are searched last
+ compiler.cpath ${prefix}/include/mysql5/mysql:${compiler.cpath}
+ compiler.library_path ${prefix}/lib/mysql5/mysql:${compiler.library_path}
configure.args-delete -no-sql-mysql
}
@@ -143,10 +130,9 @@
variant psql description {Enable PostgreSQL SQL Driver} {
depends_lib-append port:postgresql83
-
- lappend cpath ${prefix}/include/postgresql83
- lappend library_path ${prefix}/lib/postgresql83
-
+ # reverse the search paths, such that the defaults are searched last
+ compiler.cpath ${prefix}/include/postgresql83:${compiler.cpath}
+ compiler.library_path ${prefix}/lib/postgresql83:${compiler.library_path}
configure.args-delete -no-sql-psql
}
@@ -155,6 +141,59 @@
configure.args-delete -no-sql-sqlite2
}
+variant raster description {Use raster graphics system by default} {
+ configure.args-append -graphicssystem raster
+}
+
+variant no_demos description {Do not build demo programs} {
+ configure.args-append -nomake demos
+}
+
+variant no_examples description {Do not build example programs} {
+ configure.args-append -nomake examples
+}
+
+variant no_debug description {Do not include debugging libraries and pkgconfig files} {
+ configure.args-delete -debug-and-release
+ configure.args-append -release
+}
+
+variant universal {
+ configure.universal_args-delete --disable-dependency-tracking
+ configure.args-delete -arch \"${build_arch}\"
+ configure.args-append -arch \"${universal_archs}\"
+ if {[info exists universal_sysroot]} {
+ configure.args-append -sdk ${universal_sysroot}
+ }
+}
+
+# use the 10.4 SDK (the default) for 10.4 only.
+# and, build as Carbon by disabling Cocoa.
+platform darwin 8 {
+ configure.args-delete -cocoa
+ post-configure {
+ fs-traverse item ${worksrcpath} {
+ if {"Makefile" == [file tail ${item}]} {
+ reinplace "s|-framework QtHelp|-framework QtHelp -lQtCLucene|" ${item}
+ }
+ }
+ }
+}
+
+# use the 10.5 SDK for 10.5 or 10.6,
+# but only if not (doing universal and the universal sysroot is set)
+platform darwin 9 {
+ if {![variant_isset universal] || ![info exists universal_sysroot]} {
+ configure.args-append -sdk /Developer/SDKs/MacOSX10.5.sdk/
+ }
+}
+
+platform darwin 10 {
+ if {![variant_isset universal] || ![info exists universal_sysroot]} {
+ configure.args-append -sdk /Developer/SDKs/MacOSX10.5.sdk/
+ }
+}
+
build.target first
use_parallel_build yes
@@ -169,80 +208,45 @@
}
post-destroot {
- # Install documentation.
- foreach doc { INSTALL LGPL_EXCEPTION.txt LICENSE.GPL3 LICENSE.LGPL README } {
- xinstall -c -m 644 ${worksrcpath}/$doc ${destroot}${prefix}/share/doc/${name}
- }
-
- # 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} ${destroot}${prefix}/bin/[string tolower [file tail ${bin}]]-mac
- }
-
- # Fix the .pc and .prl files by removing ${destroot}.
- 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] {
+ # Fix .pc and .prl files by changing ${destroot}/lib to ${qt_dir}/lib
+ foreach fixfile [glob -nocomplain -directory ${destroot} ${qt_dir}/lib/pkgconfig/* ${qt_dir}/lib/*.prl ${qt_dir}/lib/*/*.prl ${qt_dir}/share/${dirname}/demos/shared/*.prl] {
reinplace \
- "s|-L${worksrcpath}/lib|-L${qt_dir}/lib|g" \
+ "s|${worksrcpath}/lib|${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}
+ # Install documentation.
+ foreach doc { INSTALL LGPL_EXCEPTION.txt LICENSE.GPL3 LICENSE.LGPL README } {
+ xinstall -c -m 644 ${worksrcpath}/${doc} \
+ ${destroot}${qt_dir}/share/doc/${name}
}
-
- # 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 raster description {Use raster graphics system by default} {
- configure.args-append -graphicssystem raster
-}
-
-variant no_demos description {Do not build demo programs} {
- configure.args-append -nomake demos
-}
-
-variant no_examples description {Do not build example programs} {
- configure.args-append -nomake examples
-}
-
-variant universal {
- configure.universal_args-delete --disable-dependency-tracking
- configure.args-delete -arch \"${build_arch}\"
- configure.args-append -arch \"${universal_archs}\"
- if {[info exists universal_sysroot]} {
- configure.args-append -sdk ${universal_sysroot}
+post-activate {
+ # install the appropriate select file
+ if {[variant_isset no_debug]} {
+ xinstall -c -m 644 ${filespath}/${select_name}-no-debug \
+ ${prefix}/etc/select/${select_port}/${select_name}
+ } else {
+ xinstall -c -m 644 ${filespath}/${select_name} \
+ ${prefix}/etc/select/${select_port}/${select_name}
}
+ # If this is the first qt4-* installed, select it.
+ set current_select [exec ${prefix}/bin/${select_port} -s]
+ if {${current_select} == "none"} {
+ system "${prefix}/bin/${select_port} ${select_name}"
+ } else {
+ if {${current_select} != ${select_name}} {
+ # Print out the 'select' info.
+ ui_msg "\
+Port ${current_select} is already selected.\n \
+To fully complete this installation and make ${name} the default,\n \
+please run:\n \
+\tsudo ${select_port} ${select_name}"
+ }
+ }
}
livecheck.type regex
-livecheck.url http://qt.nokia.com/developer/qt-qtcreator-prerelease
+livecheck.url http://get.qt.nokia.com/qt/source/
livecheck.regex "qt-everywhere-opensource-src-(\[0-9a-z.-\]+)${extract.suffix}"
Deleted: trunk/dports/aqua/qt4-mac-devel/files/patch-mac.conf.diff (69276 => 69277)
--- trunk/dports/aqua/qt4-mac-devel/files/patch-mac.conf.diff 2010-06-29 07:24:45 UTC (rev 69276)
+++ trunk/dports/aqua/qt4-mac-devel/files/patch-mac.conf.diff 2010-06-29 07:32:38 UTC (rev 69277)
@@ -1,25 +0,0 @@
-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
- QMAKE_LFLAGS_THREAD +=
- QMAKE_LFLAGS_INCREMENTAL+= -undefined suppress -flat_namespace
- QMAKE_LFLAGS_SONAME += -install_name$${LITERAL_WHITESPACE}
Deleted: trunk/dports/aqua/qt4-mac-devel/files/qt4-mac (69276 => 69277)
--- trunk/dports/aqua/qt4-mac-devel/files/qt4-mac 2010-06-29 07:24:45 UTC (rev 69276)
+++ trunk/dports/aqua/qt4-mac-devel/files/qt4-mac 2010-06-29 07:32:38 UTC (rev 69277)
@@ -1,42 +0,0 @@
-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
Added: trunk/dports/aqua/qt4-mac-devel/files/qt4-mac-devel (0 => 69277)
--- trunk/dports/aqua/qt4-mac-devel/files/qt4-mac-devel (rev 0)
+++ trunk/dports/aqua/qt4-mac-devel/files/qt4-mac-devel 2010-06-29 07:32:38 UTC (rev 69277)
@@ -0,0 +1,124 @@
+libexec/qt4-mac-devel/bin/Assistant.app
+-
+libexec/qt4-mac-devel/bin/Designer.app
+libexec/qt4-mac-devel/bin/Linguist.app
+libexec/qt4-mac-devel/bin/Qml.app
+libexec/qt4-mac-devel/bin/pixeltool.app
+libexec/qt4-mac-devel/bin/qdbusviewer.app
+libexec/qt4-mac-devel/bin/qhelpconverter.app
+libexec/qt4-mac-devel/bin/qtdemo.app
+libexec/qt4-mac-devel/bin/qttracereplay.app
+libexec/qt4-mac-devel/lib/Qt3Support.framework
+-
+libexec/qt4-mac-devel/lib/QtCore.framework
+libexec/qt4-mac-devel/lib/QtDBus.framework
+libexec/qt4-mac-devel/lib/QtDeclarative.framework
+libexec/qt4-mac-devel/lib/QtDesigner.framework
+libexec/qt4-mac-devel/lib/QtDesignerComponents.framework
+libexec/qt4-mac-devel/lib/QtGui.framework
+libexec/qt4-mac-devel/lib/QtHelp.framework
+libexec/qt4-mac-devel/lib/QtMediaServices.framework
+libexec/qt4-mac-devel/lib/QtMultimedia.framework
+libexec/qt4-mac-devel/lib/QtNetwork.framework
+libexec/qt4-mac-devel/lib/QtOpenGL.framework
+libexec/qt4-mac-devel/lib/QtScript.framework
+libexec/qt4-mac-devel/lib/QtScriptTools.framework
+libexec/qt4-mac-devel/lib/QtSql.framework
+libexec/qt4-mac-devel/lib/QtSvg.framework
+libexec/qt4-mac-devel/lib/QtTest.framework
+libexec/qt4-mac-devel/lib/QtWebKit.framework
+libexec/qt4-mac-devel/lib/QtXml.framework
+libexec/qt4-mac-devel/lib/QtXmlPatterns.framework
+libexec/qt4-mac-devel/lib/phonon.framework
+libexec/qt4-mac-devel/bin/Assistant.app/Contents/MacOS/Assistant
+libexec/qt4-mac-devel/bin/Assistant.app
+-
+-
+libexec/qt4-mac-devel/bin/Designer.app/Contents/MacOS/Designer
+libexec/qt4-mac-devel/bin/Designer.app
+libexec/qt4-mac-devel/bin/Linguist.app/Contents/MacOS/Linguist
+libexec/qt4-mac-devel/bin/Linguist.app
+libexec/qt4-mac-devel/bin/Qml.app/Contents/MacOS/Qml
+libexec/qt4-mac-devel/bin/Qml.app
+libexec/qt4-mac-devel/bin/pixeltool.app/Contents/MacOS/pixeltool
+libexec/qt4-mac-devel/bin/pixeltool.app
+libexec/qt4-mac-devel/bin/qdbusviewer.app/Contents/MacOS/qdbusviewer
+libexec/qt4-mac-devel/bin/qdbusviewer.app
+libexec/qt4-mac-devel/bin/qhelpconverter.app/Contents/MacOS/qhelpconverter
+libexec/qt4-mac-devel/bin/qhelpconverter.app
+libexec/qt4-mac-devel/bin/qtdemo.app/Contents/MacOS/qtdemo
+libexec/qt4-mac-devel/bin/qtdemo.app
+libexec/qt4-mac-devel/bin/qttracereplay.app/Contents/MacOS/qttracereplay
+libexec/qt4-mac-devel/bin/qttracereplay.app
+libexec/qt4-mac-devel/bin/lconvert
+libexec/qt4-mac-devel/bin/lrelease
+libexec/qt4-mac-devel/bin/lupdate
+libexec/qt4-mac-devel/bin/macdeployqt
+libexec/qt4-mac-devel/bin/moc
+libexec/qt4-mac-devel/bin/qcollectiongenerator
+libexec/qt4-mac-devel/bin/qdbus
+libexec/qt4-mac-devel/bin/qdbuscpp2xml
+libexec/qt4-mac-devel/bin/qdbusxml2cpp
+libexec/qt4-mac-devel/bin/qdoc3
+libexec/qt4-mac-devel/bin/qhelpgenerator
+libexec/qt4-mac-devel/bin/qmake
+libexec/qt4-mac-devel/bin/qt3to4
+-
+libexec/qt4-mac-devel/bin/rcc
+libexec/qt4-mac-devel/bin/uic
+libexec/qt4-mac-devel/bin/uic3
+libexec/qt4-mac-devel/bin/xmlpatterns
+libexec/qt4-mac-devel/bin/xmlpatternsvalidator
+libexec/qt4-mac-devel/lib/pkgconfig/Qt3Support.pc
+libexec/qt4-mac-devel/lib/pkgconfig/Qt3Support_debug.pc
+-
+-
+-
+-
+libexec/qt4-mac-devel/lib/pkgconfig/QtCLucene.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtCLucene_debug.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtCore.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtCore_debug.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtDBus.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtDBus_debug.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtDeclarative.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtDeclarative_debug.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtDesigner.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtDesigner_debug.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtDesignerComponents.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtDesignerComponents_debug.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtGui.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtGui_debug.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtHelp.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtHelp_debug.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtMediaServices.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtMediaServices_debug.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtMultimedia.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtMultimedia_debug.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtNetwork.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtNetwork_debug.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtOpenGL.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtOpenGL_debug.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtScript.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtScript_debug.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtScriptTools.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtScriptTools_debug.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtSql.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtSql_debug.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtSvg.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtSvg_debug.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtTest.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtTest_debug.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtUiTools.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtUiTools_debug.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtWebKit.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtWebKit_debug.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtXml.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtXml_debug.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtXmlPatterns.pc
+libexec/qt4-mac-devel/lib/pkgconfig/QtXmlPatterns_debug.pc
+libexec/qt4-mac-devel/lib/pkgconfig/phonon.pc
+libexec/qt4-mac-devel/lib/pkgconfig/phonon_debug.pc
+libexec/qt4-mac-devel/share/doc/qt4-mac-devel
+libexec/qt4-mac-devel/share/qt4-mac-devel
+libexec/qt4-mac-devel
Added: trunk/dports/aqua/qt4-mac-devel/files/qt4-mac-devel-no-debug (0 => 69277)
--- trunk/dports/aqua/qt4-mac-devel/files/qt4-mac-devel-no-debug (rev 0)
+++ trunk/dports/aqua/qt4-mac-devel/files/qt4-mac-devel-no-debug 2010-06-29 07:32:38 UTC (rev 69277)
@@ -0,0 +1,124 @@
+libexec/qt4-mac-devel/bin/Assistant.app
+-
+libexec/qt4-mac-devel/bin/Designer.app
+libexec/qt4-mac-devel/bin/Linguist.app
+libexec/qt4-mac-devel/bin/Qml.app
+libexec/qt4-mac-devel/bin/pixeltool.app
+libexec/qt4-mac-devel/bin/qdbusviewer.app
+libexec/qt4-mac-devel/bin/qhelpconverter.app
+libexec/qt4-mac-devel/bin/qtdemo.app
+libexec/qt4-mac-devel/bin/qttracereplay.app
+libexec/qt4-mac-devel/lib/Qt3Support.framework
+-
+libexec/qt4-mac-devel/lib/QtCore.framework
+libexec/qt4-mac-devel/lib/QtDBus.framework
+libexec/qt4-mac-devel/lib/QtDeclarative.framework
+libexec/qt4-mac-devel/lib/QtDesigner.framework
+libexec/qt4-mac-devel/lib/QtDesignerComponents.framework
+libexec/qt4-mac-devel/lib/QtGui.framework
+libexec/qt4-mac-devel/lib/QtHelp.framework
+libexec/qt4-mac-devel/lib/QtMediaServices.framework
+libexec/qt4-mac-devel/lib/QtMultimedia.framework
+libexec/qt4-mac-devel/lib/QtNetwork.framework
+libexec/qt4-mac-devel/lib/QtOpenGL.framework
+libexec/qt4-mac-devel/lib/QtScript.framework
+libexec/qt4-mac-devel/lib/QtScriptTools.framework
+libexec/qt4-mac-devel/lib/QtSql.framework
+libexec/qt4-mac-devel/lib/QtSvg.framework
+libexec/qt4-mac-devel/lib/QtTest.framework
+libexec/qt4-mac-devel/lib/QtWebKit.framework
+libexec/qt4-mac-devel/lib/QtXml.framework
+libexec/qt4-mac-devel/lib/QtXmlPatterns.framework
+libexec/qt4-mac-devel/lib/phonon.framework
+libexec/qt4-mac-devel/bin/Assistant.app/Contents/MacOS/Assistant
+libexec/qt4-mac-devel/bin/Assistant.app
+-
+-
+libexec/qt4-mac-devel/bin/Designer.app/Contents/MacOS/Designer
+libexec/qt4-mac-devel/bin/Designer.app
+libexec/qt4-mac-devel/bin/Linguist.app/Contents/MacOS/Linguist
+libexec/qt4-mac-devel/bin/Linguist.app
+libexec/qt4-mac-devel/bin/Qml.app/Contents/MacOS/Qml
+libexec/qt4-mac-devel/bin/Qml.app
+libexec/qt4-mac-devel/bin/pixeltool.app/Contents/MacOS/pixeltool
+libexec/qt4-mac-devel/bin/pixeltool.app
+libexec/qt4-mac-devel/bin/qdbusviewer.app/Contents/MacOS/qdbusviewer
+libexec/qt4-mac-devel/bin/qdbusviewer.app
+libexec/qt4-mac-devel/bin/qhelpconverter.app/Contents/MacOS/qhelpconverter
+libexec/qt4-mac-devel/bin/qhelpconverter.app
+libexec/qt4-mac-devel/bin/qtdemo.app/Contents/MacOS/qtdemo
+libexec/qt4-mac-devel/bin/qtdemo.app
+libexec/qt4-mac-devel/bin/qttracereplay.app/Contents/MacOS/qttracereplay
+libexec/qt4-mac-devel/bin/qttracereplay.app
+libexec/qt4-mac-devel/bin/lconvert
+libexec/qt4-mac-devel/bin/lrelease
+libexec/qt4-mac-devel/bin/lupdate
+libexec/qt4-mac-devel/bin/macdeployqt
+libexec/qt4-mac-devel/bin/moc
+libexec/qt4-mac-devel/bin/qcollectiongenerator
+libexec/qt4-mac-devel/bin/qdbus
+libexec/qt4-mac-devel/bin/qdbuscpp2xml
+libexec/qt4-mac-devel/bin/qdbusxml2cpp
+libexec/qt4-mac-devel/bin/qdoc3
+libexec/qt4-mac-devel/bin/qhelpgenerator
+libexec/qt4-mac-devel/bin/qmake
+libexec/qt4-mac-devel/bin/qt3to4
+-
+libexec/qt4-mac-devel/bin/rcc
+libexec/qt4-mac-devel/bin/uic
+libexec/qt4-mac-devel/bin/uic3
+libexec/qt4-mac-devel/bin/xmlpatterns
+libexec/qt4-mac-devel/bin/xmlpatternsvalidator
+libexec/qt4-mac-devel/lib/pkgconfig/Qt3Support.pc
+-
+-
+-
+-
+-
+libexec/qt4-mac-devel/lib/pkgconfig/QtCLucene.pc
+-
+libexec/qt4-mac-devel/lib/pkgconfig/QtCore.pc
+-
+libexec/qt4-mac-devel/lib/pkgconfig/QtDBus.pc
+-
+libexec/qt4-mac-devel/lib/pkgconfig/QtDeclarative.pc
+-
+libexec/qt4-mac-devel/lib/pkgconfig/QtDesigner.pc
+-
+libexec/qt4-mac-devel/lib/pkgconfig/QtDesignerComponents.pc
+-
+libexec/qt4-mac-devel/lib/pkgconfig/QtGui.pc
+-
+libexec/qt4-mac-devel/lib/pkgconfig/QtHelp.pc
+-
+libexec/qt4-mac-devel/lib/pkgconfig/QtMediaServices.pc
+-
+libexec/qt4-mac-devel/lib/pkgconfig/QtMultimedia.pc
+-
+libexec/qt4-mac-devel/lib/pkgconfig/QtNetwork.pc
+-
+libexec/qt4-mac-devel/lib/pkgconfig/QtOpenGL.pc
+-
+libexec/qt4-mac-devel/lib/pkgconfig/QtScript.pc
+-
+libexec/qt4-mac-devel/lib/pkgconfig/QtScriptTools.pc
+-
+libexec/qt4-mac-devel/lib/pkgconfig/QtSql.pc
+-
+libexec/qt4-mac-devel/lib/pkgconfig/QtSvg.pc
+-
+libexec/qt4-mac-devel/lib/pkgconfig/QtTest.pc
+-
+libexec/qt4-mac-devel/lib/pkgconfig/QtUiTools.pc
+-
+libexec/qt4-mac-devel/lib/pkgconfig/QtWebKit.pc
+-
+libexec/qt4-mac-devel/lib/pkgconfig/QtXml.pc
+-
+libexec/qt4-mac-devel/lib/pkgconfig/QtXmlPatterns.pc
+-
+libexec/qt4-mac-devel/lib/pkgconfig/phonon.pc
+-
+libexec/qt4-mac-devel/share/doc/qt4-mac-devel
+libexec/qt4-mac-devel/share/qt4-mac-devel
+libexec/qt4-mac-devel
Modified: trunk/dports/x11/qt4-x11/Portfile (69276 => 69277)
--- trunk/dports/x11/qt4-x11/Portfile 2010-06-29 07:24:45 UTC (rev 69276)
+++ trunk/dports/x11/qt4-x11/Portfile 2010-06-29 07:32:38 UTC (rev 69277)
@@ -2,17 +2,28 @@
# $Id$
PortSystem 1.0
+PortGroup select 1.0
-name qt4-x11
+set select_group qt4
+set select_branch x11
+set select_port ${select_group}_select
+set select_name ${select_group}-${select_branch}
+select.group ${select_group}
+select.file ${filespath}/${select_name}
+
+name ${select_name}
version 4.4.3
-revision 5
+revision 6
categories x11
maintainers nomaintainer
homepage http://qt.nokia.com/
platforms darwin
-description Qt Tool Kit
-long_description This is Qt, TrollTech's C++ toolkit for writing cross-platform GUI applications.
-master_sites ftp://ftp.trolltech.com/qt/source/ \
+description Qt Tool Kit (X11 Version)
+long_description \
+ Qt is a cross-platform application and UI framework for writing \
+ cross-platform GUI applications. This version uses the X11 UI. \
+ For a native Aqua version, see qt4-aqua\[-devel\].
+master_sites trolltech \
http://ftp.iasi.roedu.net/mirrors/ftp.trolltech.com/qt/source/ \
http://ftp.ntua.gr/pub/X11/Qt/qt/source/ \
http://wftp.tu-chemnitz.de/pub/Qt/qt/source/
@@ -23,7 +34,7 @@
sha1 a883e913e69a418e3cfcfecefe4f82c4e091c4bd \
rmd160 49de53663a86785f88236bdeca6db8ee96a37db8
-depends_build port:pkgconfig
+depends_build port:pkgconfig port:${select_port}
depends_lib \
port:zlib \
@@ -76,9 +87,9 @@
-v \
-confirm-license \
-prefix ${qt_dir} \
- -docdir ${prefix}/share/doc/${name} \
- -examplesdir ${prefix}/share/${name}/examples \
- -demosdir ${prefix}/share/${name}/demos \
+ -docdir ${qt_dir}/share/doc/${name} \
+ -examplesdir ${qt_dir}/share/${name}/examples \
+ -demosdir ${qt_dir}/share/${name}/demos \
-system-sqlite \
-openssl-linked \
-dbus-linked \
@@ -233,38 +244,40 @@
}
post-destroot {
- 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/${name}
- }
-
- # create link in ${prefix}/bin to executable files in ${qt_dir}/bin
- foreach bin [glob -type f -directory ${destroot}${qt_dir}/bin *] {
- system "ln -s ${qt_dir}/bin/[file tail ${bin}] ${destroot}${prefix}/bin"
- }
- # append -x11 to links in ${prefix}/bin to avoid conflict with qt4-mac
- foreach bin [glob ${destroot}${prefix}/bin/*] {
- file rename ${bin} ${bin}-x11
- }
- # qtconfig is not installed by qt4-mac
- file rename ${destroot}${prefix}/bin/qtconfig-x11 ${destroot}${prefix}/bin/qtconfig
-
# Fix the .pc and .prl files by removing ${destroot}
- foreach fixfile [glob -nocomplain -directory ${destroot} ${qt_dir}/lib/pkgconfig/*.pc ${qt_dir}/lib/*.prl ${prefix}/share/${name}/demos/shared/*.prl] {
+ foreach fixfile [glob -nocomplain -directory ${destroot} ${qt_dir}/lib/pkgconfig/*.pc ${qt_dir}/lib/*.prl ${qt_dir}/share/${name}/demos/shared/*.prl] {
reinplace \
- "s|-L${worksrcpath}/lib|-L${qt_dir}/lib|g" \
+ "s|${worksrcpath}/lib|${qt_dir}/lib|g" \
${fixfile}
}
- # install select file for qt4_select
- xinstall -m 755 -d ${destroot}${prefix}/etc/select/qt4
- xinstall -m 644 ${filespath}/${name} ${destroot}${prefix}/etc/select/qt4/
+ foreach doc { GPL_EXCEPTION.TXT GPL_EXCEPTION_ADDENDUM.TXT INSTALL LICENSE.GPL2 LICENSE.GPL3 OPENSOURCE-NOTICE.TXT README } {
+ xinstall -c -m 644 ${worksrcpath}/$doc \
+ ${destroot}${qt_dir}/share/doc/${name}
+ }
}
+post-activate {
+ # If this is the first qt4-* installed, select it.
+ set current_select [exec ${prefix}/bin/${select_port} -s]
+ if {${current_select} == "none"} {
+ system "${prefix}/bin/${select_port} ${select_name}"
+ } else {
+ if {${current_select} != ${select_name}} {
+ # Print out the 'select' info.
+ ui_msg "\
+Port ${current_select} is already selected.\n \
+To fully complete this installation and make ${name} the default,\n \
+please run:\n \
+\tsudo ${select_port} ${select_name}"
+ }
+ }
+}
+
variant webkit description {Use WebKit as html rendering engine in Assistant} {
configure.args-append -assistant-webkit
}
livecheck.type regex
-livecheck.url http://trolltech.com/downloads/opensource/appdev/linux-x11-cpp
+livecheck.url http://get.qt.nokia.com/qt/source
livecheck.regex "qt-x11-opensource-src-(4(?:\\.\\d+)*)${extract.suffix}"
Modified: trunk/dports/x11/qt4-x11/files/qt4-x11 (69276 => 69277)
--- trunk/dports/x11/qt4-x11/files/qt4-x11 2010-06-29 07:24:45 UTC (rev 69276)
+++ trunk/dports/x11/qt4-x11/files/qt4-x11 2010-06-29 07:32:38 UTC (rev 69277)
@@ -1,42 +1,124 @@
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
libexec/qt4-x11/bin/assistant
+-
libexec/qt4-x11/bin/assistant_adp
+-
libexec/qt4-x11/bin/designer
+-
libexec/qt4-x11/bin/linguist
+-
+-
+-
+libexec/qt4-x11/bin/pixeltool
+-
+libexec/qt4-x11/bin/qdbusviewer
+-
+libexec/qt4-x11/bin/qhelpconverter
+-
+libexec/qt4-x11/bin/qtdemo
+-
+-
+-
+-
libexec/qt4-x11/bin/lrelease
libexec/qt4-x11/bin/lupdate
+-
libexec/qt4-x11/bin/moc
-libexec/qt4-x11/bin/pixeltool
libexec/qt4-x11/bin/qcollectiongenerator
libexec/qt4-x11/bin/qdbus
libexec/qt4-x11/bin/qdbuscpp2xml
-libexec/qt4-x11/bin/qdbusviewer
libexec/qt4-x11/bin/qdbusxml2cpp
-libexec/qt4-x11/bin/qhelpconverter
+libexec/qt4-x11/bin/qdoc3
libexec/qt4-x11/bin/qhelpgenerator
libexec/qt4-x11/bin/qmake
libexec/qt4-x11/bin/qt3to4
-libexec/qt4-x11/bin/qtdemo
+libexec/qt4-x11/bin/qtconfig
libexec/qt4-x11/bin/rcc
libexec/qt4-x11/bin/uic
libexec/qt4-x11/bin/uic3
libexec/qt4-x11/bin/xmlpatterns
+-
libexec/qt4-x11/lib/pkgconfig/Qt3Support.pc
-libexec/qt4-x11/lib/pkgconfig/QtAssistant.pc
+-
+-
+-
+libexec/qt4-x11/lib/pkgconfig/QtAssistantClient.pc
+-
libexec/qt4-x11/lib/pkgconfig/QtCLucene.pc
+-
libexec/qt4-x11/lib/pkgconfig/QtCore.pc
+-
libexec/qt4-x11/lib/pkgconfig/QtDBus.pc
+-
+-
+-
libexec/qt4-x11/lib/pkgconfig/QtDesigner.pc
+-
libexec/qt4-x11/lib/pkgconfig/QtDesignerComponents.pc
+-
libexec/qt4-x11/lib/pkgconfig/QtGui.pc
+-
libexec/qt4-x11/lib/pkgconfig/QtHelp.pc
+-
+-
+-
+-
+-
libexec/qt4-x11/lib/pkgconfig/QtNetwork.pc
+-
libexec/qt4-x11/lib/pkgconfig/QtOpenGL.pc
+-
libexec/qt4-x11/lib/pkgconfig/QtScript.pc
+-
+-
+-
libexec/qt4-x11/lib/pkgconfig/QtSql.pc
+-
libexec/qt4-x11/lib/pkgconfig/QtSvg.pc
+-
libexec/qt4-x11/lib/pkgconfig/QtTest.pc
+-
libexec/qt4-x11/lib/pkgconfig/QtUiTools.pc
+-
libexec/qt4-x11/lib/pkgconfig/QtWebKit.pc
+-
libexec/qt4-x11/lib/pkgconfig/QtXml.pc
+-
libexec/qt4-x11/lib/pkgconfig/QtXmlPatterns.pc
+-
libexec/qt4-x11/lib/pkgconfig/phonon.pc
+-
+libexec/qt4-x11/share/doc/qt4-x11
+libexec/qt4-x11/share/qt4-x11
+libexec/qt4-x11