Fri Jan 29 18:19:10 2010 UTC ()
Changes 4.6.1:
* Optimized empty QUrl creation
* Improve performance of getting the canonical filename on Linux
  and Symbian by using realpath() system call.
* Avoid stat() when opening a file.
* Do not look at the Qt patch-level version embedded in plugins'
  buildkeys when trying to determine if the plugin is compatible
* Bug-fixes
* load() and loadFromData() can now support compressed GL textures
  in the DDS, ETC1, PVRTC2, and PVRTC4 formats if the OpenGL graphics
  system is active and the appropriate extensions are present in the
  GL implementation.
* Fixed a small leak when using the new QPixmapCache::Key based API.


(adam)
diff -r1.5 -r1.6 pkgsrc/x11/qt4/Makefile
diff -r1.18 -r1.19 pkgsrc/x11/qt4/Makefile.common
diff -r1.38 -r1.39 pkgsrc/x11/qt4-libs/Makefile
diff -r1.17 -r1.18 pkgsrc/x11/qt4-libs/Makefile.common
diff -r1.11 -r1.12 pkgsrc/x11/qt4-libs/PLIST
diff -r1.15 -r1.16 pkgsrc/x11/qt4-libs/buildlink3.mk
diff -r1.36 -r1.37 pkgsrc/x11/qt4-libs/distinfo
diff -r1.10 -r1.11 pkgsrc/x11/qt4-libs/patches/patch-aa
diff -r1.9 -r1.10 pkgsrc/x11/qt4-libs/patches/patch-ab
diff -r1.9 -r1.10 pkgsrc/x11/qt4-libs/patches/patch-ad
diff -r1.9 -r1.10 pkgsrc/x11/qt4-libs/patches/patch-ag
diff -r1.2 -r1.3 pkgsrc/x11/qt4-libs/patches/patch-ac
diff -r1.7 -r1.8 pkgsrc/x11/qt4-libs/patches/patch-ae
diff -r1.7 -r1.8 pkgsrc/x11/qt4-libs/patches/patch-aj
diff -r1.6 -r1.7 pkgsrc/x11/qt4-libs/patches/patch-af
diff -r1.6 -r1.7 pkgsrc/x11/qt4-libs/patches/patch-al
diff -r1.6 -r1.7 pkgsrc/x11/qt4-libs/patches/patch-an
diff -r1.6 -r1.7 pkgsrc/x11/qt4-libs/patches/patch-ao
diff -r1.5 -r1.6 pkgsrc/x11/qt4-libs/patches/patch-ak
diff -r1.5 -r1.6 pkgsrc/x11/qt4-libs/patches/patch-aq
diff -r1.4 -r1.5 pkgsrc/x11/qt4-libs/patches/patch-ar
diff -r0 -r1.4 pkgsrc/x11/qt4-libs/patches/patch-au
diff -r0 -r1.1 pkgsrc/x11/qt4-libs/patches/patch-aw
diff -r1.1 -r1.2 pkgsrc/x11/qt4-libs/patches/patch-ax
diff -r1.1 -r0 pkgsrc/x11/qt4-libs/patches/patch-ca
diff -r1.1 -r0 pkgsrc/x11/qt4-libs/patches/patch-cb
diff -r1.7 -r1.8 pkgsrc/x11/qt4-mysql/Makefile
diff -r1.12 -r1.13 pkgsrc/x11/qt4-pgsql/Makefile
diff -r1.10 -r1.11 pkgsrc/x11/qt4-qdbus/Makefile
diff -r1.6 -r1.7 pkgsrc/x11/qt4-qdbus/PLIST
diff -r1.8 -r1.9 pkgsrc/x11/qt4-sqlite3/Makefile
diff -r1.7 -r1.8 pkgsrc/x11/qt4-tiff/Makefile
diff -r1.28 -r1.29 pkgsrc/x11/qt4-tools/Makefile
diff -r1.19 -r1.20 pkgsrc/x11/qt4-tools/PLIST

cvs diff -r1.5 -r1.6 pkgsrc/x11/qt4/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4/Makefile 2010/01/18 09:59:43 1.5
+++ pkgsrc/x11/qt4/Makefile 2010/01/29 18:19:09 1.6
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.5 2010/01/18 09:59:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.6 2010/01/29 18:19:09 adam Exp $
2 2
3DISTNAME= qt4-${QTVERSION} 3DISTNAME= qt4-${QTVERSION}
4PKGREVISION= 1 
5CATEGORIES= x11 4CATEGORIES= x11
6MASTER_SITES= # none 5MASTER_SITES= # none
7 6
8COMMENT= "meta-package" for the QT GUI C++ toolkit 7COMMENT= "meta-package" for the QT GUI C++ toolkit
9 8
10META_PACKAGE= yes 9META_PACKAGE= yes
11 10
12.include "Makefile.common" 11.include "Makefile.common"
13 12
14DEPENDS+= qt4-libs-${QTVERSION}{,nb[0-9]*}:../../x11/qt4-libs 13DEPENDS+= qt4-libs-${QTVERSION}{,nb[0-9]*}:../../x11/qt4-libs
15DEPENDS+= qt4-tools-${QTVERSION}{,nb[0-9]*}:../../x11/qt4-tools 14DEPENDS+= qt4-tools-${QTVERSION}{,nb[0-9]*}:../../x11/qt4-tools
16DEPENDS+= qt4-docs-${QTVERSION}{,nb[0-9]*}:../../x11/qt4-docs 15DEPENDS+= qt4-docs-${QTVERSION}{,nb[0-9]*}:../../x11/qt4-docs
17 16

cvs diff -r1.18 -r1.19 pkgsrc/x11/qt4/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt4/Makefile.common 2009/10/11 09:14:52 1.18
+++ pkgsrc/x11/qt4/Makefile.common 2010/01/29 18:19:09 1.19
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1# $NetBSD: Makefile.common,v 1.18 2009/10/11 09:14:52 adam Exp $ 1# $NetBSD: Makefile.common,v 1.19 2010/01/29 18:19:09 adam Exp $
2# used by x11/qt4-libs/Makefile.common 2# used by x11/qt4-libs/Makefile.common
3# used by x11/qt4-tools/Makefile 3# used by x11/qt4-tools/Makefile
4 4
5QTVERSION= 4.5.3 5QTVERSION= 4.6.1
6 6
7MAINTAINER?= adam@NetBSD.org 7MAINTAINER?= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.trolltech.com/products/qt/ 8HOMEPAGE= http://qt.nokia.com/

cvs diff -r1.38 -r1.39 pkgsrc/x11/qt4-libs/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/Makefile 2010/01/18 09:59:43 1.38
+++ pkgsrc/x11/qt4-libs/Makefile 2010/01/29 18:19:09 1.39
@@ -1,72 +1,90 @@ @@ -1,72 +1,90 @@
1# $NetBSD: Makefile,v 1.38 2010/01/18 09:59:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.39 2010/01/29 18:19:09 adam Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../x11/qt4-libs/Makefile.common" 5.include "../../x11/qt4-libs/Makefile.common"
6 6
7PKGNAME= qt4-libs-${QTVERSION} 7PKGNAME= qt4-libs-${QTVERSION}
8PKGREVISION= 3 
9COMMENT= C++ X GUI toolkit 8COMMENT= C++ X GUI toolkit
10 9
 10# XXX this is to test what really gets installed when 'do-install' is disabled
 11INSTALL_DIRS+= src
 12
11BUILD_TARGET= sub-src 13BUILD_TARGET= sub-src
12INSTALL_TARGET= install_flat_headers install_targ_headers install_class_headers 14INSTALL_TARGET= install_flat_headers install_targ_headers install_class_headers
13 15
14PTHREAD_OPTS+= require 16PTHREAD_OPTS+= require
15UNLIMIT_RESOURCES= datasize 17UNLIMIT_RESOURCES= datasize
16BUILDLINK_PASSTHRU_DIRS+= ${QTPREFIX} 18BUILDLINK_PASSTHRU_DIRS+=${QTPREFIX}
17 19
18PLIST_SRC= ${WRKDIR}/PLIST ${PKGDIR}/PLIST 20PLIST_SRC= ${WRKDIR}/PLIST ${PKGDIR}/PLIST
19 21
20# built as plugins 22# built as plugins
21CONFIGURE_ARGS+= -no-sql-sqlite 23CONFIGURE_ARGS+= -no-sql-sqlite
22CONFIGURE_ARGS+= -no-libtiff 24CONFIGURE_ARGS+= -no-libtiff
23 25
24INSTALLATION_DIRS= lib/pkgconfig 26INSTALLATION_DIRS= lib/pkgconfig
25INSTALLATION_DIRS+= ${QTPREFIX}/bin 27INSTALLATION_DIRS+= ${QTPREFIX}/bin
26INSTALLATION_DIRS+= ${QTPREFIX}/include 28INSTALLATION_DIRS+= ${QTPREFIX}/include
27INSTALLATION_DIRS+= ${QTPREFIX}/lib 29INSTALLATION_DIRS+= ${QTPREFIX}/lib
28INSTALLATION_DIRS+= ${QTPREFIX}/plugins/accessible 30INSTALLATION_DIRS+= ${QTPREFIX}/plugins/accessible
 31INSTALLATION_DIRS+= ${QTPREFIX}/plugins/codecs
 32INSTALLATION_DIRS+= ${QTPREFIX}/plugins/graphicssystems
 33INSTALLATION_DIRS+= ${QTPREFIX}/plugins/iconengines
29INSTALLATION_DIRS+= ${QTPREFIX}/plugins/imageformats 34INSTALLATION_DIRS+= ${QTPREFIX}/plugins/imageformats
30INSTALLATION_DIRS+= ${QTPREFIX}/plugins/inputmethods 35INSTALLATION_DIRS+= ${QTPREFIX}/plugins/inputmethods
31 36
32INSTALL_ENV+= INSTALL_ROOT=${DESTDIR:Q} 37INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
33 38
34do-install: 39do-install:
35.for prog in moc rcc uic 40.for prog in moc rcc uic
36 ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/ 41 ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/
37.endfor 42.endfor
38 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/uic3 \ 43 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/uic3 \
39 ${DESTDIR}${QTPREFIX}/bin 44 ${DESTDIR}${QTPREFIX}/bin
40.for incl in corelib gui network opengl qt3support script scripttools sql svg xml script testlib 3rdparty/webkit/WebCore 45.for incl in corelib gui multimedia network opengl qt3support script scripttools sql svg xml script testlib 3rdparty/webkit/WebCore
41 cd ${WRKSRC}/src/${incl} && env ${MAKE_ENV} ${INSTALL_ENV} \ 46 cd ${WRKSRC}/src/${incl} && env ${MAKE_ENV} ${INSTALL_ENV} \
42 ${MAKE_PROGRAM} ${INSTALL_TARGET} 47 ${MAKE_PROGRAM} ${INSTALL_TARGET}
43.endfor 48.endfor
44 cd ${DESTDIR}${PREFIX} && find qt4/include -type f -print > ${WRKDIR}/PLIST 49 cd ${DESTDIR}${PREFIX} && find qt4/include -type f -print > ${WRKDIR}/PLIST
45.for lib in Qt3Support QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml QtScript QtScriptTools QtTest QtWebKit 50.for lib in Qt3Support QtCore QtGui QtMultimedia QtNetwork QtOpenGL QtSql QtSvg QtXml QtScript QtScriptTools QtTest QtWebKit
46 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \ 51 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \
47 ${DESTDIR}${QTPREFIX}/lib/ 52 ${DESTDIR}${QTPREFIX}/lib/
48 sed -e "s:${WRKSRC}:${QTPREFIX}:g" \ 53 sed -e "s:${WRKSRC}:${QTPREFIX}:g" \
49 -e "s:${QTPREFIX}/lib/lib\([A-Za-z3]*\)\.la:-l\1:g" \ 54 -e "s:${QTPREFIX}/lib/lib\([A-Za-z3]*\)\.la:-l\1:g" \
50 ${WRKSRC}/lib/pkgconfig/${lib}.pc > ${WRKDIR}/${lib}.pc 55 ${WRKSRC}/lib/pkgconfig/${lib}.pc > ${WRKDIR}/${lib}.pc
51 ${INSTALL_DATA} ${WRKDIR}/${lib}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/ 56 ${INSTALL_DATA} ${WRKDIR}/${lib}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/
52.endfor 57.endfor
53 ${INSTALL_DATA} ${WRKSRC}/tools/porting/src/q3porting.xml ${DESTDIR}${QTPREFIX} 58 ${INSTALL_DATA} ${WRKSRC}/tools/porting/src/q3porting.xml ${DESTDIR}${QTPREFIX}
54.for plug in qtaccessiblecompatwidgets qtaccessiblewidgets 59.for plug in qtaccessiblecompatwidgets qtaccessiblewidgets
55 ${LIBTOOL} --mode=install ${INSTALL_LIB} \ 60 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
56 ${WRKSRC}/plugins/accessible/lib${plug}.la \ 61 ${WRKSRC}/plugins/accessible/lib${plug}.la \
57 ${DESTDIR}${QTPREFIX}/plugins/accessible/ 62 ${DESTDIR}${QTPREFIX}/plugins/accessible/
58.endfor 63.endfor
59.for plug in qgif qjpeg qmng qsvg 64.for codec in qcncodecs qjpcodecs qkrcodecs qtwcodecs
 65 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
 66 ${WRKSRC}/plugins/codecs/lib${codec}.la \
 67 ${DESTDIR}${QTPREFIX}/plugins/codecs/
 68.endfor
 69.for gfxs in qglgraphicssystem qtracegraphicssystem
 70 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
 71 ${WRKSRC}/plugins/graphicssystems/lib${gfxs}.la \
 72 ${DESTDIR}${QTPREFIX}/plugins/graphicssystems/
 73.endfor
 74 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
 75 ${WRKSRC}/plugins/iconengines/libqsvgicon.la \
 76 ${DESTDIR}/${QTPREFIX}/plugins/iconengines/
 77.for plug in qgif qico qjpeg qmng qsvg
60 ${LIBTOOL} --mode=install ${INSTALL_LIB} \ 78 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
61 ${WRKSRC}/plugins/imageformats/lib${plug}.la \ 79 ${WRKSRC}/plugins/imageformats/lib${plug}.la \
62 ${DESTDIR}${QTPREFIX}/plugins/imageformats/ 80 ${DESTDIR}${QTPREFIX}/plugins/imageformats/
63.endfor 81.endfor
64 ${LIBTOOL} --mode=install ${INSTALL_LIB} \ 82 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
65 ${WRKSRC}/plugins/inputmethods/libqimsw-multi.la \ 83 ${WRKSRC}/plugins/inputmethods/libqimsw-multi.la \
66 ${DESTDIR}/${QTPREFIX}/plugins/inputmethods/ 84 ${DESTDIR}/${QTPREFIX}/plugins/inputmethods/
67 85
68.if ${OPSYS} == "Darwin" && empty(MACHINE_PLATFORM:MDarwin-[567].*) 86.if ${OPSYS} == "Darwin" && empty(MACHINE_PLATFORM:MDarwin-[567].*)
69SUBST_CLASSES+= socklen 87SUBST_CLASSES+= socklen
70SUBST_MESSAGE.socklen= Correcting socklen_t. 88SUBST_MESSAGE.socklen= Correcting socklen_t.
71SUBST_STAGE.socklen= pre-configure 89SUBST_STAGE.socklen= pre-configure
72SUBST_FILES.socklen= mkspecs/darwin-g++/qplatformdefs.h 90SUBST_FILES.socklen= mkspecs/darwin-g++/qplatformdefs.h

cvs diff -r1.17 -r1.18 pkgsrc/x11/qt4-libs/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/Makefile.common 2009/10/23 15:47:09 1.17
+++ pkgsrc/x11/qt4-libs/Makefile.common 2010/01/29 18:19:09 1.18
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile.common,v 1.17 2009/10/23 15:47:09 tnn Exp $ 1# $NetBSD: Makefile.common,v 1.18 2010/01/29 18:19:09 adam Exp $
2# used by x11/qt4-libs/Makefile 2# used by x11/qt4-libs/Makefile
3# used by x11/qt4-docs/Makefile 3# used by x11/qt4-docs/Makefile
4 4
5DISTNAME= qt-x11-opensource-src-${QTVERSION} 5DISTNAME= qt-everywhere-opensource-src-${QTVERSION}
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= http://get.qtsoftware.com/qt/source/ \ 7MASTER_SITES= http://get.qtsoftware.com/qt/source/ \
8 ftp://ftp.qtsoftware.com/qt/source/ 8 ftp://ftp.qtsoftware.com/qt/source/
9#EXTRACT_SUFX= .tar.bz2 9#EXTRACT_SUFX= .tar.bz2
10 10
11.include "../../x11/qt4/Makefile.common" 11.include "../../x11/qt4/Makefile.common"
12 12
13DISTINFO_FILE= ${.CURDIR}/../../x11/qt4-libs/distinfo 13DISTINFO_FILE= ${.CURDIR}/../../x11/qt4-libs/distinfo
14FILESDIR= ${.CURDIR}/../../x11/qt4-libs/files 14FILESDIR= ${.CURDIR}/../../x11/qt4-libs/files
15PATCHDIR= ${.CURDIR}/../../x11/qt4-libs/patches 15PATCHDIR= ${.CURDIR}/../../x11/qt4-libs/patches
16 16
17HAS_CONFIGURE= yes 17HAS_CONFIGURE= yes
18USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++

cvs diff -r1.11 -r1.12 pkgsrc/x11/qt4-libs/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/PLIST 2009/07/02 18:26:45 1.11
+++ pkgsrc/x11/qt4-libs/PLIST 2010/01/29 18:19:09 1.12
@@ -1,37 +1,46 @@ @@ -1,37 +1,46 @@
1@comment $NetBSD: PLIST,v 1.11 2009/07/02 18:26:45 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.12 2010/01/29 18:19:09 adam Exp $
2lib/pkgconfig/Qt3Support.pc 2lib/pkgconfig/Qt3Support.pc
3lib/pkgconfig/QtCore.pc 3lib/pkgconfig/QtCore.pc
4lib/pkgconfig/QtGui.pc 4lib/pkgconfig/QtGui.pc
5lib/pkgconfig/QtNetwork.pc 5lib/pkgconfig/QtNetwork.pc
6lib/pkgconfig/QtOpenGL.pc 6lib/pkgconfig/QtOpenGL.pc
7lib/pkgconfig/QtScript.pc 7lib/pkgconfig/QtScript.pc
8lib/pkgconfig/QtScriptTools.pc 8lib/pkgconfig/QtScriptTools.pc
9lib/pkgconfig/QtSql.pc 9lib/pkgconfig/QtSql.pc
10lib/pkgconfig/QtSvg.pc 10lib/pkgconfig/QtSvg.pc
11lib/pkgconfig/QtTest.pc 11lib/pkgconfig/QtTest.pc
12lib/pkgconfig/QtWebKit.pc 12lib/pkgconfig/QtWebKit.pc
13lib/pkgconfig/QtXml.pc 13lib/pkgconfig/QtXml.pc
14qt4/bin/moc 14qt4/bin/moc
15qt4/bin/rcc 15qt4/bin/rcc
16qt4/bin/uic 16qt4/bin/uic
17qt4/bin/uic3 17qt4/bin/uic3
18qt4/lib/libQt3Support.la 18qt4/lib/libQt3Support.la
19qt4/lib/libQtCore.la 19qt4/lib/libQtCore.la
20qt4/lib/libQtGui.la 20qt4/lib/libQtGui.la
 21qt4/lib/libQtMultimedia.la
