Sun Jul 4 06:00:15 2010 UTC ()
Changes 4.6.3:
* Added Spectrum analyzer demo application.
* Added exit softkey to Wiggly example.
* Added close button to Anomaly demo.
* Fixed Anomaly demo controlstrip icon placement for very small screens.
* Ensure history configuration is cleared when a state machine is restarted.
For more read: http://qt.nokia.com/developer/changes/changes-4.6.3


(adam)
diff -r1.21 -r1.22 pkgsrc/x11/qt4/Makefile.common
diff -r1.8 -r1.9 pkgsrc/x11/qt4-docs/Makefile
diff -r1.48 -r1.49 pkgsrc/x11/qt4-libs/Makefile
diff -r1.20 -r1.21 pkgsrc/x11/qt4-libs/Makefile.common
diff -r1.44 -r1.45 pkgsrc/x11/qt4-libs/distinfo
diff -r1.7 -r1.8 pkgsrc/x11/qt4-libs/patches/patch-af
diff -r1.7 -r1.8 pkgsrc/x11/qt4-libs/patches/patch-ao
diff -r1.10 -r1.11 pkgsrc/x11/qt4-libs/patches/patch-ag
diff -r1.6 -r1.7 pkgsrc/x11/qt4-libs/patches/patch-aq
diff -r1.6 -r1.7 pkgsrc/x11/qt4-libs/patches/patch-ay
diff -r1.1 -r1.2 pkgsrc/x11/qt4-libs/patches/patch-aw
diff -r1.4 -r1.5 pkgsrc/x11/qt4-libs/patches/patch-ba
diff -r1.2 -r1.3 pkgsrc/x11/qt4-mng/Makefile
diff -r1.9 -r1.10 pkgsrc/x11/qt4-mysql/Makefile
diff -r1.16 -r1.17 pkgsrc/x11/qt4-pgsql/Makefile
diff -r1.12 -r1.13 pkgsrc/x11/qt4-qdbus/Makefile
diff -r1.10 -r1.11 pkgsrc/x11/qt4-sqlite3/Makefile
diff -r1.9 -r1.10 pkgsrc/x11/qt4-tiff/Makefile
diff -r1.32 -r1.33 pkgsrc/x11/qt4-tools/Makefile
diff -r1.21 -r1.22 pkgsrc/x11/qt4-tools/PLIST
cvs diff -r1.21 -r1.22 pkgsrc/x11/qt4/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt4/Makefile.common 2010/02/16 13:08:09 1.21
+++ pkgsrc/x11/qt4/Makefile.common 2010/07/04 06:00:13 1.22
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1# $NetBSD: Makefile.common,v 1.21 2010/02/16 13:08:09 adam Exp $ 1# $NetBSD: Makefile.common,v 1.22 2010/07/04 06:00:13 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.2 5QTVERSION= 4.6.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-gpl-v3 10LICENSE= gnu-gpl-v3
cvs diff -r1.8 -r1.9 pkgsrc/x11/qt4-docs/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-docs/Makefile 2010/06/13 22:45:51 1.8
+++ pkgsrc/x11/qt4-docs/Makefile 2010/07/04 06:00:14 1.9
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.8 2010/06/13 22:45:51 wiz Exp $ 1# $NetBSD: Makefile,v 1.9 2010/07/04 06:00:14 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"
6PKGREVISION= 1 
7 6
8PKGNAME= qt4-docs-${QTVERSION} 7PKGNAME= qt4-docs-${QTVERSION}
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
cvs diff -r1.48 -r1.49 pkgsrc/x11/qt4-libs/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/Makefile 2010/06/13 22:45:51 1.48
+++ pkgsrc/x11/qt4-libs/Makefile 2010/07/04 06:00:14 1.49
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.48 2010/06/13 22:45:51 wiz Exp $ 1# $NetBSD: Makefile,v 1.49 2010/07/04 06:00:14 adam Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "../../x11/qt4-libs/Makefile.common" 5.include "../../x11/qt4-libs/Makefile.common"
6 6
7PKGNAME= qt4-libs-${QTVERSION} 7PKGNAME= qt4-libs-${QTVERSION}
8PKGREVISION= 3 
9COMMENT= C++ X GUI toolkit 8COMMENT= C++ X GUI toolkit
10 9
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.20 -r1.21 pkgsrc/x11/qt4-libs/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/Makefile.common 2010/02/02 14:33:05 1.20
+++ pkgsrc/x11/qt4-libs/Makefile.common 2010/07/04 06:00:14 1.21
@@ -1,43 +1,42 @@ @@ -1,43 +1,42 @@
1# $NetBSD: Makefile.common,v 1.20 2010/02/02 14:33:05 wiz Exp $ 1# $NetBSD: Makefile.common,v 1.21 2010/07/04 06:00:14 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= http://get.qtsoftware.com/qt/source/ \ 13MASTER_SITES= ftp://ftp.qt.nokia.com/qt/source/
14 ftp://ftp.qtsoftware.com/qt/source/ 
15#EXTRACT_SUFX= .tar.bz2 14#EXTRACT_SUFX= .tar.bz2
16 15
17.include "../../x11/qt4/Makefile.common" 16.include "../../x11/qt4/Makefile.common"
18 17
19DISTINFO_FILE= ${.CURDIR}/../../x11/qt4-libs/distinfo 18DISTINFO_FILE= ${.CURDIR}/../../x11/qt4-libs/distinfo
20FILESDIR= ${.CURDIR}/../../x11/qt4-libs/files 19FILESDIR= ${.CURDIR}/../../x11/qt4-libs/files
21PATCHDIR= ${.CURDIR}/../../x11/qt4-libs/patches 20PATCHDIR= ${.CURDIR}/../../x11/qt4-libs/patches
22 21
23HAS_CONFIGURE= yes 22HAS_CONFIGURE= yes
24USE_LANGUAGES= c c++ 23USE_LANGUAGES= c c++
25USE_LIBTOOL= yes 24USE_LIBTOOL= yes
26USE_TOOLS+= gmake 25USE_TOOLS+= gmake
27 26
28QTPREFIX= ${PREFIX}/qt4 27QTPREFIX= ${PREFIX}/qt4
29 28
30CONFIGURE_ARGS+= -arch ${MACHINE_ARCH} 29#CONFIGURE_ARGS+= -arch ${MACHINE_ARCH}
31CONFIGURE_ARGS+= -optimized-qmake 30CONFIGURE_ARGS+= -optimized-qmake
32CONFIGURE_ARGS+= -prefix "${QTPREFIX}" 31CONFIGURE_ARGS+= -prefix "${QTPREFIX}"
33CONFIGURE_ARGS+= -qt-gif # qt4 does not write compressed GIFs 32CONFIGURE_ARGS+= -qt-gif # qt4 does not write compressed GIFs
34CONFIGURE_ARGS.SunOS+= -no-xrender 33CONFIGURE_ARGS.SunOS+= -no-xrender
35CONFIGURE_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,//}
36OPSYSVARS+= CONFIGURE_ARGS 35OPSYSVARS+= CONFIGURE_ARGS
37CONFIGURE_ARGS+= < ${FILESDIR}/license-acceptance 36CONFIGURE_ARGS+= < ${FILESDIR}/license-acceptance
38 37
39LIBQT?= -lQtCore -lQtGui 38LIBQT?= -lQtCore -lQtGui
40 39
41MAKE_ENV+= QTPREFIX=${QTPREFIX:Q} 40MAKE_ENV+= QTPREFIX=${QTPREFIX:Q}
42MAKE_ENV+= QTDIR=${WRKSRC} 41MAKE_ENV+= QTDIR=${WRKSRC}
43 42
@@ -60,26 +59,27 @@ CONFIGURE_ARGS+= -platform solaris-cc-64 @@ -60,26 +59,27 @@ CONFIGURE_ARGS+= -platform solaris-cc-64
60CONFIGURE_ARGS+= -platform solaris-cc 59CONFIGURE_ARGS+= -platform solaris-cc
61. endif 60. endif
62. endif 61. endif
63SYS_LIBS= -lresolv -lsocket -lnsl -lrt 62SYS_LIBS= -lresolv -lsocket -lnsl -lrt
64.elif ${OPSYS} == "Interix" 63.elif ${OPSYS} == "Interix"
65CONFIGURE_ARGS+= -platform interix-g++ 64CONFIGURE_ARGS+= -platform interix-g++
66CFLAGS+= -I/usr/local/include/bind 65CFLAGS+= -I/usr/local/include/bind
67LDFLAGS+= -L/usr/local/lib/bind -lbind 66LDFLAGS+= -L/usr/local/lib/bind -lbind
68BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind 67BUILDLINK_PASSTHRU_DIRS+=/usr/local/include/bind /usr/local/lib/bind
69SYS_LIBS= -lbind -ldb -ldl 68SYS_LIBS= -lbind -ldb -ldl
70.elif ${OPSYS} == "DragonFly" 69.elif ${OPSYS} == "DragonFly"
71CONFIGURE_ARGS+= -platform freebsd-g++ 70CONFIGURE_ARGS+= -platform freebsd-g++
72.elif ${OPSYS} == "Darwin" 71.elif ${OPSYS} == "Darwin"
 72#CONFIGURE_ARGS+= -cocoa
