Mon Nov 15 13:05:47 2010 UTC ()
Changes 4.7.1:
Qt 4.7.1 is a bug-fix release. It maintains both forward and backward
compatibility (source and binary) with Qt 4.7.0.  For more details,
refer to the online documentation included in this distribution. The
documentation is also available online:

  http://qt.nokia.com/doc/4.7

The Qt version 4.7 series is binary compatible with the 4.6.x series.
Applications compiled for 4.6 will continue to run with 4.7.

Changes 4.7.0:
Qt 4.7 introduces many new features and improvements as well as bugfixes
over the 4.6.x series. For more details, refer to the online documentation
included in this distribution. The documentation is also available online:

  http://qt.nokia.com/doc/4.7

The Qt version 4.7 series is binary compatible with the 4.6.x series.
Applications compiled for 4.6 will continue to run with 4.7.


(adam)
diff -r1.22 -r1.23 pkgsrc/x11/qt4/Makefile.common
diff -r1.10 -r1.11 pkgsrc/x11/qt4-docs/Makefile
diff -r1.50 -r1.51 pkgsrc/x11/qt4-libs/Makefile
diff -r1.21 -r1.22 pkgsrc/x11/qt4-libs/Makefile.common
diff -r1.14 -r1.15 pkgsrc/x11/qt4-libs/PLIST
diff -r1.46 -r1.47 pkgsrc/x11/qt4-libs/distinfo
diff -r1.3 -r1.4 pkgsrc/x11/qt4-libs/files/qmake.conf
diff -r1.11 -r1.12 pkgsrc/x11/qt4-libs/patches/patch-aa
diff -r1.11 -r1.12 pkgsrc/x11/qt4-libs/patches/patch-ag
diff -r1.10 -r1.11 pkgsrc/x11/qt4-libs/patches/patch-ab
diff -r1.10 -r1.11 pkgsrc/x11/qt4-libs/patches/patch-ad
diff -r1.3 -r1.4 pkgsrc/x11/qt4-libs/patches/patch-ac
diff -r1.3 -r1.4 pkgsrc/x11/qt4-libs/patches/patch-az
diff -r1.3 -r1.4 pkgsrc/x11/qt4-libs/patches/patch-bb
diff -r1.8 -r1.9 pkgsrc/x11/qt4-libs/patches/patch-ae
diff -r1.8 -r1.9 pkgsrc/x11/qt4-libs/patches/patch-aj
diff -r1.6 -r1.7 pkgsrc/x11/qt4-libs/patches/patch-ak
diff -r1.7 -r1.8 pkgsrc/x11/qt4-libs/patches/patch-aq
diff -r1.7 -r1.8 pkgsrc/x11/qt4-libs/patches/patch-ay
diff -r1.4 -r1.5 pkgsrc/x11/qt4-libs/patches/patch-as
diff -r1.4 -r1.5 pkgsrc/x11/qt4-libs/patches/patch-au
diff -r1.2 -r1.3 pkgsrc/x11/qt4-libs/patches/patch-ax
diff -r1.5 -r1.6 pkgsrc/x11/qt4-libs/patches/patch-ba
diff -r0 -r1.3 pkgsrc/x11/qt4-libs/patches/patch-bc
diff -r0 -r1.1 pkgsrc/x11/qt4-libs/patches/patch-bd
diff -r0 -r1.1 pkgsrc/x11/qt4-libs/patches/patch-be
diff -r0 -r1.1 pkgsrc/x11/qt4-libs/patches/patch-bf
diff -r1.4 -r1.5 pkgsrc/x11/qt4-mng/Makefile
diff -r1.12 -r1.13 pkgsrc/x11/qt4-mysql/Makefile
diff -r1.18 -r1.19 pkgsrc/x11/qt4-pgsql/Makefile
diff -r1.14 -r1.15 pkgsrc/x11/qt4-qdbus/Makefile
diff -r1.12 -r1.13 pkgsrc/x11/qt4-sqlite3/Makefile
diff -r1.11 -r1.12 pkgsrc/x11/qt4-tiff/Makefile
diff -r1.35 -r1.36 pkgsrc/x11/qt4-tools/Makefile
diff -r1.22 -r1.23 pkgsrc/x11/qt4-tools/PLIST
cvs diff -r1.22 -r1.23 pkgsrc/x11/qt4/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt4/Makefile.common 2010/07/04 06:00:13 1.22
+++ pkgsrc/x11/qt4/Makefile.common 2010/11/15 13:05:44 1.23
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1# $NetBSD: Makefile.common,v 1.22 2010/07/04 06:00:13 adam Exp $ 1# $NetBSD: Makefile.common,v 1.23 2010/11/15 13:05:44 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.6.3 5QTVERSION= 4.7.1
6 6
7MAINTAINER?= pkgsrc-users@NetBSD.org 7MAINTAINER?= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://qt.nokia.com/ 8HOMEPAGE= http://qt.nokia.com/
9 9
10LICENSE= gnu-gpl-v3 10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v3
cvs diff -r1.10 -r1.11 pkgsrc/x11/qt4-docs/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-docs/Makefile 2010/09/14 11:03:04 1.10
+++ pkgsrc/x11/qt4-docs/Makefile 2010/11/15 13:05:44 1.11
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.10 2010/09/14 11:03:04 wiz Exp $ 1# $NetBSD: Makefile,v 1.11 2010/11/15 13:05:44 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-docs-${QTVERSION} 7PKGNAME= qt4-docs-${QTVERSION}
8PKGREVISION= 1 
9COMMENT= Documentation for the QT C++ X GUI toolkit 8COMMENT= Documentation for the QT C++ X GUI toolkit
10 9
11NO_CONFIGURE= yes 10NO_CONFIGURE= yes
12NO_BUILD= yes 11NO_BUILD= yes
13PLIST_SRC= ${WRKDIR}/PLIST 12PLIST_SRC= ${WRKDIR}/PLIST
14 13
15INSTALLATION_DIRS= ${QTPREFIX} 14INSTALLATION_DIRS= ${QTPREFIX}
16 15
17do-install: 16do-install:
18 cp -R ${WRKSRC}/doc ${DESTDIR}${QTPREFIX} 17 cp -R ${WRKSRC}/doc ${DESTDIR}${QTPREFIX}
19 cd ${DESTDIR}${PREFIX}; find qt4/doc -type f -print > ${WRKDIR}/PLIST 18 cd ${DESTDIR}${PREFIX}; find qt4/doc -type f -print > ${WRKDIR}/PLIST
20 19
21.include "../../x11/qt4-libs/buildlink3.mk" 20.include "../../x11/qt4-libs/buildlink3.mk"
cvs diff -r1.50 -r1.51 pkgsrc/x11/qt4-libs/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/Makefile 2010/09/14 11:13:16 1.50
+++ pkgsrc/x11/qt4-libs/Makefile 2010/11/15 13:05:45 1.51
@@ -1,108 +1,128 @@ @@ -1,108 +1,128 @@
1# $NetBSD: Makefile,v 1.50 2010/09/14 11:13:16 wiz Exp $ 1# $NetBSD: Makefile,v 1.51 2010/11/15 13:05:45 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= 1 
9COMMENT= C++ X GUI toolkit 8COMMENT= C++ X GUI toolkit
10 9
11# XXX this is to test what really gets installed when 'do-install' is disabled 10# XXX this is to test what really gets installed when 'do-install' is disabled
12INSTALL_DIRS+= src 11INSTALL_DIRS+= src
13 12
14BUILD_TARGET= sub-src 13BUILD_TARGET= sub-src
15 14
16PTHREAD_OPTS+= require 15PTHREAD_OPTS+= require
17UNLIMIT_RESOURCES= datasize 16UNLIMIT_RESOURCES= datasize
18BUILDLINK_PASSTHRU_DIRS+=${QTPREFIX} 17BUILDLINK_PASSTHRU_DIRS+=${QTPREFIX}
19 18
20PLIST_SRC= ${WRKDIR}/PLIST ${PKGDIR}/PLIST 19PLIST_SRC= ${WRKDIR}/PLIST ${PKGDIR}/PLIST
21 20
22# built as plugins 21# built as plugins
23CONFIGURE_ARGS+= -no-dbus 22CONFIGURE_ARGS+= -no-dbus
24CONFIGURE_ARGS+= -no-libmng 23CONFIGURE_ARGS+= -no-libmng
25CONFIGURE_ARGS+= -no-libtiff 24CONFIGURE_ARGS+= -no-libtiff
26CONFIGURE_ARGS+= -no-sql-sqlite 25CONFIGURE_ARGS+= -no-sql-sqlite
27 26
28INSTALLATION_DIRS= lib/pkgconfig 27INSTALLATION_DIRS= lib/pkgconfig
29INSTALLATION_DIRS+= ${QTPREFIX}/bin 28INSTALLATION_DIRS+= ${QTPREFIX}/bin
 29INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/folderlistmodel
 30INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/gestures
 31INSTALLATION_DIRS+= ${QTPREFIX}/imports/Qt/labs/particles
 32INSTALLATION_DIRS+= ${QTPREFIX}/imports/QtWebKit
30INSTALLATION_DIRS+= ${QTPREFIX}/include 33INSTALLATION_DIRS+= ${QTPREFIX}/include
31INSTALLATION_DIRS+= ${QTPREFIX}/lib 34INSTALLATION_DIRS+= ${QTPREFIX}/lib
32INSTALLATION_DIRS+= ${QTPREFIX}/plugins/accessible 35INSTALLATION_DIRS+= ${QTPREFIX}/plugins/accessible
 36INSTALLATION_DIRS+= ${QTPREFIX}/plugins/bearer
33INSTALLATION_DIRS+= ${QTPREFIX}/plugins/codecs 37INSTALLATION_DIRS+= ${QTPREFIX}/plugins/codecs
34INSTALLATION_DIRS+= ${QTPREFIX}/plugins/graphicssystems 38INSTALLATION_DIRS+= ${QTPREFIX}/plugins/graphicssystems
35INSTALLATION_DIRS+= ${QTPREFIX}/plugins/iconengines 39INSTALLATION_DIRS+= ${QTPREFIX}/plugins/iconengines
36INSTALLATION_DIRS+= ${QTPREFIX}/plugins/imageformats 40INSTALLATION_DIRS+= ${QTPREFIX}/plugins/imageformats
37INSTALLATION_DIRS+= ${QTPREFIX}/plugins/inputmethods 41INSTALLATION_DIRS+= ${QTPREFIX}/plugins/inputmethods
38 42
39INSTALL_ENV+= INSTALL_ROOT=${DESTDIR} 43INSTALL_ENV+= INSTALL_ROOT=${DESTDIR}
40 44
41do-install: 45do-install:
42.for prog in moc rcc uic 46.for prog in moc rcc uic
43 ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/ 47 ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/
44.endfor 48.endfor
45 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/uic3 \ 49 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/uic3 \
46 ${DESTDIR}${QTPREFIX}/bin 50 ${DESTDIR}${QTPREFIX}/bin/
47.for incl in corelib gui multimedia network opengl qt3support script scripttools sql svg testlib xml xmlpatterns 3rdparty/webkit/WebCore 51 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
 52 ${WRKSRC}/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.la \
 53 ${DESTDIR}${QTPREFIX}/imports/Qt/labs/folderlistmodel/
 54 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
 55 ${WRKSRC}/imports/Qt/labs/gestures/libqmlgesturesplugin.la \
 56 ${DESTDIR}${QTPREFIX}/imports/Qt/labs/gestures/
 57 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
 58 ${WRKSRC}/imports/Qt/labs/particles/libqmlparticlesplugin.la \
 59 ${DESTDIR}${QTPREFIX}/imports/Qt/labs/particles/
 60 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
 61 ${WRKSRC}/imports/QtWebKit/libqmlwebkitplugin.la \
 62 ${DESTDIR}${QTPREFIX}/imports/QtWebKit/
 63.for incl in corelib declarative gui multimedia network opengl qt3support script scripttools sql svg testlib xml xmlpatterns 3rdparty/webkit/WebCore
48 cd ${WRKSRC}/src/${incl} && env ${MAKE_ENV} ${INSTALL_ENV} \ 64 cd ${WRKSRC}/src/${incl} && env ${MAKE_ENV} ${INSTALL_ENV} \
49 ${MAKE_PROGRAM} install_flat_headers install_targ_headers install_class_headers 65 ${MAKE_PROGRAM} install_flat_headers install_targ_headers install_class_headers
50.endfor 66.endfor
51 cd ${DESTDIR}${PREFIX} && find qt4/include -type f -print > ${WRKDIR}/PLIST 67 cd ${DESTDIR}${PREFIX} && find qt4/include -type f -print > ${WRKDIR}/PLIST
52.for lib in Qt3Support QtCore QtGui QtMultimedia QtNetwork QtOpenGL QtSql QtSvg QtXml QtXmlPatterns QtScript QtScriptTools QtTest QtWebKit 68.for lib in Qt3Support QtCore QtDeclarative QtGui QtMultimedia QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg QtTest QtWebKit QtXml QtXmlPatterns jscore
53 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \ 69 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \
54 ${DESTDIR}${QTPREFIX}/lib/ 70 ${DESTDIR}${QTPREFIX}/lib/
55 sed -e "s:${WRKSRC}:${QTPREFIX}:g" \ 71 sed -e "s:${WRKSRC}:${QTPREFIX}:g" \
56 -e "s:${QTPREFIX}/lib/lib\\([A-Za-z3]*\\)\\.la:-l\\1:g" \ 72 -e "s:${QTPREFIX}/lib/lib\\([A-Za-z3]*\\)\\.la:-l\\1:g" \
57 ${WRKSRC}/lib/pkgconfig/${lib}.pc > ${WRKDIR}/${lib}.pc 73 ${WRKSRC}/lib/pkgconfig/${lib}.pc > ${WRKDIR}/${lib}.pc
58 ${INSTALL_DATA} ${WRKDIR}/${lib}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/ 74 ${INSTALL_DATA} ${WRKDIR}/${lib}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/
59.endfor 75.endfor
60 ${INSTALL_DATA} ${WRKSRC}/tools/porting/src/q3porting.xml ${DESTDIR}${QTPREFIX} 76 ${INSTALL_DATA} ${WRKSRC}/tools/porting/src/q3porting.xml ${DESTDIR}${QTPREFIX}
61.for plug in qtaccessiblecompatwidgets qtaccessiblewidgets 77.for plug in qtaccessiblecompatwidgets qtaccessiblewidgets
62 ${LIBTOOL} --mode=install ${INSTALL_LIB} \ 78 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
63 ${WRKSRC}/plugins/accessible/lib${plug}.la \ 79 ${WRKSRC}/plugins/accessible/lib${plug}.la \
64 ${DESTDIR}${QTPREFIX}/plugins/accessible/ 80 ${DESTDIR}${QTPREFIX}/plugins/accessible/
65.endfor 81.endfor
 82 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
 83 ${WRKSRC}/plugins/bearer/libqgenericbearer.la \
 84 ${DESTDIR}${QTPREFIX}/plugins/bearer/