21qt4/lib/libQtNetwork.la 22qt4/lib/libQtNetwork.la
22qt4/lib/libQtOpenGL.la 23qt4/lib/libQtOpenGL.la
23qt4/lib/libQtScript.la 24qt4/lib/libQtScript.la
24qt4/lib/libQtScriptTools.la 25qt4/lib/libQtScriptTools.la
25qt4/lib/libQtSql.la 26qt4/lib/libQtSql.la
26qt4/lib/libQtSvg.la 27qt4/lib/libQtSvg.la
27qt4/lib/libQtTest.la 28qt4/lib/libQtTest.la
28qt4/lib/libQtWebKit.la 29qt4/lib/libQtWebKit.la
29qt4/lib/libQtXml.la 30qt4/lib/libQtXml.la
30qt4/plugins/accessible/libqtaccessiblecompatwidgets.la 31qt4/plugins/accessible/libqtaccessiblecompatwidgets.la
31qt4/plugins/accessible/libqtaccessiblewidgets.la 32qt4/plugins/accessible/libqtaccessiblewidgets.la
 33qt4/plugins/codecs/libqcncodecs.la
 34qt4/plugins/codecs/libqjpcodecs.la
 35qt4/plugins/codecs/libqkrcodecs.la
 36qt4/plugins/codecs/libqtwcodecs.la
 37qt4/plugins/graphicssystems/libqglgraphicssystem.la
 38qt4/plugins/graphicssystems/libqtracegraphicssystem.la
 39qt4/plugins/iconengines/libqsvgicon.la
32qt4/plugins/imageformats/libqgif.la 40qt4/plugins/imageformats/libqgif.la
 41qt4/plugins/imageformats/libqico.la
33qt4/plugins/imageformats/libqjpeg.la 42qt4/plugins/imageformats/libqjpeg.la
34qt4/plugins/imageformats/libqmng.la 43qt4/plugins/imageformats/libqmng.la
35qt4/plugins/imageformats/libqsvg.la 44qt4/plugins/imageformats/libqsvg.la
36qt4/plugins/inputmethods/libqimsw-multi.la 45qt4/plugins/inputmethods/libqimsw-multi.la
37qt4/q3porting.xml 46qt4/q3porting.xml

cvs diff -r1.15 -r1.16 pkgsrc/x11/qt4-libs/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/buildlink3.mk 2010/01/18 09:59:43 1.15
+++ pkgsrc/x11/qt4-libs/buildlink3.mk 2010/01/29 18:19:09 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.15 2010/01/18 09:59:43 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.16 2010/01/29 18:19:09 adam Exp $
2 2
3BUILDLINK_TREE+= qt4-libs 3BUILDLINK_TREE+= qt4-libs
4 4
5.if !defined(QT4_LIBS_BUILDLINK3_MK) 5.if !defined(QT4_LIBS_BUILDLINK3_MK)
6QT4_LIBS_BUILDLINK3_MK:= 6QT4_LIBS_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.1.0 8BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.1.0
9BUILDLINK_ABI_DEPENDS.qt4-libs+= qt4-libs>=4.5.3nb3 9BUILDLINK_ABI_DEPENDS.qt4-libs+= qt4-libs>=4.5.3nb3
10BUILDLINK_PKGSRCDIR.qt4-libs?= ../../x11/qt4-libs 10BUILDLINK_PKGSRCDIR.qt4-libs?= ../../x11/qt4-libs
11 11
12BUILDLINK_INCDIRS.qt4-libs+= qt4/include 12BUILDLINK_INCDIRS.qt4-libs+= qt4/include
13BUILDLINK_LIBDIRS.qt4-libs+= qt4/lib 13BUILDLINK_LIBDIRS.qt4-libs+= qt4/lib
14 14
@@ -33,22 +33,22 @@ PTHREAD_OPTS+= require @@ -33,22 +33,22 @@ PTHREAD_OPTS+= require
33.if ${X11_TYPE} == "modular" 33.if ${X11_TYPE} == "modular"
34.include "../../x11/libXinerama/buildlink3.mk" 34.include "../../x11/libXinerama/buildlink3.mk"
35.endif 35.endif
36.include "../../mk/pthread.buildlink3.mk" 36.include "../../mk/pthread.buildlink3.mk"
37 37
38pkgbase := qt4-libs 38pkgbase := qt4-libs
39.include "../../mk/pkg-build-options.mk" 39.include "../../mk/pkg-build-options.mk"
40.if !empty(PKG_BUILD_OPTIONS.qt4-libs:Mgtk2) 40.if !empty(PKG_BUILD_OPTIONS.qt4-libs:Mgtk2)
41. include "../../devel/glib2/buildlink3.mk" 41. include "../../devel/glib2/buildlink3.mk"
42#. include "../../x11/gtk2/buildlink3.mk" 42#. include "../../x11/gtk2/buildlink3.mk"
43.endif 43.endif
44 44
45.if !defined(BUILD_QT4) 45.if !defined(BUILD_QT4)
46CONFIGURE_ENV+= QTDIR=${QTDIR:Q} 46CONFIGURE_ENV+= QTDIR=${QTDIR}
47MAKE_ENV+= QTDIR=${QTDIR:Q} 47MAKE_ENV+= QTDIR=${QTDIR}
48.endif 48.endif
49 49
50CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc" 50CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc"
51MAKE_ENV+= MOC="${QTDIR}/bin/moc" 51MAKE_ENV+= MOC="${QTDIR}/bin/moc"
52.endif # QT4_LIBS_BUILDLINK3_MK 52.endif # QT4_LIBS_BUILDLINK3_MK
53 53
54BUILDLINK_TREE+= -qt4-libs 54BUILDLINK_TREE+= -qt4-libs

cvs diff -r1.36 -r1.37 pkgsrc/x11/qt4-libs/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/distinfo 2010/01/08 09:56:09 1.36
+++ pkgsrc/x11/qt4-libs/distinfo 2010/01/29 18:19:09 1.37
@@ -1,29 +1,29 @@ @@ -1,29 +1,29 @@
1$NetBSD: distinfo,v 1.36 2010/01/08 09:56:09 drochner Exp $ 1$NetBSD: distinfo,v 1.37 2010/01/29 18:19:09 adam Exp $
2 2
3SHA1 (qt-x11-opensource-src-4.5.3.tar.gz) = 78620ffd03c83c4d86f5039ccf7b09e5c709ed25 3SHA1 (qt-everywhere-opensource-src-4.6.1.tar.gz) = d3b44ae6d9bc9c44fc57f32e545b92daf0b54775
4RMD160 (qt-x11-opensource-src-4.5.3.tar.gz) = 93d765ecf89ed15668a4eedc7d77c2a2e41424a2 4RMD160 (qt-everywhere-opensource-src-4.6.1.tar.gz) = 7365dfe3c688df36002d2c9aaef6b79ba8175402
5Size (qt-x11-opensource-src-4.5.3.tar.gz) = 125384668 bytes 5Size (qt-everywhere-opensource-src-4.6.1.tar.gz) = 160197277 bytes
6SHA1 (patch-aa) = 5d0c638f1985f4cfcc1fa6824822dc9ab9bc96eb 6SHA1 (patch-aa) = 899242f5a3b9101db98f2e87fa1a38f3bffdb262
7SHA1 (patch-ab) = caac46e91dd061f28093384b0ab56b5fd78cad0d 7SHA1 (patch-ab) = c19f854a08c3c5ce1791d6fbd63443144d8f1fc8
8SHA1 (patch-ac) = baab52ce87e4dcf11ae76b56851e92f58455d94b 8SHA1 (patch-ac) = db39e471fb43ee820556983ebf9108658ce11e84
9SHA1 (patch-ad) = 98cb6c33102e9e38621b0169fb9e03e72443884b 9SHA1 (patch-ad) = 619ae805f31df5cf490320e4ca611621a781bbb9
10SHA1 (patch-ae) = 37e68cb981b79f0ebe4afe58de3a09083d536532 10SHA1 (patch-ae) = 8b623c616a0c41be3edd3b7b8e987e40e9e7ccbe
11SHA1 (patch-af) = 110abc1d7d571e09cbbbc03ba13dfff194a7367d 11SHA1 (patch-af) = 9e49533cb835538a949bd71b53cebe15ab59b9de
12SHA1 (patch-ag) = 7f91004562f417477a10fdb54372b01812942648 12SHA1 (patch-ag) = 6f31f1f5161cf5ad0d9fc09b097d3763e72e6bd6
13SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 13SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
14SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950 14SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
15SHA1 (patch-aj) = cea33ca34c5f46c3c12e4d00a991103aca70a1ed 15SHA1 (patch-aj) = ae2bd6dd5e66a966dcdd63d32736b4a427fc85df
16SHA1 (patch-ak) = 8a77ab0d047c017eb70b588c78ec4230d1f90755 16SHA1 (patch-ak) = 2b13c4a70f5020c8bdd33e0c0b9978a8b726117d
17SHA1 (patch-al) = 2f3cef08de80d70dba6b44ad946acb56916afcf5 17SHA1 (patch-al) = fce1a98e5df112206f9ef432033215635257f981
18SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381 18SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381
19SHA1 (patch-an) = 75812ead7851ba81bf56f85ab3feeea8377f64c7 19SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409
20SHA1 (patch-ao) = 9c943f67e0c6a1a6ccf87368afc4093fb805f1b9 20SHA1 (patch-ao) = 314769424b9ae5d7e794decb2f67a10820714ff5
21SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569 21SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569
22SHA1 (patch-aq) = 3425c5599749eac7a8dd8142292808029a7419fe 22SHA1 (patch-aq) = 361befdb8e9110edffca5f82be1eb7a8923e5fa4
23SHA1 (patch-ar) = 1cdbbadf309f5f7b29a113d4253ea6ab419f77dd 23SHA1 (patch-ar) = 5bf166c9b7d71bf5e6c3839f804c865f5221879a
24SHA1 (patch-as) = ada0bb538f16bc8e3db23390cbdb3b155db2d7ed 24SHA1 (patch-as) = ada0bb538f16bc8e3db23390cbdb3b155db2d7ed
25SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed 25SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed
 26SHA1 (patch-au) = d0bb72642d73aa716587e8ed3cff4dc37c415e12
26SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf 27SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf
27SHA1 (patch-ax) = 2c895f23a49be32d4605557a74ce5af34cdfc061 28SHA1 (patch-aw) = 1e716a1f39cb4aee4872184f700f3e4b455463b6
28SHA1 (patch-ca) = ae3098989a57fef9874dfc024a4821d274ebda48 29SHA1 (patch-ax) = 0c17ee0d865a39ed167b6134e73d12a57b9f84a9
29SHA1 (patch-cb) = d520bc2a828dabada78af5a2aa110f98dc67ba73 

cvs diff -r1.10 -r1.11 pkgsrc/x11/qt4-libs/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-aa 2009/10/11 09:14:52 1.10
+++ pkgsrc/x11/qt4-libs/patches/patch-aa 2010/01/29 18:19:09 1.11
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1$NetBSD: patch-aa,v 1.10 2009/10/11 09:14:52 adam Exp $ 1$NetBSD: patch-aa,v 1.11 2010/01/29 18:19:09 adam Exp $
2 2
3--- qmake/generators/unix/unixmake2.cpp.orig 2009-09-29 13:01:33.000000000 +0200 3--- qmake/generators/unix/unixmake2.cpp.orig 2010-01-15 17:01:30.000000000 +0000
4+++ qmake/generators/unix/unixmake2.cpp 4+++ qmake/generators/unix/unixmake2.cpp
5@@ -232,6 +232,8 @@ UnixMakefileGenerator::writeMakeParts(QT 5@@ -233,6 +233,8 @@ UnixMakefileGenerator::writeMakeParts(QT
6 if(!project->isEmpty("QMAKE_BUNDLE")) { 6 if(!project->isEmpty("QMAKE_BUNDLE")) {
7 t << "TARGETD = " << escapeFilePath(var("TARGET_x.y")) << endl; 7 t << "TARGETD = " << escapeFilePath(var("TARGET_x.y")) << endl;
8 t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl; 8 t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl;
9+ } else if(project->isActiveConfig("compile_libtool")) { 9+ } else if(project->isActiveConfig("compile_libtool")) {
10+ t << "TARGETD = " << var("TARGET_la") << endl; 10+ t << "TARGETD = " << var("TARGET_la") << endl;
11 } else if(project->isEmpty("QMAKE_HPUX_SHLIB")) { 11 } else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
12 t << "TARGETD = " << escapeFilePath(var("TARGET_x.y.z")) << endl; 12 t << "TARGETD = " << escapeFilePath(var("TARGET_x.y.z")) << endl;
13 t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl; 13 t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl;
14@@ -993,8 +995,12 @@ void UnixMakefileGenerator::init2() 14@@ -994,8 +996,12 @@ void UnixMakefileGenerator::init2()
15 } else if (project->isActiveConfig("staticlib")) { 15 } else if (project->isActiveConfig("staticlib")) {
16 project->values("TARGET").first().prepend("lib"); 16 project->values("TARGET").first().prepend("lib");
17 project->values("TARGET").first() += ".a"; 17 project->values("TARGET").first() += ".a";
18- if(project->values("QMAKE_AR_CMD").isEmpty()) 18- if(project->values("QMAKE_AR_CMD").isEmpty())
19+ if(project->values("QMAKE_AR_CMD").isEmpty()) { 19+ if(project->values("QMAKE_AR_CMD").isEmpty()) {
20+ if(project->isActiveConfig("compile_libtool")) 20+ if(project->isActiveConfig("compile_libtool"))
21+ project->variables()["QMAKE_AR_CMD"].append("$(CXX) -o $(TARGET) $(OBJECTS) $(OBJMOC)"); 21+ project->variables()["QMAKE_AR_CMD"].append("$(CXX) -o $(TARGET) $(OBJECTS) $(OBJMOC)");
22+ else 22+ else
23 project->values("QMAKE_AR_CMD").append("$(AR) $(TARGET) $(OBJECTS)"); 23 project->values("QMAKE_AR_CMD").append("$(AR) $(TARGET) $(OBJECTS)");
24+ } 24+ }
25 } else { 25 } else {
26 project->values("TARGETA").append(project->first("DESTDIR") + "lib" + project->first("TARGET") + ".a"); 26 project->values("TARGETA").append(project->first("DESTDIR") + "lib" + project->first("TARGET") + ".a");
27 if(project->isActiveConfig("compile_libtool")) 27 if(project->isActiveConfig("compile_libtool"))
28@@ -1445,7 +1451,7 @@ UnixMakefileGenerator::writePkgConfigFil 28@@ -1439,7 +1445,7 @@ UnixMakefileGenerator::writePkgConfigFil
29 bundle = bundle.left(suffix); 29 bundle = bundle.left(suffix);
30 pkgConfiglibName = "-framework " + bundle + " "; 30 pkgConfiglibName = "-framework " + bundle + " ";
31 } else { 31 } else {
32- pkgConfiglibDir = "-L${libdir}"; 32- pkgConfiglibDir = "-L${libdir}";
33+ pkgConfiglibDir = "-Wl,-R${libdir} -L${libdir}"; 33+ pkgConfiglibDir = "-Wl,-R${libdir} -L${libdir}";
34 pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length()); 34 pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length());
35 } 35 }
36 t << pkgConfiglibDir << " " << pkgConfiglibName << " " << endl; 36 t << pkgConfiglibDir << " " << pkgConfiglibName << " " << endl;

