Thu May 5 12:37:08 2011 UTC ()
Changes 4.7.3:
QtNetwork
- SSL
* [QTBUG-18338] blacklist fraudulent SSL certificates

Qt for Symbian
- Bearer Management
* [QTBUG-15108] Deadlock between SymbianEngine mutex and
QNetworkConfigurationPrivate mutex in the symbian bearer code
* [QTBUG-17627] qnetworksession.h Q_DECLARE_METATYPE breaks building
QtMobility QtBearer depending applications

- GraphicsView
* [QTBUG-17966] Major regression in QGraphicsView OpenVG backend
- Declarative
* [QTBUG-17503] Export qml debugging symbols on Symbian
- Widgets
* [QTBUG-17786] BC between Qt 4.7.3 and 4.6.3 QTreeView::indexRowSizeHint
doesn't return correct value on Symbian for row when QPushButton widget is
inserted in the treeview
* [QTBUG-4953] QMessageBox can not be closed/dismissed on touch phones if any
widget is fullscreen
- Painting
* [QTBUG-17907] tst_QGraphicsTransform::rotation3d test case from
tests/auto/qgraphicstransfor is failed for some rotation angle on
Symbian^3 devices
* [QTBUG-18154] Symbian's QPixmap::logicalDpi[X\Y]() incorrectly
returns MAXINT