66.for codec in qcncodecs qjpcodecs qkrcodecs qtwcodecs 85.for codec in qcncodecs qjpcodecs qkrcodecs qtwcodecs
67 ${LIBTOOL} --mode=install ${INSTALL_LIB} \ 86 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
68 ${WRKSRC}/plugins/codecs/lib${codec}.la \ 87 ${WRKSRC}/plugins/codecs/lib${codec}.la \
69 ${DESTDIR}${QTPREFIX}/plugins/codecs/ 88 ${DESTDIR}${QTPREFIX}/plugins/codecs/
70.endfor 89.endfor
71.for gfxs in qglgraphicssystem qtracegraphicssystem 90.for plug in qglgraphicssystem qtracegraphicssystem
72 ${LIBTOOL} --mode=install ${INSTALL_LIB} \ 91 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
73 ${WRKSRC}/plugins/graphicssystems/lib${gfxs}.la \ 92 ${WRKSRC}/plugins/graphicssystems/lib${plug}.la \
74 ${DESTDIR}${QTPREFIX}/plugins/graphicssystems/ 93 ${DESTDIR}${QTPREFIX}/plugins/graphicssystems/
75.endfor 94.endfor
76 ${LIBTOOL} --mode=install ${INSTALL_LIB} \ 95 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
77 ${WRKSRC}/plugins/iconengines/libqsvgicon.la \ 96 ${WRKSRC}/plugins/iconengines/libqsvgicon.la \
78 ${DESTDIR}/${QTPREFIX}/plugins/iconengines/ 97 ${DESTDIR}/${QTPREFIX}/plugins/iconengines/
79.for plug in qgif qico qjpeg qsvg 98.for plug in qgif qico qjpeg qsvg
80 ${LIBTOOL} --mode=install ${INSTALL_LIB} \ 99 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
81 ${WRKSRC}/plugins/imageformats/lib${plug}.la \ 100 ${WRKSRC}/plugins/imageformats/lib${plug}.la \
82 ${DESTDIR}${QTPREFIX}/plugins/imageformats/ 101 ${DESTDIR}${QTPREFIX}/plugins/imageformats/
83.endfor 102.endfor
84 ${LIBTOOL} --mode=install ${INSTALL_LIB} \ 103 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
85 ${WRKSRC}/plugins/inputmethods/libqimsw-multi.la \ 104 ${WRKSRC}/plugins/inputmethods/libqimsw-multi.la \
86 ${DESTDIR}/${QTPREFIX}/plugins/inputmethods/ 105 ${DESTDIR}/${QTPREFIX}/plugins/inputmethods/
87 106
88.if ${OPSYS} == "Darwin" && empty(MACHINE_PLATFORM:MDarwin-[567].*) 107.if ${OPSYS} == "Darwin" && empty(MACHINE_PLATFORM:MDarwin-[567].*)
89SUBST_CLASSES+= socklen 108SUBST_CLASSES+= socklen
90SUBST_MESSAGE.socklen= Correcting socklen_t. 109SUBST_MESSAGE.socklen= Correcting socklen_t.
91SUBST_STAGE.socklen= pre-configure 110SUBST_STAGE.socklen= pre-configure
92SUBST_FILES.socklen= mkspecs/darwin-g++/qplatformdefs.h 111SUBST_FILES.socklen= mkspecs/darwin-g++/qplatformdefs.h
93SUBST_SED.socklen= -e 's/QT_SOCKLEN_T.*/QT_SOCKLEN_T socklen_t/' 112SUBST_SED.socklen= -e 's/QT_SOCKLEN_T.*/QT_SOCKLEN_T socklen_t/'
94.endif 113.endif
95 114
 115.include "../../devel/zlib/buildlink3.mk"
96.include "../../fonts/fontconfig/buildlink3.mk" 116.include "../../fonts/fontconfig/buildlink3.mk"
97.include "../../graphics/freetype2/buildlink3.mk" 117.include "../../graphics/freetype2/buildlink3.mk"
98.include "../../graphics/jpeg/buildlink3.mk" 118.include "../../graphics/jpeg/buildlink3.mk"
99.include "../../graphics/glu/buildlink3.mk" 119.include "../../graphics/glu/buildlink3.mk"
100.include "../../graphics/png/buildlink3.mk" 120.include "../../graphics/png/buildlink3.mk"
101.include "../../x11/libSM/buildlink3.mk" 121.include "../../x11/libSM/buildlink3.mk"
102.include "../../x11/libXcursor/buildlink3.mk" 122.include "../../x11/libXcursor/buildlink3.mk"
103.include "../../x11/libXft/buildlink3.mk" 123.include "../../x11/libXft/buildlink3.mk"
104.include "../../x11/libXmu/buildlink3.mk" 124.include "../../x11/libXmu/buildlink3.mk"
105.include "../../x11/libXrandr/buildlink3.mk" 125.include "../../x11/libXrandr/buildlink3.mk"
106 126
107.include "../../mk/pthread.buildlink3.mk" 127.include "../../mk/pthread.buildlink3.mk"
108.include "../../mk/bsd.pkg.mk" 128.include "../../mk/bsd.pkg.mk"
cvs diff -r1.21 -r1.22 pkgsrc/x11/qt4-libs/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/Makefile.common 2010/07/04 06:00:14 1.21
+++ pkgsrc/x11/qt4-libs/Makefile.common 2010/11/15 13:05:45 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.21 2010/07/04 06:00:14 adam Exp $ 1# $NetBSD: Makefile.common,v 1.22 2010/11/15 13:05:45 adam Exp $
2# used by x11/qt4-docs/Makefile 2# used by x11/qt4-docs/Makefile
3# used by x11/qt4-libs/Makefile 3# used by x11/qt4-libs/Makefile
4# used by x11/qt4-mng/Makefile 4# used by x11/qt4-mng/Makefile
5# used by x11/qt4-mysql/Makefile 5# used by x11/qt4-mysql/Makefile
6# used by x11/qt4-pgsql/Makefile 6# used by x11/qt4-pgsql/Makefile
7# used by x11/qt4-qdbus/Makefile 7# used by x11/qt4-qdbus/Makefile
8# used by x11/qt4-sqlite3/Makefile 8# used by x11/qt4-sqlite3/Makefile
9# used by x11/qt4-tiff/Makefile 9# used by x11/qt4-tiff/Makefile
10 10
11DISTNAME= qt-everywhere-opensource-src-${QTVERSION} 11DISTNAME= qt-everywhere-opensource-src-${QTVERSION}
12CATEGORIES= x11 12CATEGORIES= x11
13MASTER_SITES= ftp://ftp.qt.nokia.com/qt/source/ 13MASTER_SITES= ftp://ftp.qt.nokia.com/qt/source/
14#EXTRACT_SUFX= .tar.bz2 14#EXTRACT_SUFX= .tar.bz2
@@ -25,26 +25,32 @@ USE_LIBTOOL= yes @@ -25,26 +25,32 @@ USE_LIBTOOL= yes
25USE_TOOLS+= gmake 25USE_TOOLS+= gmake
26 26
27QTPREFIX= ${PREFIX}/qt4 27QTPREFIX= ${PREFIX}/qt4
28 28
29#CONFIGURE_ARGS+= -arch ${MACHINE_ARCH} 29#CONFIGURE_ARGS+= -arch ${MACHINE_ARCH}
30CONFIGURE_ARGS+= -optimized-qmake 30CONFIGURE_ARGS+= -optimized-qmake
31CONFIGURE_ARGS+= -prefix "${QTPREFIX}" 31CONFIGURE_ARGS+= -prefix "${QTPREFIX}"
32CONFIGURE_ARGS+= -qt-gif # qt4 does not write compressed GIFs 32CONFIGURE_ARGS+= -qt-gif # qt4 does not write compressed GIFs
33CONFIGURE_ARGS.SunOS+= -no-xrender 33CONFIGURE_ARGS.SunOS+= -no-xrender
34CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-Wl*:S/-Wl,//} 34CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-Wl*:S/-Wl,//}
35OPSYSVARS+= CONFIGURE_ARGS 35OPSYSVARS+= CONFIGURE_ARGS
36CONFIGURE_ARGS+= < ${FILESDIR}/license-acceptance 36CONFIGURE_ARGS+= < ${FILESDIR}/license-acceptance
37 37
 38.include "../../mk/bsd.prefs.mk"
 39
 40.if !empty(MAKE_JOBS)
 41CONFIGURE_ENV+= MAKE_FLAGS=-j${MAKE_JOBS:Q}
 42.endif
 43