cvs diff -r1.9 -r1.10 pkgsrc/x11/qt4-libs/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-ab 2009/10/11 09:14:52 1.9
+++ pkgsrc/x11/qt4-libs/patches/patch-ab 2010/01/29 18:19:09 1.10
@@ -1,107 +1,107 @@ @@ -1,107 +1,107 @@
1$NetBSD: patch-ab,v 1.9 2009/10/11 09:14:52 adam Exp $ 1$NetBSD: patch-ab,v 1.10 2010/01/29 18:19:09 adam Exp $
2 2
3--- src/gui/painting/painting.pri.orig 2009-09-29 13:01:37.000000000 +0200 3--- src/gui/painting/painting.pri.orig 2010-01-15 17:01:35.000000000 +0000
4+++ src/gui/painting/painting.pri 4+++ src/gui/painting/painting.pri
5@@ -231,7 +231,7 @@ contains(QMAKE_MAC_XARCH, no) { 5@@ -232,7 +232,7 @@ contains(QMAKE_MAC_XARCH, no) {
6  6
7 win32-g++|!win32:!*-icc* { 7 win32-g++|!win32:!*-icc* {
8 mmx { 8 mmx {
9- mmx_compiler.commands = $$QMAKE_CXX -c -Winline  9- mmx_compiler.commands = $$QMAKE_CXX -c -Winline
10+ mmx_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline  10+ mmx_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
11  11
12 mac { 12 mac {
13 mmx_compiler.commands += -Xarch_i386 -mmmx 13 mmx_compiler.commands += -Xarch_i386 -mmmx
14@@ -242,7 +242,7 @@ contains(QMAKE_MAC_XARCH, no) { 14@@ -243,7 +243,7 @@ contains(QMAKE_MAC_XARCH, no) {
15  15
16 mmx_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} 16 mmx_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
17 mmx_compiler.dependency_type = TYPE_C 17 mmx_compiler.dependency_type = TYPE_C
18- mmx_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} 18- mmx_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
19+ mmx_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo 19+ mmx_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
20 mmx_compiler.input = MMX_SOURCES 20 mmx_compiler.input = MMX_SOURCES
21 mmx_compiler.variable_out = OBJECTS 21 mmx_compiler.variable_out = OBJECTS
22 mmx_compiler.name = compiling[mmx] ${QMAKE_FILE_IN} 22 mmx_compiler.name = compiling[mmx] ${QMAKE_FILE_IN}
23@@ -250,7 +250,7 @@ contains(QMAKE_MAC_XARCH, no) { 23@@ -251,7 +251,7 @@ contains(QMAKE_MAC_XARCH, no) {
24 QMAKE_EXTRA_COMPILERS += mmx_compiler 24 QMAKE_EXTRA_COMPILERS += mmx_compiler
25 } 25 }
26 3dnow { 26 3dnow {
27- mmx3dnow_compiler.commands = $$QMAKE_CXX -c -Winline 27- mmx3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
28+ mmx3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline 28+ mmx3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
29  29
30 mac { 30 mac {
31 mmx3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -mmmx 31 mmx3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -mmmx
32@@ -261,14 +261,14 @@ contains(QMAKE_MAC_XARCH, no) { 32@@ -262,14 +262,14 @@ contains(QMAKE_MAC_XARCH, no) {
33  33
34 mmx3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} 34 mmx3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
35 mmx3dnow_compiler.dependency_type = TYPE_C 35 mmx3dnow_compiler.dependency_type = TYPE_C
36- mmx3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} 36- mmx3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
37+ mmx3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo 37+ mmx3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
38 mmx3dnow_compiler.input = MMX3DNOW_SOURCES 38 mmx3dnow_compiler.input = MMX3DNOW_SOURCES
39 mmx3dnow_compiler.variable_out = OBJECTS 39 mmx3dnow_compiler.variable_out = OBJECTS
40 mmx3dnow_compiler.name = compiling[mmx3dnow] ${QMAKE_FILE_IN} 40 mmx3dnow_compiler.name = compiling[mmx3dnow] ${QMAKE_FILE_IN}
41 silent:mmx3dnow_compiler.commands = @echo compiling[mmx3dnow] ${QMAKE_FILE_IN} && $$mmx3dnow_compiler.commands 41 silent:mmx3dnow_compiler.commands = @echo compiling[mmx3dnow] ${QMAKE_FILE_IN} && $$mmx3dnow_compiler.commands
42 QMAKE_EXTRA_COMPILERS += mmx3dnow_compiler 42 QMAKE_EXTRA_COMPILERS += mmx3dnow_compiler
43 sse { 43 sse {
44- sse3dnow_compiler.commands = $$QMAKE_CXX -c -Winline 44- sse3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
45+ sse3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline 45+ sse3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
46  46
47 mac { 47 mac {
48 sse3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -msse 48 sse3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -msse
49@@ -279,7 +279,7 @@ contains(QMAKE_MAC_XARCH, no) { 49@@ -280,7 +280,7 @@ contains(QMAKE_MAC_XARCH, no) {
50  50
51 sse3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} 51 sse3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
52 sse3dnow_compiler.dependency_type = TYPE_C 52 sse3dnow_compiler.dependency_type = TYPE_C
53- sse3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} 53- sse3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
54+ sse3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo 54+ sse3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
55 sse3dnow_compiler.input = SSE3DNOW_SOURCES 55 sse3dnow_compiler.input = SSE3DNOW_SOURCES
56 sse3dnow_compiler.variable_out = OBJECTS 56 sse3dnow_compiler.variable_out = OBJECTS
57 sse3dnow_compiler.name = compiling[sse3dnow] ${QMAKE_FILE_IN} 57 sse3dnow_compiler.name = compiling[sse3dnow] ${QMAKE_FILE_IN}
58@@ -288,7 +288,7 @@ contains(QMAKE_MAC_XARCH, no) { 58@@ -289,7 +289,7 @@ contains(QMAKE_MAC_XARCH, no) {
59 } 59 }
60 } 60 }
61 sse { 61 sse {
62- sse_compiler.commands = $$QMAKE_CXX -c -Winline 62- sse_compiler.commands = $$QMAKE_CXX -c -Winline
63+ sse_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline 63+ sse_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
64  64
65 mac { 65 mac {
66 sse_compiler.commands += -Xarch_i386 -msse 66 sse_compiler.commands += -Xarch_i386 -msse
67@@ -299,7 +299,7 @@ contains(QMAKE_MAC_XARCH, no) { 67@@ -300,7 +300,7 @@ contains(QMAKE_MAC_XARCH, no) {
68  68
69 sse_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} 69 sse_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
70 sse_compiler.dependency_type = TYPE_C 70 sse_compiler.dependency_type = TYPE_C
71- sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} 71- sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
72+ sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo 72+ sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
73 sse_compiler.input = SSE_SOURCES 73 sse_compiler.input = SSE_SOURCES
74 sse_compiler.variable_out = OBJECTS 74 sse_compiler.variable_out = OBJECTS
75 sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN} 75 sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN}
76@@ -307,7 +307,7 @@ contains(QMAKE_MAC_XARCH, no) { 76@@ -308,7 +308,7 @@ contains(QMAKE_MAC_XARCH, no) {
77 QMAKE_EXTRA_COMPILERS += sse_compiler 77 QMAKE_EXTRA_COMPILERS += sse_compiler
78 } 78 }
79 sse2 { 79 sse2 {
80- sse2_compiler.commands = $$QMAKE_CXX -c -Winline 80- sse2_compiler.commands = $$QMAKE_CXX -c -Winline
81+ sse2_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline 81+ sse2_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
82  82
83 mac { 83 mac {
84 sse2_compiler.commands += -Xarch_i386 -msse2 84 sse2_compiler.commands += -Xarch_i386 -msse2
85@@ -318,7 +318,7 @@ contains(QMAKE_MAC_XARCH, no) { 85@@ -319,7 +319,7 @@ contains(QMAKE_MAC_XARCH, no) {
86  86
87 sse2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} 87 sse2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
88 sse2_compiler.dependency_type = TYPE_C 88 sse2_compiler.dependency_type = TYPE_C
89- sse2_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} 89- sse2_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
90+ sse2_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo 90+ sse2_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
91 sse2_compiler.input = SSE2_SOURCES 91 sse2_compiler.input = SSE2_SOURCES
92 sse2_compiler.variable_out = OBJECTS 92 sse2_compiler.variable_out = OBJECTS
93 sse2_compiler.name = compiling[sse2] ${QMAKE_FILE_IN} 93 sse2_compiler.name = compiling[sse2] ${QMAKE_FILE_IN}
94@@ -326,11 +326,11 @@ contains(QMAKE_MAC_XARCH, no) { 94@@ -327,11 +327,11 @@ contains(QMAKE_MAC_XARCH, no) {
95 QMAKE_EXTRA_COMPILERS += sse2_compiler 95 QMAKE_EXTRA_COMPILERS += sse2_compiler
96 } 96 }
97 iwmmxt { 97 iwmmxt {
98- iwmmxt_compiler.commands = $$QMAKE_CXX -c -Winline 98- iwmmxt_compiler.commands = $$QMAKE_CXX -c -Winline
99+ iwmmxt_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline 99+ iwmmxt_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
100 iwmmxt_compiler.commands += -mcpu=iwmmxt 100 iwmmxt_compiler.commands += -mcpu=iwmmxt
101 iwmmxt_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} 101 iwmmxt_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
102 iwmmxt_compiler.dependency_type = TYPE_C 102 iwmmxt_compiler.dependency_type = TYPE_C
103- iwmmxt_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} 103- iwmmxt_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
104+ iwmmxt_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo 104+ iwmmxt_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}.lo
105 iwmmxt_compiler.input = IWMMXT_SOURCES 105 iwmmxt_compiler.input = IWMMXT_SOURCES
106 iwmmxt_compiler.variable_out = OBJECTS 106 iwmmxt_compiler.variable_out = OBJECTS
107 iwmmxt_compiler.name = compiling[iwmmxt] ${QMAKE_FILE_IN} 107 iwmmxt_compiler.name = compiling[iwmmxt] ${QMAKE_FILE_IN}

cvs diff -r1.9 -r1.10 pkgsrc/x11/qt4-libs/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-ad 2009/10/11 09:14:52 1.9
+++ pkgsrc/x11/qt4-libs/patches/patch-ad 2010/01/29 18:19:09 1.10
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1$NetBSD: patch-ad,v 1.9 2009/10/11 09:14:52 adam Exp $ 1$NetBSD: patch-ad,v 1.10 2010/01/29 18:19:09 adam Exp $
2 2
3--- src/corelib/global/qglobal.h.orig 2009-09-29 13:01:37.000000000 +0200 3--- src/corelib/global/qglobal.h.orig 2010-01-15 17:01:36.000000000 +0000
4+++ src/corelib/global/qglobal.h 4+++ src/corelib/global/qglobal.h
5@@ -158,6 +158,7 @@ namespace QT_NAMESPACE {} 5@@ -159,6 +159,7 @@ namespace QT_NAMESPACE {}
6 NETBSD - NetBSD 6 NETBSD - NetBSD
7 OPENBSD - OpenBSD 7 OPENBSD - OpenBSD
8 BSDI - BSD/OS 8 BSDI - BSD/OS
9+ INTERIX - Interix 9+ INTERIX - Interix
10 IRIX - SGI Irix 10 IRIX - SGI Irix
11 OSF - HP Tru64 UNIX 11 OSF - HP Tru64 UNIX
12 SCO - SCO OpenServer 5 12 SCO - SCO OpenServer 5
13@@ -219,6 +220,9 @@ namespace QT_NAMESPACE {} 13@@ -224,6 +225,9 @@ namespace QT_NAMESPACE {}
14 #elif defined(__NetBSD__) 14 #elif defined(__NetBSD__)
15 # define Q_OS_NETBSD 15 # define Q_OS_NETBSD
16 # define Q_OS_BSD4 16 # define Q_OS_BSD4
17+#elif defined(__INTERIX) 17+#elif defined(__INTERIX)
18+# define Q_OS_INTERIX 18+# define Q_OS_INTERIX
19+# define Q_OS_BSD4 19+# define Q_OS_BSD4
20 #elif defined(__OpenBSD__) 20 #elif defined(__OpenBSD__)
21 # define Q_OS_OPENBSD 21 # define Q_OS_OPENBSD
22 # define Q_OS_BSD4 22 # define Q_OS_BSD4
23@@ -261,8 +265,6 @@ namespace QT_NAMESPACE {} 23@@ -266,8 +270,6 @@ namespace QT_NAMESPACE {}
24 #endif 24 #endif
25  25
26 #if defined(Q_OS_DARWIN) 26 #if defined(Q_OS_DARWIN)
27-# define Q_OS_MAC /* Q_OS_MAC is mostly for compatibility, but also more clear */ 27-# define Q_OS_MAC /* Q_OS_MAC is mostly for compatibility, but also more clear */
28-# define Q_OS_MACX /* Q_OS_MACX is only for compatibility.*/ 28-# define Q_OS_MACX /* Q_OS_MACX is only for compatibility.*/
29 # if defined(Q_OS_DARWIN64) 29 # if defined(Q_OS_DARWIN64)
30 # define Q_OS_MAC64 30 # define Q_OS_MAC64
31 # elif defined(Q_OS_DARWIN32) 31 # elif defined(Q_OS_DARWIN32)
32@@ -756,8 +758,6 @@ namespace QT_NAMESPACE {} 32@@ -805,8 +807,6 @@ namespace QT_NAMESPACE {}
33 # error "Qt does not work with OS/2 Presentation Manager or Workplace Shell" 33 # error "Qt does not work with OS/2 Presentation Manager or Workplace Shell"
34 #elif defined(Q_OS_UNIX) 34 #elif defined(Q_OS_UNIX)
35 # if defined(Q_OS_MAC) && !defined(__USE_WS_X11__) && !defined(Q_WS_QWS) 35 # if defined(Q_OS_MAC) && !defined(__USE_WS_X11__) && !defined(Q_WS_QWS)
36-# define Q_WS_MAC 36-# define Q_WS_MAC
37-# define Q_WS_MACX 37-# define Q_WS_MACX
38 # if defined(Q_OS_MAC64) 38 # if defined(Q_OS_MAC64)
39 # define Q_WS_MAC64 39 # define Q_WS_MAC64
40 # elif defined(Q_OS_MAC32) 40 # elif defined(Q_OS_MAC32)

cvs diff -r1.9 -r1.10 pkgsrc/x11/qt4-libs/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-ag 2009/10/11 09:14:52 1.9
+++ pkgsrc/x11/qt4-libs/patches/patch-ag 2010/01/29 18:19:09 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ag,v 1.9 2009/10/11 09:14:52 adam Exp $ 1$NetBSD: patch-ag,v 1.10 2010/01/29 18:19:09 adam Exp $
2 2
3--- qmake/project.cpp.orig 2009-09-29 13:01:33.000000000 +0200 3--- qmake/project.cpp.orig 2010-01-15 17:01:30.000000000 +0000
4+++ qmake/project.cpp 4+++ qmake/project.cpp
5@@ -1609,6 +1609,9 @@ QMakeProject::isActiveConfig(const QStri 5@@ -1612,6 +1612,9 @@ QMakeProject::isActiveConfig(const QStri
6 else if(x == "false") 6 if(isForSymbian() && (x == "symbian" || x == "unix"))
7 return false; 7 return true;
8  8
9+ if(x == "compile_libtool" && (vars["TEMPLATE"].first() == "app" || vars["TEMPLATE"].first() == "lib")) 9+ if(x == "compile_libtool" && (vars["TEMPLATE"].first() == "app" || vars["TEMPLATE"].first() == "lib"))
10+ return true; 10+ return true;
11+ 11+
12 //mkspecs 12 //mkspecs
13 if((Option::target_mode == Option::TARG_MACX_MODE || Option::target_mode == Option::TARG_QNX6_MODE || 13 if((Option::target_mode == Option::TARG_MACX_MODE ||
14 Option::target_mode == Option::TARG_UNIX_MODE) && x == "unix") 14 Option::target_mode == Option::TARG_UNIX_MODE) && x == "unix")

cvs diff -r1.2 -r1.3 pkgsrc/x11/qt4-libs/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-ac 2008/07/24 12:55:20 1.2
+++ pkgsrc/x11/qt4-libs/patches/patch-ac 2010/01/29 18:19:09 1.3
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ac,v 1.2 2008/07/24 12:55:20 markd Exp $ 1$NetBSD: patch-ac,v 1.3 2010/01/29 18:19:09 adam Exp $
2 2
3--- tools/designer/src/designer/designer.pro.orig 2008-04-28 15:11:20.000000000 +0200 3--- tools/designer/src/designer/designer.pro.orig 2010-01-15 17:01:29.000000000 +0000
4+++ tools/designer/src/designer/designer.pro 4+++ tools/designer/src/designer/designer.pro
5@@ -13,7 +13,7 @@ INCLUDEPATH += \ 5@@ -14,7 +14,7 @@ INCLUDEPATH += \
6 ../lib/uilib \ 6 ../lib/uilib \
7 extra 7 extra
8  8
9-LIBS += -L../../lib \ 9-LIBS += -L../../lib \
10+LIBS += \ 10+LIBS += \
11 -L../../../../lib \ 11 -L../../../../lib \
12 -lQtDesignerComponents \ 12 -lQtDesignerComponents \
13 -lQtDesigner 13 -lQtDesigner

cvs diff -r1.7 -r1.8 pkgsrc/x11/qt4-libs/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-ae 2009/10/11 09:14:52 1.7
+++ pkgsrc/x11/qt4-libs/patches/patch-ae 2010/01/29 18:19:09 1.8
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-ae,v 1.7 2009/10/11 09:14:52 adam Exp $ 1$NetBSD: patch-ae,v 1.8 2010/01/29 18:19:09 adam Exp $
2 2
3--- qmake/generators/unix/unixmake.cpp.orig 2009-09-29 13:01:33.000000000 +0200 3--- qmake/generators/unix/unixmake.cpp.orig 2010-01-15 17:01:30.000000000 +0000
4+++ qmake/generators/unix/unixmake.cpp 4+++ qmake/generators/unix/unixmake.cpp
5@@ -324,27 +324,29 @@ UnixMakefileGenerator::init() 5@@ -325,27 +325,29 @@ UnixMakefileGenerator::init()
6 if(libtoolify[i].startsWith("QMAKE_LINK") || libtoolify[i] == "QMAKE_AR_CMD") { 6 if(libtoolify[i].startsWith("QMAKE_LINK") || libtoolify[i] == "QMAKE_AR_CMD") {
7 libtool_flags += " --mode=link"; 7 libtool_flags += " --mode=link";
8 if(project->isActiveConfig("staticlib")) { 8 if(project->isActiveConfig("staticlib")) {
9- libtool_flags += " -static"; 9- libtool_flags += " -static";
10+ comp_flags += " -static"; 10+ comp_flags += " -static";
11 } else { 11 } else {
12 if(!project->isEmpty("QMAKE_LIB_FLAG")) { 12 if(!project->isEmpty("QMAKE_LIB_FLAG")) {
13+ if(project->isActiveConfig("plugin")) 13+ if(project->isActiveConfig("plugin"))
14+ comp_flags += " -avoid-version"; 14+ comp_flags += " -avoid-version";
15+ else { 15+ else {
16 int maj = project->first("VER_MAJ").toInt(); 16 int maj = project->first("VER_MAJ").toInt();
17 int min = project->first("VER_MIN").toInt(); 17 int min = project->first("VER_MIN").toInt();
18 int pat = project->first("VER_PAT").toInt(); 18 int pat = project->first("VER_PAT").toInt();
@@ -32,35 +32,35 @@ $NetBSD: patch-ae,v 1.7 2009/10/11 09:14 @@ -32,35 +32,35 @@ $NetBSD: patch-ae,v 1.7 2009/10/11 09:14
32+ QString rpath = Option::fixPathToTargetOS(project->first("target.path"), FALSE); 32+ QString rpath = Option::fixPathToTargetOS(project->first("target.path"), FALSE);
33+ if(rpath.right(1) != Option::dir_sep) 33+ if(rpath.right(1) != Option::dir_sep)
34+ rpath += Option::dir_sep; 34+ rpath += Option::dir_sep;
35 comp_flags += " -rpath " + Option::fixPathToTargetOS(rpath, false); 35 comp_flags += " -rpath " + Option::fixPathToTargetOS(rpath, false);
36 } 36 }
37 } 37 }
38 } 38 }
39 if(project->isActiveConfig("plugin")) 39 if(project->isActiveConfig("plugin"))
40- libtool_flags += " -module"; 40- libtool_flags += " -module";
41+ comp_flags += " -module"; 41+ comp_flags += " -module";
42 } else { 42 } else {
43 libtool_flags += " --mode=compile"; 43 libtool_flags += " --mode=compile";
44 } 44 }
45@@ -676,7 +678,6 @@ UnixMakefileGenerator::defaultInstall(co 45@@ -677,7 +679,6 @@ UnixMakefileGenerator::defaultInstall(co
46 QString targetdir = Option::fixPathToTargetOS(project->first("target.path"), false); 46 QString targetdir = Option::fixPathToTargetOS(project->first("target.path"), false);
47 if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep) 47 if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep)
48 destdir += Option::dir_sep; 48 destdir += Option::dir_sep;
49- targetdir = fileFixify(targetdir, FileFixifyAbsolute); 49- targetdir = fileFixify(targetdir, FileFixifyAbsolute);
50 if(targetdir.right(1) != Option::dir_sep) 50 if(targetdir.right(1) != Option::dir_sep)
51 targetdir += Option::dir_sep; 51 targetdir += Option::dir_sep;
52  52
53@@ -714,10 +715,14 @@ UnixMakefileGenerator::defaultInstall(co 53@@ -715,10 +716,14 @@ UnixMakefileGenerator::defaultInstall(co
54 QString src_targ = target; 54 QString src_targ = target;
55 if(src_targ == "$(TARGET)") 55 if(src_targ == "$(TARGET)")
56 src_targ = "$(TARGETL)"; 56 src_targ = "$(TARGETL)";
57- QString dst_dir = fileFixify(targetdir, FileFixifyAbsolute); 57- QString dst_dir = fileFixify(targetdir, FileFixifyAbsolute);
58+ QString dst_dir = targetdir; 58+ QString dst_dir = targetdir;
59 if(QDir::isRelativePath(dst_dir)) 59 if(QDir::isRelativePath(dst_dir))
60- dst_dir = Option::fixPathToTargetOS(Option::output_dir + Option::dir_sep + dst_dir); 60- dst_dir = Option::fixPathToTargetOS(Option::output_dir + Option::dir_sep + dst_dir);
61- ret = "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + filePrefixRoot(root, dst_dir) + "\""; 61- ret = "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + filePrefixRoot(root, dst_dir) + "\"";
62+ dst_dir = Option::fixPathToTargetOS(dst_dir); 62+ dst_dir = Option::fixPathToTargetOS(dst_dir);
63+ if(!ret.isEmpty()) 63+ if(!ret.isEmpty())
64+ ret += "\n\t"; 64+ ret += "\n\t";
65+ ret += "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + filePrefixRoot(root, dst_dir) + "\""; 65+ ret += "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + filePrefixRoot(root, dst_dir) + "\"";
66+ if(!uninst.isEmpty()) 66+ if(!uninst.isEmpty())

cvs diff -r1.7 -r1.8 pkgsrc/x11/qt4-libs/patches/patch-aj (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-aj 2009/10/11 09:14:52 1.7
+++ pkgsrc/x11/qt4-libs/patches/patch-aj 2010/01/29 18:19:09 1.8
@@ -1,26 +1,26 @@ @@ -1,26 +1,26 @@
1$NetBSD: patch-aj,v 1.7 2009/10/11 09:14:52 adam Exp $ 1$NetBSD: patch-aj,v 1.8 2010/01/29 18:19:09 adam Exp $
2 2
3--- mkspecs/netbsd-g++/qplatformdefs.h.orig 2009-09-29 13:01:33.000000000 +0200 3--- mkspecs/netbsd-g++/qplatformdefs.h.orig 2010-01-15 17:01:28.000000000 +0000
4+++ mkspecs/netbsd-g++/qplatformdefs.h 4+++ mkspecs/netbsd-g++/qplatformdefs.h
5@@ -65,6 +65,7 @@ 5@@ -65,6 +65,7 @@
6 #include <sys/types.h> 6 #include <sys/types.h>
7 #include <sys/ioctl.h> 7 #include <sys/ioctl.h>
8 #include <sys/ipc.h> 8 #include <sys/ipc.h>
9+#include <sys/param.h> 9+#include <sys/param.h>
10 #include <sys/time.h> 10 #include <sys/time.h>
11 #include <sys/shm.h> 11 #include <sys/shm.h>
12 #include <sys/socket.h> 12 #include <sys/socket.h>
13@@ -126,10 +127,14 @@ 13@@ -127,10 +128,14 @@
14 #define QT_SNPRINTF ::snprintf 14 #define QT_SNPRINTF ::snprintf
15 #define QT_VSNPRINTF ::vsnprintf 15 #define QT_VSNPRINTF ::vsnprintf
16  16
17+#if (__NetBSD_Version__ >= 299000900) 17+#if (__NetBSD_Version__ >= 299000900)
18+#include <sys/statvfs.h> 18+#include <sys/statvfs.h>
19+#define QT_STATVFS 1 19+#define QT_STATVFS 1
20+#endif 20+#endif
21+ 21+
22 // Older NetBSD versions may still use the a.out format instead of ELF. 22 // Older NetBSD versions may still use the a.out format instead of ELF.
23 #ifndef __ELF__ 23 #ifndef __ELF__
24 #define QT_AOUT_UNDERSCORE 24 #define QT_AOUT_UNDERSCORE
25 #endif 25 #endif
26  26

cvs diff -r1.6 -r1.7 pkgsrc/x11/qt4-libs/patches/patch-af (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-af 2009/06/13 11:55:51 1.6
+++ pkgsrc/x11/qt4-libs/patches/patch-af 2010/01/29 18:19:09 1.7
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1$NetBSD: patch-af,v 1.6 2009/06/13 11:55:51 hasso Exp $ 1$NetBSD: patch-af,v 1.7 2010/01/29 18:19:09 adam Exp $
2 2
3--- qmake/Makefile.unix.orig 2009-02-25 22:09:16.000000000 +0100 3--- qmake/Makefile.unix.orig 2010-01-15 17:01:30.000000000 +0000
4+++ qmake/Makefile.unix 4+++ qmake/Makefile.unix
5@@ -3,7 +3,7 @@ BUILD_PATH = @BUILD_PATH@ 5@@ -3,7 +3,7 @@ BUILD_PATH = @BUILD_PATH@
6 QTOBJS = @QMAKE_QTOBJS@ 6 QTOBJS = @QMAKE_QTOBJS@
7 QTSRCS = @QMAKE_QTSRCS@ 7 QTSRCS = @QMAKE_QTSRCS@
8 QMAKESPEC = @QMAKESPEC@ 8 QMAKESPEC = @QMAKESPEC@
9-LFLAGS = @QMAKE_LFLAGS@ 9-LFLAGS = @QMAKE_LFLAGS@
10+LFLAGS = @QMAKE_LFLAGS@ ${LDFLAGS} 10+LFLAGS = @QMAKE_LFLAGS@ ${LDFLAGS}
11  11
12 #qmake code 12 #qmake code
13 OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o \ 13 OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o \
14@@ -88,7 +88,7 @@ DEPEND_SRC=project.cpp property.cpp meta 14@@ -59,7 +59,7 @@ DEPEND_SRC=project.cpp property.cpp meta
15 $(SOURCE_PATH)/src/script/qscriptstring.cpp \ 15 $(SOURCE_PATH)/src/corelib/xml/qxmlutils.cpp \
16 $(QTSRCS) 16 $(QTSRCS)
17  17
18-CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ 18-CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac -Igenerators/symbian \
19+CPPFLAGS += -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ 19+CPPFLAGS += -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac -Igenerators/symbian \
20 -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \ 20 -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
21 -I$(BUILD_PATH)/src/corelib/global \ 21 -I$(BUILD_PATH)/src/corelib/global -I$(BUILD_PATH)/src/corelib/xml \
22 -I$(SOURCE_PATH)/src/script -DQT_NO_PCRE \ 22 -DQT_NO_PCRE \
23@@ -97,7 +97,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators 23@@ -68,7 +68,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators
24 -DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \ 24 -DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \
25 -DQT_NO_GEOM_VARIANT $(OPENSOURCE_CXXFLAGS) 25 -DQT_NO_GEOM_VARIANT $(OPENSOURCE_CXXFLAGS)
26  26
27-CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS) 27-CXXFLAGS = @QMAKE_CXXFLAGS@ $(CPPFLAGS)
28+CXXFLAGS += @QMAKE_CXXFLAGS@ $(CPPFLAGS) 28+CXXFLAGS += @QMAKE_CXXFLAGS@ $(CPPFLAGS)
29  29
30 first all: $(BUILD_PATH)/bin/qmake 30 first all: $(BUILD_PATH)/bin/qmake
31 qmake: $(BUILD_PATH)/bin/qmake 31 qmake: $(BUILD_PATH)/bin/qmake

cvs diff -r1.6 -r1.7 pkgsrc/x11/qt4-libs/patches/patch-al (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-al 2009/10/11 09:14:52 1.6
+++ pkgsrc/x11/qt4-libs/patches/patch-al 2010/01/29 18:19:09 1.7
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1$NetBSD: patch-al,v 1.6 2009/10/11 09:14:52 adam Exp $ 1$NetBSD: patch-al,v 1.7 2010/01/29 18:19:09 adam Exp $
2 2
3--- src/corelib/io/qsettings.cpp.orig 2009-09-29 13:01:37.000000000 +0200 3--- src/corelib/io/qsettings.cpp.orig 2010-01-15 17:01:36.000000000 +0000
4+++ src/corelib/io/qsettings.cpp 4+++ src/corelib/io/qsettings.cpp
5@@ -132,9 +132,16 @@ QT_END_INCLUDE_NAMESPACE 5@@ -136,9 +136,16 @@ QT_END_INCLUDE_NAMESPACE
6  6
7 static bool isLikelyToBeNfs(int handle) 7 static bool isLikelyToBeNfs(int handle)
8 { 8 {
9+#ifdef QT_STATVFS 9+#ifdef QT_STATVFS
10+ struct statvfs buf; 10+ struct statvfs buf;
11+ if (fstatvfs(handle, &buf) != 0) 11+ if (fstatvfs(handle, &buf) != 0)
12+ return false; 12+ return false;
13+#else 13+#else
14 struct statfs buf; 14 struct statfs buf;
15 if (fstatfs(handle, &buf) != 0) 15 if (fstatfs(handle, &buf) != 0)
16 return false; 16 return false;
17+#endif 17+#endif
18+ 18+
19 return qt_isEvilFsTypeName(buf.f_fstypename); 19 return qt_isEvilFsTypeName(buf.f_fstypename);
20 } 20 }
21  21
22@@ -168,7 +175,7 @@ static bool isLikelyToBeNfs(int handle) 22@@ -172,7 +179,7 @@ static bool isLikelyToBeNfs(int handle)
23  23
24 #elif defined(Q_OS_SOLARIS) || defined(Q_OS_IRIX) || defined(Q_OS_AIX) || defined(Q_OS_HPUX) \ 24 #elif defined(Q_OS_SOLARIS) || defined(Q_OS_IRIX) || defined(Q_OS_AIX) || defined(Q_OS_HPUX) \
25 || defined(Q_OS_OSF) || defined(Q_OS_QNX) || defined(Q_OS_QNX6) || defined(Q_OS_SCO) \ 25 || defined(Q_OS_OSF) || defined(Q_OS_QNX) || defined(Q_OS_SCO) \
26- || defined(Q_OS_UNIXWARE) || defined(Q_OS_RELIANT) || defined(Q_OS_NETBSD) 26- || defined(Q_OS_UNIXWARE) || defined(Q_OS_RELIANT) || defined(Q_OS_NETBSD)
27+ || defined(Q_OS_UNIXWARE) || defined(Q_OS_RELIANT) 27+ || defined(Q_OS_UNIXWARE) || defined(Q_OS_RELIANT)
28 QT_BEGIN_INCLUDE_NAMESPACE 28 QT_BEGIN_INCLUDE_NAMESPACE
29 # include <sys/statvfs.h> 29 # include <sys/statvfs.h>
30 QT_END_INCLUDE_NAMESPACE 30 QT_END_INCLUDE_NAMESPACE

cvs diff -r1.6 -r1.7 pkgsrc/x11/qt4-libs/patches/patch-an (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-an 2009/10/11 09:14:52 1.6
+++ pkgsrc/x11/qt4-libs/patches/patch-an 2010/01/29 18:19:09 1.7
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-an,v 1.6 2009/10/11 09:14:52 adam Exp $ 1$NetBSD: patch-an,v 1.7 2010/01/29 18:19:09 adam Exp $
2 2
3--- src/corelib/concurrent/qtconcurrentiteratekernel.cpp.orig 2009-09-29 13:01:37.000000000 +0200 3--- src/corelib/concurrent/qtconcurrentiteratekernel.cpp.orig 2010-01-15 17:01:36.000000000 +0000
4+++ src/corelib/concurrent/qtconcurrentiteratekernel.cpp 4+++ src/corelib/concurrent/qtconcurrentiteratekernel.cpp
5@@ -41,7 +41,7 @@ 5@@ -41,7 +41,7 @@
6  6
7 #include "qtconcurrentiteratekernel.h" 7 #include "qtconcurrentiteratekernel.h"
8  8
9-#if defined(Q_OS_MAC) 9-#if defined(Q_OS_MAC)
10+#if defined(Q_OS_MAC) || defined(__APPLE__) 10+#if defined(Q_OS_MAC) || defined(__APPLE__)
11  
12 #include <mach/mach.h> 11 #include <mach/mach.h>
13 #include <mach/mach_time.h> 12 #include <mach/mach_time.h>
14@@ -68,7 +68,7 @@ enum { 13 #include <unistd.h>
 14@@ -67,7 +67,7 @@ enum {
15 MedianSize = 7 15 MedianSize = 7
16 }; 16 };
17  17
18-#if defined(Q_OS_MAC) 18-#if defined(Q_OS_MAC)
19+#if defined(Q_OS_MAC) || defined(__APPLE__) 19+#if defined(Q_OS_MAC) || defined(__APPLE__)
20  20
21 static qint64 getticks() 21 static qint64 getticks()
22 { 22 {

cvs diff -r1.6 -r1.7 pkgsrc/x11/qt4-libs/patches/patch-ao (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-ao 2009/06/13 11:55:51 1.6
+++ pkgsrc/x11/qt4-libs/patches/patch-ao 2010/01/29 18:19:09 1.7
@@ -1,63 +1,63 @@ @@ -1,63 +1,63 @@
1$NetBSD: patch-ao,v 1.6 2009/06/13 11:55:51 hasso Exp $ 1$NetBSD: patch-ao,v 1.7 2010/01/29 18:19:09 adam Exp $
2 2
3--- src/corelib/codecs/qiconvcodec.cpp.orig 2009-02-25 22:09:21.000000000 +0100 3--- src/corelib/codecs/qiconvcodec.cpp.orig 2010-01-15 17:01:36.000000000 +0000
4+++ src/corelib/codecs/qiconvcodec.cpp 4+++ src/corelib/codecs/qiconvcodec.cpp
5@@ -50,9 +50,14 @@ 5@@ -50,9 +50,14 @@
6 #include <stdio.h> 6 #include <stdio.h>
7 #include <dlfcn.h> 7 #include <dlfcn.h>
8  8
9+// for __DragonFly_version 9+// for __DragonFly_version
10+#if defined(__DragonFly__) 10+#if defined(__DragonFly__)
11+#include <sys/param.h> 11+#include <sys/param.h>
12+#endif 12+#endif
13+ 13+
14 // unistd.h is needed for the _XOPEN_UNIX macro 14 // unistd.h is needed for the _XOPEN_UNIX macro
15 #include <unistd.h> 15 #include <unistd.h>
16-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF) 16-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)
17+#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__) 17+#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__)
18 # include <langinfo.h> 18 # include <langinfo.h>
19 #endif 19 #endif
20  20
21@@ -69,6 +74,9 @@ 21@@ -69,6 +74,9 @@
22 # else 22 # else
23 # define UTF16 "UTF-16LE" 23 # define UTF16 "UTF-16LE"
24 # endif 24 # endif
25+#elif defined(__DragonFly__) && __DragonFly_version__ < 197700 25+#elif defined(__DragonFly__) && __DragonFly_version__ < 197700
26+# define NO_BOM 26+# define NO_BOM
27+# define UTF16 "UTF-16" 27+# define UTF16 "UTF-16"
28 #else 28 #else
29 # define UTF16 "UTF-16" 29 # define UTF16 "UTF-16"
30 #endif 30 #endif
31@@ -218,7 +226,7 @@ QString QIconvCodec::convertToUnicode(co 31@@ -218,7 +226,7 @@ QString QIconvCodec::convertToUnicode(co
32 IconvState *state = *pstate; 32 IconvState *state = *pstate;
33 size_t inBytesLeft = len; 33 size_t inBytesLeft = len;
34 // best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM 34 // best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM
35-#ifdef GNU_LIBICONV 35-#ifdef GNU_LIBICONV
36+#if defined(GNU_LIBICONV) || defined(__NetBSD__) 36+#if defined(GNU_LIBICONV) || defined(__NetBSD__)
37 // GNU doesn't disagree with POSIX :/ 37 // GNU doesn't disagree with POSIX :/
38 const char *inBytes = chars; 38 const char *inBytes = chars;
39 #else 39 #else
40@@ -306,7 +314,7 @@ QByteArray QIconvCodec::convertFromUnico 40@@ -305,7 +313,7 @@ QByteArray QIconvCodec::convertFromUnico
41 char *outBytes; 41 char *outBytes;
42 size_t inBytesLeft; 42 size_t inBytesLeft;
43  43
44-#if defined(GNU_LIBICONV) 44-#if defined(GNU_LIBICONV)
45+#if defined(GNU_LIBICONV) || defined(__NetBSD__) 45+#if defined(GNU_LIBICONV) || defined(__NetBSD__)
46 const char **inBytesPtr = const_cast<const char **>(&inBytes); 46 const char **inBytesPtr = const_cast<const char **>(&inBytes);
47 #else 47 #else
48 char **inBytesPtr = &inBytes; 48 char **inBytesPtr = &inBytes;
49@@ -454,11 +462,13 @@ iconv_t QIconvCodec::createIconv_t(const 49@@ -451,11 +459,13 @@ iconv_t QIconvCodec::createIconv_t(const
50 static const char empty_codeset[] = ""; 50 static const char empty_codeset[] = "";
51 const char *codeset = empty_codeset; 51 const char *codeset = empty_codeset;
52 cd = iconv_open(to ? to : codeset, from ? from : codeset); 52 cd = iconv_open(to ? to : codeset, from ? from : codeset);
53+#elif defined(__NetBSD) 53+#elif defined(__NetBSD)
54+ const char *codeset = 0; 54+ const char *codeset = 0;
55 #else 55 #else
56 char *codeset = 0; 56 char *codeset = 0;
57 #endif 57 #endif
58  58
59-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF) 59-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)
60+#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__) 60+#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__)
61 if (cd == (iconv_t) -1) { 61 if (cd == (iconv_t) -1) {
62 codeset = nl_langinfo(CODESET); 62 codeset = nl_langinfo(CODESET);
63 if (codeset) 63 if (codeset)

cvs diff -r1.5 -r1.6 pkgsrc/x11/qt4-libs/patches/patch-ak (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-ak 2009/10/11 09:14:52 1.5
+++ pkgsrc/x11/qt4-libs/patches/patch-ak 2010/01/29 18:19:09 1.6
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ak,v 1.5 2009/10/11 09:14:52 adam Exp $ 1$NetBSD: patch-ak,v 1.6 2010/01/29 18:19:09 adam Exp $
2 2
3--- src/gui/kernel/qcursor_x11.cpp.orig 2009-09-29 13:01:37.000000000 +0200 3--- src/gui/kernel/qcursor_x11.cpp.orig 2010-01-15 17:01:35.000000000 +0000
4+++ src/gui/kernel/qcursor_x11.cpp 4+++ src/gui/kernel/qcursor_x11.cpp
5@@ -244,7 +244,7 @@ void QCursorData::update() 5@@ -243,7 +243,7 @@ void QCursorData::update()
6 return; 6 return;
7 } 7 }
8  8
9- static const char *cursorNames[] = { 9- static const char *cursorNames[] = {
10+ static char *cursorNames[] = { 10+ static char *cursorNames[] = {
11 "left_ptr", 11 "left_ptr",
12 "up_arrow", 12 "up_arrow",
13 "cross", 13 "cross",

cvs diff -r1.5 -r1.6 pkgsrc/x11/qt4-libs/patches/patch-aq (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-aq 2009/10/11 09:14:52 1.5
+++ pkgsrc/x11/qt4-libs/patches/patch-aq 2010/01/29 18:19:09 1.6
@@ -1,63 +1,22 @@ @@ -1,63 +1,22 @@
1$NetBSD: patch-aq,v 1.5 2009/10/11 09:14:52 adam Exp $ 1$NetBSD: patch-aq,v 1.6 2010/01/29 18:19:09 adam Exp $
2 2
3--- configure.orig 2009-09-29 13:01:31.000000000 +0200 3--- configure.orig 2010-01-15 17:01:30.000000000 +0000
4+++ configure 4+++ configure
5@@ -2798,7 +2798,7 @@ elif [ "$CFG_PRECOMPILE" = "yes" ] && [  5@@ -3069,7 +3069,7 @@ fi
6 fi 6 if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then
7  7 # get the darwin version. 10.0.0 and up means snow leopard.
8 #auto-detect DWARF2 on the mac 8 VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
9-if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" == "auto" ]; then 9- if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" == "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" == "macx-g++" ]; then
10+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "auto" ]; then 10+ if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" = "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" = "macx-g++" ]; then
11 if "$mactests/dwarf2.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then 11 echo
12 CFG_MAC_DWARF2=no 12 echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. "
13 else 13 echo
14@@ -2807,7 +2807,7 @@ if [ "$PLATFORM_MAC" = "yes" ] && [ "$CF 14@@ -7012,7 +7012,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
15 fi 
16  
17 # auto-detect support for -Xarch on the mac 
18-if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" == "auto" ]; then 
19+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_XARCH" = "auto" ]; then 
20 if "$mactests/xarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" ; then 
21 CFG_MAC_XARCH=no 
22 else 
23@@ -5587,18 +5587,18 @@ fi 
24  
25 # Set the default arch. Select 32-bit/carbon if nothing else has  
26 # been specified on the configure line. 
27-if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_ARCHS" == "" ]; then 
28+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_ARCHS" = "" ]; then 
29 source "$mactests/defaultarch.test" "$TEST_COMPILER" "$OPT_VERBOSE" "$mactests" 
30  
31- if [ "$QT_MAC_DEFUALT_ARCH" == "x86_64" ]; then 
32+ if [ "$QT_MAC_DEFUALT_ARCH" = "x86_64" ]; then 
33 CFG_MAC_ARCHS=" x86" 
34- elif [ "$QT_MAC_DEFUALT_ARCH" == "ppc64" ]; then 
35+ elif [ "$QT_MAC_DEFUALT_ARCH" = "ppc64" ]; then 
36 CFG_MAC_ARCHS=" ppc" 
37 else 
38 CFG_MAC_ARCHS=" $QT_MAC_DEFUALT_ARCH" 
39 fi 
40  
41- [ "$OPT_VERBOSE" == "yes" ] && echo "Setting Mac architechture to$CFG_MAC_ARCHS." 
42+ [ "$OPT_VERBOSE" = "yes" ] && echo "Setting Mac architechture to$CFG_MAC_ARCHS." 
43 fi 
44  
45 # enable cocoa and/or carbon on Mac 
46@@ -6538,7 +6538,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" 
47 [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS" 15 [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS"
48 [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6" 16 [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6"
49 [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE" 17 [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE"
50-[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" 18-[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
51+#[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" 19+#[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
52  20
53 if [ "$PLATFORM_QWS" != "yes" ]; then 21 if [ "$PLATFORM_QWS" != "yes" ]; then
54 [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" 22 [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER"
55@@ -6856,7 +6856,7 @@ EOF 
56 *) ;; 
57 esac 
58  
59-if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" == "no" ] && [ "$CFG_WEBKIT" = "yes" ] && [ "$CFG_DEBUG_RELEASE" == "yes" ]; then 
60+if [ "$PLATFORM_MAC" = "yes" ] && [ "$CFG_MAC_DWARF2" = "no" ] && [ "$CFG_WEBKIT" = "yes" ] && [ "$CFG_DEBUG_RELEASE" = "yes" ]; then 
61 cat <<EOF 
62 WARNING: DWARF2 debug symbols are not enabled. Linking webkit 
63 in debug mode will run out of memory on systems with 2GB or less. 

cvs diff -r1.4 -r1.5 pkgsrc/x11/qt4-libs/patches/patch-ar (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-ar 2009/10/11 09:14:52 1.4
+++ pkgsrc/x11/qt4-libs/patches/patch-ar 2010/01/29 18:19:09 1.5
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ar,v 1.4 2009/10/11 09:14:52 adam Exp $ 1$NetBSD: patch-ar,v 1.5 2010/01/29 18:19:09 adam Exp $
2 2
3--- src/corelib/global/qglobal.h.orig 2009-10-05 09:36:44.000000000 +0200 3--- src/corelib/global/qglobal.h.orig 2010-01-27 13:03:02.000000000 +0000
4+++ src/corelib/global/qglobal.h 4+++ src/corelib/global/qglobal.h
5@@ -176,7 +176,7 @@ namespace QT_NAMESPACE {} 5@@ -177,7 +177,7 @@ namespace QT_NAMESPACE {}
6 */ 6 */
7  7
8 #if defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__)) 8 #if defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__))
9-# define Q_OS_DARWIN 9-# define Q_OS_DARWIN
10+/* # define Q_OS_DARWIN *//* Else it'll try to use MacOS, no X, stuff - HF */ 10+/* # define Q_OS_DARWIN *//* Else it'll try to use MacOS, no X, stuff - HF */
11 # define Q_OS_BSD4 11 # define Q_OS_BSD4
12 # ifdef __LP64__ 12 # ifdef __LP64__
13 # define Q_OS_DARWIN64 13 # define Q_OS_DARWIN64

File Added: pkgsrc/x11/qt4-libs/patches/patch-au
$NetBSD: patch-au,v 1.4 2010/01/29 18:19:09 adam Exp $

--- src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h.orig	2010-01-28 07:10:17.000000000 +0000
+++ src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h
@@ -468,7 +468,7 @@ namespace JSC {
             u.asBits.tag = CellTag;
         else
             u.asBits.tag = EmptyValueTag;
-        u.asBits.payload = reinterpret_cast<int32_t>(ptr);
+        u.asBits.payload = reinterpret_cast<intptr_t>(ptr);
     }
 
     inline JSValue::JSValue(const JSCell* ptr)
@@ -477,7 +477,7 @@ namespace JSC {
             u.asBits.tag = CellTag;
         else
             u.asBits.tag = EmptyValueTag;
-        u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr));
+        u.asBits.payload = reinterpret_cast<intptr_t>(const_cast<JSCell*>(ptr));
     }
 
     inline JSValue::operator bool() const

File Added: pkgsrc/x11/qt4-libs/patches/patch-aw
$NetBSD: patch-aw,v 1.1 2010/01/29 18:19:09 adam Exp $

--- src/network/kernel/qhostinfo_unix.cpp.orig	2010-01-28 07:21:09.000000000 +0000
+++ src/network/kernel/qhostinfo_unix.cpp
@@ -116,6 +116,8 @@ static void resolveLibrary()
         if (!local_res_nclose)
             local_res_ninit = 0;
     }
+    if (local_res_ninit)
+        local_res_init = 0;
 #endif
 }
 

cvs diff -r1.1 -r1.2 pkgsrc/x11/qt4-libs/patches/Attic/patch-ax (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/Attic/patch-ax 2009/06/13 11:55:51 1.1
+++ pkgsrc/x11/qt4-libs/patches/Attic/patch-ax 2010/01/29 18:19:09 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ax,v 1.1 2009/06/13 11:55:51 hasso Exp $ 1$NetBSD: patch-ax,v 1.2 2010/01/29 18:19:09 adam Exp $
2 2
3--- src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp.orig 2009-04-22 02:57:38 +0300 3--- src/3rdparty/webkit/WebCore/websockets/WebSocketHandshake.cpp.orig 2010-01-28 06:27:43.000000000 +0000
4+++ src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp 2009-05-01 19:45:48 +0300 4+++ src/3rdparty/webkit/WebCore/websockets/WebSocketHandshake.cpp
5@@ -76,9 +76,7 @@ extern int *__libc_stack_end; 5@@ -252,7 +252,11 @@ int WebSocketHandshake::readServerHandsh
6 #include <thread.h> 6 p += sizeof(webSocketConnectionHeader) - 1;
7 #endif 7 }
8  8
9-#if PLATFORM(OPENBSD) 9+#if defined(__NetBSD__)
10 #include <pthread.h> 10+ if (!strstr(p, "\r\n\r\n")) {
11-#endif 11+#else
12  12 if (!strnstr(p, "\r\n\r\n", end - p)) {
13 #if HAVE(PTHREAD_NP_H) 13+#endif
14 #include <pthread_np.h> 14 // Just hasn't been received fully yet.
 15 return -1;
 16 }

File Deleted: pkgsrc/x11/qt4-libs/patches/patch-ca

File Deleted: pkgsrc/x11/qt4-libs/patches/Attic/patch-cb

cvs diff -r1.7 -r1.8 pkgsrc/x11/qt4-mysql/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-mysql/Makefile 2010/01/18 09:59:43 1.7
+++ pkgsrc/x11/qt4-mysql/Makefile 2010/01/29 18:19:09 1.8
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.7 2010/01/18 09:59:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.8 2010/01/29 18:19:09 adam Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../x11/qt4-libs/Makefile.common" 5.include "../../x11/qt4-libs/Makefile.common"
6 6
7PKGNAME= qt4-mysql-${QTVERSION} 7PKGNAME= qt4-mysql-${QTVERSION}
8PKGREVISION= 1 
9COMMENT= QT mysql driver 8COMMENT= QT mysql driver
10 9
11CONFIGURE_ARGS+= -I${QTDIR}/include 10CONFIGURE_ARGS+= -I${QTDIR}/include
12CONFIGURE_ARGS+= -L${QTDIR}/lib 11CONFIGURE_ARGS+= -L${QTDIR}/lib
13 12
14BUILD_QT4= yes 13BUILD_QT4= yes
15 14
16do-build: 15do-build:
17 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} 16 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE}
18 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} 17 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}
19 cd ${WRKSRC}/src/plugins/sqldrivers/mysql && env ${MAKE_ENV} ${GMAKE} 18 cd ${WRKSRC}/src/plugins/sqldrivers/mysql && env ${MAKE_ENV} ${GMAKE}
20 19
21SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers 20SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers

cvs diff -r1.12 -r1.13 pkgsrc/x11/qt4-pgsql/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-pgsql/Makefile 2010/01/18 09:59:43 1.12
+++ pkgsrc/x11/qt4-pgsql/Makefile 2010/01/29 18:19:09 1.13
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.12 2010/01/18 09:59:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.13 2010/01/29 18:19:09 adam Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../x11/qt4-libs/Makefile.common" 5.include "../../x11/qt4-libs/Makefile.common"
6 6
7PKGNAME= qt4-pgsql-${QTVERSION} 7PKGNAME= qt4-pgsql-${QTVERSION}
8PKGREVISION= 1 
9COMMENT= QT postgresql driver 8COMMENT= QT postgresql driver
10 9
11CONFIGURE_ARGS+= -I${QTDIR}/include 10CONFIGURE_ARGS+= -I${QTDIR}/include
12CONFIGURE_ARGS+= -I${PGSQL_PREFIX}/include/postgresql/server 11CONFIGURE_ARGS+= -I${PGSQL_PREFIX}/include/postgresql/server
13CONFIGURE_ARGS+= -L${QTDIR}/lib 12CONFIGURE_ARGS+= -L${QTDIR}/lib
14 13
15BUILD_QT4= yes 14BUILD_QT4= yes
16 15
17do-build: 16do-build:
18 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} 17 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE}
19 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} 18 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}
20 cd ${WRKSRC}/src/plugins/sqldrivers/psql && env ${MAKE_ENV} ${GMAKE} 19 cd ${WRKSRC}/src/plugins/sqldrivers/psql && env ${MAKE_ENV} ${GMAKE}
21 20

cvs diff -r1.10 -r1.11 pkgsrc/x11/qt4-qdbus/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-qdbus/Makefile 2010/01/18 09:59:43 1.10
+++ pkgsrc/x11/qt4-qdbus/Makefile 2010/01/29 18:19:09 1.11
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.10 2010/01/18 09:59:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.11 2010/01/29 18:19:09 adam Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../x11/qt4-libs/Makefile.common" 5.include "../../x11/qt4-libs/Makefile.common"
6 6
7PKGNAME= qt4-qdbus-${QTVERSION} 7PKGNAME= qt4-qdbus-${QTVERSION}
8PKGREVISION= 2 
9COMMENT= QT DBus support 8COMMENT= QT DBus support
10 9
11CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib 10CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib
12CONFIGURE_ARGS+= -qdbus 11CONFIGURE_ARGS+= -qdbus
13 12
14USE_TOOLS+= pkg-config 13USE_TOOLS+= pkg-config
15 14
16BUILD_QT4= yes 15BUILD_QT4= yes
17 16
18post-configure: 17post-configure:
19 ln -s ${QTPREFIX}/bin/moc ${WRKSRC}/bin/moc 18 ln -s ${QTPREFIX}/bin/moc ${WRKSRC}/bin/moc
20 ln -s ${QTPREFIX}/bin/uic ${WRKSRC}/bin/uic 19 ln -s ${QTPREFIX}/bin/uic ${WRKSRC}/bin/uic
21 ln -s ${QTPREFIX}/bin/rcc ${WRKSRC}/bin/rcc 20 ln -s ${QTPREFIX}/bin/rcc ${WRKSRC}/bin/rcc

cvs diff -r1.6 -r1.7 pkgsrc/x11/qt4-qdbus/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/qt4-qdbus/PLIST 2009/10/17 22:57:45 1.6
+++ pkgsrc/x11/qt4-qdbus/PLIST 2010/01/29 18:19:09 1.7
@@ -1,60 +1,64 @@ @@ -1,60 +1,64 @@
1@comment $NetBSD: PLIST,v 1.6 2009/10/17 22:57:45 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.7 2010/01/29 18:19:09 adam Exp $
2lib/pkgconfig/QtDBus.pc 2lib/pkgconfig/QtDBus.pc
3qt4/bin/qdbus 3qt4/bin/qdbus
4qt4/bin/qdbuscpp2xml 4qt4/bin/qdbuscpp2xml
5qt4/bin/qdbusviewer 5qt4/bin/qdbusviewer
6qt4/bin/qdbusxml2cpp 6qt4/bin/qdbusxml2cpp
7qt4/include/Qt/QtDBus 7qt4/include/Qt/QtDBus
8qt4/include/Qt/qdbusabstractadaptor.h 8qt4/include/Qt/qdbusabstractadaptor.h
9qt4/include/Qt/qdbusabstractinterface.h 9qt4/include/Qt/qdbusabstractinterface.h
10qt4/include/Qt/qdbusargument.h 10qt4/include/Qt/qdbusargument.h
11qt4/include/Qt/qdbusconnection.h 11qt4/include/Qt/qdbusconnection.h
12qt4/include/Qt/qdbusconnectioninterface.h 12qt4/include/Qt/qdbusconnectioninterface.h
13qt4/include/Qt/qdbuscontext.h 13qt4/include/Qt/qdbuscontext.h
14qt4/include/Qt/qdbuserror.h 14qt4/include/Qt/qdbuserror.h
15qt4/include/Qt/qdbusextratypes.h 15qt4/include/Qt/qdbusextratypes.h
16qt4/include/Qt/qdbusinterface.h 16qt4/include/Qt/qdbusinterface.h
17qt4/include/Qt/qdbusmacros.h 17qt4/include/Qt/qdbusmacros.h
18qt4/include/Qt/qdbusmessage.h 18qt4/include/Qt/qdbusmessage.h
19qt4/include/Qt/qdbusmetatype.h 19qt4/include/Qt/qdbusmetatype.h
20qt4/include/Qt/qdbuspendingcall.h 20qt4/include/Qt/qdbuspendingcall.h
21qt4/include/Qt/qdbuspendingreply.h 21qt4/include/Qt/qdbuspendingreply.h
22qt4/include/Qt/qdbusreply.h 22qt4/include/Qt/qdbusreply.h
23qt4/include/Qt/qdbusserver.h 23qt4/include/Qt/qdbusserver.h
 24qt4/include/Qt/qdbusservicewatcher.h
24qt4/include/QtDBus/QDBusAbstractAdaptor 25qt4/include/QtDBus/QDBusAbstractAdaptor
25qt4/include/QtDBus/QDBusAbstractInterface 26qt4/include/QtDBus/QDBusAbstractInterface
 27qt4/include/QtDBus/QDBusAbstractInterfaceBase
26qt4/include/QtDBus/QDBusArgument 28qt4/include/QtDBus/QDBusArgument
27qt4/include/QtDBus/QDBusConnection 29qt4/include/QtDBus/QDBusConnection
28qt4/include/QtDBus/QDBusConnectionInterface 30qt4/include/QtDBus/QDBusConnectionInterface
29qt4/include/QtDBus/QDBusContext 31qt4/include/QtDBus/QDBusContext
30qt4/include/QtDBus/QDBusError 32qt4/include/QtDBus/QDBusError
31qt4/include/QtDBus/QDBusInterface 33qt4/include/QtDBus/QDBusInterface
32qt4/include/QtDBus/QDBusMessage 34qt4/include/QtDBus/QDBusMessage
33qt4/include/QtDBus/QDBusMetaType 35qt4/include/QtDBus/QDBusMetaType
34qt4/include/QtDBus/QDBusObjectPath 36qt4/include/QtDBus/QDBusObjectPath
35qt4/include/QtDBus/QDBusPendingCall 37qt4/include/QtDBus/QDBusPendingCall
36qt4/include/QtDBus/QDBusPendingCallWatcher 38qt4/include/QtDBus/QDBusPendingCallWatcher
37qt4/include/QtDBus/QDBusPendingReply 39qt4/include/QtDBus/QDBusPendingReply
38qt4/include/QtDBus/QDBusPendingReplyData 40qt4/include/QtDBus/QDBusPendingReplyData
39qt4/include/QtDBus/QDBusReply 41qt4/include/QtDBus/QDBusReply
40qt4/include/QtDBus/QDBusServer 42qt4/include/QtDBus/QDBusServer
 43qt4/include/QtDBus/QDBusServiceWatcher
41qt4/include/QtDBus/QDBusSignature 44qt4/include/QtDBus/QDBusSignature
42qt4/include/QtDBus/QDBusVariant 45qt4/include/QtDBus/QDBusVariant
43qt4/include/QtDBus/QtDBus 46qt4/include/QtDBus/QtDBus
44qt4/include/QtDBus/qdbusabstractadaptor.h 47qt4/include/QtDBus/qdbusabstractadaptor.h
45qt4/include/QtDBus/qdbusabstractinterface.h 48qt4/include/QtDBus/qdbusabstractinterface.h
46qt4/include/QtDBus/qdbusargument.h 49qt4/include/QtDBus/qdbusargument.h
47qt4/include/QtDBus/qdbusconnection.h 50qt4/include/QtDBus/qdbusconnection.h
48qt4/include/QtDBus/qdbusconnectioninterface.h 51qt4/include/QtDBus/qdbusconnectioninterface.h
49qt4/include/QtDBus/qdbuscontext.h 52qt4/include/QtDBus/qdbuscontext.h
50qt4/include/QtDBus/qdbuserror.h 53qt4/include/QtDBus/qdbuserror.h
51qt4/include/QtDBus/qdbusextratypes.h 54qt4/include/QtDBus/qdbusextratypes.h
52qt4/include/QtDBus/qdbusinterface.h 55qt4/include/QtDBus/qdbusinterface.h
53qt4/include/QtDBus/qdbusmacros.h 56qt4/include/QtDBus/qdbusmacros.h
54qt4/include/QtDBus/qdbusmessage.h 57qt4/include/QtDBus/qdbusmessage.h
55qt4/include/QtDBus/qdbusmetatype.h 58qt4/include/QtDBus/qdbusmetatype.h
56qt4/include/QtDBus/qdbuspendingcall.h 59qt4/include/QtDBus/qdbuspendingcall.h
57qt4/include/QtDBus/qdbuspendingreply.h 60qt4/include/QtDBus/qdbuspendingreply.h
58qt4/include/QtDBus/qdbusreply.h 61qt4/include/QtDBus/qdbusreply.h
59qt4/include/QtDBus/qdbusserver.h 62qt4/include/QtDBus/qdbusserver.h
 63qt4/include/QtDBus/qdbusservicewatcher.h
60qt4/lib/libQtDBus.la 64qt4/lib/libQtDBus.la

cvs diff -r1.8 -r1.9 pkgsrc/x11/qt4-sqlite3/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-sqlite3/Makefile 2010/01/18 09:59:44 1.8
+++ pkgsrc/x11/qt4-sqlite3/Makefile 2010/01/29 18:19:09 1.9
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.8 2010/01/18 09:59:44 wiz Exp $ 1# $NetBSD: Makefile,v 1.9 2010/01/29 18:19:09 adam Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../x11/qt4-libs/Makefile.common" 5.include "../../x11/qt4-libs/Makefile.common"
6 6
7PKGNAME= qt4-sqlite3-${QTVERSION} 7PKGNAME= qt4-sqlite3-${QTVERSION}
8PKGREVISION= 1 
9COMMENT= QT sqlite3 driver 8COMMENT= QT sqlite3 driver
10 9
11CONFIGURE_ARGS+= -I${QTDIR}/include 10CONFIGURE_ARGS+= -I${QTDIR}/include
12CONFIGURE_ARGS+= -L${QTDIR}/lib 11CONFIGURE_ARGS+= -L${QTDIR}/lib
13CONFIGURE_ARGS+= -system-sqlite 12CONFIGURE_ARGS+= -system-sqlite
14 13
15BUILD_QT4= yes 14BUILD_QT4= yes
16USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
17 16
18do-build: 17do-build:
19 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} 18 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE}
20 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} 19 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}
21 cd ${WRKSRC}/src/plugins/sqldrivers/sqlite && env ${MAKE_ENV} ${GMAKE} 20 cd ${WRKSRC}/src/plugins/sqldrivers/sqlite && env ${MAKE_ENV} ${GMAKE}

cvs diff -r1.7 -r1.8 pkgsrc/x11/qt4-tiff/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-tiff/Makefile 2010/01/18 09:59:44 1.7
+++ pkgsrc/x11/qt4-tiff/Makefile 2010/01/29 18:19:09 1.8
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.7 2010/01/18 09:59:44 wiz Exp $ 1# $NetBSD: Makefile,v 1.8 2010/01/29 18:19:09 adam Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../x11/qt4-libs/Makefile.common" 5.include "../../x11/qt4-libs/Makefile.common"
6 6
7PKGNAME= qt4-tiff-${QTVERSION} 7PKGNAME= qt4-tiff-${QTVERSION}
8PKGREVISION= 1 
9COMMENT= QT TIFF image format plugin 8COMMENT= QT TIFF image format plugin
10 9
11CONFIGURE_ARGS+= -I${QTDIR}/include 10CONFIGURE_ARGS+= -I${QTDIR}/include
12CONFIGURE_ARGS+= -L${QTDIR}/lib 11CONFIGURE_ARGS+= -L${QTDIR}/lib
13 12
14BUILD_QT4= yes 13BUILD_QT4= yes
15 14
16do-build: 15do-build:
17 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} 16 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE}
18 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} 17 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}
19 cd ${WRKSRC}/src/plugins/imageformats/tiff && env ${MAKE_ENV} ${GMAKE} 18 cd ${WRKSRC}/src/plugins/imageformats/tiff && env ${MAKE_ENV} ${GMAKE}
20 19
21IMGFMTDIR= ${QTPREFIX}/plugins/imageformats 20IMGFMTDIR= ${QTPREFIX}/plugins/imageformats

cvs diff -r1.28 -r1.29 pkgsrc/x11/qt4-tools/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-tools/Makefile 2010/01/18 09:59:44 1.28
+++ pkgsrc/x11/qt4-tools/Makefile 2010/01/29 18:19:09 1.29
@@ -1,66 +1,73 @@ @@ -1,66 +1,73 @@
1# $NetBSD: Makefile,v 1.28 2010/01/18 09:59:44 wiz Exp $ 1# $NetBSD: Makefile,v 1.29 2010/01/29 18:19:09 adam Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../x11/qt4-libs/Makefile.common" 5.include "../../x11/qt4-libs/Makefile.common"
6 6
7PKGNAME= qt4-tools-${QTVERSION} 7PKGNAME= qt4-tools-${QTVERSION}
8PKGREVISION= 2 
9COMMENT= QT GUI (WYSIWYG) builder and other tools 8COMMENT= QT GUI (WYSIWYG) builder and other tools
10 9
11DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base 10DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base
12 11
13CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib 12CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib
14CONFIGURE_ARGS+= -DQT_NO_DBUS 13CONFIGURE_ARGS+= -DQT_NO_DBUS
15 14
16BUILD_TARGET= sub-tools sub-tools-qdoc3 15# XXX this is to test what really gets installed when 'do-install' is disabled
 16INSTALL_DIRS+= tools
 17
 18BUILD_TARGET= sub-tools-bootstrap sub-tools
17 19
18BUILD_QT4= yes 20BUILD_QT4= yes
19UNLIMIT_RESOURCES= datasize 21UNLIMIT_RESOURCES= datasize
20 22
21INSTALLATION_DIRS= ${QTPREFIX}/bin ${QTPREFIX}/lib lib/pkgconfig \ 23INSTALLATION_DIRS= lib/pkgconfig
22 ${QTPREFIX}/plugins/designer ${QTPREFIX}/phrasebooks \ 24INSTALLATION_DIRS+= ${QTPREFIX}/bin
23 ${QTPREFIX}/mkspecs ${QTPREFIX}/tools/qdoc3 25INSTALLATION_DIRS+= ${QTPREFIX}/lib
 26INSTALLATION_DIRS+= ${QTPREFIX}/phrasebooks
 27INSTALLATION_DIRS+= ${QTPREFIX}/plugins/designer
 28INSTALLATION_DIRS+= ${QTPREFIX}/mkspecs
 29INSTALLATION_DIRS+= ${QTPREFIX}/tools/qdoc3
24INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 30INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
25 31
26post-configure: 32post-configure:
27 ln -s ${QTPREFIX}/bin/moc ${WRKSRC}/bin/moc 33 ln -s ${QTPREFIX}/bin/moc ${WRKSRC}/bin/moc
28 ln -s ${QTPREFIX}/bin/uic ${WRKSRC}/bin/uic 34 ln -s ${QTPREFIX}/bin/uic ${WRKSRC}/bin/uic
29 ln -s ${QTPREFIX}/bin/rcc ${WRKSRC}/bin/rcc 35 ln -s ${QTPREFIX}/bin/rcc ${WRKSRC}/bin/rcc
30 36
31do-install: 37do-install:
32.for prog in assistant_adp lrelease lupdate pixeltool qmake qt3to4 38.for prog in assistant_adp lrelease lupdate pixeltool qmake qt3to4
33 ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/ 39 ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/
34.endfor 40.endfor
35.for prog in assistant designer linguist qtconfig qhelpconverter \ 41.for prog in assistant designer linguist qdoc3 qtconfig qhelpconverter \
36 qhelpgenerator qcollectiongenerator 42 qhelpgenerator qcollectiongenerator
37 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} \ 43 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} \
38 ${DESTDIR}${QTPREFIX}/bin 44 ${DESTDIR}${QTPREFIX}/bin
39.endfor 45.endfor
40 ${INSTALL_PROGRAM} ${WRKSRC}/tools/qdoc3/qdoc3 \ 
41 ${DESTDIR}${QTPREFIX}/tools/qdoc3/ 
42 cd ${WRKSRC}/tools/assistant/lib && env ${MAKE_ENV} ${INSTALL_ENV} \ 46 cd ${WRKSRC}/tools/assistant/lib && env ${MAKE_ENV} ${INSTALL_ENV} \
43 ${MAKE_PROGRAM} install_flat_headers install_targ_headers install_class_headers 47 ${MAKE_PROGRAM} install_flat_headers install_targ_headers install_class_headers
44 cd ${WRKSRC}/tools/assistant/compat/lib && env ${MAKE_ENV} ${INSTALL_ENV} \ 48 cd ${WRKSRC}/tools/assistant/compat/lib && env ${MAKE_ENV} ${INSTALL_ENV} \
45 ${MAKE_PROGRAM} install_assistant_headers 49 ${MAKE_PROGRAM} install_assistant_headers
46 cd ${WRKSRC}/tools/designer/src/lib && env ${MAKE_ENV} ${INSTALL_ENV} \ 50 cd ${WRKSRC}/tools/designer/src/lib && env ${MAKE_ENV} ${INSTALL_ENV} \
47 ${MAKE_PROGRAM} install_designer_headers 51 ${MAKE_PROGRAM} install_designer_headers
48 cd ${WRKSRC}/tools/designer/src/uitools && env ${MAKE_ENV} ${INSTALL_ENV} \ 52 cd ${WRKSRC}/tools/designer/src/uitools && env ${MAKE_ENV} ${INSTALL_ENV} \
49 ${MAKE_PROGRAM} install_quitools_headers 53 ${MAKE_PROGRAM} install_quitools_headers
50.for lib in QtAssistantClient QtCLucene QtDesigner QtDesignerComponents QtHelp QtUiTools 54.for lib in QtAssistantClient QtCLucene QtDesigner QtDesignerComponents QtHelp QtUiTools
51 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \ 55 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \
52 ${DESTDIR}${QTPREFIX}/lib/ 56 ${DESTDIR}${QTPREFIX}/lib/
53 sed -e "s:${WRKSRC}:${QTPREFIX}:g" \ 57 sed -e "s:${WRKSRC}:${QTPREFIX}:g" \
54 ${WRKSRC}/lib/pkgconfig/${lib}.pc > ${WRKDIR}/${lib}.pc 58 ${WRKSRC}/lib/pkgconfig/${lib}.pc > ${WRKDIR}/${lib}.pc
55 ${INSTALL_DATA} ${WRKDIR}/${lib}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/ 59 ${INSTALL_DATA} ${WRKDIR}/${lib}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/
56.endfor 60.endfor
57 ${LIBTOOL} --mode=install ${INSTALL_LIB} \ 61 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
58 ${WRKSRC}/plugins/designer/libqt3supportwidgets.la \ 62 ${WRKSRC}/plugins/designer/libqt3supportwidgets.la \
59 ${DESTDIR}${QTPREFIX}/plugins/designer/ 63 ${DESTDIR}${QTPREFIX}/plugins/designer/
 64 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
 65 ${WRKSRC}/plugins/designer/libqwebview.la \
 66 ${DESTDIR}${QTPREFIX}/plugins/designer/
60 ${INSTALL_DATA} ${WRKSRC}/tools/linguist/phrasebooks/*.qph \ 67 ${INSTALL_DATA} ${WRKSRC}/tools/linguist/phrasebooks/*.qph \
61 ${DESTDIR}${QTPREFIX}/phrasebooks/ 68 ${DESTDIR}${QTPREFIX}/phrasebooks/
62 cp -R ${WRKSRC}/mkspecs ${DESTDIR}${QTPREFIX} 69 cp -R ${WRKSRC}/mkspecs ${DESTDIR}${QTPREFIX}
63 70
64.include "../../converters/libiconv/buildlink3.mk" 71.include "../../converters/libiconv/buildlink3.mk"
65.include "../../x11/qt4-libs/buildlink3.mk" 72.include "../../x11/qt4-libs/buildlink3.mk"
66.include "../../mk/bsd.pkg.mk" 73.include "../../mk/bsd.pkg.mk"

cvs diff -r1.19 -r1.20 pkgsrc/x11/qt4-tools/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/qt4-tools/PLIST 2009/10/17 23:32:52 1.19
+++ pkgsrc/x11/qt4-tools/PLIST 2010/01/29 18:19:10 1.20
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1@comment $NetBSD: PLIST,v 1.19 2009/10/17 23:32:52 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.20 2010/01/29 18:19:10 adam Exp $
2lib/pkgconfig/QtAssistantClient.pc 2lib/pkgconfig/QtAssistantClient.pc
3lib/pkgconfig/QtCLucene.pc 3lib/pkgconfig/QtCLucene.pc
4lib/pkgconfig/QtDesigner.pc 4lib/pkgconfig/QtDesigner.pc
5lib/pkgconfig/QtDesignerComponents.pc 5lib/pkgconfig/QtDesignerComponents.pc
6lib/pkgconfig/QtHelp.pc 6lib/pkgconfig/QtHelp.pc
7lib/pkgconfig/QtUiTools.pc 7lib/pkgconfig/QtUiTools.pc
8qt4/bin/assistant 8qt4/bin/assistant
9qt4/bin/assistant_adp 9qt4/bin/assistant_adp
10qt4/bin/designer 10qt4/bin/designer
11qt4/bin/linguist 11qt4/bin/linguist
12qt4/bin/lrelease 12qt4/bin/lrelease
13qt4/bin/lupdate 13qt4/bin/lupdate
14qt4/bin/pixeltool 14qt4/bin/pixeltool
15qt4/bin/qcollectiongenerator 15qt4/bin/qcollectiongenerator
 16qt4/bin/qdoc3
16qt4/bin/qhelpconverter 17qt4/bin/qhelpconverter
17qt4/bin/qhelpgenerator 18qt4/bin/qhelpgenerator
18qt4/bin/qmake 19qt4/bin/qmake
19qt4/bin/qt3to4 20qt4/bin/qt3to4
20qt4/bin/qtconfig 21qt4/bin/qtconfig
21qt4/include/Qt/QtHelp 22qt4/include/Qt/QtHelp
22qt4/include/Qt/qhelp_global.h 23qt4/include/Qt/qhelp_global.h
23qt4/include/Qt/qhelpcontentwidget.h 24qt4/include/Qt/qhelpcontentwidget.h
24qt4/include/Qt/qhelpengine.h 25qt4/include/Qt/qhelpengine.h
25qt4/include/Qt/qhelpenginecore.h 26qt4/include/Qt/qhelpenginecore.h
26qt4/include/Qt/qhelpindexwidget.h 27qt4/include/Qt/qhelpindexwidget.h
27qt4/include/Qt/qhelpsearchengine.h 28qt4/include/Qt/qhelpsearchengine.h
28qt4/include/Qt/qhelpsearchquerywidget.h 29qt4/include/Qt/qhelpsearchquerywidget.h
@@ -146,43 +147,48 @@ qt4/mkspecs/aix-g++/qmake.conf @@ -146,43 +147,48 @@ qt4/mkspecs/aix-g++/qmake.conf
146qt4/mkspecs/aix-g++/qplatformdefs.h 147qt4/mkspecs/aix-g++/qplatformdefs.h
147qt4/mkspecs/aix-xlc-64/qmake.conf 148qt4/mkspecs/aix-xlc-64/qmake.conf
148qt4/mkspecs/aix-xlc-64/qplatformdefs.h 149qt4/mkspecs/aix-xlc-64/qplatformdefs.h
149qt4/mkspecs/aix-xlc/qmake.conf 150qt4/mkspecs/aix-xlc/qmake.conf
150qt4/mkspecs/aix-xlc/qplatformdefs.h 151qt4/mkspecs/aix-xlc/qplatformdefs.h
151qt4/mkspecs/common/g++.conf 152qt4/mkspecs/common/g++.conf
152qt4/mkspecs/common/linux.conf 153qt4/mkspecs/common/linux.conf
153qt4/mkspecs/common/llvm.conf 154qt4/mkspecs/common/llvm.conf
154qt4/mkspecs/common/mac-g++.conf 155qt4/mkspecs/common/mac-g++.conf
155qt4/mkspecs/common/mac-llvm.conf 156qt4/mkspecs/common/mac-llvm.conf
156qt4/mkspecs/common/mac.conf 157qt4/mkspecs/common/mac.conf
157qt4/mkspecs/common/qmake.conf 158qt4/mkspecs/common/qmake.conf
158qt4/mkspecs/common/qws.conf 159qt4/mkspecs/common/qws.conf
 160qt4/mkspecs/common/symbian/qplatformdefs.h
 161qt4/mkspecs/common/symbian/stl-off/new
 162qt4/mkspecs/common/symbian/symbian.conf
159qt4/mkspecs/common/unix.conf 163qt4/mkspecs/common/unix.conf
160qt4/mkspecs/common/wince.conf 164qt4/mkspecs/common/wince/qmake.conf
 165qt4/mkspecs/common/wince/qplatformdefs.h
161qt4/mkspecs/cygwin-g++/qmake.conf 166qt4/mkspecs/cygwin-g++/qmake.conf
162qt4/mkspecs/cygwin-g++/qplatformdefs.h 167qt4/mkspecs/cygwin-g++/qplatformdefs.h
163qt4/mkspecs/darwin-g++/qmake.conf 168qt4/mkspecs/darwin-g++/qmake.conf
164qt4/mkspecs/darwin-g++/qplatformdefs.h 169qt4/mkspecs/darwin-g++/qplatformdefs.h
165qt4/mkspecs/default 170qt4/mkspecs/default
166qt4/mkspecs/features/assistant.prf 171qt4/mkspecs/features/assistant.prf
167qt4/mkspecs/features/build_pass.prf 172qt4/mkspecs/features/build_pass.prf
168qt4/mkspecs/features/dbusadaptors.prf 173qt4/mkspecs/features/dbusadaptors.prf
169qt4/mkspecs/features/dbusinterfaces.prf 174qt4/mkspecs/features/dbusinterfaces.prf
170qt4/mkspecs/features/debug.prf 175qt4/mkspecs/features/debug.prf
171qt4/mkspecs/features/debug_and_release.prf 176qt4/mkspecs/features/debug_and_release.prf
172qt4/mkspecs/features/default_post.prf 177qt4/mkspecs/features/default_post.prf
173qt4/mkspecs/features/default_pre.prf 178qt4/mkspecs/features/default_pre.prf
174qt4/mkspecs/features/designer.prf 179qt4/mkspecs/features/designer.prf
175qt4/mkspecs/features/dll.prf 180qt4/mkspecs/features/dll.prf
 181qt4/mkspecs/features/egl.prf
176qt4/mkspecs/features/exclusive_builds.prf 182qt4/mkspecs/features/exclusive_builds.prf
177qt4/mkspecs/features/help.prf 183qt4/mkspecs/features/help.prf
178qt4/mkspecs/features/include_source_dir.prf 184qt4/mkspecs/features/include_source_dir.prf
179qt4/mkspecs/features/incredibuild_xge.prf 185qt4/mkspecs/features/incredibuild_xge.prf
180qt4/mkspecs/features/lex.prf 186qt4/mkspecs/features/lex.prf
181qt4/mkspecs/features/link_pkgconfig.prf 187qt4/mkspecs/features/link_pkgconfig.prf
182qt4/mkspecs/features/mac/default_post.prf 188qt4/mkspecs/features/mac/default_post.prf
183qt4/mkspecs/features/mac/default_pre.prf 189qt4/mkspecs/features/mac/default_pre.prf
184qt4/mkspecs/features/mac/dwarf2.prf 190qt4/mkspecs/features/mac/dwarf2.prf
185qt4/mkspecs/features/mac/objective_c.prf 191qt4/mkspecs/features/mac/objective_c.prf
186qt4/mkspecs/features/mac/ppc.prf 192qt4/mkspecs/features/mac/ppc.prf
187qt4/mkspecs/features/mac/ppc64.prf 193qt4/mkspecs/features/mac/ppc64.prf
188qt4/mkspecs/features/mac/rez.prf 194qt4/mkspecs/features/mac/rez.prf
@@ -197,52 +203,66 @@ qt4/mkspecs/features/qt.prf @@ -197,52 +203,66 @@ qt4/mkspecs/features/qt.prf
197qt4/mkspecs/features/qt_config.prf 203qt4/mkspecs/features/qt_config.prf
198qt4/mkspecs/features/qt_functions.prf 204qt4/mkspecs/features/qt_functions.prf
199qt4/mkspecs/features/qtestlib.prf 205qt4/mkspecs/features/qtestlib.prf
200qt4/mkspecs/features/qtopia.prf 206qt4/mkspecs/features/qtopia.prf
201qt4/mkspecs/features/qtopiainc.prf 207qt4/mkspecs/features/qtopiainc.prf
202qt4/mkspecs/features/qtopialib.prf 208qt4/mkspecs/features/qtopialib.prf
203qt4/mkspecs/features/release.prf 209qt4/mkspecs/features/release.prf
204qt4/mkspecs/features/resources.prf 210qt4/mkspecs/features/resources.prf
205qt4/mkspecs/features/shared.prf 211qt4/mkspecs/features/shared.prf
206qt4/mkspecs/features/silent.prf 212qt4/mkspecs/features/silent.prf
207qt4/mkspecs/features/static.prf 213qt4/mkspecs/features/static.prf
208qt4/mkspecs/features/static_and_shared.prf 214qt4/mkspecs/features/static_and_shared.prf
209qt4/mkspecs/features/staticlib.prf 215qt4/mkspecs/features/staticlib.prf
 216qt4/mkspecs/features/symbian/application_icon.prf
 217qt4/mkspecs/features/symbian/armcc_warnings.prf
 218qt4/mkspecs/features/symbian/data_caging_paths.prf
 219qt4/mkspecs/features/symbian/default_post.prf
 220qt4/mkspecs/features/symbian/default_pre.prf
 221qt4/mkspecs/features/symbian/epocallowdlldata.prf
 222qt4/mkspecs/features/symbian/moc.prf
 223qt4/mkspecs/features/symbian/platform_paths.prf
 224qt4/mkspecs/features/symbian/qt.prf
 225qt4/mkspecs/features/symbian/stl.prf
 226qt4/mkspecs/features/symbian/stl_off.prf
210qt4/mkspecs/features/uic.prf 227qt4/mkspecs/features/uic.prf
211qt4/mkspecs/features/uitools.prf 228qt4/mkspecs/features/uitools.prf
212qt4/mkspecs/features/unix/bsymbolic_functions.prf 229qt4/mkspecs/features/unix/bsymbolic_functions.prf
213qt4/mkspecs/features/unix/dylib.prf 230qt4/mkspecs/features/unix/dylib.prf
214qt4/mkspecs/features/unix/hide_symbols.prf 231qt4/mkspecs/features/unix/hide_symbols.prf
215qt4/mkspecs/features/unix/largefile.prf 232qt4/mkspecs/features/unix/largefile.prf
216qt4/mkspecs/features/unix/opengl.prf 233qt4/mkspecs/features/unix/opengl.prf
 234qt4/mkspecs/features/unix/openvg.prf
217qt4/mkspecs/features/unix/separate_debug_info.prf 235qt4/mkspecs/features/unix/separate_debug_info.prf
218qt4/mkspecs/features/unix/thread.prf 236qt4/mkspecs/features/unix/thread.prf
219qt4/mkspecs/features/unix/x11.prf 237qt4/mkspecs/features/unix/x11.prf
220qt4/mkspecs/features/unix/x11inc.prf 238qt4/mkspecs/features/unix/x11inc.prf
221qt4/mkspecs/features/unix/x11lib.prf 239qt4/mkspecs/features/unix/x11lib.prf
222qt4/mkspecs/features/unix/x11sm.prf 240qt4/mkspecs/features/unix/x11sm.prf
223qt4/mkspecs/features/use_c_linker.prf 241qt4/mkspecs/features/use_c_linker.prf
 242qt4/mkspecs/features/vxworks.prf
224qt4/mkspecs/features/warn_off.prf 243qt4/mkspecs/features/warn_off.prf
225qt4/mkspecs/features/warn_on.prf 244qt4/mkspecs/features/warn_on.prf
226qt4/mkspecs/features/win32/console.prf 245qt4/mkspecs/features/win32/console.prf
227qt4/mkspecs/features/win32/default_post.prf 246qt4/mkspecs/features/win32/default_post.prf
228qt4/mkspecs/features/win32/default_pre.prf 247qt4/mkspecs/features/win32/default_pre.prf
229qt4/mkspecs/features/win32/dumpcpp.prf 248qt4/mkspecs/features/win32/dumpcpp.prf
230qt4/mkspecs/features/win32/embed_manifest_dll.prf 249qt4/mkspecs/features/win32/embed_manifest_dll.prf
231qt4/mkspecs/features/win32/embed_manifest_exe.prf 250qt4/mkspecs/features/win32/embed_manifest_exe.prf
232qt4/mkspecs/features/win32/exceptions.prf 251qt4/mkspecs/features/win32/exceptions.prf
233qt4/mkspecs/features/win32/exceptions_off.prf 252qt4/mkspecs/features/win32/exceptions_off.prf
234qt4/mkspecs/features/win32/ltcg.prf 253qt4/mkspecs/features/win32/ltcg.prf
235qt4/mkspecs/features/win32/opengl.prf 254qt4/mkspecs/features/win32/opengl.prf
 255qt4/mkspecs/features/win32/openvg.prf
236qt4/mkspecs/features/win32/qaxcontainer.prf 256qt4/mkspecs/features/win32/qaxcontainer.prf
237qt4/mkspecs/features/win32/qaxserver.prf 257qt4/mkspecs/features/win32/qaxserver.prf
238qt4/mkspecs/features/win32/qt_dll.prf 258qt4/mkspecs/features/win32/qt_dll.prf
239qt4/mkspecs/features/win32/rtti.prf 259qt4/mkspecs/features/win32/rtti.prf
240qt4/mkspecs/features/win32/rtti_off.prf 260qt4/mkspecs/features/win32/rtti_off.prf
241qt4/mkspecs/features/win32/stl.prf 261qt4/mkspecs/features/win32/stl.prf
242qt4/mkspecs/features/win32/stl_off.prf 262qt4/mkspecs/features/win32/stl_off.prf
243qt4/mkspecs/features/win32/thread.prf 263qt4/mkspecs/features/win32/thread.prf
244qt4/mkspecs/features/win32/thread_off.prf 264qt4/mkspecs/features/win32/thread_off.prf
245qt4/mkspecs/features/win32/windows.prf 265qt4/mkspecs/features/win32/windows.prf
246qt4/mkspecs/features/yacc.prf 266qt4/mkspecs/features/yacc.prf
247qt4/mkspecs/freebsd-g++/qmake.conf 267qt4/mkspecs/freebsd-g++/qmake.conf
248qt4/mkspecs/freebsd-g++/qplatformdefs.h 268qt4/mkspecs/freebsd-g++/qplatformdefs.h
@@ -278,48 +298,54 @@ qt4/mkspecs/irix-cc/qmake.conf @@ -278,48 +298,54 @@ qt4/mkspecs/irix-cc/qmake.conf
278qt4/mkspecs/irix-cc/qplatformdefs.h 298qt4/mkspecs/irix-cc/qplatformdefs.h
279qt4/mkspecs/irix-g++-64/qmake.conf 299qt4/mkspecs/irix-g++-64/qmake.conf
280qt4/mkspecs/irix-g++-64/qplatformdefs.h 300qt4/mkspecs/irix-g++-64/qplatformdefs.h
281qt4/mkspecs/irix-g++/qmake.conf 301qt4/mkspecs/irix-g++/qmake.conf
282qt4/mkspecs/irix-g++/qplatformdefs.h 302qt4/mkspecs/irix-g++/qplatformdefs.h
283qt4/mkspecs/linux-cxx/qmake.conf 303qt4/mkspecs/linux-cxx/qmake.conf
284qt4/mkspecs/linux-cxx/qplatformdefs.h 304qt4/mkspecs/linux-cxx/qplatformdefs.h
285qt4/mkspecs/linux-ecc-64/qmake.conf 305qt4/mkspecs/linux-ecc-64/qmake.conf
286qt4/mkspecs/linux-ecc-64/qplatformdefs.h 306qt4/mkspecs/linux-ecc-64/qplatformdefs.h
287qt4/mkspecs/linux-g++-32/qmake.conf 307qt4/mkspecs/linux-g++-32/qmake.conf
288qt4/mkspecs/linux-g++-32/qplatformdefs.h 308qt4/mkspecs/linux-g++-32/qplatformdefs.h
289qt4/mkspecs/linux-g++-64/qmake.conf 309qt4/mkspecs/linux-g++-64/qmake.conf
290qt4/mkspecs/linux-g++-64/qplatformdefs.h 310qt4/mkspecs/linux-g++-64/qplatformdefs.h
 311qt4/mkspecs/linux-g++-maemo/qmake.conf
 312qt4/mkspecs/linux-g++-maemo/qplatformdefs.h
291qt4/mkspecs/linux-g++/qmake.conf 313qt4/mkspecs/linux-g++/qmake.conf
292qt4/mkspecs/linux-g++/qplatformdefs.h 314qt4/mkspecs/linux-g++/qplatformdefs.h
293qt4/mkspecs/linux-icc-32/qmake.conf 315qt4/mkspecs/linux-icc-32/qmake.conf
294qt4/mkspecs/linux-icc-32/qplatformdefs.h 316qt4/mkspecs/linux-icc-32/qplatformdefs.h
295qt4/mkspecs/linux-icc-64/qmake.conf 317qt4/mkspecs/linux-icc-64/qmake.conf
296qt4/mkspecs/linux-icc-64/qplatformdefs.h 318qt4/mkspecs/linux-icc-64/qplatformdefs.h
297qt4/mkspecs/linux-icc/qmake.conf 319qt4/mkspecs/linux-icc/qmake.conf
298qt4/mkspecs/linux-icc/qplatformdefs.h 320qt4/mkspecs/linux-icc/qplatformdefs.h
299qt4/mkspecs/linux-kcc/qmake.conf 321qt4/mkspecs/linux-kcc/qmake.conf
300qt4/mkspecs/linux-kcc/qplatformdefs.h 322qt4/mkspecs/linux-kcc/qplatformdefs.h
301qt4/mkspecs/linux-llvm/qmake.conf 323qt4/mkspecs/linux-llvm/qmake.conf
302qt4/mkspecs/linux-llvm/qplatformdefs.h 324qt4/mkspecs/linux-llvm/qplatformdefs.h
303qt4/mkspecs/linux-lsb-g++/qmake.conf 325qt4/mkspecs/linux-lsb-g++/qmake.conf
304qt4/mkspecs/linux-lsb-g++/qplatformdefs.h 326qt4/mkspecs/linux-lsb-g++/qplatformdefs.h
305qt4/mkspecs/linux-pgcc/qmake.conf 327qt4/mkspecs/linux-pgcc/qmake.conf
306qt4/mkspecs/linux-pgcc/qplatformdefs.h 328qt4/mkspecs/linux-pgcc/qplatformdefs.h
307qt4/mkspecs/lynxos-g++/qmake.conf 329qt4/mkspecs/lynxos-g++/qmake.conf
308qt4/mkspecs/lynxos-g++/qplatformdefs.h 330qt4/mkspecs/lynxos-g++/qplatformdefs.h
309qt4/mkspecs/macx-g++/Info.plist.app 331qt4/mkspecs/macx-g++/Info.plist.app
310qt4/mkspecs/macx-g++/Info.plist.lib 332qt4/mkspecs/macx-g++/Info.plist.lib
311qt4/mkspecs/macx-g++/qmake.conf 333qt4/mkspecs/macx-g++/qmake.conf
312qt4/mkspecs/macx-g++/qplatformdefs.h 334qt4/mkspecs/macx-g++/qplatformdefs.h
 335qt4/mkspecs/macx-g++40/Info.plist.app
 336qt4/mkspecs/macx-g++40/Info.plist.lib
 337qt4/mkspecs/macx-g++40/qmake.conf
 338qt4/mkspecs/macx-g++40/qplatformdefs.h
313qt4/mkspecs/macx-g++42/Info.plist.app 339qt4/mkspecs/macx-g++42/Info.plist.app
314qt4/mkspecs/macx-g++42/Info.plist.lib 340qt4/mkspecs/macx-g++42/Info.plist.lib
315qt4/mkspecs/macx-g++42/qmake.conf 341qt4/mkspecs/macx-g++42/qmake.conf
316qt4/mkspecs/macx-g++42/qplatformdefs.h 342qt4/mkspecs/macx-g++42/qplatformdefs.h
317qt4/mkspecs/macx-icc/qmake.conf 343qt4/mkspecs/macx-icc/qmake.conf
318qt4/mkspecs/macx-icc/qplatformdefs.h 344qt4/mkspecs/macx-icc/qplatformdefs.h
319qt4/mkspecs/macx-llvm/Info.plist.app 345qt4/mkspecs/macx-llvm/Info.plist.app
320qt4/mkspecs/macx-llvm/Info.plist.lib 346qt4/mkspecs/macx-llvm/Info.plist.lib
321qt4/mkspecs/macx-llvm/qmake.conf 347qt4/mkspecs/macx-llvm/qmake.conf
322qt4/mkspecs/macx-llvm/qplatformdefs.h 348qt4/mkspecs/macx-llvm/qplatformdefs.h
323qt4/mkspecs/macx-pbuilder/Info.plist.app 349qt4/mkspecs/macx-pbuilder/Info.plist.app
324qt4/mkspecs/macx-pbuilder/qmake.conf 350qt4/mkspecs/macx-pbuilder/qmake.conf
325qt4/mkspecs/macx-pbuilder/qplatformdefs.h 351qt4/mkspecs/macx-pbuilder/qplatformdefs.h
@@ -348,65 +374,97 @@ qt4/mkspecs/qws/linux-dm7000-g++/qmake.c @@ -348,65 +374,97 @@ qt4/mkspecs/qws/linux-dm7000-g++/qmake.c
348qt4/mkspecs/qws/linux-dm7000-g++/qplatformdefs.h 374qt4/mkspecs/qws/linux-dm7000-g++/qplatformdefs.h
349qt4/mkspecs/qws/linux-dm800-g++/qmake.conf 375qt4/mkspecs/qws/linux-dm800-g++/qmake.conf
350qt4/mkspecs/qws/linux-dm800-g++/qplatformdefs.h 376qt4/mkspecs/qws/linux-dm800-g++/qplatformdefs.h
351qt4/mkspecs/qws/linux-generic-g++-32/qmake.conf 377qt4/mkspecs/qws/linux-generic-g++-32/qmake.conf
352qt4/mkspecs/qws/linux-generic-g++-32/qplatformdefs.h 378qt4/mkspecs/qws/linux-generic-g++-32/qplatformdefs.h
353qt4/mkspecs/qws/linux-generic-g++/qmake.conf 379qt4/mkspecs/qws/linux-generic-g++/qmake.conf
354qt4/mkspecs/qws/linux-generic-g++/qplatformdefs.h 380qt4/mkspecs/qws/linux-generic-g++/qplatformdefs.h
355qt4/mkspecs/qws/linux-ipaq-g++/qmake.conf 381qt4/mkspecs/qws/linux-ipaq-g++/qmake.conf
356qt4/mkspecs/qws/linux-ipaq-g++/qplatformdefs.h 382qt4/mkspecs/qws/linux-ipaq-g++/qplatformdefs.h
357qt4/mkspecs/qws/linux-lsb-g++/qmake.conf 383qt4/mkspecs/qws/linux-lsb-g++/qmake.conf
358qt4/mkspecs/qws/linux-lsb-g++/qplatformdefs.h 384qt4/mkspecs/qws/linux-lsb-g++/qplatformdefs.h
359qt4/mkspecs/qws/linux-mips-g++/qmake.conf 385qt4/mkspecs/qws/linux-mips-g++/qmake.conf
360qt4/mkspecs/qws/linux-mips-g++/qplatformdefs.h 386qt4/mkspecs/qws/linux-mips-g++/qplatformdefs.h
361qt4/mkspecs/qws/linux-ppc-g++/qmake.conf 387qt4/mkspecs/qws/linux-powerpc-g++/qmake.conf
362qt4/mkspecs/qws/linux-ppc-g++/qplatformdefs.h 388qt4/mkspecs/qws/linux-powerpc-g++/qplatformdefs.h
363qt4/mkspecs/qws/linux-sh-g++/qmake.conf 389qt4/mkspecs/qws/linux-sh-g++/qmake.conf
364qt4/mkspecs/qws/linux-sh-g++/qplatformdefs.h 390qt4/mkspecs/qws/linux-sh-g++/qplatformdefs.h
365qt4/mkspecs/qws/linux-sh4al-g++/qmake.conf 391qt4/mkspecs/qws/linux-sh4al-g++/qmake.conf
366qt4/mkspecs/qws/linux-sh4al-g++/qplatformdefs.h 392qt4/mkspecs/qws/linux-sh4al-g++/qplatformdefs.h
367qt4/mkspecs/qws/linux-sharp-g++/qmake.conf 393qt4/mkspecs/qws/linux-sharp-g++/qmake.conf
368qt4/mkspecs/qws/linux-sharp-g++/qplatformdefs.h 394qt4/mkspecs/qws/linux-sharp-g++/qplatformdefs.h
369qt4/mkspecs/qws/linux-x86-g++/qmake.conf 395qt4/mkspecs/qws/linux-x86-g++/qmake.conf
370qt4/mkspecs/qws/linux-x86-g++/qplatformdefs.h 396qt4/mkspecs/qws/linux-x86-g++/qplatformdefs.h
371qt4/mkspecs/qws/linux-x86_64-g++/qmake.conf 397qt4/mkspecs/qws/linux-x86_64-g++/qmake.conf
372qt4/mkspecs/qws/linux-x86_64-g++/qplatformdefs.h 398qt4/mkspecs/qws/linux-x86_64-g++/qplatformdefs.h
373qt4/mkspecs/qws/linux-zylonite-g++/qmake.conf 399qt4/mkspecs/qws/linux-zylonite-g++/qmake.conf
374qt4/mkspecs/qws/linux-zylonite-g++/qplatformdefs.h 400qt4/mkspecs/qws/linux-zylonite-g++/qplatformdefs.h
375qt4/mkspecs/qws/macx-generic-g++/qmake.conf 401qt4/mkspecs/qws/macx-generic-g++/qmake.conf
376qt4/mkspecs/qws/macx-generic-g++/qplatformdefs.h 402qt4/mkspecs/qws/macx-generic-g++/qplatformdefs.h
377qt4/mkspecs/qws/qmake.conf 403qt4/mkspecs/qws/qmake.conf
378qt4/mkspecs/qws/solaris-generic-g++/qmake.conf 404qt4/mkspecs/qws/solaris-generic-g++/qmake.conf
379qt4/mkspecs/qws/solaris-generic-g++/qplatformdefs.h 405qt4/mkspecs/qws/solaris-generic-g++/qplatformdefs.h
380qt4/mkspecs/sco-cc/qmake.conf 406qt4/mkspecs/sco-cc/qmake.conf
381qt4/mkspecs/sco-cc/qplatformdefs.h 407qt4/mkspecs/sco-cc/qplatformdefs.h
382qt4/mkspecs/sco-g++/qmake.conf 408qt4/mkspecs/sco-g++/qmake.conf
383qt4/mkspecs/sco-g++/qplatformdefs.h 409qt4/mkspecs/sco-g++/qplatformdefs.h
 410qt4/mkspecs/solaris-cc-64-stlport/qmake.conf
 411qt4/mkspecs/solaris-cc-64-stlport/qplatformdefs.h
384qt4/mkspecs/solaris-cc-64/qmake.conf 412qt4/mkspecs/solaris-cc-64/qmake.conf
385qt4/mkspecs/solaris-cc-64/qplatformdefs.h 413qt4/mkspecs/solaris-cc-64/qplatformdefs.h
 414qt4/mkspecs/solaris-cc-stlport/qmake.conf
 415qt4/mkspecs/solaris-cc-stlport/qplatformdefs.h
386qt4/mkspecs/solaris-cc/qmake.conf 416qt4/mkspecs/solaris-cc/qmake.conf
387qt4/mkspecs/solaris-cc/qplatformdefs.h 417qt4/mkspecs/solaris-cc/qplatformdefs.h
388qt4/mkspecs/solaris-g++-64/qmake.conf 418qt4/mkspecs/solaris-g++-64/qmake.conf
389qt4/mkspecs/solaris-g++-64/qplatformdefs.h 419qt4/mkspecs/solaris-g++-64/qplatformdefs.h
390qt4/mkspecs/solaris-g++/qmake.conf 420qt4/mkspecs/solaris-g++/qmake.conf
391qt4/mkspecs/solaris-g++/qplatformdefs.h 421qt4/mkspecs/solaris-g++/qplatformdefs.h
 422qt4/mkspecs/symbian-abld/qmake.conf
 423qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm
 424qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm
 425qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm
 426qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
 427qt4/mkspecs/symbian-sbsv2/flm/qt/qt.xml
 428qt4/mkspecs/symbian-sbsv2/qmake.conf
392qt4/mkspecs/tru64-cxx/qmake.conf 429qt4/mkspecs/tru64-cxx/qmake.conf
393qt4/mkspecs/tru64-cxx/qplatformdefs.h 430qt4/mkspecs/tru64-cxx/qplatformdefs.h
394qt4/mkspecs/tru64-g++/qmake.conf 431qt4/mkspecs/tru64-g++/qmake.conf
395qt4/mkspecs/tru64-g++/qplatformdefs.h 432qt4/mkspecs/tru64-g++/qplatformdefs.h
396qt4/mkspecs/unixware-cc/qmake.conf 433qt4/mkspecs/unixware-cc/qmake.conf
397qt4/mkspecs/unixware-cc/qplatformdefs.h 434qt4/mkspecs/unixware-cc/qplatformdefs.h
398qt4/mkspecs/unixware-g++/qmake.conf 435qt4/mkspecs/unixware-g++/qmake.conf
399qt4/mkspecs/unixware-g++/qplatformdefs.h 436qt4/mkspecs/unixware-g++/qplatformdefs.h
 437qt4/mkspecs/unsupported/linux-host-g++/qmake.conf
 438qt4/mkspecs/unsupported/linux-host-g++/qplatformdefs.h
 439qt4/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf
 440qt4/mkspecs/unsupported/linux-scratchbox2-g++/qplatformdefs.h
 441qt4/mkspecs/unsupported/qmake.conf
 442qt4/mkspecs/unsupported/qnx-g++/qmake.conf
 443qt4/mkspecs/unsupported/qnx-g++/qplatformdefs.h
 444qt4/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
 445qt4/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h
 446qt4/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
 447qt4/mkspecs/unsupported/qws/qnx-i386-g++/qplatformdefs.h
 448qt4/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
 449qt4/mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h
 450qt4/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
 451qt4/mkspecs/unsupported/vxworks-ppc-dcc/qplatformdefs.h
 452qt4/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf
 453qt4/mkspecs/unsupported/vxworks-ppc-g++/qplatformdefs.h
 454qt4/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
 455qt4/mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h
 456qt4/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
 457qt4/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h
400qt4/mkspecs/win32-borland/qmake.conf 458qt4/mkspecs/win32-borland/qmake.conf
401qt4/mkspecs/win32-borland/qplatformdefs.h 459qt4/mkspecs/win32-borland/qplatformdefs.h
402qt4/mkspecs/win32-g++/qmake.conf 460qt4/mkspecs/win32-g++/qmake.conf
403qt4/mkspecs/win32-g++/qplatformdefs.h 461qt4/mkspecs/win32-g++/qplatformdefs.h
404qt4/mkspecs/win32-icc/qmake.conf 462qt4/mkspecs/win32-icc/qmake.conf
405qt4/mkspecs/win32-icc/qplatformdefs.h 463qt4/mkspecs/win32-icc/qplatformdefs.h
406qt4/mkspecs/win32-msvc.net/qmake.conf 464qt4/mkspecs/win32-msvc.net/qmake.conf
407qt4/mkspecs/win32-msvc.net/qplatformdefs.h 465qt4/mkspecs/win32-msvc.net/qplatformdefs.h
408qt4/mkspecs/win32-msvc/features/incremental.prf 466qt4/mkspecs/win32-msvc/features/incremental.prf
409qt4/mkspecs/win32-msvc/features/incremental_off.prf 467qt4/mkspecs/win32-msvc/features/incremental_off.prf
410qt4/mkspecs/win32-msvc/qmake.conf 468qt4/mkspecs/win32-msvc/qmake.conf
411qt4/mkspecs/win32-msvc/qplatformdefs.h 469qt4/mkspecs/win32-msvc/qplatformdefs.h
412qt4/mkspecs/win32-msvc2002/qmake.conf 470qt4/mkspecs/win32-msvc2002/qmake.conf
@@ -435,51 +493,59 @@ qt4/mkspecs/wince50standard-mipsiv-msvc2 @@ -435,51 +493,59 @@ qt4/mkspecs/wince50standard-mipsiv-msvc2
435qt4/mkspecs/wince50standard-mipsiv-msvc2008/qplatformdefs.h 493qt4/mkspecs/wince50standard-mipsiv-msvc2008/qplatformdefs.h
436qt4/mkspecs/wince50standard-sh4-msvc2005/qmake.conf 494qt4/mkspecs/wince50standard-sh4-msvc2005/qmake.conf
437qt4/mkspecs/wince50standard-sh4-msvc2005/qplatformdefs.h 495qt4/mkspecs/wince50standard-sh4-msvc2005/qplatformdefs.h
438qt4/mkspecs/wince50standard-sh4-msvc2008/qmake.conf 496qt4/mkspecs/wince50standard-sh4-msvc2008/qmake.conf
439qt4/mkspecs/wince50standard-sh4-msvc2008/qplatformdefs.h 497qt4/mkspecs/wince50standard-sh4-msvc2008/qplatformdefs.h
440qt4/mkspecs/wince50standard-x86-msvc2005/default_post.prf 498qt4/mkspecs/wince50standard-x86-msvc2005/default_post.prf
441qt4/mkspecs/wince50standard-x86-msvc2005/qmake.conf 499qt4/mkspecs/wince50standard-x86-msvc2005/qmake.conf
442qt4/mkspecs/wince50standard-x86-msvc2005/qplatformdefs.h 500qt4/mkspecs/wince50standard-x86-msvc2005/qplatformdefs.h
443qt4/mkspecs/wince50standard-x86-msvc2008/default_post.prf 501qt4/mkspecs/wince50standard-x86-msvc2008/default_post.prf
444qt4/mkspecs/wince50standard-x86-msvc2008/qmake.conf 502qt4/mkspecs/wince50standard-x86-msvc2008/qmake.conf
445qt4/mkspecs/wince50standard-x86-msvc2008/qplatformdefs.h 503qt4/mkspecs/wince50standard-x86-msvc2008/qplatformdefs.h
446qt4/mkspecs/wince60standard-armv4i-msvc2005/qmake.conf 504qt4/mkspecs/wince60standard-armv4i-msvc2005/qmake.conf
447qt4/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h 505qt4/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h
 506qt4/mkspecs/wince60standard-x86-msvc2005/qmake.conf
 507qt4/mkspecs/wince60standard-x86-msvc2005/qplatformdefs.h
448qt4/mkspecs/wincewm50pocket-msvc2005/default_post.prf 508qt4/mkspecs/wincewm50pocket-msvc2005/default_post.prf
449qt4/mkspecs/wincewm50pocket-msvc2005/qmake.conf 509qt4/mkspecs/wincewm50pocket-msvc2005/qmake.conf
450qt4/mkspecs/wincewm50pocket-msvc2005/qplatformdefs.h 510qt4/mkspecs/wincewm50pocket-msvc2005/qplatformdefs.h
451qt4/mkspecs/wincewm50pocket-msvc2008/default_post.prf 511qt4/mkspecs/wincewm50pocket-msvc2008/default_post.prf
452qt4/mkspecs/wincewm50pocket-msvc2008/qmake.conf 512qt4/mkspecs/wincewm50pocket-msvc2008/qmake.conf
453qt4/mkspecs/wincewm50pocket-msvc2008/qplatformdefs.h 513qt4/mkspecs/wincewm50pocket-msvc2008/qplatformdefs.h
454qt4/mkspecs/wincewm50smart-msvc2005/default_post.prf 514qt4/mkspecs/wincewm50smart-msvc2005/default_post.prf
455qt4/mkspecs/wincewm50smart-msvc2005/qmake.conf 515qt4/mkspecs/wincewm50smart-msvc2005/qmake.conf
456qt4/mkspecs/wincewm50smart-msvc2005/qplatformdefs.h 516qt4/mkspecs/wincewm50smart-msvc2005/qplatformdefs.h
457qt4/mkspecs/wincewm50smart-msvc2008/default_post.prf 517qt4/mkspecs/wincewm50smart-msvc2008/default_post.prf
458qt4/mkspecs/wincewm50smart-msvc2008/qmake.conf 518qt4/mkspecs/wincewm50smart-msvc2008/qmake.conf
459qt4/mkspecs/wincewm50smart-msvc2008/qplatformdefs.h 519qt4/mkspecs/wincewm50smart-msvc2008/qplatformdefs.h
460qt4/mkspecs/wincewm60professional-msvc2005/default_post.prf 520qt4/mkspecs/wincewm60professional-msvc2005/default_post.prf
461qt4/mkspecs/wincewm60professional-msvc2005/qmake.conf 521qt4/mkspecs/wincewm60professional-msvc2005/qmake.conf
462qt4/mkspecs/wincewm60professional-msvc2005/qplatformdefs.h 522qt4/mkspecs/wincewm60professional-msvc2005/qplatformdefs.h
463qt4/mkspecs/wincewm60professional-msvc2008/default_post.prf 523qt4/mkspecs/wincewm60professional-msvc2008/default_post.prf
464qt4/mkspecs/wincewm60professional-msvc2008/qmake.conf 524qt4/mkspecs/wincewm60professional-msvc2008/qmake.conf
465qt4/mkspecs/wincewm60professional-msvc2008/qplatformdefs.h 525qt4/mkspecs/wincewm60professional-msvc2008/qplatformdefs.h
466qt4/mkspecs/wincewm60standard-msvc2005/default_post.prf 526qt4/mkspecs/wincewm60standard-msvc2005/default_post.prf
467qt4/mkspecs/wincewm60standard-msvc2005/qmake.conf 527qt4/mkspecs/wincewm60standard-msvc2005/qmake.conf
468qt4/mkspecs/wincewm60standard-msvc2005/qplatformdefs.h 528qt4/mkspecs/wincewm60standard-msvc2005/qplatformdefs.h
469qt4/mkspecs/wincewm60standard-msvc2008/default_post.prf 529qt4/mkspecs/wincewm60standard-msvc2008/default_post.prf
470qt4/mkspecs/wincewm60standard-msvc2008/qmake.conf 530qt4/mkspecs/wincewm60standard-msvc2008/qmake.conf
471qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h 531qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h
 532qt4/mkspecs/wincewm65professional-msvc2005/default_post.prf
 533qt4/mkspecs/wincewm65professional-msvc2005/qmake.conf
 534qt4/mkspecs/wincewm65professional-msvc2005/qplatformdefs.h
 535qt4/mkspecs/wincewm65professional-msvc2008/default_post.prf
 536qt4/mkspecs/wincewm65professional-msvc2008/qmake.conf
 537qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h
472qt4/phrasebooks/danish.qph 538qt4/phrasebooks/danish.qph
473qt4/phrasebooks/dutch.qph 539qt4/phrasebooks/dutch.qph
474qt4/phrasebooks/finnish.qph 540qt4/phrasebooks/finnish.qph
475qt4/phrasebooks/french.qph 541qt4/phrasebooks/french.qph
476qt4/phrasebooks/german.qph 542qt4/phrasebooks/german.qph
477qt4/phrasebooks/italian.qph 543qt4/phrasebooks/italian.qph
478qt4/phrasebooks/japanese.qph 544qt4/phrasebooks/japanese.qph
479qt4/phrasebooks/norwegian.qph 545qt4/phrasebooks/norwegian.qph
480qt4/phrasebooks/polish.qph 546qt4/phrasebooks/polish.qph
481qt4/phrasebooks/russian.qph 547qt4/phrasebooks/russian.qph
482qt4/phrasebooks/spanish.qph 548qt4/phrasebooks/spanish.qph
483qt4/phrasebooks/swedish.qph 549qt4/phrasebooks/swedish.qph
484qt4/plugins/designer/libqt3supportwidgets.la 550qt4/plugins/designer/libqt3supportwidgets.la
485qt4/tools/qdoc3/qdoc3 551qt4/plugins/designer/libqwebview.la