[81012] trunk/dports/x11/qt3

[takeshi at macports.org]

Revision: 81012
          http://trac.macports.org/changeset/81012
Author:   takeshi at macports.org
Date:     2011-07-22 19:30:05 -0700 (Fri, 22 Jul 2011)
Log Message:
-----------
qt3: use configure.cc etc. fixed for Lion

Modified Paths:
--------------
    trunk/dports/x11/qt3/Portfile

Removed Paths:
-------------
    trunk/dports/x11/qt3/files/x86_64/

Modified: trunk/dports/x11/qt3/Portfile
===================================================================
--- trunk/dports/x11/qt3/Portfile	2011-07-23 02:27:30 UTC (rev 81011)
+++ trunk/dports/x11/qt3/Portfile	2011-07-23 02:30:05 UTC (rev 81012)
@@ -6,7 +6,7 @@
 name            qt3
 conflicts       qt3-mac qt4-mac qt4-mac-devel
 version         3.3.8
-revision        10
+revision        11
 categories      x11
 maintainers     nomaintainer
 description     Qt Tool Kit
@@ -109,6 +109,13 @@
         reinplace "s|__MAKE__|${build.cmd}|g" ${worksrcpath}/${file}
         file attributes ${worksrcpath}/${file} -permissions 0755
     }
+    if {${os.major}>=11 && ${configure.build_arch} == "x86_64"} {
+        system "perl -pi -e \"s,\\(int\\)owner\\, \\(int\\),\\(long\\)owner\\, \\(long\\),g\" ${worksrcpath}/src/tools/qmutex_unix.cpp"
+    }
+    reinplace "s|pipe|pipe ${configure.cflags}|" ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
+    reinplace "s|gcc-4.0|${configure.cc}|g" ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
+    reinplace "s|g++-4.0|${configure.cxx}|g" ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
+    reinplace "s|\\.dylib$|.dylib ${configure.cc_archflags}|g" ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
 }
 
 configure.args  -buildkey qt3-jaguar \
@@ -192,19 +199,6 @@
                             -plugin-sql-psql
 }
 
-platform darwin 10 {
-    pre-patch {
-        if {${configure.build_arch} == "x86_64"} {
-            patchfiles-append   x86_64/patch-mkspecs_darwin-g++_qmake.conf.diff
-        }
-    }
-    post-patch {
-        if {${configure.build_arch} == "x86_64"} {
-            system "perl -pi -e \"s,\\(int\\)owner\\, \\(int\\),\\(long\\)owner\\, \\(long\\),g\" ${worksrcpath}/src/tools/qmutex_unix.cpp"
-        }
-    }
-}
-
 livecheck.type  regex
 livecheck.url   http://ftp.silug.org/mirrors/ftp.trolltech.com/qt/source/
 livecheck.regex {qt-x11-free-(\d+(?:\.\d+)*)}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110722/9ebe487e/attachment.html>