38LIBQT?= -lQtCore -lQtGui 44LIBQT?= -lQtCore -lQtGui
39 45
40MAKE_ENV+= QTPREFIX=${QTPREFIX:Q} 46MAKE_ENV+= QTPREFIX=${QTPREFIX:Q}
41MAKE_ENV+= QTDIR=${WRKSRC} 47MAKE_ENV+= QTDIR=${WRKSRC}
42 48
43# avoid creating a .qt directory in the users home directory 49# avoid creating a .qt directory in the users home directory
44SCRIPTS_ENV+= HOME=${WRKDIR} 50SCRIPTS_ENV+= HOME=${WRKDIR}
45 51
46.include "../../mk/compiler.mk" 52.include "../../mk/compiler.mk"
47 53
48.if ${OPSYS} == "SunOS" 54.if ${OPSYS} == "SunOS"
49. if !empty(CC_VERSION:Mgcc*) 55. if !empty(CC_VERSION:Mgcc*)
50. if ${ABI:U} == "64" 56. if ${ABI:U} == "64"
@@ -88,37 +94,37 @@ CONFIGURE_ARGS+= -no-xinerama @@ -88,37 +94,37 @@ CONFIGURE_ARGS+= -no-xinerama
88.endif 94.endif
89 95
90.include "options.mk" 96.include "options.mk"
91 97
92# Reverse the change to how templates are handled made between 3.0.4 98# Reverse the change to how templates are handled made between 3.0.4
93# and 3.0.5 for older toolchains. Removing inline for newer toolchains 99# and 3.0.5 for older toolchains. Removing inline for newer toolchains
94# produces smaller code. Removing inline for older toolchains prod- 100# produces smaller code. Removing inline for older toolchains prod-
95# uces buggy code. 101# uces buggy code.
96.if !empty(CC_VERSION:Mgcc-2.8*) 102.if !empty(CC_VERSION:Mgcc-2.8*)
97CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline 103CXXFLAGS+= -DQ_INLINE_TEMPLATES=inline
98.endif 104.endif
99 105
100pre-configure: 106pre-configure:
101 sed -e 's:@LOCALBASE@:${LOCALBASE:Q}:g' \ 107 sed -e 's:@LOCALBASE@:${LOCALBASE}:g' \
102 -e 's:@X11BASE@:${X11BASE:Q}:g' \ 108 -e 's:@X11BASE@:${X11BASE}:g' \
103 -e 's:@X11PREFIX@:${X11PREFIX:Q}:g' \ 109 -e 's:@X11PREFIX@:${X11PREFIX}:g' \
104 -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \ 110 -e 's:@LIBTOOL@:${LIBTOOL:Q}:g' \
105 -e 's:@CC@:${CC:Q}:g' \ 111 -e 's:@CC@:${CC:Q}:g' \
106 -e 's:@CXX@:${CXX:Q}:g' \ 112 -e 's:@CXX@:${CXX:Q}:g' \
107 -e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \ 113 -e 's:@LDFLAGS@:${LDFLAGS:Q}:g' \
108 -e 's:@CFLAGS@:${CFLAGS:Q}:g' \ 114 -e 's:@CFLAGS@:${CFLAGS:Q}:g' \
109 -e 's:@CXXFLAGS@:${CXXFLAGS:Q}:g' \ 115 -e 's:@CXXFLAGS@:${CXXFLAGS:Q}:g' \
110 -e 's:@SYS_LIBS@:${SYS_LIBS:Q}:g' \ 116 -e 's:@SYS_LIBS@:${SYS_LIBS:Q}:g' \
111 -e 's:@LEX@:${LEX:Q}:g' \ 117 -e 's:@LEX@:${LEX}:g' \
112 -e 's:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \ 118 -e 's:@YACC@:${TOOLS_CMDLINE_YACC:Q}:g' \
113 -e 's:@AR@:${AR:Q}:g' \ 119 -e 's:@AR@:${AR:Q}:g' \
114 -e 's:@MKDIR@:${MKDIR:Q}:g' \ 120 -e 's:@MKDIR@:${MKDIR}:g' \
115 -e 's:@LIBQT@:${LIBQT:Q}:g' \ 121 -e 's:@LIBQT@:${LIBQT:Q}:g' \
116 -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS:Q}:g' \ 122 -e 's:@PTHREAD_LDFLAGS@:${PTHREAD_LDFLAGS:Q}:g' \
117 -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS:Q}:g' \ 123 -e 's:@PTHREAD_LIBS@:${PTHREAD_LIBS:Q}:g' \
118 -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG:Q}:g' \ 124 -e 's:@COMPILER_RPATH_FLAG@:${COMPILER_RPATH_FLAG}:g' \
119 -e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB:Q}:g' \ 125 -e 's:@QMAKE_RANLIB@:${QMAKE_RANLIB:Q}:g' \
120 ${FILESDIR}/qmake.conf > ${WRKSRC}/qmake.conf 126 ${FILESDIR}/qmake.conf > ${WRKSRC}/qmake.conf
121 for dir in ${WRKSRC}/mkspecs/*; do \ 127 for dir in ${WRKSRC}/mkspecs/*; do \
122 cp ${WRKSRC}/qmake.conf $${dir}; \ 128 cp ${WRKSRC}/qmake.conf $${dir}; \
123 rm -f $${dir}/*.orig; \ 129 rm -f $${dir}/*.orig; \
124 done 130 done
cvs diff -r1.14 -r1.15 pkgsrc/x11/qt4-libs/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/PLIST 2010/02/02 14:05:59 1.14
+++ pkgsrc/x11/qt4-libs/PLIST 2010/11/15 13:05:45 1.15
@@ -1,48 +1,57 @@ @@ -1,48 +1,57 @@
1@comment $NetBSD: PLIST,v 1.14 2010/02/02 14:05:59 adam Exp $ 1@comment $NetBSD: PLIST,v 1.15 2010/11/15 13:05:45 adam Exp $
2lib/pkgconfig/Qt3Support.pc 2lib/pkgconfig/Qt3Support.pc
3lib/pkgconfig/QtCore.pc 3lib/pkgconfig/QtCore.pc
 4lib/pkgconfig/QtDeclarative.pc
4lib/pkgconfig/QtGui.pc 5lib/pkgconfig/QtGui.pc
5lib/pkgconfig/QtMultimedia.pc 6lib/pkgconfig/QtMultimedia.pc
6lib/pkgconfig/QtNetwork.pc 7lib/pkgconfig/QtNetwork.pc
7lib/pkgconfig/QtOpenGL.pc 8lib/pkgconfig/QtOpenGL.pc
8lib/pkgconfig/QtScript.pc 9lib/pkgconfig/QtScript.pc
9lib/pkgconfig/QtScriptTools.pc 10lib/pkgconfig/QtScriptTools.pc
10lib/pkgconfig/QtSql.pc 11lib/pkgconfig/QtSql.pc
11lib/pkgconfig/QtSvg.pc 12lib/pkgconfig/QtSvg.pc
12lib/pkgconfig/QtTest.pc 13lib/pkgconfig/QtTest.pc
13lib/pkgconfig/QtWebKit.pc 14lib/pkgconfig/QtWebKit.pc
14lib/pkgconfig/QtXml.pc 15lib/pkgconfig/QtXml.pc
15lib/pkgconfig/QtXmlPatterns.pc 16lib/pkgconfig/QtXmlPatterns.pc
 17lib/pkgconfig/jscore.pc
16qt4/bin/moc 18qt4/bin/moc
17qt4/bin/rcc 19qt4/bin/rcc
18qt4/bin/uic 20qt4/bin/uic
19qt4/bin/uic3 21qt4/bin/uic3
 22qt4/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.la
 23qt4/imports/Qt/labs/gestures/libqmlgesturesplugin.la
 24qt4/imports/Qt/labs/particles/libqmlparticlesplugin.la
 25qt4/imports/QtWebKit/libqmlwebkitplugin.la
20qt4/lib/libQt3Support.la 26qt4/lib/libQt3Support.la
21qt4/lib/libQtCore.la 27qt4/lib/libQtCore.la
 28qt4/lib/libQtDeclarative.la
22qt4/lib/libQtGui.la 29qt4/lib/libQtGui.la
23qt4/lib/libQtMultimedia.la 30qt4/lib/libQtMultimedia.la
24qt4/lib/libQtNetwork.la 31qt4/lib/libQtNetwork.la
25qt4/lib/libQtOpenGL.la 32qt4/lib/libQtOpenGL.la
26qt4/lib/libQtScript.la 33qt4/lib/libQtScript.la
27qt4/lib/libQtScriptTools.la 34qt4/lib/libQtScriptTools.la
28qt4/lib/libQtSql.la 35qt4/lib/libQtSql.la
29qt4/lib/libQtSvg.la 36qt4/lib/libQtSvg.la
30qt4/lib/libQtTest.la 37qt4/lib/libQtTest.la
31qt4/lib/libQtWebKit.la 38qt4/lib/libQtWebKit.la
32qt4/lib/libQtXml.la 39qt4/lib/libQtXml.la
33qt4/lib/libQtXmlPatterns.la 40qt4/lib/libQtXmlPatterns.la
 41qt4/lib/libjscore.la
34qt4/plugins/accessible/libqtaccessiblecompatwidgets.la 42qt4/plugins/accessible/libqtaccessiblecompatwidgets.la
35qt4/plugins/accessible/libqtaccessiblewidgets.la 43qt4/plugins/accessible/libqtaccessiblewidgets.la
 44qt4/plugins/bearer/libqgenericbearer.la
36qt4/plugins/codecs/libqcncodecs.la 45qt4/plugins/codecs/libqcncodecs.la
37qt4/plugins/codecs/libqjpcodecs.la 46qt4/plugins/codecs/libqjpcodecs.la
38qt4/plugins/codecs/libqkrcodecs.la 47qt4/plugins/codecs/libqkrcodecs.la
39qt4/plugins/codecs/libqtwcodecs.la 48qt4/plugins/codecs/libqtwcodecs.la
40qt4/plugins/graphicssystems/libqglgraphicssystem.la 49qt4/plugins/graphicssystems/libqglgraphicssystem.la
41qt4/plugins/graphicssystems/libqtracegraphicssystem.la 50qt4/plugins/graphicssystems/libqtracegraphicssystem.la
42qt4/plugins/iconengines/libqsvgicon.la 51qt4/plugins/iconengines/libqsvgicon.la
43qt4/plugins/imageformats/libqgif.la 52qt4/plugins/imageformats/libqgif.la
44qt4/plugins/imageformats/libqico.la 53qt4/plugins/imageformats/libqico.la
45qt4/plugins/imageformats/libqjpeg.la 54qt4/plugins/imageformats/libqjpeg.la
46qt4/plugins/imageformats/libqsvg.la 55qt4/plugins/imageformats/libqsvg.la
47qt4/plugins/inputmethods/libqimsw-multi.la 56qt4/plugins/inputmethods/libqimsw-multi.la
48qt4/q3porting.xml 57qt4/q3porting.xml
cvs diff -r1.46 -r1.47 pkgsrc/x11/qt4-libs/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/distinfo 2010/09/03 13:47:12 1.46
+++ pkgsrc/x11/qt4-libs/distinfo 2010/11/15 13:05:45 1.47
@@ -1,34 +1,38 @@ @@ -1,34 +1,38 @@
1$NetBSD: distinfo,v 1.46 2010/09/03 13:47:12 drochner Exp $ 1$NetBSD: distinfo,v 1.47 2010/11/15 13:05:45 adam Exp $
2 2
3SHA1 (qt-everywhere-opensource-src-4.6.3.tar.gz) = 1c18a564df9296c7cb0e0dedde40b9843e1b30e8 3SHA1 (qt-everywhere-opensource-src-4.7.1.tar.gz) = fcf764d39d982c7f84703821582bd10c3192e341
4RMD160 (qt-everywhere-opensource-src-4.6.3.tar.gz) = ceb3ca78263d0d9cdf92fef903e30c0026db6bff 4RMD160 (qt-everywhere-opensource-src-4.7.1.tar.gz) = de6998948eb9f51a9193b9020ba80cfd52d50899
5Size (qt-everywhere-opensource-src-4.6.3.tar.gz) = 160993454 bytes 5Size (qt-everywhere-opensource-src-4.7.1.tar.gz) = 211768512 bytes
6SHA1 (patch-aa) = 899242f5a3b9101db98f2e87fa1a38f3bffdb262 6SHA1 (patch-aa) = 70cf085b3f5ac32e8d2e7312eb998e08500f30f1
7SHA1 (patch-ab) = c19f854a08c3c5ce1791d6fbd63443144d8f1fc8 7SHA1 (patch-ab) = a2de275815bc71f294c787c124f5596440d3ce03
8SHA1 (patch-ac) = db39e471fb43ee820556983ebf9108658ce11e84 8SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5
9SHA1 (patch-ad) = 619ae805f31df5cf490320e4ca611621a781bbb9 9SHA1 (patch-ad) = df3a50533fdb6d71ecb83cb3d6fef9a9195ef3e6
10SHA1 (patch-ae) = 8b623c616a0c41be3edd3b7b8e987e40e9e7ccbe 10SHA1 (patch-ae) = c3956f4453a0c365b683692ef86f25be6af9f744
11SHA1 (patch-af) = 54bb375f7c1a43e7bf3f9528e31000a1f292f7d3 11SHA1 (patch-af) = 54bb375f7c1a43e7bf3f9528e31000a1f292f7d3
12SHA1 (patch-ag) = c7573bf93741d91b4f81ca5f0e7d851c1a40239a 12SHA1 (patch-ag) = ae652f320072670ef4125b11e002c4aa2d87ce89
13SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 13SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
14SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950 14SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
15SHA1 (patch-aj) = ae2bd6dd5e66a966dcdd63d32736b4a427fc85df 15SHA1 (patch-aj) = c5510b6f6044f17855f2840fabb8ed94fddbd525
16SHA1 (patch-ak) = 2b13c4a70f5020c8bdd33e0c0b9978a8b726117d 16SHA1 (patch-ak) = 6ee5822d81723cddb44226b34d891fd93c4779b9
17SHA1 (patch-al) = fce1a98e5df112206f9ef432033215635257f981 17SHA1 (patch-al) = fce1a98e5df112206f9ef432033215635257f981
18SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381 18SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381
19SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409 19SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409
20SHA1 (patch-ao) = becfc697d7ae337327a416cfcea2ca8952fe1ed4 20SHA1 (patch-ao) = becfc697d7ae337327a416cfcea2ca8952fe1ed4
21SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569 21SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569
22SHA1 (patch-aq) = 1a7f8ba45c9a232c35c4db0094ae1ac2c795b6ab 22SHA1 (patch-aq) = ec88f8b47d77297cc9a06e97a0cfce5297074c68
23SHA1 (patch-ar) = 5bf166c9b7d71bf5e6c3839f804c865f5221879a 23SHA1 (patch-ar) = 5bf166c9b7d71bf5e6c3839f804c865f5221879a
24SHA1 (patch-as) = ada0bb538f16bc8e3db23390cbdb3b155db2d7ed 24SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058
25SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed 25SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed
26SHA1 (patch-au) = d0bb72642d73aa716587e8ed3cff4dc37c415e12 26SHA1 (patch-au) = 397a18f84299026e21aee0079784f56698fc9c6b
27SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf 27SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf
28SHA1 (patch-aw) = df067e2530a825734ffc0afe2607e43c45c07f9b 28SHA1 (patch-aw) = df067e2530a825734ffc0afe2607e43c45c07f9b
29SHA1 (patch-ax) = 0c17ee0d865a39ed167b6134e73d12a57b9f84a9 29SHA1 (patch-ax) = 10f35c99b8cfebeb35f09a97188ae5c8b47a6635
30SHA1 (patch-ay) = ee700d2a4bf02be6a908c0aebe8e8bfd3b1f6c38 30SHA1 (patch-ay) = e1edcb5de9a40b3549c7cd74ebb814c6b4eb6c94
31SHA1 (patch-az) = 8c8cf4f77b28d092ce05ab2d4a8a87d1a22c61a1 31SHA1 (patch-az) = c54b9c594de3e4fd3312e6689d2b8d3bfb84202d
32SHA1 (patch-ba) = 3fbe444ec924b9185f845cbcc90f4a799aaf59ae 32SHA1 (patch-ba) = 8e70813962e434a82a737ce4f3ea743c1bb560f9
33SHA1 (patch-bb) = 9f82a7ac9f951a033af6ae78201ccd8d00004d42 33SHA1 (patch-bb) = 0d002013974af33e097df5df03ec3f45222846b5
 34SHA1 (patch-bc) = 25e41d689335387c10d26a31291f34f55df4903f
 35SHA1 (patch-bd) = 6bb0a67cb087d75761338a5abe567b9fa2b5471d
 36SHA1 (patch-be) = fa9cd7a9ab77dbad48ef441832f744a574fe3d0f
 37SHA1 (patch-bf) = 7c5810021580a5c4faf8c890b2c02a373b167b04
34SHA1 (patch-ca) = 8b69cb6201f624f43df7d766ff1967253bb22430 38SHA1 (patch-ca) = 8b69cb6201f624f43df7d766ff1967253bb22430
cvs diff -r1.3 -r1.4 pkgsrc/x11/qt4-libs/files/qmake.conf (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/files/qmake.conf 2008/10/08 09:35:49 1.3
+++ pkgsrc/x11/qt4-libs/files/qmake.conf 2010/11/15 13:05:45 1.4
@@ -1,84 +1,94 @@ @@ -1,84 +1,94 @@
1# $NetBSD: qmake.conf,v 1.3 2008/10/08 09:35:49 wiz Exp $ 1# $NetBSD: qmake.conf,v 1.4 2010/11/15 13:05:45 adam Exp $
2# $Id: qmake.conf,v 1.3 2008/10/08 09:35:49 wiz Exp $ 2# $Id: qmake.conf,v 1.4 2010/11/15 13:05:45 adam Exp $
3# 3#
4# qmake configuration for pkgsrc 4# qmake configuration for pkgsrc
5# 5#
6 6
7MAKEFILE_GENERATOR = UNIX 7MAKEFILE_GENERATOR = UNIX
 8TARGET_PLATFORM = unix
8TEMPLATE = app 9TEMPLATE = app
9CONFIG += qt warn_on release link_prl 10CONFIG += qt warn_on release link_prl
10QT += core gui 11QT += core gui
11 12
12QMAKE_CC = @CC@ 13QMAKE_CC = @CC@
13QMAKE_LEX = @LEX@ 14QMAKE_LEX = @LEX@
14QMAKE_LEXFLAGS =  15QMAKE_LEXFLAGS =
15QMAKE_YACC = @YACC@ 16QMAKE_YACC = @YACC@
16QMAKE_YACCFLAGS = -d 17QMAKE_YACCFLAGS = -d
17QMAKE_CFLAGS = @CFLAGS@ 18QMAKE_CFLAGS = @CFLAGS@
18QMAKE_CFLAGS_DEPS = -M 19QMAKE_CFLAGS_DEPS = -M
19QMAKE_CFLAGS_WARN_ON =  20QMAKE_CFLAGS_WARN_ON =
20QMAKE_CFLAGS_WARN_OFF = 21QMAKE_CFLAGS_WARN_OFF =
21QMAKE_CFLAGS_RELEASE = 22QMAKE_CFLAGS_RELEASE =
22QMAKE_CFLAGS_DEBUG = -g 23QMAKE_CFLAGS_DEBUG = -g
23QMAKE_CFLAGS_SHLIB = -fPIC 24QMAKE_CFLAGS_SHLIB = -fPIC
 25QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
24QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses 26QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
25QMAKE_CFLAGS_THREAD = -D_REENTRANT 27QMAKE_CFLAGS_THREAD = -D_REENTRANT
26 28
27QMAKE_CXX = @CXX@ 29QMAKE_CXX = @CXX@
28QMAKE_CXXFLAGS = @CXXFLAGS@ -DQ_TRAILING_DIR_SEP 30QMAKE_CXXFLAGS = @CXXFLAGS@ -DQ_TRAILING_DIR_SEP
29QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS 31QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
30QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON 32QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
31QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF 33QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF
32QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE 34QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE
33QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG 35QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG
34QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB 36QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB
 37QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
35QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC 38QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC
36QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD 39QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
37 40
38QMAKE_INCDIR = @LOCALBASE@/include 41QMAKE_INCDIR = @LOCALBASE@/include
39QMAKE_LIBDIR = @LOCALBASE@/lib 42QMAKE_LIBDIR = @LOCALBASE@/lib
40QMAKE_INCDIR_X11 = @X11BASE@/include 43QMAKE_INCDIR_X11 = @X11BASE@/include
41QMAKE_LIBDIR_X11 = @X11BASE@/lib 44QMAKE_LIBDIR_X11 = @X11BASE@/lib
42QMAKE_INCDIR_QT = $(QTDIR)/include 45QMAKE_INCDIR_QT = $(QTDIR)/include
43QMAKE_LIBDIR_QT = $(QTDIR)/lib 46QMAKE_LIBDIR_QT = $(QTDIR)/lib
44QMAKE_INCDIR_OPENGL = @X11PREFIX@/include 47QMAKE_INCDIR_OPENGL = @X11PREFIX@/include
45QMAKE_LIBDIR_OPENGL = @X11PREFIX@/lib 48QMAKE_LIBDIR_OPENGL = @X11PREFIX@/lib
46 49
47QMAKE_LINK = @CXX@ 50QMAKE_LINK = @CXX@
48QMAKE_LINK_SHLIB = @CXX@ 51QMAKE_LINK_SHLIB = @CXX@
 52QMAKE_LINK_C = @CC@
 53QMAKE_LINK_C_SHLIB = @CC@
49QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS) 54QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $$QMAKE_LFLAGS_SHLIB $(LFLAGS) $$QMAKE_LFLAGS -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
50QMAKE_LFLAGS = $(LDFLAGS) -L$(QTDIR)/lib 55QMAKE_LFLAGS = $(LDFLAGS) -L$(QTDIR)/lib
51QMAKE_LFLAGS_RELEASE = 56QMAKE_LFLAGS_RELEASE =
52QMAKE_LFLAGS_DEBUG = 57QMAKE_LFLAGS_DEBUG =
53QMAKE_LFLAGS_SHLIB = -shared 58QMAKE_LFLAGS_SHLIB = -shared
54QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB 59QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
55QMAKE_LFLAGS_SONAME = 60QMAKE_LFLAGS_SONAME =
56QMAKE_LFLAGS_THREAD = 61QMAKE_LFLAGS_THREAD = @PTHREAD_LDFLAGS@
57QMAKE_RPATH = @COMPILER_RPATH_FLAG@ 62QMAKE_LFLAGS_NOUNDEF =
 63QMAKE_LFLAGS_RPATH = @COMPILER_RPATH_FLAG@
58 64
59QMAKE_LIBS = 65QMAKE_LIBS =
60QMAKE_LIBS_DYNLOAD =  66QMAKE_LIBS_DYNLOAD =
61QMAKE_LIBS_X11 = -lXext -lX11 -lm @SYS_LIBS@ 67QMAKE_LIBS_X11 = -lXext -lX11 -lm @SYS_LIBS@
62QMAKE_LIBS_X11SM = -lSM -lICE 68QMAKE_LIBS_X11SM = -lSM -lICE
63QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu 69QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu
64QMAKE_LIBS_OPENGL_QT = -lGL -lXmu 70QMAKE_LIBS_OPENGL_QT = -lGL -lXmu
65QMAKE_LIBS_THREAD = @PTHREAD_LDFLAGS@ @PTHREAD_LIBS@ 71QMAKE_LIBS_THREAD = @PTHREAD_LIBS@
66 72
67QMAKE_MOC = $(QTDIR)/bin/moc 73QMAKE_MOC = $(QTDIR)/bin/moc
68QMAKE_UIC = $(QTDIR)/bin/uic 74QMAKE_UIC = $(QTDIR)/bin/uic
69QMAKE_UIC3 = $(QTDIR)/bin/uic3 75QMAKE_UIC3 = $(QTDIR)/bin/uic3
70QMAKE_RCC = $(QTDIR)/bin/rcc 76QMAKE_RCC = $(QTDIR)/bin/rcc
71 77
72QMAKE_AR = @AR@ ru 78QMAKE_AR = @AR@ ru
 79#QMAKE_OBJCOPY = objcopy
73QMAKE_RANLIB = @QMAKE_RANLIB@ 80QMAKE_RANLIB = @QMAKE_RANLIB@
74 81
75QMAKE_TAR = tar -cf 82QMAKE_TAR = tar -cf
76QMAKE_GZIP = gzip -9f 83QMAKE_GZIP = gzip -9f
77 84
78QMAKE_COPY = cp -f 85QMAKE_COPY = cp -f
79QMAKE_MOVE = mv 86QMAKE_COPY_FILE = $$QMAKE_COPY
 87QMAKE_COPY_DIR = $$QMAKE_COPY -R
 88QMAKE_MOVE = mv -f
80QMAKE_DEL_FILE = rm -f 89QMAKE_DEL_FILE = rm -f
81QMAKE_DEL_DIR = rmdir 90QMAKE_DEL_DIR = rmdir
82QMAKE_CHK_DIR_EXISTS = test -d 91QMAKE_CHK_DIR_EXISTS = test -d
83QMAKE_MKDIR = @MKDIR@ 92QMAKE_MKDIR = @MKDIR@
 93include(../common/unix.conf)
84load(qt_config) 94load(qt_config)
cvs diff -r1.11 -r1.12 pkgsrc/x11/qt4-libs/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-aa 2010/01/29 18:19:09 1.11
+++ pkgsrc/x11/qt4-libs/patches/patch-aa 2010/11/15 13:05:45 1.12
@@ -1,36 +1,36 @@ @@ -1,36 +1,36 @@
1$NetBSD: patch-aa,v 1.11 2010/01/29 18:19:09 adam Exp $ 1$NetBSD: patch-aa,v 1.12 2010/11/15 13:05:45 adam Exp $
2 2
3--- qmake/generators/unix/unixmake2.cpp.orig 2010-01-15 17:01:30.000000000 +0000 3--- qmake/generators/unix/unixmake2.cpp.orig 2010-09-10 09:04:41.000000000 +0000
4+++ qmake/generators/unix/unixmake2.cpp 4+++ qmake/generators/unix/unixmake2.cpp
5@@ -233,6 +233,8 @@ UnixMakefileGenerator::writeMakeParts(QT 5@@ -239,6 +239,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_SYMBIAN_SHLIB")) {
 12 t << "TARGETD = " << escapeFilePath(var("TARGET")) << endl;
11 } else if(project->isEmpty("QMAKE_HPUX_SHLIB")) { 13 } else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
12 t << "TARGETD = " << escapeFilePath(var("TARGET_x.y.z")) << endl; 14@@ -1016,8 +1018,12 @@ void UnixMakefileGenerator::init2()
13 t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl; 
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(project->first("QMAKE_PREFIX_STATICLIB"));
17 project->values("TARGET").first() += ".a"; 17 project->values("TARGET").first() += "." + project->first("QMAKE_EXTENSION_STATICLIB");
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") + project->first("QMAKE_PREFIX_STATICLIB")
27 if(project->isActiveConfig("compile_libtool")) 27 + project->first("TARGET") + "." + project->first("QMAKE_EXTENSION_STATICLIB"));
28@@ -1439,7 +1445,7 @@ UnixMakefileGenerator::writePkgConfigFil 28@@ -1467,7 +1473,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.11 -r1.12 pkgsrc/x11/qt4-libs/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-ag 2010/07/04 06:00:14 1.11
+++ pkgsrc/x11/qt4-libs/patches/patch-ag 2010/11/15 13:05:45 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ag,v 1.11 2010/07/04 06:00:14 adam Exp $ 1$NetBSD: patch-ag,v 1.12 2010/11/15 13:05:45 adam Exp $
2 2
3--- qmake/project.cpp.orig 2010-06-02 02:03:09.000000000 +0000 3--- qmake/project.cpp.orig 2010-09-10 09:04:41.000000000 +0000
4+++ qmake/project.cpp 4+++ qmake/project.cpp
5@@ -1614,6 +1614,9 @@ QMakeProject::isActiveConfig(const QStri 5@@ -1534,6 +1534,9 @@ QMakeProject::isActiveConfig(const QStri
6 if(isForSymbian() && (x == "symbian" || x == "unix")) 6 return Option::target_mode == Option::TARG_WIN_MODE;
7 return true; 7 }
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 || 13 static QString spec;
14 Option::target_mode == Option::TARG_UNIX_MODE) && x == "unix") 14 if(spec.isEmpty())
cvs diff -r1.10 -r1.11 pkgsrc/x11/qt4-libs/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-ab 2010/01/29 18:19:09 1.10
+++ pkgsrc/x11/qt4-libs/patches/patch-ab 2010/11/15 13:05:45 1.11
@@ -1,107 +1,107 @@ @@ -1,107 +1,107 @@
1$NetBSD: patch-ab,v 1.10 2010/01/29 18:19:09 adam Exp $ 1$NetBSD: patch-ab,v 1.11 2010/11/15 13:05:45 adam Exp $
2 2
3--- src/gui/painting/painting.pri.orig 2010-01-15 17:01:35.000000000 +0000 3--- src/gui/gui.pro.orig 2010-11-06 01:55:14.000000000 +0000
4+++ src/gui/painting/painting.pri 4+++ src/gui/gui.pro
5@@ -232,7 +232,7 @@ contains(QMAKE_MAC_XARCH, no) { 5@@ -101,7 +101,7 @@ contains(QMAKE_MAC_XARCH, no) {
6  6 } else {
7 win32-g++|!win32:!*-icc* { 7 win32-g++*|!win32:!win32-icc*:!macx-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@@ -243,7 +243,7 @@ contains(QMAKE_MAC_XARCH, no) { 14@@ -112,7 +112,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@@ -251,7 +251,7 @@ contains(QMAKE_MAC_XARCH, no) { 23@@ -120,7 +120,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@@ -262,14 +262,14 @@ contains(QMAKE_MAC_XARCH, no) { 32@@ -131,14 +131,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@@ -280,7 +280,7 @@ contains(QMAKE_MAC_XARCH, no) { 49@@ -149,7 +149,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@@ -289,7 +289,7 @@ contains(QMAKE_MAC_XARCH, no) { 58@@ -158,7 +158,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@@ -300,7 +300,7 @@ contains(QMAKE_MAC_XARCH, no) { 67@@ -169,7 +169,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@@ -308,7 +308,7 @@ contains(QMAKE_MAC_XARCH, no) { 76@@ -177,7 +177,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@@ -319,7 +319,7 @@ contains(QMAKE_MAC_XARCH, no) { 85@@ -188,7 +188,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@@ -327,11 +327,11 @@ contains(QMAKE_MAC_XARCH, no) { 94@@ -215,11 +215,11 @@ contains(QMAKE_MAC_XARCH, no) {
95 QMAKE_EXTRA_COMPILERS += sse2_compiler 95 QMAKE_EXTRA_COMPILERS += ssse3_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.10 -r1.11 pkgsrc/x11/qt4-libs/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-ad 2010/01/29 18:19:09 1.10
+++ pkgsrc/x11/qt4-libs/patches/patch-ad 2010/11/15 13:05:45 1.11
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ad,v 1.10 2010/01/29 18:19:09 adam Exp $ 1$NetBSD: patch-ad,v 1.11 2010/11/15 13:05:45 adam Exp $
2 2
3--- src/corelib/global/qglobal.h.orig 2010-01-15 17:01:36.000000000 +0000 3--- src/corelib/global/qglobal.h.orig 2010-09-10 09:05:25.000000000 +0000
4+++ src/corelib/global/qglobal.h 4+++ src/corelib/global/qglobal.h
5@@ -159,6 +159,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@@ -224,6 +225,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
@@ -19,22 +19,22 @@ $NetBSD: patch-ad,v 1.10 2010/01/29 18:1 @@ -19,22 +19,22 @@ $NetBSD: patch-ad,v 1.10 2010/01/29 18:1
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@@ -266,8 +270,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@@ -805,8 +807,6 @@ namespace QT_NAMESPACE {} 32@@ -804,8 +806,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.3 -r1.4 pkgsrc/x11/qt4-libs/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-ac 2010/01/29 18:19:09 1.3
+++ pkgsrc/x11/qt4-libs/patches/patch-ac 2010/11/15 13:05:45 1.4
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ac,v 1.3 2010/01/29 18:19:09 adam Exp $ 1$NetBSD: patch-ac,v 1.4 2010/11/15 13:05:45 adam Exp $
2 2
3--- tools/designer/src/designer/designer.pro.orig 2010-01-15 17:01:29.000000000 +0000 3--- tools/designer/src/designer/designer.pro.orig 2010-09-10 09:04:49.000000000 +0000
4+++ tools/designer/src/designer/designer.pro 4+++ tools/designer/src/designer/designer.pro
5@@ -14,7 +14,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-QMAKE_LIBDIR += ../../lib ../../../../lib
10+LIBS += \ 10+QMAKE_LIBDIR += ../../../../lib
11 -L../../../../lib \ 11 LIBS += -lQtDesignerComponents -lQtDesigner
12 -lQtDesignerComponents \ 12
13 -lQtDesigner 13 RESOURCES += designer.qrc
cvs diff -r1.3 -r1.4 pkgsrc/x11/qt4-libs/patches/Attic/patch-az (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/Attic/patch-az 2010/03/12 08:19:38 1.3
+++ pkgsrc/x11/qt4-libs/patches/Attic/patch-az 2010/11/15 13:05:45 1.4
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-az,v 1.3 2010/03/12 08:19:38 mrg Exp $ 1$NetBSD: patch-az,v 1.4 2010/11/15 13:05:45 adam Exp $
2 2
3--- ./src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.h.orig 2010-03-11 18:45:16.000000000 -0800 3--- src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.h.orig 2010-09-10 09:05:24.000000000 +0000
4+++ ./src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.h 2010-03-11 18:45:31.000000000 -0800 4+++ src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.h
5@@ -476,7 +476,7 @@ 5@@ -491,7 +491,7 @@ namespace JSC {
6 u.asBits.tag = CellTag; 6 u.asBits.tag = CellTag;
7 else 7 else
8 u.asBits.tag = EmptyValueTag; 8 u.asBits.tag = EmptyValueTag;
9- u.asBits.payload = reinterpret_cast<int32_t>(ptr); 9- u.asBits.payload = reinterpret_cast<int32_t>(ptr);
10+ u.asBits.payload = reinterpret_cast<intptr_t>(ptr); 10+ u.asBits.payload = reinterpret_cast<intptr_t>(ptr);
11 } 11 #if ENABLE(JSC_ZOMBIES)
12  12 ASSERT(!isZombie());
13 inline JSValue::JSValue(const JSCell* ptr) 13 #endif
14@@ -485,7 +485,7 @@ 14@@ -503,7 +503,7 @@ namespace JSC {
15 u.asBits.tag = CellTag; 15 u.asBits.tag = CellTag;
16 else 16 else
17 u.asBits.tag = EmptyValueTag; 17 u.asBits.tag = EmptyValueTag;
18- u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr)); 18- u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr));
19+ u.asBits.payload = reinterpret_cast<intptr_t>(const_cast<JSCell*>(ptr)); 19+ u.asBits.payload = reinterpret_cast<intptr_t>(const_cast<JSCell*>(ptr));
20 } 20 #if ENABLE(JSC_ZOMBIES)
21  21 ASSERT(!isZombie());
22 inline JSValue::operator bool() const 22 #endif
cvs diff -r1.3 -r1.4 pkgsrc/x11/qt4-libs/patches/patch-bb (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-bb 2010/05/29 17:10:31 1.3
+++ pkgsrc/x11/qt4-libs/patches/patch-bb 2010/11/15 13:05:45 1.4
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-bb,v 1.3 2010/05/29 17:10:31 adam Exp $ 1$NetBSD: patch-bb,v 1.4 2010/11/15 13:05:45 adam Exp $
2 2
3--- src/3rdparty/javascriptcore/JavaScriptCore/config.h.orig 2010-05-29 13:27:36.000000000 +0000 3--- src/3rdparty/javascriptcore/JavaScriptCore/config.h.orig 2010-09-10 09:05:24.000000000 +0000
4+++ src/3rdparty/javascriptcore/JavaScriptCore/config.h 4+++ src/3rdparty/javascriptcore/JavaScriptCore/config.h
5@@ -53,7 +53,7 @@ 5@@ -53,7 +53,7 @@
6  6
7 #endif 7 #endif
8  8
9-#if PLATFORM(FREEBSD) || PLATFORM(OPENBSD) 9-#if OS(FREEBSD) || OS(OPENBSD)
10+#if PLATFORM(FREEBSD) || PLATFORM(OPENBSD) || PLATFORM(DRAGONFLY) 10+#if OS(FREEBSD) || OS(OPENBSD) || OS(DRAGONFLY)
11 #define HAVE_PTHREAD_NP_H 1 11 #define HAVE_PTHREAD_NP_H 1
12 #endif 12 #endif
13  13
cvs diff -r1.8 -r1.9 pkgsrc/x11/qt4-libs/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-ae 2010/01/29 18:19:09 1.8
+++ pkgsrc/x11/qt4-libs/patches/patch-ae 2010/11/15 13:05:45 1.9
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-ae,v 1.8 2010/01/29 18:19:09 adam Exp $ 1$NetBSD: patch-ae,v 1.9 2010/11/15 13:05:45 adam Exp $
2 2
3--- qmake/generators/unix/unixmake.cpp.orig 2010-01-15 17:01:30.000000000 +0000 3--- qmake/generators/unix/unixmake.cpp.orig 2010-09-10 09:04:41.000000000 +0000
4+++ qmake/generators/unix/unixmake.cpp 4+++ qmake/generators/unix/unixmake.cpp
5@@ -325,27 +325,29 @@ UnixMakefileGenerator::init() 5@@ -327,27 +327,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.8 2010/01/29 18:19 @@ -32,35 +32,35 @@ $NetBSD: patch-ae,v 1.8 2010/01/29 18:19
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@@ -677,7 +679,6 @@ UnixMakefileGenerator::defaultInstall(co 45@@ -683,7 +685,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@@ -715,10 +716,14 @@ UnixMakefileGenerator::defaultInstall(co 53@@ -721,10 +722,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.8 -r1.9 pkgsrc/x11/qt4-libs/patches/patch-aj (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-aj 2010/01/29 18:19:09 1.8
+++ pkgsrc/x11/qt4-libs/patches/patch-aj 2010/11/15 13:05:45 1.9
@@ -1,28 +1,24 @@ @@ -1,28 +1,24 @@
1$NetBSD: patch-aj,v 1.8 2010/01/29 18:19:09 adam Exp $ 1$NetBSD: patch-aj,v 1.9 2010/11/15 13:05:45 adam Exp $
2 2
3--- mkspecs/netbsd-g++/qplatformdefs.h.orig 2010-01-15 17:01:28.000000000 +0000 3--- mkspecs/netbsd-g++/qplatformdefs.h.orig 2010-09-10 09:04:49.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@@ -127,10 +128,14 @@ 13@@ -87,6 +88,11 @@
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 
26  
27- 
28 #endif // QPLATFORMDEFS_H 
cvs diff -r1.6 -r1.7 pkgsrc/x11/qt4-libs/patches/patch-ak (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-ak 2010/01/29 18:19:09 1.6
+++ pkgsrc/x11/qt4-libs/patches/patch-ak 2010/11/15 13:05:45 1.7
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ak,v 1.6 2010/01/29 18:19:09 adam Exp $ 1$NetBSD: patch-ak,v 1.7 2010/11/15 13:05:45 adam Exp $
2 2
3--- src/gui/kernel/qcursor_x11.cpp.orig 2010-01-15 17:01:35.000000000 +0000 3--- src/gui/kernel/qcursor_x11.cpp.orig 2010-09-10 09:05:24.000000000 +0000
4+++ src/gui/kernel/qcursor_x11.cpp 4+++ src/gui/kernel/qcursor_x11.cpp
5@@ -243,7 +243,7 @@ void QCursorData::update() 5@@ -246,7 +246,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.7 -r1.8 pkgsrc/x11/qt4-libs/patches/patch-aq (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-aq 2010/07/04 06:00:14 1.7
+++ pkgsrc/x11/qt4-libs/patches/patch-aq 2010/11/15 13:05:45 1.8
@@ -1,22 +1,40 @@ @@ -1,22 +1,40 @@
1$NetBSD: patch-aq,v 1.7 2010/07/04 06:00:14 adam Exp $ 1$NetBSD: patch-aq,v 1.8 2010/11/15 13:05:45 adam Exp $
2 2
3--- configure.orig 2010-06-02 02:03:10.000000000 +0000 3--- configure.orig 2010-11-06 01:55:00.000000000 +0000
4+++ configure 4+++ configure
5@@ -3071,7 +3071,7 @@ fi 5@@ -3272,7 +3272,7 @@ fi
6 if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then 6 if [ "$PLATFORM_MAC" = "yes" ] && [ '!' -z "$CFG_SDK" ]; then
7 # get the darwin version. 10.0.0 and up means snow leopard. 7 # get the darwin version. 10.0.0 and up means snow leopard.
8 VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'` 8 VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
9- if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" == "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" == "macx-g++" ]; then 9- if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" == "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" == "macx-g++" ]; then
10+ if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" = "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" = "macx-g++" ]; then 10+ if [ "$VERSION" -gt 9 ] && [ "$CFG_SDK" = "/Developer/SDKs/MacOSX10.4u.sdk/" ] && [ "$PLATFORM" = "macx-g++" ]; then
11 echo 11 echo
12 echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. " 12 echo "WARNING: The 10.4u SDK does not support gcc 4.2. Configure with -platform macx-g++40. "
13 echo 13 echo
14@@ -7002,7 +7002,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" 14@@ -4733,7 +4733,7 @@ if true; then ###[ '!' -f "$outpath/bin/
 15 done
 16
 17 QMAKE_BUILD_ERROR=no
 18- (cd "$outpath/qmake"; "$MAKE") || QMAKE_BUILD_ERROR=yes
 19+ (cd "$outpath/qmake"; "$MAKE" $MAKE_FLAGS) || QMAKE_BUILD_ERROR=yes
 20 [ '!' -z "$QCONFIG_H" ] && mv -f "$QCONFIG_H" "$QMAKE_QCONFIG_H" #move qmake's qconfig.h to qconfig.h.qmake
 21 [ '!' -z "$OLD_QCONFIG_H" ] && mv -f "${OLD_QCONFIG_H}.old" "$OLD_QCONFIG_H" #put back qconfig.h
 22 [ "$QMAKE_BUILD_ERROR" = "yes" ] && exit 2
 23@@ -6556,7 +6556,7 @@ fi
 24 # select Carbon on 10.4 Tiger.
 25 if [ "$PLATFORM_MAC" = "yes" ]; then
 26 VERSION=`uname -r | tr '.' ' ' | awk '{print $1}'`
 27- if [ "$VERSION" == 8 ]; then
 28+ if [ "$VERSION" = 8 ]; then
 29 CFG_MAC_COCOA="no";
 30 CFG_MAC_CARBON="yes";
 31 fi
 32@@ -7754,7 +7754,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
15 [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS" 33 [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS"
16 [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6" 34 [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6"
17 [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE" 35 [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE"
18-[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" 36-[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
19+#[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" 37+#[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
20  38
21 if [ "$PLATFORM_QWS" != "yes" ]; then 39 if [ "$PLATFORM_QWS" != "yes" ]; then
22 [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" 40 [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER"
cvs diff -r1.7 -r1.8 pkgsrc/x11/qt4-libs/patches/patch-ay (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-ay 2010/07/04 06:00:14 1.7
+++ pkgsrc/x11/qt4-libs/patches/patch-ay 2010/11/15 13:05:45 1.8
@@ -1,35 +1,33 @@ @@ -1,35 +1,33 @@
1$NetBSD: patch-ay,v 1.7 2010/07/04 06:00:14 adam Exp $ 1$NetBSD: patch-ay,v 1.8 2010/11/15 13:05:45 adam Exp $
2 2
3--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig 2010-06-02 02:03:12.000000000 +0000 3--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig 2010-09-10 09:05:23.000000000 +0000
4+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 4+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
5@@ -86,6 +86,13 @@ 5@@ -399,7 +399,7 @@
6 #define WTF_PLATFORM_OPENBSD 1 6
 7 /* OS(NETBSD) - NetBSD */
 8 #if defined(__NetBSD__)
 9-#define WTF_PLATFORM_NETBSD 1
 10+#define WTF_OS_NETBSD 1
 11 #endif
 12
 13 /* OS(OPENBSD) - OpenBSD */
 14@@ -407,6 +407,11 @@
 15 #define WTF_OS_OPENBSD 1
