[86133] trunk/dports/devel/qt-assistant

[michaelld at macports.org]

Revision: 86133
          http://trac.macports.org/changeset/86133
Author:   michaelld at macports.org
Date:     2011-10-19 11:26:20 -0700 (Wed, 19 Oct 2011)
Log Message:
-----------
qt-assistant: build for correct arch(es); fixes ticket #30265.

Modified Paths:
--------------
    trunk/dports/devel/qt-assistant/Portfile
    trunk/dports/devel/qt-assistant/files/patch-compat.pro.diff
    trunk/dports/devel/qt-assistant/files/patch-lib_lib.pro.diff

Modified: trunk/dports/devel/qt-assistant/Portfile
===================================================================
--- trunk/dports/devel/qt-assistant/Portfile	2011-10-19 18:20:55 UTC (rev 86132)
+++ trunk/dports/devel/qt-assistant/Portfile	2011-10-19 18:26:20 UTC (rev 86133)
@@ -6,6 +6,7 @@
 
 name                qt-assistant
 version             4.6.3
+revision            1
 categories          devel aqua
 platforms           macosx
 maintainers         michaelld openmaintainer
@@ -29,6 +30,11 @@
                     patch-lib_lib.pro.diff
 
 post-patch {
+    # set arch type(s)
+    reinplace "s|@ARCHES@|${qt_arch_types}|g" \
+        ${worksrcpath}/lib/lib.pro \
+        ${worksrcpath}/compat.pro
+
     # move files around
     system "cd ${worksrcpath} && mkdir compat && \
                 mv `/bin/ls -1 | grep -v compat | grep -v lib` \

Modified: trunk/dports/devel/qt-assistant/files/patch-compat.pro.diff
===================================================================
--- trunk/dports/devel/qt-assistant/files/patch-compat.pro.diff	2011-10-19 18:20:55 UTC (rev 86132)
+++ trunk/dports/devel/qt-assistant/files/patch-compat.pro.diff	2011-10-19 18:26:20 UTC (rev 86133)
@@ -1,7 +1,12 @@
---- compat.pro.orig	2010-11-11 10:55:36.000000000 -0500
-+++ compat.pro	2010-11-11 10:57:00.000000000 -0500
-@@ -6,10 +6,12 @@
+--- compat.pro.orig	2011-10-19 13:37:56.000000000 -0400
++++ compat.pro	2011-10-19 13:40:25.000000000 -0400
+@@ -2,14 +2,16 @@
+ LANGUAGE = C++
+ TARGET = assistant_adp
  
+-CONFIG += qt warn_on
++CONFIG += qt warn_on @ARCHES@
+ 
  unix:contains(QT_CONFIG, dbus):QT += dbus
  
 -build_all:!build_pass {

Modified: trunk/dports/devel/qt-assistant/files/patch-lib_lib.pro.diff
===================================================================
--- trunk/dports/devel/qt-assistant/files/patch-lib_lib.pro.diff	2011-10-19 18:20:55 UTC (rev 86132)
+++ trunk/dports/devel/qt-assistant/files/patch-lib_lib.pro.diff	2011-10-19 18:26:20 UTC (rev 86133)
@@ -13,7 +13,7 @@
  
  CONFIG                += qt warn_on
 -mac|win32:CONFIG                += debug_and_release
-+CONFIG                += @BUILD_TYPE@ create_prl
++CONFIG                += @ARCHES@ @BUILD_TYPE@ create_prl
  mac:unix:CONFIG       += explicitlib
  CONFIG                -= dll
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111019/1b2d3399/attachment.html>