Changeset 81012

Timestamp:

07/22/11 19:30:05 (4 years ago)

Author:

takeshi@…

Message:

qt3: use configure.cc etc. fixed for Lion

Location:

trunk/dports/x11/qt3

Files:

• Portfile (modified) (3 diffs)
• files/x86_64 (deleted)

trunk/dports/x11/qt3/Portfile

@@ -7 +7 @@
 conflicts       qt3-mac qt4-mac qt4-mac-devel
 version         3.3.8
-revision        10
+revision        11
 categories      x11
 maintainers     nomaintainer
@@ -110 +110 @@
         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
 }
 
@@ -193 +200 @@
 }
 
-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/