[62569] trunk/dports/aqua/qt4-mac-devel

sharky at macports.org sharky at macports.org
Mon Jan 11 03:37:56 PST 2010


Revision: 62569
          http://trac.macports.org/changeset/62569
Author:   sharky at macports.org
Date:     2010-01-11 03:37:55 -0800 (Mon, 11 Jan 2010)
Log Message:
-----------
qt4-mac-devel: resync with current qt4-mac

Modified Paths:
--------------
    trunk/dports/aqua/qt4-mac-devel/Portfile
    trunk/dports/aqua/qt4-mac-devel/files/patch-mac.conf.diff

Added Paths:
-----------
    trunk/dports/aqua/qt4-mac-devel/files/patch-network.pro.diff

Modified: trunk/dports/aqua/qt4-mac-devel/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/Portfile	2010-01-11 11:26:03 UTC (rev 62568)
+++ trunk/dports/aqua/qt4-mac-devel/Portfile	2010-01-11 11:37:55 UTC (rev 62569)
@@ -7,7 +7,7 @@
 conflicts           qt4-mac kdelibs3 libevent
 epoch               1
 version             4.6.0
-revision            1
+revision            2
 categories          aqua
 platforms           macosx
 maintainers         nomaintainer
@@ -33,27 +33,35 @@
 # Ensure that securesocketclient demo is built even with configure option -openssl-linked.
 patchfiles          patch-mac.conf.diff \
                     patch-configure.diff \
-                    patch-precomp.test.diff
+                    patch-precomp.test.diff \
+                    patch-network.pro.diff
 
 # The build process uses -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 see them.
-configure.cppflags
-configure.ldflags
 
 ################################################################################
 # We do not want flags of any kind -- QT is smart enough to set up its own.    #
 ################################################################################
 
+configure.cflags
+configure.cppflags
+configure.cxxflags
+configure.ldflags
+
 configure.universal_cflags
 configure.universal_cppflags
 configure.universal_cxxflags
 configure.universal_ldflags
 
+configure.cc_archflags
+configure.cxx_archflags
+if {[info exists configure.ld_archflags]} {
+    configure.ld_archflags
+}
+
 set dirname qt4-mac
 set qt_dir ${prefix}/libexec/${dirname}
 

Modified: trunk/dports/aqua/qt4-mac-devel/files/patch-mac.conf.diff
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/files/patch-mac.conf.diff	2010-01-11 11:26:03 UTC (rev 62568)
+++ trunk/dports/aqua/qt4-mac-devel/files/patch-mac.conf.diff	2010-01-11 11:37:55 UTC (rev 62569)
@@ -19,7 +19,7 @@
  QMAKE_LFLAGS_APP	+=
  QMAKE_LFLAGS_SHLIB	+= -single_module -dynamiclib
 -QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB
-+QMAKE_LFLAGS_PLUGIN	+= -bundle -flat_namespace
++QMAKE_LFLAGS_PLUGIN	+= -bundle
  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/patch-network.pro.diff
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/files/patch-network.pro.diff	                        (rev 0)
+++ trunk/dports/aqua/qt4-mac-devel/files/patch-network.pro.diff	2010-01-11 11:37:55 UTC (rev 62569)
@@ -0,0 +1,11 @@
+--- examples/network/network.pro.orig	2009-02-25 16:09:16.000000000 -0500
++++ examples/network/network.pro	2009-03-11 14:06:26.000000000 -0400
+@@ -13,7 +13,7 @@
+                 threadedfortuneserver \
+  		torrent
+ 
+-contains(QT_CONFIG, openssl):SUBDIRS += securesocketclient
++contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked):SUBDIRS += securesocketclient
+ 
+ # install
+ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS network.pro README
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100111/d9ec2bb2/attachment.html>


More information about the macports-changes mailing list