(adam)
diff -r1.24 -r1.25 pkgsrc/x11/qt4/Makefile.common
diff -r1.15 -r1.16 pkgsrc/x11/qt4-docs/Makefile
diff -r1.59 -r1.60 pkgsrc/x11/qt4-libs/Makefile
diff -r1.53 -r1.54 pkgsrc/x11/qt4-libs/distinfo
diff -r1.9 -r1.10 pkgsrc/x11/qt4-mng/Makefile
diff -r1.17 -r1.18 pkgsrc/x11/qt4-mysql/Makefile
diff -r1.23 -r1.24 pkgsrc/x11/qt4-pgsql/Makefile
diff -r1.19 -r1.20 pkgsrc/x11/qt4-qdbus/Makefile
diff -r1.17 -r1.18 pkgsrc/x11/qt4-sqlite3/Makefile
diff -r1.16 -r1.17 pkgsrc/x11/qt4-tiff/Makefile
diff -r1.41 -r1.42 pkgsrc/x11/qt4-tools/Makefile
cvs diff -r1.24 -r1.25 pkgsrc/x11/qt4/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt4/Makefile.common 2011/03/03 05:50:03 1.24
+++ pkgsrc/x11/qt4/Makefile.common 2011/05/05 12:37:07 1.25
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1# $NetBSD: Makefile.common,v 1.24 2011/03/03 05:50:03 adam Exp $ 1# $NetBSD: Makefile.common,v 1.25 2011/05/05 12:37:07 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.7.2 5QTVERSION= 4.7.3
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-lgpl-v2.1 AND gnu-gpl-v3 10LICENSE= gnu-lgpl-v2.1 AND gnu-gpl-v3
cvs diff -r1.15 -r1.16 pkgsrc/x11/qt4-docs/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-docs/Makefile 2011/04/22 13:45:14 1.15
+++ pkgsrc/x11/qt4-docs/Makefile 2011/05/05 12:37:07 1.16
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.15 2011/04/22 13:45:14 obache Exp $ 1# $NetBSD: Makefile,v 1.16 2011/05/05 12:37:07 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.59 -r1.60 pkgsrc/x11/qt4-libs/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/Makefile 2011/04/22 14:40:46 1.59
+++ pkgsrc/x11/qt4-libs/Makefile 2011/05/05 12:37:07 1.60
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.59 2011/04/22 14:40:46 obache Exp $ 1# $NetBSD: Makefile,v 1.60 2011/05/05 12:37:07 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= 2 
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
cvs diff -r1.53 -r1.54 pkgsrc/x11/qt4-libs/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/distinfo 2011/04/07 05:23:52 1.53
+++ pkgsrc/x11/qt4-libs/distinfo 2011/05/05 12:37:07 1.54
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.53 2011/04/07 05:23:52 obache Exp $ 1$NetBSD: distinfo,v 1.54 2011/05/05 12:37:07 adam Exp $
2 2
3SHA1 (qt-everywhere-opensource-src-4.7.2.tar.gz) = 84414f82bbc9e8d356b986d5d1ebee89d06e4f2e 3SHA1 (qt-everywhere-opensource-src-4.7.3.tar.gz) = 765eb70d9779f93fefddddda5e6ddb33f4c0b71e
4RMD160 (qt-everywhere-opensource-src-4.7.2.tar.gz) = de3d1c172c23c33681a0945c331db179c84cb7b5 4RMD160 (qt-everywhere-opensource-src-4.7.3.tar.gz) = ab9c11c85898430fa74e5e07894f8da5e5936645
5Size (qt-everywhere-opensource-src-4.7.2.tar.gz) = 213663032 bytes 5Size (qt-everywhere-opensource-src-4.7.3.tar.gz) = 213659173 bytes
6SHA1 (patch-aa) = 70cf085b3f5ac32e8d2e7312eb998e08500f30f1 6SHA1 (patch-aa) = 70cf085b3f5ac32e8d2e7312eb998e08500f30f1
7SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5 7SHA1 (patch-ac) = 078ddafefc719f248740f40e2063dae07cd601e5
8SHA1 (patch-ad) = 42ab1fa5f0dd54c3cdc898c1a95c399414ca33ea 8SHA1 (patch-ad) = 42ab1fa5f0dd54c3cdc898c1a95c399414ca33ea
9SHA1 (patch-ae) = 249bae0d7befeb74b2e855f2b9d3e6e8dd101540 9SHA1 (patch-ae) = 249bae0d7befeb74b2e855f2b9d3e6e8dd101540
10SHA1 (patch-af) = 54bb375f7c1a43e7bf3f9528e31000a1f292f7d3 10SHA1 (patch-af) = 54bb375f7c1a43e7bf3f9528e31000a1f292f7d3
11SHA1 (patch-ag) = 61f992a4f8e36cd2bbdf56849f3c39c86f0b1033 11SHA1 (patch-ag) = 61f992a4f8e36cd2bbdf56849f3c39c86f0b1033
12SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 12SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
13SHA1 (patch-aj) = c5510b6f6044f17855f2840fabb8ed94fddbd525 13SHA1 (patch-aj) = c5510b6f6044f17855f2840fabb8ed94fddbd525
14SHA1 (patch-ak) = 6ee5822d81723cddb44226b34d891fd93c4779b9 14SHA1 (patch-ak) = 6ee5822d81723cddb44226b34d891fd93c4779b9
15SHA1 (patch-al) = 4a2a30551a4970bf3b2f5347b9067a7d490d01fb 15SHA1 (patch-al) = 4a2a30551a4970bf3b2f5347b9067a7d490d01fb
16SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381 16SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381
17SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409 17SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409
18SHA1 (patch-ao) = becfc697d7ae337327a416cfcea2ca8952fe1ed4 18SHA1 (patch-ao) = becfc697d7ae337327a416cfcea2ca8952fe1ed4
cvs diff -r1.9 -r1.10 pkgsrc/x11/qt4-mng/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-mng/Makefile 2011/04/22 13:45:14 1.9
+++ pkgsrc/x11/qt4-mng/Makefile 2011/05/05 12:37:07 1.10
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.9 2011/04/22 13:45:14 obache Exp $ 1# $NetBSD: Makefile,v 1.10 2011/05/05 12:37:07 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
cvs diff -r1.17 -r1.18 pkgsrc/x11/qt4-mysql/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-mysql/Makefile 2011/04/22 13:45:14 1.17
+++ pkgsrc/x11/qt4-mysql/Makefile 2011/05/05 12:37:07 1.18
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.17 2011/04/22 13:45:14 obache Exp $ 1# $NetBSD: Makefile,v 1.18 2011/05/05 12:37:07 adam Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../x11/qt4-libs/Makefile.common" 5.include "../../x11/qt4-libs/Makefile.common"
6 6
7PKGNAME= qt4-mysql-${QTVERSION} 7PKGNAME= qt4-mysql-${QTVERSION}
8PKGREVISION= 1 
9COMMENT= QT mysql driver 8COMMENT= QT mysql driver
10 9
11CONFIGURE_ARGS+= -I${QTDIR}/include 10CONFIGURE_ARGS+= -I${QTDIR}/include
12CONFIGURE_ARGS+= -L${QTDIR}/lib 11CONFIGURE_ARGS+= -L${QTDIR}/lib
13 12
14BUILD_QT4= yes 13BUILD_QT4= yes
15 14
16do-build: 15do-build:
17 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} 16 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE}
18 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} 17 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}
19 cd ${WRKSRC}/src/plugins/sqldrivers/mysql && env ${MAKE_ENV} ${GMAKE} 18 cd ${WRKSRC}/src/plugins/sqldrivers/mysql && env ${MAKE_ENV} ${GMAKE}
20 19
21SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers 20SQLDRVDIR= ${QTPREFIX}/plugins/sqldrivers
cvs diff -r1.23 -r1.24 pkgsrc/x11/qt4-pgsql/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-pgsql/Makefile 2011/04/22 13:45:14 1.23
+++ pkgsrc/x11/qt4-pgsql/Makefile 2011/05/05 12:37:07 1.24
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.23 2011/04/22 13:45:14 obache Exp $ 1# $NetBSD: Makefile,v 1.24 2011/05/05 12:37:07 adam Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../x11/qt4-libs/Makefile.common" 5.include "../../x11/qt4-libs/Makefile.common"
6 6
7PKGNAME= qt4-pgsql-${QTVERSION} 7PKGNAME= qt4-pgsql-${QTVERSION}
8PKGREVISION= 1 
9COMMENT= QT postgresql driver 8COMMENT= QT postgresql driver
10 9
11CONFIGURE_ARGS+= -I${QTDIR}/include 10CONFIGURE_ARGS+= -I${QTDIR}/include
12CONFIGURE_ARGS+= -I${PGSQL_PREFIX}/include/postgresql/server 11CONFIGURE_ARGS+= -I${PGSQL_PREFIX}/include/postgresql/server
13CONFIGURE_ARGS+= -L${QTDIR}/lib 12CONFIGURE_ARGS+= -L${QTDIR}/lib
14 13
15BUILD_QT4= yes 14BUILD_QT4= yes
16 15
17do-build: 16do-build:
18 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} 17 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE}
19 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} 18 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}
20 cd ${WRKSRC}/src/plugins/sqldrivers/psql && env ${MAKE_ENV} ${GMAKE} 19 cd ${WRKSRC}/src/plugins/sqldrivers/psql && env ${MAKE_ENV} ${GMAKE}
21 20
cvs diff -r1.19 -r1.20 pkgsrc/x11/qt4-qdbus/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-qdbus/Makefile 2011/04/22 13:42:36 1.19
+++ pkgsrc/x11/qt4-qdbus/Makefile 2011/05/05 12:37:08 1.20
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.19 2011/04/22 13:42:36 obache Exp $ 1# $NetBSD: Makefile,v 1.20 2011/05/05 12:37:08 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
cvs diff -r1.17 -r1.18 pkgsrc/x11/qt4-sqlite3/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-sqlite3/Makefile 2011/04/22 13:45:14 1.17
+++ pkgsrc/x11/qt4-sqlite3/Makefile 2011/05/05 12:37:08 1.18
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.17 2011/04/22 13:45:14 obache Exp $ 1# $NetBSD: Makefile,v 1.18 2011/05/05 12:37:08 adam Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../x11/qt4-libs/Makefile.common" 5.include "../../x11/qt4-libs/Makefile.common"
6 6
7PKGNAME= qt4-sqlite3-${QTVERSION} 7PKGNAME= qt4-sqlite3-${QTVERSION}
8PKGREVISION= 1 
9COMMENT= QT sqlite3 driver 8COMMENT= QT sqlite3 driver
10 9
11CONFIGURE_ARGS+= -I${QTDIR}/include 10CONFIGURE_ARGS+= -I${QTDIR}/include
12CONFIGURE_ARGS+= -L${QTDIR}/lib 11CONFIGURE_ARGS+= -L${QTDIR}/lib
13CONFIGURE_ARGS+= -system-sqlite 12CONFIGURE_ARGS+= -system-sqlite
14 13
15BUILD_QT4= yes 14BUILD_QT4= yes
16USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
17 16
18do-build: 17do-build:
19 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} 18 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE}
20 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} 19 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}
21 cd ${WRKSRC}/src/plugins/sqldrivers/sqlite && env ${MAKE_ENV} ${GMAKE} 20 cd ${WRKSRC}/src/plugins/sqldrivers/sqlite && env ${MAKE_ENV} ${GMAKE}
cvs diff -r1.16 -r1.17 pkgsrc/x11/qt4-tiff/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-tiff/Makefile 2011/04/22 13:45:14 1.16
+++ pkgsrc/x11/qt4-tiff/Makefile 2011/05/05 12:37:08 1.17
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.16 2011/04/22 13:45:14 obache Exp $ 1# $NetBSD: Makefile,v 1.17 2011/05/05 12:37:08 adam Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../x11/qt4-libs/Makefile.common" 5.include "../../x11/qt4-libs/Makefile.common"
6 6
7PKGNAME= qt4-tiff-${QTVERSION} 7PKGNAME= qt4-tiff-${QTVERSION}
8PKGREVISION= 1 
9COMMENT= QT TIFF image format plugin 8COMMENT= QT TIFF image format plugin
10 9
11CONFIGURE_ARGS+= -I${QTDIR}/include 10CONFIGURE_ARGS+= -I${QTDIR}/include
12CONFIGURE_ARGS+= -L${QTDIR}/lib 11CONFIGURE_ARGS+= -L${QTDIR}/lib
13 12
14BUILD_QT4= yes 13BUILD_QT4= yes
15 14
16do-build: 15do-build:
17 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE} 16 cd ${WRKSRC}/src/tools/bootstrap && env ${MAKE_ENV} ${GMAKE}
18 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE} 17 cd ${WRKSRC}/src/tools/moc && env ${MAKE_ENV} ${GMAKE}
19 cd ${WRKSRC}/src/plugins/imageformats/tiff && env ${MAKE_ENV} ${GMAKE} 18 cd ${WRKSRC}/src/plugins/imageformats/tiff && env ${MAKE_ENV} ${GMAKE}
20 19
21IMGFMTDIR= ${QTPREFIX}/plugins/imageformats 20IMGFMTDIR= ${QTPREFIX}/plugins/imageformats
cvs diff -r1.41 -r1.42 pkgsrc/x11/qt4-tools/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-tools/Makefile 2011/04/22 13:42:36 1.41
+++ pkgsrc/x11/qt4-tools/Makefile 2011/05/05 12:37:08 1.42
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.41 2011/04/22 13:42:36 obache Exp $ 1# $NetBSD: Makefile,v 1.42 2011/05/05 12:37:08 adam Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../x11/qt4-libs/Makefile.common" 5.include "../../x11/qt4-libs/Makefile.common"
6 6
7PKGNAME= qt4-tools-${QTVERSION} 7PKGNAME= qt4-tools-${QTVERSION}
8PKGREVISION= 1 
9COMMENT= QT GUI (WYSIWYG) builder and other tools 8COMMENT= QT GUI (WYSIWYG) builder and other tools
10 9
11DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base 10DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base
12 11
13CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib 12CONFIGURE_ARGS+= -I${QTDIR}/include -L${QTDIR}/lib
14CONFIGURE_ARGS+= -DQT_NO_DBUS 13CONFIGURE_ARGS+= -DQT_NO_DBUS
15 14
16# 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
17INSTALL_DIRS+= tools 16INSTALL_DIRS+= tools
18 17
19BUILD_TARGET= sub-tools-bootstrap sub-tools 18BUILD_TARGET= sub-tools-bootstrap sub-tools
20 19
21BUILD_QT4= yes 20BUILD_QT4= yes