73QMAKE_RANLIB= ${RANLIB} 73QMAKE_RANLIB= ${RANLIB}
74. if exists(/usr/lib/libresolv.dylib) 74. if exists(/usr/lib/libresolv.dylib)
75LDFLAGS+= -lresolv 75LDFLAGS+= -lresolv
76. endif 76. endif
77.elif ${OPSYS} == "Linux" 77.elif ${OPSYS} == "Linux"
78LDFLAGS+= -ldl 78LDFLAGS+= -ldl
79.endif 79.endif
80 80
81QMAKE_RANLIB?= ${TRUE} 81QMAKE_RANLIB?= ${TRUE}
82 82
83.if ${X11_TYPE} != "native" 83.if ${X11_TYPE} != "native"
84.include "../../x11/libXinerama/buildlink3.mk" 84.include "../../x11/libXinerama/buildlink3.mk"
85.elif !exists(${X11BASE}/lib/libXinerama.so) && \ 85.elif !exists(${X11BASE}/lib/libXinerama.so) && \
cvs diff -r1.44 -r1.45 pkgsrc/x11/qt4-libs/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/distinfo 2010/05/29 17:10:31 1.44
+++ pkgsrc/x11/qt4-libs/distinfo 2010/07/04 06:00:14 1.45
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1$NetBSD: distinfo,v 1.44 2010/05/29 17:10:31 adam Exp $ 1$NetBSD: distinfo,v 1.45 2010/07/04 06:00:14 adam Exp $
2 2
3SHA1 (qt-everywhere-opensource-src-4.6.2.tar.gz) = 977c10b88a2230e96868edc78a9e3789c0fcbf70 3SHA1 (qt-everywhere-opensource-src-4.6.3.tar.gz) = 1c18a564df9296c7cb0e0dedde40b9843e1b30e8
4RMD160 (qt-everywhere-opensource-src-4.6.2.tar.gz) = 5f3fea120f2dba274c4150b02162bba40b65a872 4RMD160 (qt-everywhere-opensource-src-4.6.3.tar.gz) = ceb3ca78263d0d9cdf92fef903e30c0026db6bff
5Size (qt-everywhere-opensource-src-4.6.2.tar.gz) = 160601949 bytes 5Size (qt-everywhere-opensource-src-4.6.3.tar.gz) = 160993454 bytes
6SHA1 (patch-aa) = 899242f5a3b9101db98f2e87fa1a38f3bffdb262 6SHA1 (patch-aa) = 899242f5a3b9101db98f2e87fa1a38f3bffdb262
7SHA1 (patch-ab) = c19f854a08c3c5ce1791d6fbd63443144d8f1fc8 7SHA1 (patch-ab) = c19f854a08c3c5ce1791d6fbd63443144d8f1fc8
8SHA1 (patch-ac) = db39e471fb43ee820556983ebf9108658ce11e84 8SHA1 (patch-ac) = db39e471fb43ee820556983ebf9108658ce11e84
9SHA1 (patch-ad) = 619ae805f31df5cf490320e4ca611621a781bbb9 9SHA1 (patch-ad) = 619ae805f31df5cf490320e4ca611621a781bbb9
10SHA1 (patch-ae) = 8b623c616a0c41be3edd3b7b8e987e40e9e7ccbe 10SHA1 (patch-ae) = 8b623c616a0c41be3edd3b7b8e987e40e9e7ccbe
11SHA1 (patch-af) = 9e49533cb835538a949bd71b53cebe15ab59b9de 11SHA1 (patch-af) = 54bb375f7c1a43e7bf3f9528e31000a1f292f7d3
12SHA1 (patch-ag) = 6f31f1f5161cf5ad0d9fc09b097d3763e72e6bd6 12SHA1 (patch-ag) = c7573bf93741d91b4f81ca5f0e7d851c1a40239a
13SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112 13SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
14SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950 14SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
15SHA1 (patch-aj) = ae2bd6dd5e66a966dcdd63d32736b4a427fc85df 15SHA1 (patch-aj) = ae2bd6dd5e66a966dcdd63d32736b4a427fc85df
16SHA1 (patch-ak) = 2b13c4a70f5020c8bdd33e0c0b9978a8b726117d 16SHA1 (patch-ak) = 2b13c4a70f5020c8bdd33e0c0b9978a8b726117d
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) = 314769424b9ae5d7e794decb2f67a10820714ff5 20SHA1 (patch-ao) = becfc697d7ae337327a416cfcea2ca8952fe1ed4
21SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569 21SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569
22SHA1 (patch-aq) = 361befdb8e9110edffca5f82be1eb7a8923e5fa4 22SHA1 (patch-aq) = 1a7f8ba45c9a232c35c4db0094ae1ac2c795b6ab
23SHA1 (patch-ar) = 5bf166c9b7d71bf5e6c3839f804c865f5221879a 23SHA1 (patch-ar) = 5bf166c9b7d71bf5e6c3839f804c865f5221879a
24SHA1 (patch-as) = ada0bb538f16bc8e3db23390cbdb3b155db2d7ed 24SHA1 (patch-as) = ada0bb538f16bc8e3db23390cbdb3b155db2d7ed
25SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed 25SHA1 (patch-at) = f9b090ead20dd1b664484237ac5777fdd03ea1ed
26SHA1 (patch-au) = d0bb72642d73aa716587e8ed3cff4dc37c415e12 26SHA1 (patch-au) = d0bb72642d73aa716587e8ed3cff4dc37c415e12
27SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf 27SHA1 (patch-av) = f716b571ef0f8b5c7684378a0e3772c1680c6dcf
28SHA1 (patch-aw) = 1e716a1f39cb4aee4872184f700f3e4b455463b6 28SHA1 (patch-aw) = df067e2530a825734ffc0afe2607e43c45c07f9b
29SHA1 (patch-ax) = 0c17ee0d865a39ed167b6134e73d12a57b9f84a9 29SHA1 (patch-ax) = 0c17ee0d865a39ed167b6134e73d12a57b9f84a9
30SHA1 (patch-ay) = 29f62543381febdaf054e2b43e7449676dc0ecb7 30SHA1 (patch-ay) = ee700d2a4bf02be6a908c0aebe8e8bfd3b1f6c38
31SHA1 (patch-az) = 8c8cf4f77b28d092ce05ab2d4a8a87d1a22c61a1 31SHA1 (patch-az) = 8c8cf4f77b28d092ce05ab2d4a8a87d1a22c61a1
32SHA1 (patch-ba) = 97f9f21909cf42d04d6c40f1e297791e592b6532 32SHA1 (patch-ba) = 3fbe444ec924b9185f845cbcc90f4a799aaf59ae
33SHA1 (patch-bb) = 9f82a7ac9f951a033af6ae78201ccd8d00004d42 33SHA1 (patch-bb) = 9f82a7ac9f951a033af6ae78201ccd8d00004d42
cvs diff -r1.7 -r1.8 pkgsrc/x11/qt4-libs/patches/patch-af (expand / switch to unified diff)

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