7 #endif 16 #endif
8  17
9+/* PLATFORM(DRAGONFLY) */ 18+/* OS(DRAGONFLY) - DragonFly */
10+/* Operating system level dependencies for OpenBSD systems that */ 
11+/* should be used regardless of operating environment */ 
12+#ifdef __DragonFly__ 19+#ifdef __DragonFly__
13+#define WTF_PLATFORM_DRAGONFLY 1 20+#define WTF_OS_DRAGONFLY 1
14+#endif 21+#endif
15+ 22+
16 /* PLATFORM(SOLARIS) */ 23 /* OS(QNX) - QNX */
17 /* Operating system level dependencies for Solaris that should be used */ 24 #if defined(__QNXNTO__)
18 /* regardless of operating environment */ 25 #define WTF_OS_QNX 1
19@@ -141,6 +148,7 @@ 26@@ -440,6 +445,7 @@
20 /* should be used regardless of operating environment */ 27 || OS(ANDROID) \
21 #if PLATFORM(DARWIN) \ 28 || OS(DARWIN) \
22 || PLATFORM(FREEBSD) \ 29 || OS(FREEBSD) \
23+ || PLATFORM(DRAGONFLY) \ 30+ || OS(DRAGONFLY) \
24 || PLATFORM(SYMBIAN) \ 31 || OS(HAIKU) \
25 || PLATFORM(NETBSD) \ 32 || OS(HPUX) \
26 || PLATFORM(SOLARIS) \ 33 || OS(LINUX) \
27@@ -723,7 +731,7 @@ 
28 #endif 
29  
30 #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) 
31-#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(SOLARIS) || PLATFORM(HPUX)) 
32+#if (PLATFORM(X86_64) && (PLATFORM(UNIX) || PLATFORM(WIN_OS))) || PLATFORM(IA64) || PLATFORM(ALPHA) 
33 #define WTF_USE_JSVALUE64 1 
34 #elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64) || PLATFORM(ALPHA) 
35 #define WTF_USE_JSVALUE64 1 
cvs diff -r1.4 -r1.5 pkgsrc/x11/qt4-libs/patches/patch-as (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-as 2009/10/11 09:14:52 1.4
+++ pkgsrc/x11/qt4-libs/patches/patch-as 2010/11/15 13:05:45 1.5
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-as,v 1.4 2009/10/11 09:14:52 adam Exp $ 1$NetBSD: patch-as,v 1.5 2010/11/15 13:05:45 adam Exp $
2 2
3--- tools/assistant/lib/fulltextsearch/qclucene-config_p.h.orig 2009-09-29 13:01:39.000000000 +0200 3--- tools/assistant/lib/fulltextsearch/qclucene-config_p.h.orig 2010-09-10 09:04:47.000000000 +0000
4+++ tools/assistant/lib/fulltextsearch/qclucene-config_p.h 4+++ tools/assistant/lib/fulltextsearch/qclucene-config_p.h
5@@ -94,7 +94,7 @@ configure. 5@@ -94,7 +94,7 @@ configure.
6 #define _CL_HAVE_FCNTL_H 1 6 #define _CL_HAVE_FCNTL_H 1
7 #endif 7 #endif
8  8
9-#if !defined(__xlC__) && !defined(__xlc__) && !defined (__MINGW32__) && \ 9-#if !defined(__xlC__) && !defined(__xlc__) && !defined (__MINGW32__) && \
10+#if !defined(__xlC__) && !defined(__xlc__) && !defined (__MINGW32__) && !defined(__NetBSD) && \ 10+#if !defined(__xlC__) && !defined(__xlc__) && !defined (__MINGW32__) && !defined(__NetBSD) && \
11 !defined(__HP_aCC) && !defined(__SUNPRO_C) && !defined(__SUNPRO_CC) || \ 11 !defined(__HP_aCC) && !defined(__SUNPRO_C) && !defined(__SUNPRO_CC) || \
12 defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x550) || (defined(__HP_aCC) && defined(__ia64)) 12 defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x550) || (defined(__HP_aCC) && defined(__ia64))
13 /* Define to 1 if the system has the type `float_t'. */ 13 /* Define to 1 if the system has the type `float_t'. */
14@@ -432,7 +432,7 @@ configure. 14@@ -430,7 +430,7 @@ configure.
15 # endif 15 # endif
16 #endif 16 #endif
17  17
18-#if defined(__SUNPRO_CC) || defined(__SUNPRO_C) || defined(__HP_aCC) 18-#if defined(__SUNPRO_CC) || defined(__SUNPRO_C) || defined(__HP_aCC)
19+#if defined(__SUNPRO_CC) || defined(__SUNPRO_C) || defined(__HP_aCC) || defined(__NetBSD__) 19+#if defined(__SUNPRO_CC) || defined(__SUNPRO_C) || defined(__HP_aCC) || defined(__NetBSD__)
20 /* Define to 1 if you have a functioning <wchar.h> header file. */ 20 /* Define to 1 if you have a functioning <wchar.h> header file. */
21 # ifndef _CL_HAVE_WCTYPE_H 21 # ifndef _CL_HAVE_WCTYPE_H
22 # define _CL_HAVE_WCTYPE_H 22 # define _CL_HAVE_WCTYPE_H
cvs diff -r1.4 -r1.5 pkgsrc/x11/qt4-libs/patches/patch-au (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-au 2010/01/29 18:19:09 1.4
+++ pkgsrc/x11/qt4-libs/patches/patch-au 2010/11/15 13:05:45 1.5
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-au,v 1.4 2010/01/29 18:19:09 adam Exp $ 1$NetBSD: patch-au,v 1.5 2010/11/15 13:05:45 adam Exp $
2 2
3--- src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h.orig 2010-01-28 07:10:17.000000000 +0000 3--- src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h.orig 2010-09-10 09:05:24.000000000 +0000
4+++ src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h 4+++ src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h
5@@ -468,7 +468,7 @@ namespace JSC { 5@@ -491,7 +491,7 @@ namespace JSC {
6 u.asBits.tag = CellTag; 6 u.asBits.tag = CellTag;
7 else 7 else
8 u.asBits.tag = EmptyValueTag; 8 u.asBits.tag = EmptyValueTag;
9- u.asBits.payload = reinterpret_cast<int32_t>(ptr); 9- u.asBits.payload = reinterpret_cast<int32_t>(ptr);
10+ u.asBits.payload = reinterpret_cast<intptr_t>(ptr); 10+ u.asBits.payload = reinterpret_cast<intptr_t>(ptr);
11 } 11 #if ENABLE(JSC_ZOMBIES)
12  12 ASSERT(!isZombie());
13 inline JSValue::JSValue(const JSCell* ptr) 13 #endif
14@@ -477,7 +477,7 @@ namespace JSC { 14@@ -503,7 +503,7 @@ namespace JSC {
15 u.asBits.tag = CellTag; 15 u.asBits.tag = CellTag;
16 else 16 else
17 u.asBits.tag = EmptyValueTag; 17 u.asBits.tag = EmptyValueTag;
18- u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr)); 18- u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr));
19+ u.asBits.payload = reinterpret_cast<intptr_t>(const_cast<JSCell*>(ptr)); 19+ u.asBits.payload = reinterpret_cast<intptr_t>(const_cast<JSCell*>(ptr));
20 } 20 #if ENABLE(JSC_ZOMBIES)
21  21 ASSERT(!isZombie());
22 inline JSValue::operator bool() const 22 #endif
cvs diff -r1.2 -r1.3 pkgsrc/x11/qt4-libs/patches/Attic/patch-ax (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/Attic/patch-ax 2010/01/29 18:19:09 1.2
+++ pkgsrc/x11/qt4-libs/patches/Attic/patch-ax 2010/11/15 13:05:45 1.3
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ax,v 1.2 2010/01/29 18:19:09 adam Exp $ 1$NetBSD: patch-ax,v 1.3 2010/11/15 13:05:45 adam Exp $
2 2
3--- src/3rdparty/webkit/WebCore/websockets/WebSocketHandshake.cpp.orig 2010-01-28 06:27:43.000000000 +0000 3--- src/3rdparty/webkit/WebCore/websockets/WebSocketHandshake.cpp.orig 2010-09-10 09:05:20.000000000 +0000
4+++ src/3rdparty/webkit/WebCore/websockets/WebSocketHandshake.cpp 4+++ src/3rdparty/webkit/WebCore/websockets/WebSocketHandshake.cpp
5@@ -252,7 +252,11 @@ int WebSocketHandshake::readServerHandsh 5@@ -286,7 +286,11 @@ int WebSocketHandshake::readServerHandsh
6 p += sizeof(webSocketConnectionHeader) - 1; 6 p += sizeof(webSocketConnectionHeader) - 1;
7 } 7 }
8  8
9+#if defined(__NetBSD__) 9+#if defined(__NetBSD__)
10+ if (!strstr(p, "\r\n\r\n")) { 10+ if (!strstr(p, "\r\n\r\n")) {
11+#else 11+#else
12 if (!strnstr(p, "\r\n\r\n", end - p)) { 12 if (!strnstr(p, "\r\n\r\n", end - p)) {
13+#endif 13+#endif
14 // Just hasn't been received fully yet. 14 // Just hasn't been received fully yet.
 15 m_mode = Incomplete;
15 return -1; 16 return -1;
16 } 
cvs diff -r1.5 -r1.6 pkgsrc/x11/qt4-libs/patches/patch-ba (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-ba 2010/07/04 06:00:14 1.5
+++ pkgsrc/x11/qt4-libs/patches/patch-ba 2010/11/15 13:05:45 1.6
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ba,v 1.5 2010/07/04 06:00:14 adam Exp $ 1$NetBSD: patch-ba,v 1.6 2010/11/15 13:05:45 adam Exp $
2 2
3http://bugreports.qt.nokia.com/browse/QTBUG-6932 3http://bugreports.qt.nokia.com/browse/QTBUG-6932
4 4
5--- src/gui/graphicsview/qgraphicsitem_p.h.orig 2010-06-02 02:03:15.000000000 +0000 5--- src/gui/graphicsview/qgraphicsitem_p.h.orig 2010-09-10 09:05:24.000000000 +0000
6+++ src/gui/graphicsview/qgraphicsitem_p.h 6+++ src/gui/graphicsview/qgraphicsitem_p.h
7@@ -679,7 +679,7 @@ inline bool qt_closestItemFirst(const QG 7@@ -762,7 +762,7 @@ inline bool qt_closestItemFirst(const QG
8 // item1Ancestor is now at the same level as item2Ancestor, but not the same. 8 // item1Ancestor is now at the same level as item2Ancestor, but not the same.
9 const QGraphicsItem *p1 = t1; 9 const QGraphicsItem *p1 = t1;
10 const QGraphicsItem *p2 = t2; 10 const QGraphicsItem *p2 = t2;
11- while (t1 && t1 != t2) { 11- while (t1 && t1 != t2) {
12+ while (t1 && t2 && t1 != t2) { 12+ while (t1 && t2 && t1 != t2) {
13 p1 = t1; 13 p1 = t1;
14 p2 = t2; 14 p2 = t2;
15 t1 = t1->d_ptr->parent; 15 t1 = t1->d_ptr->parent;
File Added: pkgsrc/x11/qt4-libs/patches/patch-bc
$NetBSD: patch-bc,v 1.3 2010/11/15 13:05:45 adam Exp $

--- src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h.orig	2010-11-06 01:55:19.000000000 +0000
+++ src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h
@@ -376,7 +376,7 @@
 
 /* OS(NETBSD) - NetBSD */
 #if defined(__NetBSD__)
-#define WTF_PLATFORM_NETBSD 1
+#define WTF_OS_NETBSD 1
 #endif
 
 /* OS(OPENBSD) - OpenBSD */
@@ -384,6 +384,11 @@
 #define WTF_OS_OPENBSD 1
 #endif
 
+/* OS(DRAGONFLY) - DragonFly */
+#ifdef __DragonFly__
+#define WTF_OS_DRAGONFLY 1
+#endif
+
 /* OS(QNX) - QNX */
 #if defined(__QNXNTO__)
 #define WTF_OS_QNX 1
@@ -414,6 +419,7 @@
     || OS(ANDROID)          \
     || OS(DARWIN)           \
     || OS(FREEBSD)          \
+    || OS(DRAGONFLY)        \
     || OS(HAIKU)            \
     || OS(LINUX)            \
     || OS(NETBSD)           \
File Added: pkgsrc/x11/qt4-libs/patches/patch-bd
$NetBSD: patch-bd,v 1.1 2010/11/15 13:05:45 adam Exp $

--- src/3rdparty/webkit/JavaScriptCore/config.h.orig	2010-10-26 09:26:05.000000000 +0000
+++ src/3rdparty/webkit/JavaScriptCore/config.h
@@ -53,7 +53,7 @@
 
 #endif
 
-#if OS(FREEBSD) || OS(OPENBSD)
+#if OS(FREEBSD) || OS(OPENBSD) || OS(DRAGONFLY)
 #define HAVE_PTHREAD_NP_H 1
 #endif
File Added: pkgsrc/x11/qt4-libs/patches/patch-be
$NetBSD: patch-be,v 1.1 2010/11/15 13:05:45 adam Exp $

--- src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri.orig	2010-11-06 01:55:19.000000000 +0000
+++ src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
@@ -90,7 +90,7 @@ defineTest(addJavaScriptCoreLib) {
         # that can't resolve symbols from QtCore if libjscore comes after.
         QMAKE_LIBDIR = $$pathToJavaScriptCoreOutput $$QMAKE_LIBDIR
         LIBS += -l$$JAVASCRIPTCORE_TARGET
-        POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}lib$${JAVASCRIPTCORE_TARGET}.a
+        POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}lib$${JAVASCRIPTCORE_TARGET}.la
     }
 
     win32-* {
File Added: pkgsrc/x11/qt4-libs/patches/patch-bf
$NetBSD: patch-bf,v 1.1 2010/11/15 13:05:45 adam Exp $

--- src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro.orig	2010-11-06 01:55:20.000000000 +0000
+++ src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
@@ -4,7 +4,7 @@ include($$PWD/../WebKit.pri)
 include(JavaScriptCore.pri)
 
 TEMPLATE = lib
-CONFIG += staticlib
+CONFIG += buildling-libs
 # Don't use JavaScriptCore as the target name. qmake would create a JavaScriptCore.vcproj for msvc
 # which already exists as a directory
 TARGET = $$JAVASCRIPTCORE_TARGET
@@ -33,10 +33,11 @@ CONFIG(QTDIR_build) {
 # WebCore adds these config only when in a standalone build.
 # qbase.pri takes care of that when in a QTDIR_build
 # Here we add the config for both cases since we don't include qbase.pri
-contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
-unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
+#contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
+#unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
 
 CONFIG(QTDIR_build) {
+    include($$QT_SOURCE_TREE/src/qbase.pri)
     # Remove the following 2 lines if you want debug information in JavaScriptCore
     CONFIG -= separate_debug_info
     CONFIG += no_debug_info
cvs diff -r1.4 -r1.5 pkgsrc/x11/qt4-mng/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-mng/Makefile 2010/09/14 11:03:04 1.4
+++ pkgsrc/x11/qt4-mng/Makefile 2010/11/15 13:05:45 1.5
@@ -1,32 +1,31 @@ @@ -1,32 +1,31 @@
1# $NetBSD: Makefile,v 1.4 2010/09/14 11:03:04 wiz Exp $ 1# $NetBSD: Makefile,v 1.5 2010/11/15 13:05:45 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-mng-${QTVERSION} 7PKGNAME= qt4-mng-${QTVERSION}
8PKGREVISION= 1 
9COMMENT= QT MNG image format plugin 8COMMENT= QT MNG 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/mng && env ${MAKE_ENV} ${GMAKE} 18 cd ${WRKSRC}/src/plugins/imageformats/mng && env ${MAKE_ENV} ${GMAKE}
20 19
21IMGFMTDIR= ${QTPREFIX}/plugins/imageformats 20IMGFMTDIR= ${QTPREFIX}/plugins/imageformats
22 21
23INSTALLATION_DIRS= ${IMGFMTDIR} 22INSTALLATION_DIRS= ${IMGFMTDIR}
24 23
25do-install: 24do-install:
26 ${LIBTOOL} --mode=install ${INSTALL_DATA} \ 25 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
27 ${WRKSRC}/plugins/imageformats/libqmng.la ${DESTDIR}${IMGFMTDIR} 26 ${WRKSRC}/plugins/imageformats/libqmng.la ${DESTDIR}${IMGFMTDIR}
28 27
29.include "../../x11/qt4-libs/buildlink3.mk" 28.include "../../x11/qt4-libs/buildlink3.mk"
30.include "../../x11/qt4-tools/buildlink3.mk" 29.include "../../x11/qt4-tools/buildlink3.mk"
31.include "../../graphics/mng/buildlink3.mk" 30.include "../../graphics/mng/buildlink3.mk"
32.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/x11/qt4-mysql/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-mysql/Makefile 2010/09/30 10:49:13 1.12
+++ pkgsrc/x11/qt4-mysql/Makefile 2010/11/15 13:05:46 1.13
@@ -1,31 +1,30 @@ @@ -1,31 +1,30 @@
1# $NetBSD: Makefile,v 1.12 2010/09/30 10:49:13 obache Exp $ 1# $NetBSD: Makefile,v 1.13 2010/11/15 13:05:46 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= 2 
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
22INSTALLATION_DIRS= ${SQLDRVDIR} 21INSTALLATION_DIRS= ${SQLDRVDIR}
23 22
24do-install: 23do-install:
25 ${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlmysql.la \ 24 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/plugins/sqldrivers/libqsqlmysql.la \
26 ${DESTDIR}${SQLDRVDIR} 25 ${DESTDIR}${SQLDRVDIR}
27 26
28.include "../../x11/qt4-libs/buildlink3.mk" 27.include "../../x11/qt4-libs/buildlink3.mk"
29.include "../../x11/qt4-tools/buildlink3.mk" 28.include "../../x11/qt4-tools/buildlink3.mk"
30.include "../../mk/mysql.buildlink3.mk" 29.include "../../mk/mysql.buildlink3.mk"
31.include "../../mk/bsd.pkg.mk" 30.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/x11/qt4-pgsql/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-pgsql/Makefile 2010/09/14 11:03:05 1.18
+++ pkgsrc/x11/qt4-pgsql/Makefile 2010/11/15 13:05:46 1.19
@@ -1,32 +1,31 @@ @@ -1,32 +1,31 @@
1# $NetBSD: Makefile,v 1.18 2010/09/14 11:03:05 wiz Exp $ 1# $NetBSD: Makefile,v 1.19 2010/11/15 13:05:46 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
22SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers 21SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers
23INSTALLATION_DIRS= ${SQLDRVDIR} 22INSTALLATION_DIRS= ${SQLDRVDIR}
24 23
25do-install: 24do-install:
26 ${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlpsql.la \ 25 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/plugins/sqldrivers/libqsqlpsql.la \
27 ${DESTDIR}${SQLDRVDIR} 26 ${DESTDIR}${SQLDRVDIR}
28 27
29.include "../../x11/qt4-libs/buildlink3.mk" 28.include "../../x11/qt4-libs/buildlink3.mk"
30.include "../../x11/qt4-tools/buildlink3.mk" 29.include "../../x11/qt4-tools/buildlink3.mk"
31.include "../../mk/pgsql.buildlink3.mk" 30.include "../../mk/pgsql.buildlink3.mk"
32.include "../../mk/bsd.pkg.mk" 31.include "../../mk/bsd.pkg.mk"
cvs diff -r1.14 -r1.15 pkgsrc/x11/qt4-qdbus/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-qdbus/Makefile 2010/09/14 11:01:15 1.14
+++ pkgsrc/x11/qt4-qdbus/Makefile 2010/11/15 13:05:46 1.15
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.14 2010/09/14 11:01:15 wiz Exp $ 1# $NetBSD: Makefile,v 1.15 2010/11/15 13:05:46 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= 1 
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
@@ -29,16 +28,16 @@ INSTALLATION_DIRS= ${QTPREFIX}/bin ${QTP @@ -29,16 +28,16 @@ INSTALLATION_DIRS= ${QTPREFIX}/bin ${QTP
29do-install: 28do-install:
30 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/libQtDBus.la \ 29 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/libQtDBus.la \
31 ${DESTDIR}${QTPREFIX}/lib/ 30 ${DESTDIR}${QTPREFIX}/lib/
32 ${SED} -e "s:${WRKSRC}:${QTPREFIX}:g" \ 31 ${SED} -e "s:${WRKSRC}:${QTPREFIX}:g" \
33 ${WRKSRC}/lib/pkgconfig/QtDBus.pc > ${WRKDIR}/QtDBus.pc 32 ${WRKSRC}/lib/pkgconfig/QtDBus.pc > ${WRKDIR}/QtDBus.pc
34 ${INSTALL_DATA} ${WRKDIR}/QtDBus.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/ 33 ${INSTALL_DATA} ${WRKDIR}/QtDBus.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/
35 cd ${WRKSRC}/src/dbus && env ${MAKE_ENV} INSTALL_ROOT=${DESTDIR} \ 34 cd ${WRKSRC}/src/dbus && env ${MAKE_ENV} INSTALL_ROOT=${DESTDIR} \
36 ${MAKE_PROGRAM} install_flat_headers install_targ_headers install_class_headers 35 ${MAKE_PROGRAM} install_flat_headers install_targ_headers install_class_headers
37.for prog in qdbus qdbuscpp2xml qdbusviewer qdbusxml2cpp 36.for prog in qdbus qdbuscpp2xml qdbusviewer qdbusxml2cpp
38 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} \ 37 ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} \
39 ${DESTDIR}${QTPREFIX}/bin 38 ${DESTDIR}${QTPREFIX}/bin
40.endfor 39.endfor
41 40
42.include "../../x11/qt4-libs/buildlink3.mk" 
43.include "../../sysutils/dbus/buildlink3.mk" 41.include "../../sysutils/dbus/buildlink3.mk"
 42.include "../../x11/qt4-libs/buildlink3.mk"
44.include "../../mk/bsd.pkg.mk" 43.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/x11/qt4-sqlite3/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-sqlite3/Makefile 2010/09/14 11:03:05 1.12
+++ pkgsrc/x11/qt4-sqlite3/Makefile 2010/11/15 13:05:46 1.13
@@ -1,33 +1,32 @@ @@ -1,33 +1,32 @@
1# $NetBSD: Makefile,v 1.12 2010/09/14 11:03:05 wiz Exp $ 1# $NetBSD: Makefile,v 1.13 2010/11/15 13:05:46 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}
22 21
23SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers 22SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers
24INSTALLATION_DIRS= ${SQLDRVDIR} 23INSTALLATION_DIRS= ${SQLDRVDIR}
25 24
26do-install: 25do-install:
27 ${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlite.la \ 26 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/plugins/sqldrivers/libqsqlite.la \
28 ${DESTDIR}${SQLDRVDIR} 27 ${DESTDIR}${SQLDRVDIR}
29 28
30.include "../../x11/qt4-libs/buildlink3.mk" 29.include "../../x11/qt4-libs/buildlink3.mk"
31.include "../../x11/qt4-tools/buildlink3.mk" 30.include "../../x11/qt4-tools/buildlink3.mk"
32.include "../../databases/sqlite3/buildlink3.mk" 31.include "../../databases/sqlite3/buildlink3.mk"
33.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
cvs diff -r1.11 -r1.12 pkgsrc/x11/qt4-tiff/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-tiff/Makefile 2010/09/14 11:03:05 1.11
+++ pkgsrc/x11/qt4-tiff/Makefile 2010/11/15 13:05:46 1.12
@@ -1,34 +1,33 @@ @@ -1,34 +1,33 @@
1# $NetBSD: Makefile,v 1.11 2010/09/14 11:03:05 wiz Exp $ 1# $NetBSD: Makefile,v 1.12 2010/11/15 13:05:46 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
22 21
23INSTALLATION_DIRS= ${IMGFMTDIR} 22INSTALLATION_DIRS= ${IMGFMTDIR}
24 23
25do-install: 24do-install:
26 ${LIBTOOL} --mode=install ${INSTALL_DATA} ${WRKSRC}/plugins/imageformats/libqtiff.la \ 25 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/plugins/imageformats/libqtiff.la \
27 ${DESTDIR}${IMGFMTDIR} 26 ${DESTDIR}${IMGFMTDIR}
28 27
29# up to 4.3.2 a builtin libtiff is used 28# up to 4.3.2 a builtin libtiff is used
30BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.3.2nb1 29BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.3.2nb1
31.include "../../x11/qt4-libs/buildlink3.mk" 30.include "../../x11/qt4-libs/buildlink3.mk"
32.include "../../x11/qt4-tools/buildlink3.mk" 31.include "../../x11/qt4-tools/buildlink3.mk"
33.include "../../graphics/tiff/buildlink3.mk" 32.include "../../graphics/tiff/buildlink3.mk"
34.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.35 -r1.36 pkgsrc/x11/qt4-tools/Makefile (expand / switch to unified diff)

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

--- pkgsrc/x11/qt4-tools/PLIST 2010/07/04 06:00:15 1.22
+++ pkgsrc/x11/qt4-tools/PLIST 2010/11/15 13:05:47 1.23
@@ -1,47 +1,46 @@ @@ -1,47 +1,46 @@
1@comment $NetBSD: PLIST,v 1.22 2010/07/04 06:00:15 adam Exp $ 1@comment $NetBSD: PLIST,v 1.23 2010/11/15 13:05:47 adam Exp $
2lib/pkgconfig/QtAssistantClient.pc 
3lib/pkgconfig/QtCLucene.pc 2lib/pkgconfig/QtCLucene.pc
4lib/pkgconfig/QtDesigner.pc 3lib/pkgconfig/QtDesigner.pc
5lib/pkgconfig/QtDesignerComponents.pc 4lib/pkgconfig/QtDesignerComponents.pc
6lib/pkgconfig/QtHelp.pc 5lib/pkgconfig/QtHelp.pc
7lib/pkgconfig/QtUiTools.pc 6lib/pkgconfig/QtUiTools.pc
8qt4/bin/assistant 7qt4/bin/assistant
9qt4/bin/assistant_adp 
10qt4/bin/designer 8qt4/bin/designer
 9qt4/bin/lconvert
11qt4/bin/linguist 10qt4/bin/linguist
12qt4/bin/lrelease 11qt4/bin/lrelease
13qt4/bin/lupdate 12qt4/bin/lupdate
14qt4/bin/pixeltool 13qt4/bin/pixeltool
15qt4/bin/qcollectiongenerator 14qt4/bin/qcollectiongenerator
16qt4/bin/qdoc3 15qt4/bin/qdoc3
17qt4/bin/qhelpconverter 16qt4/bin/qhelpconverter
18qt4/bin/qhelpgenerator 17qt4/bin/qhelpgenerator
19qt4/bin/qmake 18qt4/bin/qmake
 19qt4/bin/qmlviewer
20qt4/bin/qt3to4 20qt4/bin/qt3to4
21qt4/bin/qtconfig 21qt4/bin/qtconfig
 22qt4/bin/qttracereplay
 23qt4/bin/xmlpatterns
 24qt4/bin/xmlpatternsvalidator
22qt4/include/Qt/QtHelp 25qt4/include/Qt/QtHelp
23qt4/include/Qt/qhelp_global.h 26qt4/include/Qt/qhelp_global.h
24qt4/include/Qt/qhelpcontentwidget.h 27qt4/include/Qt/qhelpcontentwidget.h
25qt4/include/Qt/qhelpengine.h 28qt4/include/Qt/qhelpengine.h
26qt4/include/Qt/qhelpenginecore.h 29qt4/include/Qt/qhelpenginecore.h
27qt4/include/Qt/qhelpindexwidget.h 30qt4/include/Qt/qhelpindexwidget.h
28qt4/include/Qt/qhelpsearchengine.h 31qt4/include/Qt/qhelpsearchengine.h
29qt4/include/Qt/qhelpsearchquerywidget.h 32qt4/include/Qt/qhelpsearchquerywidget.h
30qt4/include/Qt/qhelpsearchresultwidget.h 33qt4/include/Qt/qhelpsearchresultwidget.h
31qt4/include/QtAssistant/QAssistantClient 
32qt4/include/QtAssistant/QtAssistant 
33qt4/include/QtAssistant/qassistantclient.h 
34qt4/include/QtAssistant/qassistantclient_global.h 
35qt4/include/QtDesigner/QAbstractExtensionFactory 34qt4/include/QtDesigner/QAbstractExtensionFactory
36qt4/include/QtDesigner/QAbstractExtensionManager 35qt4/include/QtDesigner/QAbstractExtensionManager
37qt4/include/QtDesigner/QAbstractFormBuilder 36qt4/include/QtDesigner/QAbstractFormBuilder
38qt4/include/QtDesigner/QDesignerActionEditorInterface 37qt4/include/QtDesigner/QDesignerActionEditorInterface
39qt4/include/QtDesigner/QDesignerBrushManagerInterface 38qt4/include/QtDesigner/QDesignerBrushManagerInterface
40qt4/include/QtDesigner/QDesignerComponents 39qt4/include/QtDesigner/QDesignerComponents
41qt4/include/QtDesigner/QDesignerContainerExtension 40qt4/include/QtDesigner/QDesignerContainerExtension
42qt4/include/QtDesigner/QDesignerCustomWidgetCollectionInterface 41qt4/include/QtDesigner/QDesignerCustomWidgetCollectionInterface
43qt4/include/QtDesigner/QDesignerCustomWidgetInterface 42qt4/include/QtDesigner/QDesignerCustomWidgetInterface
44qt4/include/QtDesigner/QDesignerDnDItemInterface 43qt4/include/QtDesigner/QDesignerDnDItemInterface
45qt4/include/QtDesigner/QDesignerDynamicPropertySheetExtension 44qt4/include/QtDesigner/QDesignerDynamicPropertySheetExtension
46qt4/include/QtDesigner/QDesignerExportWidget 45qt4/include/QtDesigner/QDesignerExportWidget
47qt4/include/QtDesigner/QDesignerExtraInfoExtension 46qt4/include/QtDesigner/QDesignerExtraInfoExtension
@@ -125,60 +124,83 @@ qt4/include/QtHelp/QHelpSearchQueryWidge @@ -125,60 +124,83 @@ qt4/include/QtHelp/QHelpSearchQueryWidge
125qt4/include/QtHelp/QHelpSearchResultWidget 124qt4/include/QtHelp/QHelpSearchResultWidget
126qt4/include/QtHelp/QtHelp 125qt4/include/QtHelp/QtHelp
127qt4/include/QtHelp/qhelp_global.h 126qt4/include/QtHelp/qhelp_global.h
128qt4/include/QtHelp/qhelpcontentwidget.h 127qt4/include/QtHelp/qhelpcontentwidget.h
129qt4/include/QtHelp/qhelpengine.h 128qt4/include/QtHelp/qhelpengine.h
130qt4/include/QtHelp/qhelpenginecore.h 129qt4/include/QtHelp/qhelpenginecore.h
131qt4/include/QtHelp/qhelpindexwidget.h 130qt4/include/QtHelp/qhelpindexwidget.h
132qt4/include/QtHelp/qhelpsearchengine.h 131qt4/include/QtHelp/qhelpsearchengine.h
133qt4/include/QtHelp/qhelpsearchquerywidget.h 132qt4/include/QtHelp/qhelpsearchquerywidget.h
134qt4/include/QtHelp/qhelpsearchresultwidget.h 133qt4/include/QtHelp/qhelpsearchresultwidget.h
135qt4/include/QtUiTools/QUiLoader 134qt4/include/QtUiTools/QUiLoader
136qt4/include/QtUiTools/QtUiTools 135qt4/include/QtUiTools/QtUiTools
137qt4/include/QtUiTools/quiloader.h 136qt4/include/QtUiTools/quiloader.h
138qt4/lib/libQtAssistantClient.la 
139qt4/lib/libQtCLucene.la 137qt4/lib/libQtCLucene.la
140qt4/lib/libQtDesigner.la 138qt4/lib/libQtDesigner.la
141qt4/lib/libQtDesignerComponents.la 139qt4/lib/libQtDesignerComponents.la
142qt4/lib/libQtHelp.la 140qt4/lib/libQtHelp.la
143qt4/lib/libQtUiTools.la 141qt4/lib/libQtUiTools.la
144qt4/mkspecs/aix-g++-64/qmake.conf 142qt4/mkspecs/aix-g++-64/qmake.conf
145qt4/mkspecs/aix-g++-64/qplatformdefs.h 143qt4/mkspecs/aix-g++-64/qplatformdefs.h
146qt4/mkspecs/aix-g++/qmake.conf 144qt4/mkspecs/aix-g++/qmake.conf
147qt4/mkspecs/aix-g++/qplatformdefs.h 145qt4/mkspecs/aix-g++/qplatformdefs.h
148qt4/mkspecs/aix-xlc-64/qmake.conf 146qt4/mkspecs/aix-xlc-64/qmake.conf
149qt4/mkspecs/aix-xlc-64/qplatformdefs.h 147qt4/mkspecs/aix-xlc-64/qplatformdefs.h
150qt4/mkspecs/aix-xlc/qmake.conf 148qt4/mkspecs/aix-xlc/qmake.conf
151qt4/mkspecs/aix-xlc/qplatformdefs.h 149qt4/mkspecs/aix-xlc/qplatformdefs.h
 150qt4/mkspecs/common/aix/qplatformdefs.h
 151qt4/mkspecs/common/armcc.conf
 152qt4/mkspecs/common/c89/qplatformdefs.h
152qt4/mkspecs/common/g++.conf 153qt4/mkspecs/common/g++.conf
153qt4/mkspecs/common/linux.conf 154qt4/mkspecs/common/linux.conf
154qt4/mkspecs/common/llvm.conf 155qt4/mkspecs/common/llvm.conf
155qt4/mkspecs/common/mac-g++.conf 156qt4/mkspecs/common/mac-g++.conf
156qt4/mkspecs/common/mac-llvm.conf 157qt4/mkspecs/common/mac-llvm.conf
157qt4/mkspecs/common/mac.conf 158qt4/mkspecs/common/mac.conf
 159qt4/mkspecs/common/posix/qplatformdefs.h
158qt4/mkspecs/common/qmake.conf 160qt4/mkspecs/common/qmake.conf
159qt4/mkspecs/common/qws.conf 161qt4/mkspecs/common/qws.conf
 162qt4/mkspecs/common/symbian/header-wrappers/AknBitmapAnimation.h
 163qt4/mkspecs/common/symbian/header-wrappers/AknDoc.h
 164qt4/mkspecs/common/symbian/header-wrappers/AknFontAccess.h
 165qt4/mkspecs/common/symbian/header-wrappers/AknInputLanguageInfo.h
 166qt4/mkspecs/common/symbian/header-wrappers/AknLayoutFont.h
 167qt4/mkspecs/common/symbian/header-wrappers/AknPopupFader.h
 168qt4/mkspecs/common/symbian/header-wrappers/AknServerApp.h
 169qt4/mkspecs/common/symbian/header-wrappers/AknUtils.h
 170qt4/mkspecs/common/symbian/header-wrappers/AknsBasicBackgroundControlContext.h
 171qt4/mkspecs/common/symbian/header-wrappers/AknsConstants.h
 172qt4/mkspecs/common/symbian/header-wrappers/AknsDrawUtils.h
 173qt4/mkspecs/common/symbian/header-wrappers/AknsItemID.h
 174qt4/mkspecs/common/symbian/header-wrappers/AknsSkinInstance.h
 175qt4/mkspecs/common/symbian/header-wrappers/AknsUtils.h
 176qt4/mkspecs/common/symbian/header-wrappers/ApAccessPointItem.h
 177qt4/mkspecs/common/symbian/header-wrappers/ApDataHandler.h
 178qt4/mkspecs/common/symbian/header-wrappers/ApUtils.h
 179qt4/mkspecs/common/symbian/header-wrappers/CDirectoryLocalizer.h
 180qt4/mkspecs/common/symbian/header-wrappers/DocumentHandler.h
160qt4/mkspecs/common/symbian/qplatformdefs.h 181qt4/mkspecs/common/symbian/qplatformdefs.h
161qt4/mkspecs/common/symbian/stl-off/new 182qt4/mkspecs/common/symbian/stl-off/new
 183qt4/mkspecs/common/symbian/symbian-makefile.conf
 184qt4/mkspecs/common/symbian/symbian-mmp.conf
162qt4/mkspecs/common/symbian/symbian.conf 185qt4/mkspecs/common/symbian/symbian.conf
163qt4/mkspecs/common/unix.conf 186qt4/mkspecs/common/unix.conf
164qt4/mkspecs/common/wince/qmake.conf 187qt4/mkspecs/common/wince/qmake.conf
165qt4/mkspecs/common/wince/qplatformdefs.h 188qt4/mkspecs/common/wince/qplatformdefs.h
166qt4/mkspecs/cygwin-g++/qmake.conf 189qt4/mkspecs/cygwin-g++/qmake.conf
167qt4/mkspecs/cygwin-g++/qplatformdefs.h 190qt4/mkspecs/cygwin-g++/qplatformdefs.h
168qt4/mkspecs/darwin-g++/qmake.conf 191qt4/mkspecs/darwin-g++/qmake.conf
169qt4/mkspecs/darwin-g++/qplatformdefs.h 192qt4/mkspecs/darwin-g++/qplatformdefs.h
170qt4/mkspecs/default 193qt4/mkspecs/default
171qt4/mkspecs/features/assistant.prf 
172qt4/mkspecs/features/build_pass.prf 194qt4/mkspecs/features/build_pass.prf
173qt4/mkspecs/features/dbusadaptors.prf 195qt4/mkspecs/features/dbusadaptors.prf
174qt4/mkspecs/features/dbusinterfaces.prf 196qt4/mkspecs/features/dbusinterfaces.prf
175qt4/mkspecs/features/debug.prf 197qt4/mkspecs/features/debug.prf
176qt4/mkspecs/features/debug_and_release.prf 198qt4/mkspecs/features/debug_and_release.prf
177qt4/mkspecs/features/default_post.prf 199qt4/mkspecs/features/default_post.prf
178qt4/mkspecs/features/default_pre.prf 200qt4/mkspecs/features/default_pre.prf
179qt4/mkspecs/features/designer.prf 201qt4/mkspecs/features/designer.prf
180qt4/mkspecs/features/dll.prf 202qt4/mkspecs/features/dll.prf
181qt4/mkspecs/features/egl.prf 203qt4/mkspecs/features/egl.prf
182qt4/mkspecs/features/exclusive_builds.prf 204qt4/mkspecs/features/exclusive_builds.prf
183qt4/mkspecs/features/help.prf 205qt4/mkspecs/features/help.prf
184qt4/mkspecs/features/include_source_dir.prf 206qt4/mkspecs/features/include_source_dir.prf
@@ -207,36 +229,47 @@ qt4/mkspecs/features/qtopia.prf @@ -207,36 +229,47 @@ qt4/mkspecs/features/qtopia.prf
207qt4/mkspecs/features/qtopiainc.prf 229qt4/mkspecs/features/qtopiainc.prf
208qt4/mkspecs/features/qtopialib.prf 230qt4/mkspecs/features/qtopialib.prf
209qt4/mkspecs/features/release.prf 231qt4/mkspecs/features/release.prf
210qt4/mkspecs/features/resources.prf 232qt4/mkspecs/features/resources.prf
211qt4/mkspecs/features/shared.prf 233qt4/mkspecs/features/shared.prf
212qt4/mkspecs/features/silent.prf 234qt4/mkspecs/features/silent.prf
213qt4/mkspecs/features/static.prf 235qt4/mkspecs/features/static.prf
214qt4/mkspecs/features/static_and_shared.prf 236qt4/mkspecs/features/static_and_shared.prf
215qt4/mkspecs/features/staticlib.prf 237qt4/mkspecs/features/staticlib.prf
216qt4/mkspecs/features/symbian/add_mmp_rules.prf 238qt4/mkspecs/features/symbian/add_mmp_rules.prf
217qt4/mkspecs/features/symbian/application_icon.prf 239qt4/mkspecs/features/symbian/application_icon.prf
218qt4/mkspecs/features/symbian/armcc_warnings.prf 240qt4/mkspecs/features/symbian/armcc_warnings.prf
219qt4/mkspecs/features/symbian/data_caging_paths.prf 241qt4/mkspecs/features/symbian/data_caging_paths.prf
 242qt4/mkspecs/features/symbian/debug.prf
220qt4/mkspecs/features/symbian/def_files.prf 243qt4/mkspecs/features/symbian/def_files.prf
221qt4/mkspecs/features/symbian/def_files_disabled.prf 244qt4/mkspecs/features/symbian/def_files_disabled.prf
222qt4/mkspecs/features/symbian/default_post.prf 245qt4/mkspecs/features/symbian/default_post.prf
223qt4/mkspecs/features/symbian/default_pre.prf 246qt4/mkspecs/features/symbian/default_pre.prf
 247qt4/mkspecs/features/symbian/do_not_build_as_thumb.prf
224qt4/mkspecs/features/symbian/epocallowdlldata.prf 248qt4/mkspecs/features/symbian/epocallowdlldata.prf
225qt4/mkspecs/features/symbian/moc.prf 249qt4/mkspecs/features/symbian/moc.prf
 250qt4/mkspecs/features/symbian/nested_exceptions.prf
 251qt4/mkspecs/features/symbian/opengl.prf
226qt4/mkspecs/features/symbian/platform_paths.prf 252qt4/mkspecs/features/symbian/platform_paths.prf
227qt4/mkspecs/features/symbian/qt.prf 253qt4/mkspecs/features/symbian/qt.prf
 254qt4/mkspecs/features/symbian/qt_config.prf
 255qt4/mkspecs/features/symbian/release.prf
 256qt4/mkspecs/features/symbian/run_on_phone.prf
 257qt4/mkspecs/features/symbian/sis_targets.prf
228qt4/mkspecs/features/symbian/stl.prf 258qt4/mkspecs/features/symbian/stl.prf
229qt4/mkspecs/features/symbian/stl_off.prf 259qt4/mkspecs/features/symbian/stl_off.prf
 260qt4/mkspecs/features/symbian/symbian_building.prf
 261qt4/mkspecs/features/symbian/thread.prf
 262qt4/mkspecs/features/testcase.prf
230qt4/mkspecs/features/uic.prf 263qt4/mkspecs/features/uic.prf
231qt4/mkspecs/features/uitools.prf 264qt4/mkspecs/features/uitools.prf
232qt4/mkspecs/features/unix/bsymbolic_functions.prf 265qt4/mkspecs/features/unix/bsymbolic_functions.prf
233qt4/mkspecs/features/unix/dylib.prf 266qt4/mkspecs/features/unix/dylib.prf
234qt4/mkspecs/features/unix/hide_symbols.prf 267qt4/mkspecs/features/unix/hide_symbols.prf
235qt4/mkspecs/features/unix/largefile.prf 268qt4/mkspecs/features/unix/largefile.prf
236qt4/mkspecs/features/unix/opengl.prf 269qt4/mkspecs/features/unix/opengl.prf
237qt4/mkspecs/features/unix/openvg.prf 270qt4/mkspecs/features/unix/openvg.prf
238qt4/mkspecs/features/unix/separate_debug_info.prf 271qt4/mkspecs/features/unix/separate_debug_info.prf
239qt4/mkspecs/features/unix/thread.prf 272qt4/mkspecs/features/unix/thread.prf
240qt4/mkspecs/features/unix/x11.prf 273qt4/mkspecs/features/unix/x11.prf
241qt4/mkspecs/features/unix/x11inc.prf 274qt4/mkspecs/features/unix/x11inc.prf
242qt4/mkspecs/features/unix/x11lib.prf 275qt4/mkspecs/features/unix/x11lib.prf
@@ -244,26 +277,27 @@ qt4/mkspecs/features/unix/x11sm.prf @@ -244,26 +277,27 @@ qt4/mkspecs/features/unix/x11sm.prf
244qt4/mkspecs/features/use_c_linker.prf 277qt4/mkspecs/features/use_c_linker.prf
245qt4/mkspecs/features/vxworks.prf 278qt4/mkspecs/features/vxworks.prf
246qt4/mkspecs/features/warn_off.prf 279qt4/mkspecs/features/warn_off.prf
247qt4/mkspecs/features/warn_on.prf 280qt4/mkspecs/features/warn_on.prf
248qt4/mkspecs/features/win32/console.prf 281qt4/mkspecs/features/win32/console.prf
249qt4/mkspecs/features/win32/default_post.prf 282qt4/mkspecs/features/win32/default_post.prf
250qt4/mkspecs/features/win32/default_pre.prf 283qt4/mkspecs/features/win32/default_pre.prf
251qt4/mkspecs/features/win32/dumpcpp.prf 284qt4/mkspecs/features/win32/dumpcpp.prf
252qt4/mkspecs/features/win32/embed_manifest_dll.prf 285qt4/mkspecs/features/win32/embed_manifest_dll.prf
253qt4/mkspecs/features/win32/embed_manifest_exe.prf 286qt4/mkspecs/features/win32/embed_manifest_exe.prf
254qt4/mkspecs/features/win32/exceptions.prf 287qt4/mkspecs/features/win32/exceptions.prf
255qt4/mkspecs/features/win32/exceptions_off.prf 288qt4/mkspecs/features/win32/exceptions_off.prf
256qt4/mkspecs/features/win32/ltcg.prf 289qt4/mkspecs/features/win32/ltcg.prf
 290qt4/mkspecs/features/win32/msvc_mp.prf
257qt4/mkspecs/features/win32/opengl.prf 291qt4/mkspecs/features/win32/opengl.prf
258qt4/mkspecs/features/win32/openvg.prf 292qt4/mkspecs/features/win32/openvg.prf
259qt4/mkspecs/features/win32/qaxcontainer.prf 293qt4/mkspecs/features/win32/qaxcontainer.prf
260qt4/mkspecs/features/win32/qaxserver.prf 294qt4/mkspecs/features/win32/qaxserver.prf
261qt4/mkspecs/features/win32/qt_dll.prf 295qt4/mkspecs/features/win32/qt_dll.prf
262qt4/mkspecs/features/win32/rtti.prf 296qt4/mkspecs/features/win32/rtti.prf
263qt4/mkspecs/features/win32/rtti_off.prf 297qt4/mkspecs/features/win32/rtti_off.prf
264qt4/mkspecs/features/win32/stl.prf 298qt4/mkspecs/features/win32/stl.prf
265qt4/mkspecs/features/win32/stl_off.prf 299qt4/mkspecs/features/win32/stl_off.prf
266qt4/mkspecs/features/win32/thread.prf 300qt4/mkspecs/features/win32/thread.prf
267qt4/mkspecs/features/win32/thread_off.prf 301qt4/mkspecs/features/win32/thread_off.prf
268qt4/mkspecs/features/win32/windows.prf 302qt4/mkspecs/features/win32/windows.prf
269qt4/mkspecs/features/yacc.prf 303qt4/mkspecs/features/yacc.prf
@@ -348,35 +382,40 @@ qt4/mkspecs/macx-icc/qplatformdefs.h @@ -348,35 +382,40 @@ qt4/mkspecs/macx-icc/qplatformdefs.h
348qt4/mkspecs/macx-llvm/Info.plist.app 382qt4/mkspecs/macx-llvm/Info.plist.app
349qt4/mkspecs/macx-llvm/Info.plist.lib 383qt4/mkspecs/macx-llvm/Info.plist.lib
350qt4/mkspecs/macx-llvm/qmake.conf 384qt4/mkspecs/macx-llvm/qmake.conf
351qt4/mkspecs/macx-llvm/qplatformdefs.h 385qt4/mkspecs/macx-llvm/qplatformdefs.h
352qt4/mkspecs/macx-pbuilder/Info.plist.app 386qt4/mkspecs/macx-pbuilder/Info.plist.app
353qt4/mkspecs/macx-pbuilder/qmake.conf 387qt4/mkspecs/macx-pbuilder/qmake.conf
354qt4/mkspecs/macx-pbuilder/qplatformdefs.h 388qt4/mkspecs/macx-pbuilder/qplatformdefs.h
355qt4/mkspecs/macx-xcode/Info.plist.app 389qt4/mkspecs/macx-xcode/Info.plist.app
356qt4/mkspecs/macx-xcode/Info.plist.lib 390qt4/mkspecs/macx-xcode/Info.plist.lib
357qt4/mkspecs/macx-xcode/qmake.conf 391qt4/mkspecs/macx-xcode/qmake.conf
358qt4/mkspecs/macx-xcode/qplatformdefs.h 392qt4/mkspecs/macx-xcode/qplatformdefs.h
359qt4/mkspecs/macx-xlc/qmake.conf 393qt4/mkspecs/macx-xlc/qmake.conf
360qt4/mkspecs/macx-xlc/qplatformdefs.h 394qt4/mkspecs/macx-xlc/qplatformdefs.h
 395qt4/mkspecs/modules/README
 396qt4/mkspecs/modules/qmake.conf
 397qt4/mkspecs/modules/qt_webkit_version.pri
361qt4/mkspecs/netbsd-g++/qmake.conf 398qt4/mkspecs/netbsd-g++/qmake.conf
362qt4/mkspecs/netbsd-g++/qplatformdefs.h 399qt4/mkspecs/netbsd-g++/qplatformdefs.h
363qt4/mkspecs/openbsd-g++/qmake.conf 400qt4/mkspecs/openbsd-g++/qmake.conf
364qt4/mkspecs/openbsd-g++/qplatformdefs.h 401qt4/mkspecs/openbsd-g++/qplatformdefs.h
365qt4/mkspecs/qconfig.pri 402qt4/mkspecs/qconfig.pri
366qt4/mkspecs/qws/freebsd-generic-g++/qmake.conf 403qt4/mkspecs/qws/freebsd-generic-g++/qmake.conf
367qt4/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h 404qt4/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h
368qt4/mkspecs/qws/linux-arm-g++/qmake.conf 405qt4/mkspecs/qws/linux-arm-g++/qmake.conf
369qt4/mkspecs/qws/linux-arm-g++/qplatformdefs.h 406qt4/mkspecs/qws/linux-arm-g++/qplatformdefs.h
 407qt4/mkspecs/qws/linux-arm-gnueabi-g++/qmake.conf
 408qt4/mkspecs/qws/linux-arm-gnueabi-g++/qplatformdefs.h
370qt4/mkspecs/qws/linux-armv6-g++/qmake.conf 409qt4/mkspecs/qws/linux-armv6-g++/qmake.conf
371qt4/mkspecs/qws/linux-armv6-g++/qplatformdefs.h 410qt4/mkspecs/qws/linux-armv6-g++/qplatformdefs.h
372qt4/mkspecs/qws/linux-avr32-g++/qmake.conf 411qt4/mkspecs/qws/linux-avr32-g++/qmake.conf
373qt4/mkspecs/qws/linux-avr32-g++/qplatformdefs.h 412qt4/mkspecs/qws/linux-avr32-g++/qplatformdefs.h
374qt4/mkspecs/qws/linux-cellon-g++/qmake.conf 413qt4/mkspecs/qws/linux-cellon-g++/qmake.conf
375qt4/mkspecs/qws/linux-cellon-g++/qplatformdefs.h 414qt4/mkspecs/qws/linux-cellon-g++/qplatformdefs.h
376qt4/mkspecs/qws/linux-dm7000-g++/qmake.conf 415qt4/mkspecs/qws/linux-dm7000-g++/qmake.conf
377qt4/mkspecs/qws/linux-dm7000-g++/qplatformdefs.h 416qt4/mkspecs/qws/linux-dm7000-g++/qplatformdefs.h
378qt4/mkspecs/qws/linux-dm800-g++/qmake.conf 417qt4/mkspecs/qws/linux-dm800-g++/qmake.conf
379qt4/mkspecs/qws/linux-dm800-g++/qplatformdefs.h 418qt4/mkspecs/qws/linux-dm800-g++/qplatformdefs.h
380qt4/mkspecs/qws/linux-generic-g++-32/qmake.conf 419qt4/mkspecs/qws/linux-generic-g++-32/qmake.conf
381qt4/mkspecs/qws/linux-generic-g++-32/qplatformdefs.h 420qt4/mkspecs/qws/linux-generic-g++-32/qplatformdefs.h
382qt4/mkspecs/qws/linux-generic-g++/qmake.conf 421qt4/mkspecs/qws/linux-generic-g++/qmake.conf
@@ -421,75 +460,80 @@ qt4/mkspecs/solaris-cc/qplatformdefs.h @@ -421,75 +460,80 @@ qt4/mkspecs/solaris-cc/qplatformdefs.h
421qt4/mkspecs/solaris-g++-64/qmake.conf 460qt4/mkspecs/solaris-g++-64/qmake.conf
422qt4/mkspecs/solaris-g++-64/qplatformdefs.h 461qt4/mkspecs/solaris-g++-64/qplatformdefs.h
423qt4/mkspecs/solaris-g++/qmake.conf 462qt4/mkspecs/solaris-g++/qmake.conf
424qt4/mkspecs/solaris-g++/qplatformdefs.h 463qt4/mkspecs/solaris-g++/qplatformdefs.h
425qt4/mkspecs/symbian-abld/qmake.conf 464qt4/mkspecs/symbian-abld/qmake.conf
426qt4/mkspecs/symbian-abld/qplatformdefs.h 465qt4/mkspecs/symbian-abld/qplatformdefs.h
427qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm 466qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm
428qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm 467qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm
429qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm 468qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm
430qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm 469qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
431qt4/mkspecs/symbian-sbsv2/flm/qt/qt.xml 470qt4/mkspecs/symbian-sbsv2/flm/qt/qt.xml
432qt4/mkspecs/symbian-sbsv2/qmake.conf 471qt4/mkspecs/symbian-sbsv2/qmake.conf
433qt4/mkspecs/symbian-sbsv2/qplatformdefs.h 472qt4/mkspecs/symbian-sbsv2/qplatformdefs.h
 473qt4/mkspecs/symbian/linux-armcc/features/default_post.prf
 474qt4/mkspecs/symbian/linux-armcc/qmake.conf
 475qt4/mkspecs/symbian/linux-armcc/qplatformdefs.h
 476qt4/mkspecs/symbian/linux-gcce/features/default_post.prf
 477qt4/mkspecs/symbian/linux-gcce/qmake.conf
 478qt4/mkspecs/symbian/linux-gcce/qplatformdefs.h
 479qt4/mkspecs/symbian/qmake.conf
434qt4/mkspecs/tru64-cxx/qmake.conf 480qt4/mkspecs/tru64-cxx/qmake.conf
435qt4/mkspecs/tru64-cxx/qplatformdefs.h 481qt4/mkspecs/tru64-cxx/qplatformdefs.h
436qt4/mkspecs/tru64-g++/qmake.conf 482qt4/mkspecs/tru64-g++/qmake.conf
437qt4/mkspecs/tru64-g++/qplatformdefs.h 483qt4/mkspecs/tru64-g++/qplatformdefs.h
438qt4/mkspecs/unixware-cc/qmake.conf 484qt4/mkspecs/unixware-cc/qmake.conf
439qt4/mkspecs/unixware-cc/qplatformdefs.h 485qt4/mkspecs/unixware-cc/qplatformdefs.h
440qt4/mkspecs/unixware-g++/qmake.conf 486qt4/mkspecs/unixware-g++/qmake.conf
441qt4/mkspecs/unixware-g++/qplatformdefs.h 487qt4/mkspecs/unixware-g++/qplatformdefs.h
442qt4/mkspecs/unsupported/linux-host-g++/qmake.conf 488qt4/mkspecs/unsupported/linux-host-g++/qmake.conf
443qt4/mkspecs/unsupported/linux-host-g++/qplatformdefs.h 489qt4/mkspecs/unsupported/linux-host-g++/qplatformdefs.h
444qt4/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf 490qt4/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf
445qt4/mkspecs/unsupported/linux-scratchbox2-g++/qplatformdefs.h 491qt4/mkspecs/unsupported/linux-scratchbox2-g++/qplatformdefs.h
446qt4/mkspecs/unsupported/qmake.conf 492qt4/mkspecs/unsupported/qmake.conf
447qt4/mkspecs/unsupported/qnx-g++/qmake.conf 493qt4/mkspecs/unsupported/qnx-g++/qmake.conf
448qt4/mkspecs/unsupported/qnx-g++/qplatformdefs.h 494qt4/mkspecs/unsupported/qnx-g++/qplatformdefs.h
 495qt4/mkspecs/unsupported/qws/qnx-641/qmake.conf
 496qt4/mkspecs/unsupported/qws/qnx-641/qplatformdefs.h
449qt4/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf 497qt4/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
450qt4/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h 498qt4/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h
451qt4/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf 499qt4/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
452qt4/mkspecs/unsupported/qws/qnx-i386-g++/qplatformdefs.h 500qt4/mkspecs/unsupported/qws/qnx-i386-g++/qplatformdefs.h
453qt4/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf 501qt4/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
454qt4/mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h 502qt4/mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h
455qt4/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf 503qt4/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
456qt4/mkspecs/unsupported/vxworks-ppc-dcc/qplatformdefs.h 504qt4/mkspecs/unsupported/vxworks-ppc-dcc/qplatformdefs.h
457qt4/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf 505qt4/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf
458qt4/mkspecs/unsupported/vxworks-ppc-g++/qplatformdefs.h 506qt4/mkspecs/unsupported/vxworks-ppc-g++/qplatformdefs.h
459qt4/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf 507qt4/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
460qt4/mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h 508qt4/mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h
461qt4/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf 509qt4/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
462qt4/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h 510qt4/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h
 511qt4/mkspecs/unsupported/win32-g++-cross/qmake.conf
 512qt4/mkspecs/unsupported/win32-g++-cross/qplatformdefs.h
463qt4/mkspecs/win32-borland/qmake.conf 513qt4/mkspecs/win32-borland/qmake.conf
464qt4/mkspecs/win32-borland/qplatformdefs.h 514qt4/mkspecs/win32-borland/qplatformdefs.h
465qt4/mkspecs/win32-g++/qmake.conf 515qt4/mkspecs/win32-g++/qmake.conf
466qt4/mkspecs/win32-g++/qplatformdefs.h 516qt4/mkspecs/win32-g++/qplatformdefs.h
467qt4/mkspecs/win32-icc/qmake.conf 517qt4/mkspecs/win32-icc/qmake.conf
468qt4/mkspecs/win32-icc/qplatformdefs.h 518qt4/mkspecs/win32-icc/qplatformdefs.h
469qt4/mkspecs/win32-msvc.net/qmake.conf 
470qt4/mkspecs/win32-msvc.net/qplatformdefs.h 
471qt4/mkspecs/win32-msvc/features/incremental.prf 
472qt4/mkspecs/win32-msvc/features/incremental_off.prf 
473qt4/mkspecs/win32-msvc/qmake.conf 
474qt4/mkspecs/win32-msvc/qplatformdefs.h 
475qt4/mkspecs/win32-msvc2002/qmake.conf 
476qt4/mkspecs/win32-msvc2002/qplatformdefs.h 
477qt4/mkspecs/win32-msvc2003/qmake.conf 519qt4/mkspecs/win32-msvc2003/qmake.conf
478qt4/mkspecs/win32-msvc2003/qplatformdefs.h 520qt4/mkspecs/win32-msvc2003/qplatformdefs.h
479qt4/mkspecs/win32-msvc2005/qmake.conf 521qt4/mkspecs/win32-msvc2005/qmake.conf
480qt4/mkspecs/win32-msvc2005/qplatformdefs.h 522qt4/mkspecs/win32-msvc2005/qplatformdefs.h
481qt4/mkspecs/win32-msvc2008/qmake.conf 523qt4/mkspecs/win32-msvc2008/qmake.conf
482qt4/mkspecs/win32-msvc2008/qplatformdefs.h 524qt4/mkspecs/win32-msvc2008/qplatformdefs.h
 525qt4/mkspecs/win32-msvc2010/qmake.conf
 526qt4/mkspecs/win32-msvc2010/qplatformdefs.h
483qt4/mkspecs/wince50standard-armv4i-msvc2005/default_post.prf 527qt4/mkspecs/wince50standard-armv4i-msvc2005/default_post.prf
484qt4/mkspecs/wince50standard-armv4i-msvc2005/qmake.conf 528qt4/mkspecs/wince50standard-armv4i-msvc2005/qmake.conf
485qt4/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h 529qt4/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h
486qt4/mkspecs/wince50standard-armv4i-msvc2008/default_post.prf 530qt4/mkspecs/wince50standard-armv4i-msvc2008/default_post.prf
487qt4/mkspecs/wince50standard-armv4i-msvc2008/qmake.conf 531qt4/mkspecs/wince50standard-armv4i-msvc2008/qmake.conf
488qt4/mkspecs/wince50standard-armv4i-msvc2008/qplatformdefs.h 532qt4/mkspecs/wince50standard-armv4i-msvc2008/qplatformdefs.h
489qt4/mkspecs/wince50standard-mipsii-msvc2005/default_post.prf 533qt4/mkspecs/wince50standard-mipsii-msvc2005/default_post.prf
490qt4/mkspecs/wince50standard-mipsii-msvc2005/qmake.conf 534qt4/mkspecs/wince50standard-mipsii-msvc2005/qmake.conf
491qt4/mkspecs/wince50standard-mipsii-msvc2005/qplatformdefs.h 535qt4/mkspecs/wince50standard-mipsii-msvc2005/qplatformdefs.h
492qt4/mkspecs/wince50standard-mipsii-msvc2008/default_post.prf 536qt4/mkspecs/wince50standard-mipsii-msvc2008/default_post.prf
493qt4/mkspecs/wince50standard-mipsii-msvc2008/qmake.conf 537qt4/mkspecs/wince50standard-mipsii-msvc2008/qmake.conf
494qt4/mkspecs/wince50standard-mipsii-msvc2008/qplatformdefs.h 538qt4/mkspecs/wince50standard-mipsii-msvc2008/qplatformdefs.h
495qt4/mkspecs/wince50standard-mipsiv-msvc2005/qmake.conf 539qt4/mkspecs/wince50standard-mipsiv-msvc2005/qmake.conf
@@ -535,22 +579,24 @@ qt4/mkspecs/wincewm60standard-msvc2008/d @@ -535,22 +579,24 @@ qt4/mkspecs/wincewm60standard-msvc2008/d
535qt4/mkspecs/wincewm60standard-msvc2008/qmake.conf 579qt4/mkspecs/wincewm60standard-msvc2008/qmake.conf
536qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h 580qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h
537qt4/mkspecs/wincewm65professional-msvc2005/default_post.prf 581qt4/mkspecs/wincewm65professional-msvc2005/default_post.prf
538qt4/mkspecs/wincewm65professional-msvc2005/qmake.conf 582qt4/mkspecs/wincewm65professional-msvc2005/qmake.conf
539qt4/mkspecs/wincewm65professional-msvc2005/qplatformdefs.h 583qt4/mkspecs/wincewm65professional-msvc2005/qplatformdefs.h
540qt4/mkspecs/wincewm65professional-msvc2008/default_post.prf 584qt4/mkspecs/wincewm65professional-msvc2008/default_post.prf
541qt4/mkspecs/wincewm65professional-msvc2008/qmake.conf 585qt4/mkspecs/wincewm65professional-msvc2008/qmake.conf
542qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h 586qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h
543qt4/phrasebooks/danish.qph 587qt4/phrasebooks/danish.qph
544qt4/phrasebooks/dutch.qph 588qt4/phrasebooks/dutch.qph
545qt4/phrasebooks/finnish.qph 589qt4/phrasebooks/finnish.qph
546qt4/phrasebooks/french.qph 590qt4/phrasebooks/french.qph
547qt4/phrasebooks/german.qph 591qt4/phrasebooks/german.qph
 592qt4/phrasebooks/hungarian.qph
548qt4/phrasebooks/italian.qph 593qt4/phrasebooks/italian.qph
549qt4/phrasebooks/japanese.qph 594qt4/phrasebooks/japanese.qph
550qt4/phrasebooks/norwegian.qph 595qt4/phrasebooks/norwegian.qph
551qt4/phrasebooks/polish.qph 596qt4/phrasebooks/polish.qph
552qt4/phrasebooks/russian.qph 597qt4/phrasebooks/russian.qph
553qt4/phrasebooks/spanish.qph 598qt4/phrasebooks/spanish.qph
554qt4/phrasebooks/swedish.qph 599qt4/phrasebooks/swedish.qph
 600qt4/plugins/designer/libqdeclarativeview.la
555qt4/plugins/designer/libqt3supportwidgets.la 601qt4/plugins/designer/libqt3supportwidgets.la
556qt4/plugins/designer/libqwebview.la 602qt4/plugins/designer/libqwebview.la