[55965] trunk/dports/x11/qt3

[takanori at macports.org]

Revision: 55965
          http://trac.macports.org/changeset/55965
Author:   takanori at macports.org
Date:     2009-08-22 07:14:03 -0700 (Sat, 22 Aug 2009)
Log Message:
-----------
qt3: Add support for building on 10.6. (experimental)

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

Added Paths:
-----------
    trunk/dports/x11/qt3/files/x86_64/
    trunk/dports/x11/qt3/files/x86_64/patch-mkspecs_darwin-g++_qmake.conf.diff

Modified: trunk/dports/x11/qt3/Portfile
===================================================================
--- trunk/dports/x11/qt3/Portfile	2009-08-22 14:03:38 UTC (rev 55964)
+++ trunk/dports/x11/qt3/Portfile	2009-08-22 14:14:03 UTC (rev 55965)
@@ -42,9 +42,6 @@
     foreach p ${patchfiles} {
         system "cd ${worksrcpath} && sed -e 's|@PREFIX@|${prefix}|g' < ${portpath}/${filesdir}/${p} | patch -p1"
     }
-    #if {[variant_isset x86_64]} {
-    #    system "perl -pi -e \"s,\\(int\\)owner\\, \\(int\\),\\(long\\)owner\\, \\(long\\),g\" ${worksrcpath}/src/tools/qmutex_unix.cpp"
-    #}
     #system "perl -pi -e 's|cp \-P|/bin/cp \-RL|' ${worksrcpath}/qmake/Makefile.unix"
 
     foreach p { patches/qt-3.3.4-print-CJK.patch \
@@ -189,6 +186,19 @@
                             -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"
+        }
+    }
+}
+
 platform darwin 9 {}
 
 platform darwin 8 {}

Added: trunk/dports/x11/qt3/files/x86_64/patch-mkspecs_darwin-g++_qmake.conf.diff
===================================================================
--- trunk/dports/x11/qt3/files/x86_64/patch-mkspecs_darwin-g++_qmake.conf.diff	                        (rev 0)
+++ trunk/dports/x11/qt3/files/x86_64/patch-mkspecs_darwin-g++_qmake.conf.diff	2009-08-22 14:14:03 UTC (rev 55965)
@@ -0,0 +1,39 @@
+--- qt-x11-free-3.3.8/mkspecs/darwin-g++/qmake.conf~	2009-08-22 15:17:02.000000000 +0900
++++ qt-x11-free-3.3.8/mkspecs/darwin-g++/qmake.conf	2009-08-22 15:17:40.000000000 +0900
+@@ -12,12 +12,12 @@
+ CONFIG			+= qt warn_on release link_prl lib_version_first
+ DEFINES                 += __DARWIN_X11__
+ 
+-QMAKE_CC		= gcc-4.0
++QMAKE_CC		= gcc-4.2
+ QMAKE_LEX		= flex
+ QMAKE_LEXFLAGS		= 
+ QMAKE_YACC		= yacc
+ QMAKE_YACCFLAGS		= -d
+-QMAKE_CFLAGS		= -pipe
++QMAKE_CFLAGS		= -pipe -arch x86_64
+ QMAKE_CFLAGS_DEPS	= -M
+ QMAKE_CFLAGS_WARN_ON	= -Wall -W
+ QMAKE_CFLAGS_WARN_OFF	= -w
+@@ -29,7 +29,7 @@
+ QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+ QMAKE_CFLAGS_THREAD	=
+ 
+-QMAKE_CXX		= g++-4.0
++QMAKE_CXX		= g++-4.2
+ QMAKE_CXXFLAGS		= $$QMAKE_CFLAGS
+ QMAKE_CXXFLAGS_DEPS	= $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON	= $$QMAKE_CFLAGS_WARN_ON
+@@ -49,9 +49,9 @@
+ QMAKE_INCDIR_OPENGL	= /opt/local/include
+ QMAKE_LIBDIR_OPENGL	= /opt/local/lib
+ 
+-QMAKE_LINK		= g++-4.0
+-QMAKE_LINK_SHLIB	= g++-4.0
+-QMAKE_LFLAGS		= -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
++QMAKE_LINK		= g++-4.2
++QMAKE_LINK_SHLIB	= g++-4.2
++QMAKE_LFLAGS		= -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -arch x86_64
+ QMAKE_LFLAGS_RELEASE	=
+ QMAKE_LFLAGS_DEBUG	=
+ QMAKE_LFLAGS_APP        = -prebind
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090822/4a156b60/attachment.html>