--- pkgsrc/x11/qt4-libs/patches/patch-ao 2010/01/29 18:19:09 1.7
+++ pkgsrc/x11/qt4-libs/patches/patch-ao 2010/07/04 06:00:14 1.8
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ao,v 1.7 2010/01/29 18:19:09 adam Exp $ 1$NetBSD: patch-ao,v 1.8 2010/07/04 06:00:14 adam Exp $
2 2
3--- src/corelib/codecs/qiconvcodec.cpp.orig 2010-01-15 17:01:36.000000000 +0000 3--- src/corelib/codecs/qiconvcodec.cpp.orig 2010-06-02 02:03:17.000000000 +0000
4+++ src/corelib/codecs/qiconvcodec.cpp 4+++ src/corelib/codecs/qiconvcodec.cpp
5@@ -50,9 +50,14 @@ 5@@ -50,9 +50,14 @@
6 #include <stdio.h> 6 #include <stdio.h>
7 #include <dlfcn.h> 7 #include <dlfcn.h>
8  8
9+// for __DragonFly_version 9+// for __DragonFly_version
10+#if defined(__DragonFly__) 10+#if defined(__DragonFly__)
11+#include <sys/param.h> 11+#include <sys/param.h>
12+#endif 12+#endif
13+ 13+
14 // unistd.h is needed for the _XOPEN_UNIX macro 14 // unistd.h is needed for the _XOPEN_UNIX macro
15 #include <unistd.h> 15 #include <unistd.h>
16-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF) 16-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)
@@ -27,36 +27,45 @@ $NetBSD: patch-ao,v 1.7 2010/01/29 18:19 @@ -27,36 +27,45 @@ $NetBSD: patch-ao,v 1.7 2010/01/29 18:19
27+# define UTF16 "UTF-16" 27+# define UTF16 "UTF-16"
28 #else 28 #else
29 # define UTF16 "UTF-16" 29 # define UTF16 "UTF-16"
30 #endif 30 #endif
31@@ -218,7 +226,7 @@ QString QIconvCodec::convertToUnicode(co 31@@ -218,7 +226,7 @@ QString QIconvCodec::convertToUnicode(co
32 IconvState *state = *pstate; 32 IconvState *state = *pstate;
33 size_t inBytesLeft = len; 33 size_t inBytesLeft = len;
34 // best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM 34 // best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM
35-#ifdef GNU_LIBICONV 35-#ifdef GNU_LIBICONV
36+#if defined(GNU_LIBICONV) || defined(__NetBSD__) 36+#if defined(GNU_LIBICONV) || defined(__NetBSD__)
37 // GNU doesn't disagree with POSIX :/ 37 // GNU doesn't disagree with POSIX :/
38 const char *inBytes = chars; 38 const char *inBytes = chars;
39 #else 39 #else
40@@ -305,7 +313,7 @@ QByteArray QIconvCodec::convertFromUnico 40@@ -311,7 +319,7 @@ static bool setByteOrder(iconv_t cd)
 41 size_t outBytesLeft = sizeof buf;
 42 size_t inBytesLeft = sizeof bom;
 43
 44-#if defined(GNU_LIBICONV)
 45+#if defined(GNU_LIBICONV) || defined(__NetBSD__)
 46 const char **inBytesPtr = const_cast<const char **>(&inBytes);
 47 #else
 48 char **inBytesPtr = &inBytes;
 49@@ -331,7 +339,7 @@ QByteArray QIconvCodec::convertFromUnico
41 char *outBytes; 50 char *outBytes;
42 size_t inBytesLeft; 51 size_t inBytesLeft;
43  52
44-#if defined(GNU_LIBICONV) 53-#if defined(GNU_LIBICONV)
45+#if defined(GNU_LIBICONV) || defined(__NetBSD__) 54+#if defined(GNU_LIBICONV) || defined(__NetBSD__)
46 const char **inBytesPtr = const_cast<const char **>(&inBytes); 55 const char **inBytesPtr = const_cast<const char **>(&inBytes);
47 #else 56 #else
48 char **inBytesPtr = &inBytes; 57 char **inBytesPtr = &inBytes;
49@@ -451,11 +459,13 @@ iconv_t QIconvCodec::createIconv_t(const 58@@ -468,11 +476,13 @@ iconv_t QIconvCodec::createIconv_t(const
50 static const char empty_codeset[] = ""; 59 static const char empty_codeset[] = "";
51 const char *codeset = empty_codeset; 60 const char *codeset = empty_codeset;
52 cd = iconv_open(to ? to : codeset, from ? from : codeset); 61 cd = iconv_open(to ? to : codeset, from ? from : codeset);
53+#elif defined(__NetBSD) 62+#elif defined(__NetBSD)
54+ const char *codeset = 0; 63+ const char *codeset = 0;
55 #else 64 #else
56 char *codeset = 0; 65 char *codeset = 0;
57 #endif 66 #endif
58  67
59-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF) 68-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)
60+#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__) 69+#if (defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)) || defined(Q_OS_NETBSD) || defined(__DragonFly__)
61 if (cd == (iconv_t) -1) { 70 if (cd == (iconv_t) -1) {
62 codeset = nl_langinfo(CODESET); 71 codeset = nl_langinfo(CODESET);
cvs diff -r1.10 -r1.11 pkgsrc/x11/qt4-libs/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-ag 2010/01/29 18:19:09 1.10
+++ pkgsrc/x11/qt4-libs/patches/patch-ag 2010/07/04 06:00:14 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-ag,v 1.10 2010/01/29 18:19:09 adam Exp $ 1$NetBSD: patch-ag,v 1.11 2010/07/04 06:00:14 adam Exp $
2 2
3--- qmake/project.cpp.orig 2010-01-15 17:01:30.000000000 +0000 3--- qmake/project.cpp.orig 2010-06-02 02:03:09.000000000 +0000
4+++ qmake/project.cpp 4+++ qmake/project.cpp
5@@ -1612,6 +1612,9 @@ QMakeProject::isActiveConfig(const QStri 5@@ -1614,6 +1614,9 @@ QMakeProject::isActiveConfig(const QStri
6 if(isForSymbian() && (x == "symbian" || x == "unix")) 6 if(isForSymbian() && (x == "symbian" || x == "unix"))
7 return true; 7 return true;
8  8
9+ if(x == "compile_libtool" && (vars["TEMPLATE"].first() == "app" || vars["TEMPLATE"].first() == "lib")) 9+ if(x == "compile_libtool" && (vars["TEMPLATE"].first() == "app" || vars["TEMPLATE"].first() == "lib"))
10+ return true; 10+ return true;
11+ 11+
12 //mkspecs 12 //mkspecs
13 if((Option::target_mode == Option::TARG_MACX_MODE || 13 if((Option::target_mode == Option::TARG_MACX_MODE ||
14 Option::target_mode == Option::TARG_UNIX_MODE) && x == "unix") 14 Option::target_mode == Option::TARG_UNIX_MODE) && x == "unix")
cvs diff -r1.6 -r1.7 pkgsrc/x11/qt4-libs/patches/patch-aq (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-aq 2010/01/29 18:19:09 1.6
+++ pkgsrc/x11/qt4-libs/patches/patch-aq 2010/07/04 06:00:14 1.7
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-aq,v 1.6 2010/01/29 18:19:09 adam Exp $ 1$NetBSD: patch-aq,v 1.7 2010/07/04 06:00:14 adam Exp $
2 2
3--- configure.orig 2010-01-15 17:01:30.000000000 +0000 3--- configure.orig 2010-06-02 02:03:10.000000000 +0000
4+++ configure 4+++ configure
5@@ -3069,7 +3069,7 @@ fi 5@@ -3071,7 +3071,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@@ -7012,7 +7012,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" 14@@ -7002,7 +7002,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
15 [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS" 15 [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS"
16 [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6" 16 [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6"
17 [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE" 17 [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE"
18-[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" 18-[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
19+#[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" 19+#[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
20  20
21 if [ "$PLATFORM_QWS" != "yes" ]; then 21 if [ "$PLATFORM_QWS" != "yes" ]; then
22 [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" 22 [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER"
cvs diff -r1.6 -r1.7 pkgsrc/x11/qt4-libs/patches/patch-ay (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-ay 2010/05/29 17:10:31 1.6
+++ pkgsrc/x11/qt4-libs/patches/patch-ay 2010/07/04 06:00:14 1.7
@@ -1,35 +1,35 @@ @@ -1,35 +1,35 @@
1$NetBSD: patch-ay,v 1.6 2010/05/29 17:10:31 adam Exp $ 1$NetBSD: patch-ay,v 1.7 2010/07/04 06:00:14 adam Exp $
2 2
3--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig 2010-02-11 15:55:20.000000000 +0000 3--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig 2010-06-02 02:03:12.000000000 +0000
4+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 4+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
5@@ -86,6 +86,13 @@ 5@@ -86,6 +86,13 @@
6 #define WTF_PLATFORM_OPENBSD 1 6 #define WTF_PLATFORM_OPENBSD 1
7 #endif 7 #endif
8  8
9+/* PLATFORM(DRAGONFLY) */ 9+/* PLATFORM(DRAGONFLY) */
10+/* Operating system level dependencies for OpenBSD systems that */ 10+/* Operating system level dependencies for OpenBSD systems that */
11+/* should be used regardless of operating environment */ 11+/* should be used regardless of operating environment */
12+#ifdef __DragonFly__ 12+#ifdef __DragonFly__
13+#define WTF_PLATFORM_DRAGONFLY 1 13+#define WTF_PLATFORM_DRAGONFLY 1
14+#endif 14+#endif
15+ 15+
16 /* PLATFORM(SOLARIS) */ 16 /* PLATFORM(SOLARIS) */
17 /* Operating system level dependencies for Solaris that should be used */ 17 /* Operating system level dependencies for Solaris that should be used */
18 /* regardless of operating environment */ 18 /* regardless of operating environment */
19@@ -141,6 +148,7 @@ 19@@ -141,6 +148,7 @@
20 /* should be used regardless of operating environment */ 20 /* should be used regardless of operating environment */
21 #if PLATFORM(DARWIN) \ 21 #if PLATFORM(DARWIN) \
22 || PLATFORM(FREEBSD) \ 22 || PLATFORM(FREEBSD) \
23+ || PLATFORM(DRAGONFLY) \ 23+ || PLATFORM(DRAGONFLY) \
24 || PLATFORM(SYMBIAN) \ 24 || PLATFORM(SYMBIAN) \
25 || PLATFORM(NETBSD) \ 25 || PLATFORM(NETBSD) \
26 || PLATFORM(SOLARIS) \ 26 || PLATFORM(SOLARIS) \
27@@ -718,7 +726,7 @@ 27@@ -723,7 +731,7 @@
28 #endif 28 #endif
29  29
30 #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) 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)) 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) 32+#if (PLATFORM(X86_64) && (PLATFORM(UNIX) || PLATFORM(WIN_OS))) || PLATFORM(IA64) || PLATFORM(ALPHA)
33 #define WTF_USE_JSVALUE64 1 33 #define WTF_USE_JSVALUE64 1
34 #elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64) 34 #elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64) || PLATFORM(ALPHA)
35 #define WTF_USE_JSVALUE64 1 35 #define WTF_USE_JSVALUE64 1
cvs diff -r1.1 -r1.2 pkgsrc/x11/qt4-libs/patches/patch-aw (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-aw 2010/01/29 18:19:09 1.1
+++ pkgsrc/x11/qt4-libs/patches/patch-aw 2010/07/04 06:00:14 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-aw,v 1.1 2010/01/29 18:19:09 adam Exp $ 1$NetBSD: patch-aw,v 1.2 2010/07/04 06:00:14 adam Exp $
2 2
3--- src/network/kernel/qhostinfo_unix.cpp.orig 2010-01-28 07:21:09.000000000 +0000 3--- src/network/kernel/qhostinfo_unix.cpp.orig 2010-06-02 02:03:17.000000000 +0000
4+++ src/network/kernel/qhostinfo_unix.cpp 4+++ src/network/kernel/qhostinfo_unix.cpp
5@@ -116,6 +116,8 @@ static void resolveLibrary() 5@@ -117,6 +117,8 @@ static void resolveLibrary()
6 if (!local_res_nclose) 6 if (!local_res_nclose)
7 local_res_ninit = 0; 7 local_res_ninit = 0;
8 } 8 }
9+ if (local_res_ninit) 9+ if (local_res_ninit)
10+ local_res_init = 0; 10+ local_res_init = 0;
11 #endif 11 #endif
12 } 12 }
13  13
cvs diff -r1.4 -r1.5 pkgsrc/x11/qt4-libs/patches/patch-ba (expand / switch to unified diff)

--- pkgsrc/x11/qt4-libs/patches/patch-ba 2010/04/16 11:45:27 1.4
+++ pkgsrc/x11/qt4-libs/patches/patch-ba 2010/07/04 06:00:14 1.5
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ba,v 1.4 2010/04/16 11:45:27 wiz Exp $ 1$NetBSD: patch-ba,v 1.5 2010/07/04 06:00:14 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-02-11 15:55:22.000000000 +0000 5--- src/gui/graphicsview/qgraphicsitem_p.h.orig 2010-06-02 02:03:15.000000000 +0000
6+++ src/gui/graphicsview/qgraphicsitem_p.h 6+++ src/gui/graphicsview/qgraphicsitem_p.h
7@@ -678,7 +678,7 @@ inline bool qt_closestItemFirst(const QG 7@@ -679,7 +679,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;
cvs diff -r1.2 -r1.3 pkgsrc/x11/qt4-mng/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-mng/Makefile 2010/06/13 22:45:51 1.2
+++ pkgsrc/x11/qt4-mng/Makefile 2010/07/04 06:00:14 1.3
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.2 2010/06/13 22:45:51 wiz Exp $ 1# $NetBSD: Makefile,v 1.3 2010/07/04 06:00:14 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"
6PKGREVISION= 1 
7 6
8PKGNAME= qt4-mng-${QTVERSION} 7PKGNAME= qt4-mng-${QTVERSION}
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}
cvs diff -r1.9 -r1.10 pkgsrc/x11/qt4-mysql/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-mysql/Makefile 2010/06/13 22:45:51 1.9
+++ pkgsrc/x11/qt4-mysql/Makefile 2010/07/04 06:00:14 1.10
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:51 wiz Exp $ 1# $NetBSD: Makefile,v 1.10 2010/07/04 06:00:14 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"
6PKGREVISION= 1 
7 6
8PKGNAME= qt4-mysql-${QTVERSION} 7PKGNAME= qt4-mysql-${QTVERSION}
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}
cvs diff -r1.16 -r1.17 pkgsrc/x11/qt4-pgsql/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-pgsql/Makefile 2010/06/13 22:45:51 1.16
+++ pkgsrc/x11/qt4-pgsql/Makefile 2010/07/04 06:00:14 1.17
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.16 2010/06/13 22:45:51 wiz Exp $ 1# $NetBSD: Makefile,v 1.17 2010/07/04 06:00:14 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"
6PKGREVISION= 1 
7 6
8PKGNAME= qt4-pgsql-${QTVERSION} 7PKGNAME= qt4-pgsql-${QTVERSION}
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}
cvs diff -r1.12 -r1.13 pkgsrc/x11/qt4-qdbus/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-qdbus/Makefile 2010/06/13 22:45:51 1.12
+++ pkgsrc/x11/qt4-qdbus/Makefile 2010/07/04 06:00:14 1.13
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.12 2010/06/13 22:45:51 wiz Exp $ 1# $NetBSD: Makefile,v 1.13 2010/07/04 06:00:14 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"
6PKGREVISION= 1 
7 6
8PKGNAME= qt4-qdbus-${QTVERSION} 7PKGNAME= qt4-qdbus-${QTVERSION}
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
cvs diff -r1.10 -r1.11 pkgsrc/x11/qt4-sqlite3/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-sqlite3/Makefile 2010/06/13 22:45:52 1.10
+++ pkgsrc/x11/qt4-sqlite3/Makefile 2010/07/04 06:00:15 1.11
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.10 2010/06/13 22:45:52 wiz Exp $ 1# $NetBSD: Makefile,v 1.11 2010/07/04 06:00:15 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"
6PKGREVISION= 1 
7 6
8PKGNAME= qt4-sqlite3-${QTVERSION} 7PKGNAME= qt4-sqlite3-${QTVERSION}
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}
cvs diff -r1.9 -r1.10 pkgsrc/x11/qt4-tiff/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-tiff/Makefile 2010/06/13 22:45:52 1.9
+++ pkgsrc/x11/qt4-tiff/Makefile 2010/07/04 06:00:15 1.10
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.9 2010/06/13 22:45:52 wiz Exp $ 1# $NetBSD: Makefile,v 1.10 2010/07/04 06:00:15 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"
6PKGREVISION= 1 
7 6
8PKGNAME= qt4-tiff-${QTVERSION} 7PKGNAME= qt4-tiff-${QTVERSION}
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}
cvs diff -r1.32 -r1.33 pkgsrc/x11/qt4-tools/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt4-tools/Makefile 2010/06/13 22:45:52 1.32
+++ pkgsrc/x11/qt4-tools/Makefile 2010/07/04 06:00:15 1.33
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.32 2010/06/13 22:45:52 wiz Exp $ 1# $NetBSD: Makefile,v 1.33 2010/07/04 06:00:15 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"
6PKGREVISION= 1 
7 6
8PKGNAME= qt4-tools-${QTVERSION} 7PKGNAME= qt4-tools-${QTVERSION}
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
cvs diff -r1.21 -r1.22 pkgsrc/x11/qt4-tools/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/qt4-tools/PLIST 2010/02/16 13:08:09 1.21
+++ pkgsrc/x11/qt4-tools/PLIST 2010/07/04 06:00:15 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.21 2010/02/16 13:08:09 adam Exp $ 1@comment $NetBSD: PLIST,v 1.22 2010/07/04 06:00:15 adam Exp $
2lib/pkgconfig/QtAssistantClient.pc 2lib/pkgconfig/QtAssistantClient.pc
3lib/pkgconfig/QtCLucene.pc 3lib/pkgconfig/QtCLucene.pc
4lib/pkgconfig/QtDesigner.pc 4lib/pkgconfig/QtDesigner.pc
5lib/pkgconfig/QtDesignerComponents.pc 5lib/pkgconfig/QtDesignerComponents.pc
6lib/pkgconfig/QtHelp.pc 6lib/pkgconfig/QtHelp.pc
7lib/pkgconfig/QtUiTools.pc 7lib/pkgconfig/QtUiTools.pc
8qt4/bin/assistant 8qt4/bin/assistant
9qt4/bin/assistant_adp 9qt4/bin/assistant_adp
10qt4/bin/designer 10qt4/bin/designer
11qt4/bin/linguist 11qt4/bin/linguist
12qt4/bin/lrelease 12qt4/bin/lrelease
13qt4/bin/lupdate 13qt4/bin/lupdate
14qt4/bin/pixeltool 14qt4/bin/pixeltool
@@ -203,26 +203,27 @@ qt4/mkspecs/features/qt.prf @@ -203,26 +203,27 @@ qt4/mkspecs/features/qt.prf
203qt4/mkspecs/features/qt_config.prf 203qt4/mkspecs/features/qt_config.prf
204qt4/mkspecs/features/qt_functions.prf 204qt4/mkspecs/features/qt_functions.prf
205qt4/mkspecs/features/qtestlib.prf 205qt4/mkspecs/features/qtestlib.prf
206qt4/mkspecs/features/qtopia.prf 206qt4/mkspecs/features/qtopia.prf
207qt4/mkspecs/features/qtopiainc.prf 207qt4/mkspecs/features/qtopiainc.prf
208qt4/mkspecs/features/qtopialib.prf 208qt4/mkspecs/features/qtopialib.prf
209qt4/mkspecs/features/release.prf 209qt4/mkspecs/features/release.prf
210qt4/mkspecs/features/resources.prf 210qt4/mkspecs/features/resources.prf
211qt4/mkspecs/features/shared.prf 211qt4/mkspecs/features/shared.prf
212qt4/mkspecs/features/silent.prf 212qt4/mkspecs/features/silent.prf
213qt4/mkspecs/features/static.prf 213qt4/mkspecs/features/static.prf
214qt4/mkspecs/features/static_and_shared.prf 214qt4/mkspecs/features/static_and_shared.prf
215qt4/mkspecs/features/staticlib.prf 215qt4/mkspecs/features/staticlib.prf
 216qt4/mkspecs/features/symbian/add_mmp_rules.prf
216qt4/mkspecs/features/symbian/application_icon.prf 217qt4/mkspecs/features/symbian/application_icon.prf
217qt4/mkspecs/features/symbian/armcc_warnings.prf 218qt4/mkspecs/features/symbian/armcc_warnings.prf
218qt4/mkspecs/features/symbian/data_caging_paths.prf 219qt4/mkspecs/features/symbian/data_caging_paths.prf
219qt4/mkspecs/features/symbian/def_files.prf 220qt4/mkspecs/features/symbian/def_files.prf
220qt4/mkspecs/features/symbian/def_files_disabled.prf 221qt4/mkspecs/features/symbian/def_files_disabled.prf
221qt4/mkspecs/features/symbian/default_post.prf 222qt4/mkspecs/features/symbian/default_post.prf
222qt4/mkspecs/features/symbian/default_pre.prf 223qt4/mkspecs/features/symbian/default_pre.prf
223qt4/mkspecs/features/symbian/epocallowdlldata.prf 224qt4/mkspecs/features/symbian/epocallowdlldata.prf
224qt4/mkspecs/features/symbian/moc.prf 225qt4/mkspecs/features/symbian/moc.prf
225qt4/mkspecs/features/symbian/platform_paths.prf 226qt4/mkspecs/features/symbian/platform_paths.prf
226qt4/mkspecs/features/symbian/qt.prf 227qt4/mkspecs/features/symbian/qt.prf
227qt4/mkspecs/features/symbian/stl.prf 228qt4/mkspecs/features/symbian/stl.prf
228qt4/mkspecs/features/symbian/stl_off.prf 229qt4/mkspecs/features/symbian/stl_off.prf
@@ -412,32 +413,34 @@ qt4/mkspecs/sco-g++/qplatformdefs.h @@ -412,32 +413,34 @@ qt4/mkspecs/sco-g++/qplatformdefs.h
412qt4/mkspecs/solaris-cc-64-stlport/qmake.conf 413qt4/mkspecs/solaris-cc-64-stlport/qmake.conf
413qt4/mkspecs/solaris-cc-64-stlport/qplatformdefs.h 414qt4/mkspecs/solaris-cc-64-stlport/qplatformdefs.h
414qt4/mkspecs/solaris-cc-64/qmake.conf 415qt4/mkspecs/solaris-cc-64/qmake.conf
415qt4/mkspecs/solaris-cc-64/qplatformdefs.h 416qt4/mkspecs/solaris-cc-64/qplatformdefs.h
416qt4/mkspecs/solaris-cc-stlport/qmake.conf 417qt4/mkspecs/solaris-cc-stlport/qmake.conf
417qt4/mkspecs/solaris-cc-stlport/qplatformdefs.h 418qt4/mkspecs/solaris-cc-stlport/qplatformdefs.h
418qt4/mkspecs/solaris-cc/qmake.conf 419qt4/mkspecs/solaris-cc/qmake.conf
419qt4/mkspecs/solaris-cc/qplatformdefs.h 420qt4/mkspecs/solaris-cc/qplatformdefs.h
420qt4/mkspecs/solaris-g++-64/qmake.conf 421qt4/mkspecs/solaris-g++-64/qmake.conf
421qt4/mkspecs/solaris-g++-64/qplatformdefs.h 422qt4/mkspecs/solaris-g++-64/qplatformdefs.h
422qt4/mkspecs/solaris-g++/qmake.conf 423qt4/mkspecs/solaris-g++/qmake.conf
423qt4/mkspecs/solaris-g++/qplatformdefs.h 424qt4/mkspecs/solaris-g++/qplatformdefs.h
424qt4/mkspecs/symbian-abld/qmake.conf 425qt4/mkspecs/symbian-abld/qmake.conf
 426qt4/mkspecs/symbian-abld/qplatformdefs.h
425qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm 427qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm
426qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm 428qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm
427qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm 429qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm
428qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm 430qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
429qt4/mkspecs/symbian-sbsv2/flm/qt/qt.xml 431qt4/mkspecs/symbian-sbsv2/flm/qt/qt.xml
430qt4/mkspecs/symbian-sbsv2/qmake.conf 432qt4/mkspecs/symbian-sbsv2/qmake.conf
 433qt4/mkspecs/symbian-sbsv2/qplatformdefs.h
431qt4/mkspecs/tru64-cxx/qmake.conf 434qt4/mkspecs/tru64-cxx/qmake.conf
432qt4/mkspecs/tru64-cxx/qplatformdefs.h 435qt4/mkspecs/tru64-cxx/qplatformdefs.h
433qt4/mkspecs/tru64-g++/qmake.conf 436qt4/mkspecs/tru64-g++/qmake.conf
434qt4/mkspecs/tru64-g++/qplatformdefs.h 437qt4/mkspecs/tru64-g++/qplatformdefs.h
435qt4/mkspecs/unixware-cc/qmake.conf 438qt4/mkspecs/unixware-cc/qmake.conf
436qt4/mkspecs/unixware-cc/qplatformdefs.h 439qt4/mkspecs/unixware-cc/qplatformdefs.h
437qt4/mkspecs/unixware-g++/qmake.conf 440qt4/mkspecs/unixware-g++/qmake.conf
438qt4/mkspecs/unixware-g++/qplatformdefs.h 441qt4/mkspecs/unixware-g++/qplatformdefs.h
439qt4/mkspecs/unsupported/linux-host-g++/qmake.conf 442qt4/mkspecs/unsupported/linux-host-g++/qmake.conf
440qt4/mkspecs/unsupported/linux-host-g++/qplatformdefs.h 443qt4/mkspecs/unsupported/linux-host-g++/qplatformdefs.h
441qt4/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf 444qt4/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf
442qt4/mkspecs/unsupported/linux-scratchbox2-g++/qplatformdefs.h 445qt4/mkspecs/unsupported/linux-scratchbox2-g++/qplatformdefs.h
443qt4/mkspecs/unsupported/qmake.conf 446qt4/mkspecs/unsupported/qmake.conf