summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11/qt4-libs/Makefile7
-rw-r--r--x11/qt4-libs/Makefile.common6
-rw-r--r--x11/qt4-libs/PLIST8
-rw-r--r--x11/qt4-libs/distinfo37
-rw-r--r--x11/qt4-libs/patches/patch-aa26
-rw-r--r--x11/qt4-libs/patches/patch-ab38
-rw-r--r--x11/qt4-libs/patches/patch-ac6
-rw-r--r--x11/qt4-libs/patches/patch-ad12
-rw-r--r--x11/qt4-libs/patches/patch-ae10
-rw-r--r--x11/qt4-libs/patches/patch-af12
-rw-r--r--x11/qt4-libs/patches/patch-ag6
-rw-r--r--x11/qt4-libs/patches/patch-aj8
-rw-r--r--x11/qt4-libs/patches/patch-ak6
-rw-r--r--x11/qt4-libs/patches/patch-al12
-rw-r--r--x11/qt4-libs/patches/patch-an13
-rw-r--r--x11/qt4-libs/patches/patch-ao28
-rw-r--r--x11/qt4-libs/patches/patch-aq10
-rw-r--r--x11/qt4-libs/patches/patch-ar6
-rw-r--r--x11/qt4-libs/patches/patch-as22
-rw-r--r--x11/qt4-libs/patches/patch-at13
-rw-r--r--x11/qt4-qdbus/Makefile7
-rw-r--r--x11/qt4-qdbus/PLIST61
-rw-r--r--x11/qt4-tools/Makefile17
-rw-r--r--x11/qt4-tools/PLIST137
-rw-r--r--x11/qt4/Makefile.common4
25 files changed, 312 insertions, 200 deletions
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index 942deabaadc..3dc83aa54de 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.23 2008/02/11 23:06:01 hubertf Exp $
+# $NetBSD: Makefile,v 1.24 2008/07/24 12:55:20 markd Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/qt4-libs/Makefile.common"
PKGNAME= qt4-libs-${QTVERSION}
-PKGREVISION= 2
COMMENT= C++ X GUI toolkit
BUILD_TARGET= sub-src
@@ -33,12 +32,12 @@ do-install:
.endfor
${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/uic3 \
${DESTDIR}${QTPREFIX}/bin
-.for incl in corelib gui network opengl qt3support sql svg xml script
+.for incl in corelib gui network opengl qt3support sql svg xml script testlib 3rdparty/webkit/WebCore
cd ${WRKSRC}/src/${incl} && env ${MAKE_ENV} ${INSTALL_ENV} \
${MAKE_PROGRAM} ${INSTALL_TARGET}
.endfor
cd ${DESTDIR}${PREFIX} && find qt4/include -type f -print > ${WRKDIR}/PLIST
-.for lib in Qt3Support QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml QtScript
+.for lib in Qt3Support QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml QtScript QtTest QtWebKit
${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \
${DESTDIR}${QTPREFIX}/lib/
sed -e "s:${WRKSRC}:${QTPREFIX}:g" \
diff --git a/x11/qt4-libs/Makefile.common b/x11/qt4-libs/Makefile.common
index 7f4c69b9208..0a5c2598847 100644
--- a/x11/qt4-libs/Makefile.common
+++ b/x11/qt4-libs/Makefile.common
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile.common,v 1.9 2008/06/12 12:50:19 abs Exp $
+# $NetBSD: Makefile.common,v 1.10 2008/07/24 12:55:20 markd Exp $
# used by x11/qt4-libs/Makefile
DISTNAME= qt-x11-opensource-src-${QTVERSION}
CATEGORIES= x11
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
ftp://ftp.bero.org/pub/qt/source/
+EXTRACT_SUFX= .tar.bz2
.include "../../x11/qt4/Makefile.common"
@@ -27,6 +28,9 @@ CONFIGURE_ARGS+= -system-libpng
CONFIGURE_ARGS+= -system-zlib
CONFIGURE_ARGS+= -qt-gif # qt4 does not write compressed GIFs
CONFIGURE_ARGS+= ${CFLAGS:M-I*} ${LDFLAGS:M-L*} ${LDFLAGS:M-Wl*:S/-Wl,//}
+# current WebKit fails for missing pthread_getattr_np() in
+# src/3rdparty/webkit/JavaScriptCore/kjs/collector.cpp
+#CONFIGURE_ARGS+= -no-webkit
CONFIGURE_ARGS.SunOS+= -no-xrender
OPSYSVARS+= CONFIGURE_ARGS
CONFIGURE_ARGS+= < ${FILESDIR}/license-acceptance
diff --git a/x11/qt4-libs/PLIST b/x11/qt4-libs/PLIST
index 7ccd568773c..048265f64ea 100644
--- a/x11/qt4-libs/PLIST
+++ b/x11/qt4-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/12/12 09:53:46 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2008/07/24 12:55:20 markd Exp $
lib/pkgconfig/Qt3Support.pc
lib/pkgconfig/QtCore.pc
lib/pkgconfig/QtGui.pc
@@ -7,6 +7,8 @@ lib/pkgconfig/QtOpenGL.pc
lib/pkgconfig/QtScript.pc
lib/pkgconfig/QtSql.pc
lib/pkgconfig/QtSvg.pc
+lib/pkgconfig/QtTest.pc
+lib/pkgconfig/QtWebKit.pc
lib/pkgconfig/QtXml.pc
qt4/bin/moc
qt4/bin/rcc
@@ -20,6 +22,8 @@ qt4/lib/libQtOpenGL.la
qt4/lib/libQtScript.la
qt4/lib/libQtSql.la
qt4/lib/libQtSvg.la
+qt4/lib/libQtTest.la
+qt4/lib/libQtWebKit.la
qt4/lib/libQtXml.la
qt4/plugins/accessible/libqtaccessiblecompatwidgets.la
qt4/plugins/accessible/libqtaccessiblewidgets.la
@@ -32,6 +36,8 @@ qt4/q3porting.xml
@dirrm qt4/plugins
@dirrm qt4/lib
@dirrm qt4/include/QtXml
+@dirrm qt4/include/QtWebKit
+@dirrm qt4/include/QtTest
@dirrm qt4/include/QtSvg
@dirrm qt4/include/QtSql
@dirrm qt4/include/QtScript
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index e5cc7036a96..907775f54e8 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,23 +1,24 @@
-$NetBSD: distinfo,v 1.22 2008/05/13 18:35:19 drochner Exp $
+$NetBSD: distinfo,v 1.23 2008/07/24 12:55:20 markd Exp $
-SHA1 (qt-x11-opensource-src-4.3.3.tar.gz) = 77d00e2438efa793f6c16c54b64c8ba440ee3228
-RMD160 (qt-x11-opensource-src-4.3.3.tar.gz) = 410daca03b6802ba5cc6662219c2ba7a190bd292
-Size (qt-x11-opensource-src-4.3.3.tar.gz) = 42341802 bytes
-SHA1 (patch-aa) = 671cf6bdcabc0919a0e0c80a2b82734a85b58757
-SHA1 (patch-ab) = c2a9c3b51a1afa3080aed5ef8fb91032c4dc53c1
-SHA1 (patch-ac) = 766ca4aba25029765f83c8a72873b603864ea821
-SHA1 (patch-ad) = fa55c0803316acf11856fdfd11b360a169fb27de
-SHA1 (patch-ae) = 497966ec97e941f7d9140a6993bed44c3037ff74
-SHA1 (patch-af) = 416f8154074b561e57b87e45ef2f67d3b1caf711
-SHA1 (patch-ag) = 7b2186277bbdccf55468c469cc7505574b7f18ad
+SHA1 (qt-x11-opensource-src-4.4.0.tar.bz2) = 71acc53f5ec7bdc6abbc85409568d0d006a040e3
+RMD160 (qt-x11-opensource-src-4.4.0.tar.bz2) = ddcfe3390e65761a45a6112a8466b3b1e22cc584
+Size (qt-x11-opensource-src-4.4.0.tar.bz2) = 98584925 bytes
+SHA1 (patch-aa) = c1b203fc294dacc18443f0035435b30fa5b8d884
+SHA1 (patch-ab) = 08203775d62d2397b3d120009c448683208bea6f
+SHA1 (patch-ac) = baab52ce87e4dcf11ae76b56851e92f58455d94b
+SHA1 (patch-ad) = 2da97a6eba43e43396c335210b5a66d5e895b660
+SHA1 (patch-ae) = 02f17681f1e9b42a88dbb14e7904eca7bd91eeb4
+SHA1 (patch-af) = b43a2e4b92435f9b7a7e5b46821e2943c343a7f4
+SHA1 (patch-ag) = 62e37b973c7709e917092a7601094d46ac37d4ac
SHA1 (patch-ah) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
SHA1 (patch-ai) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
-SHA1 (patch-aj) = e9ca9544f929bb4adf3ccb0ca2cad9352124289d
-SHA1 (patch-ak) = bd5d0f766a6ddcd801b94b4387d19b62edc8e4e1
-SHA1 (patch-al) = 606610ee684836d14e5893d295c0b131beeb9605
+SHA1 (patch-aj) = aabfd55bf93d61db29aefab33040fff6dcb18615
+SHA1 (patch-ak) = ab61338af77848f346dcf3351f87e3ec9dd3af5c
+SHA1 (patch-al) = 7424cb5c11fd035afa7c353389d9af940e0b9141
SHA1 (patch-am) = 0d4a4f2767cad5414c8bfe4dc8485064a9be4381
-SHA1 (patch-an) = 6c9044134516d089e97b47a2750beab0e4c4952f
-SHA1 (patch-ao) = 44d5b5830b237d6e71fc83444029461bace15081
+SHA1 (patch-ao) = 610051176bd491e2aa8cb562d6f9d36a8a38798b
SHA1 (patch-ap) = 99402ac9ef527e7fa9b1825c8e1b8a299bc4ffe7
-SHA1 (patch-aq) = afdc1fcacc6f2f421a209d96d2c80141f1aa6dc3
-SHA1 (patch-ar) = 7ed6f3e8db11e15c907eeeb11f691612633f1c34
+SHA1 (patch-aq) = b26e4a3e099bc4710728e30972ad1d74e05964f4
+SHA1 (patch-ar) = d690a582dd3dfb16fe17938c77a01940df1e7c8f
+SHA1 (patch-as) = 614250b087b195c38979f6aa9c000d3d742f544e
+SHA1 (patch-at) = a3b0a81abef7a209cd6a71322eff6771bf0f9c2e
diff --git a/x11/qt4-libs/patches/patch-aa b/x11/qt4-libs/patches/patch-aa
index b61e97c866b..3c8399743e4 100644
--- a/x11/qt4-libs/patches/patch-aa
+++ b/x11/qt4-libs/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2007/10/13 12:02:14 adam Exp $
+$NetBSD: patch-aa,v 1.7 2008/07/24 12:55:20 markd Exp $
---- qmake/generators/unix/unixmake2.cpp.orig 2007-10-01 15:06:33.000000000 +0200
+--- qmake/generators/unix/unixmake2.cpp.orig 2008-04-28 15:11:14.000000000 +0200
+++ qmake/generators/unix/unixmake2.cpp
-@@ -227,6 +227,8 @@ UnixMakefileGenerator::writeMakeParts(QT
+@@ -234,6 +234,8 @@ UnixMakefileGenerator::writeMakeParts(QT
if(!project->isEmpty("QMAKE_BUNDLE")) {
t << "TARGETD = " << escapeFilePath(var("TARGET_x.y")) << endl;
t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl;
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.6 2007/10/13 12:02:14 adam Exp $
} else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
t << "TARGETD = " << escapeFilePath(var("TARGET_x.y.z")) << endl;
t << "TARGET0 = " << escapeFilePath(var("TARGET_")) << endl;
-@@ -977,8 +979,12 @@ void UnixMakefileGenerator::init2()
+@@ -984,8 +986,12 @@ void UnixMakefileGenerator::init2()
} else if (project->isActiveConfig("staticlib")) {
project->values("TARGET").first().prepend("lib");
project->values("TARGET").first() += ".a";
@@ -25,12 +25,12 @@ $NetBSD: patch-aa,v 1.6 2007/10/13 12:02:14 adam Exp $
} else {
project->values("TARGETA").append(project->first("DESTDIR") + "lib" + project->first("TARGET") + ".a");
if(project->isActiveConfig("compile_libtool"))
-@@ -1413,7 +1419,7 @@ UnixMakefileGenerator::writePkgConfigFil
- else
- libs << "QMAKE_LIBS"; //obvious one
- libs << "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread?
-- t << "Libs: -L${libdir} -l" << lname.left(lname.length()-Option::libtool_ext.length()) << " ";
-+ t << "Libs: -Wl,-R${libdir} -L${libdir} -l" << lname.left(lname.length()-Option::libtool_ext.length()) << " ";
- for(QStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it)
- t << project->values((*it)).join(" ") << " ";
- t << endl;
+@@ -1436,7 +1442,7 @@ UnixMakefileGenerator::writePkgConfigFil
+ bundle = bundle.left(suffix);
+ pkgConfiglibName = "-framework " + bundle + " ";
+ } else {
+- pkgConfiglibDir = "-L${libdir}";
++ pkgConfiglibDir = "-Wl,-R${libdir} -L${libdir}";
+ pkgConfiglibName = "-l" + lname.left(lname.length()-Option::libtool_ext.length());
+ }
+ t << pkgConfiglibDir << " " << pkgConfiglibName << " ";
diff --git a/x11/qt4-libs/patches/patch-ab b/x11/qt4-libs/patches/patch-ab
index e32265bd9a5..71ac94e7bbf 100644
--- a/x11/qt4-libs/patches/patch-ab
+++ b/x11/qt4-libs/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2007/09/03 09:35:16 drochner Exp $
+$NetBSD: patch-ab,v 1.6 2008/07/24 12:55:20 markd Exp $
---- src/gui/painting/painting.pri.orig 2007-08-07 15:08:41.000000000 +0200
+--- src/gui/painting/painting.pri.orig 2008-04-28 15:11:18.000000000 +0200
+++ src/gui/painting/painting.pri
-@@ -182,11 +182,11 @@ mac {
+@@ -197,11 +197,11 @@ mac {
win32-g++|!win32:!*-icc* {
mmx {
-- mmx_compiler.commands = $$QMAKE_CXX -c
-+ mmx_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+- mmx_compiler.commands = $$QMAKE_CXX -c -Winline
++ mmx_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
mmx_compiler.commands += -mmmx
mmx_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
mmx_compiler.dependency_type = TYPE_C
@@ -16,12 +16,12 @@ $NetBSD: patch-ab,v 1.5 2007/09/03 09:35:16 drochner Exp $
mmx_compiler.input = MMX_SOURCES
mmx_compiler.variable_out = OBJECTS
mmx_compiler.name = compiling[mmx] ${QMAKE_FILE_IN}
-@@ -194,22 +194,22 @@ mac {
+@@ -209,22 +209,22 @@ mac {
QMAKE_EXTRA_COMPILERS += mmx_compiler
}
3dnow {
-- mmx3dnow_compiler.commands = $$QMAKE_CXX -c
-+ mmx3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+- mmx3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
++ mmx3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
mmx3dnow_compiler.commands += -m3dnow -mmmx
mmx3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
mmx3dnow_compiler.dependency_type = TYPE_C
@@ -33,8 +33,8 @@ $NetBSD: patch-ab,v 1.5 2007/09/03 09:35:16 drochner Exp $
silent:mmx3dnow_compiler.commands = @echo compiling[mmx3dnow] ${QMAKE_FILE_IN} && $$mmx3dnow_compiler.commands
QMAKE_EXTRA_COMPILERS += mmx3dnow_compiler
sse {
-- sse3dnow_compiler.commands = $$QMAKE_CXX -c
-+ sse3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+- sse3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
++ sse3dnow_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
sse3dnow_compiler.commands += -m3dnow -msse
sse3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
sse3dnow_compiler.dependency_type = TYPE_C
@@ -43,12 +43,12 @@ $NetBSD: patch-ab,v 1.5 2007/09/03 09:35:16 drochner Exp $
sse3dnow_compiler.input = SSE3DNOW_SOURCES
sse3dnow_compiler.variable_out = OBJECTS
sse3dnow_compiler.name = compiling[sse3dnow] ${QMAKE_FILE_IN}
-@@ -218,11 +218,11 @@ mac {
+@@ -233,11 +233,11 @@ mac {
}
}
sse {
-- sse_compiler.commands = $$QMAKE_CXX -c
-+ sse_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+- sse_compiler.commands = $$QMAKE_CXX -c -Winline
++ sse_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
sse_compiler.commands += -msse
sse_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
sse_compiler.dependency_type = TYPE_C
@@ -57,12 +57,12 @@ $NetBSD: patch-ab,v 1.5 2007/09/03 09:35:16 drochner Exp $
sse_compiler.input = SSE_SOURCES
sse_compiler.variable_out = OBJECTS
sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN}
-@@ -230,11 +230,11 @@ mac {
+@@ -245,11 +245,11 @@ mac {
QMAKE_EXTRA_COMPILERS += sse_compiler
}
sse2 {
-- sse2_compiler.commands = $$QMAKE_CXX -c
-+ sse2_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+- sse2_compiler.commands = $$QMAKE_CXX -c -Winline
++ sse2_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
sse2_compiler.commands += -msse2
sse2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
sse2_compiler.dependency_type = TYPE_C
@@ -71,12 +71,12 @@ $NetBSD: patch-ab,v 1.5 2007/09/03 09:35:16 drochner Exp $
sse2_compiler.input = SSE2_SOURCES
sse2_compiler.variable_out = OBJECTS
sse2_compiler.name = compiling[sse2] ${QMAKE_FILE_IN}
-@@ -242,11 +242,11 @@ mac {
+@@ -257,11 +257,11 @@ mac {
QMAKE_EXTRA_COMPILERS += sse2_compiler
}
iwmmxt {
-- iwmmxt_compiler.commands = $$QMAKE_CXX -c
-+ iwmmxt_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c
+- iwmmxt_compiler.commands = $$QMAKE_CXX -c -Winline
++ iwmmxt_compiler.commands = ${LIBTOOL} --mode=compile $$QMAKE_CXX -c -Winline
iwmmxt_compiler.commands += -mcpu=iwmmxt
iwmmxt_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
iwmmxt_compiler.dependency_type = TYPE_C
diff --git a/x11/qt4-libs/patches/patch-ac b/x11/qt4-libs/patches/patch-ac
index 139af1922f5..bfc445e7962 100644
--- a/x11/qt4-libs/patches/patch-ac
+++ b/x11/qt4-libs/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/02/20 12:08:15 adam Exp $
+$NetBSD: patch-ac,v 1.2 2008/07/24 12:55:20 markd Exp $
---- tools/designer/src/designer/designer.pro.orig 2006-01-30 15:07:57.000000000 +0100
+--- tools/designer/src/designer/designer.pro.orig 2008-04-28 15:11:20.000000000 +0200
+++ tools/designer/src/designer/designer.pro
-@@ -14,7 +14,7 @@ INCLUDEPATH += \
+@@ -13,7 +13,7 @@ INCLUDEPATH += \
../lib/uilib \
extra
diff --git a/x11/qt4-libs/patches/patch-ad b/x11/qt4-libs/patches/patch-ad
index 0e4880a9001..a8b57813291 100644
--- a/x11/qt4-libs/patches/patch-ad
+++ b/x11/qt4-libs/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.6 2007/10/13 12:02:14 adam Exp $
+$NetBSD: patch-ad,v 1.7 2008/07/24 12:55:20 markd Exp $
---- src/corelib/global/qglobal.h.orig 2007-10-01 15:06:02.000000000 +0200
+--- src/corelib/global/qglobal.h.orig 2008-04-28 15:11:18.000000000 +0200
+++ src/corelib/global/qglobal.h
-@@ -74,6 +74,7 @@
+@@ -155,6 +155,7 @@ namespace QT_NAMESPACE {}
NETBSD - NetBSD
OPENBSD - OpenBSD
BSDI - BSD/OS
@@ -10,7 +10,7 @@ $NetBSD: patch-ad,v 1.6 2007/10/13 12:02:14 adam Exp $
IRIX - SGI Irix
OSF - HP Tru64 UNIX
SCO - SCO OpenServer 5
-@@ -131,6 +132,9 @@
+@@ -216,6 +217,9 @@ namespace QT_NAMESPACE {}
#elif defined(__NetBSD__)
# define Q_OS_NETBSD
# define Q_OS_BSD4
@@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.6 2007/10/13 12:02:14 adam Exp $
#elif defined(__OpenBSD__)
# define Q_OS_OPENBSD
# define Q_OS_BSD4
-@@ -173,8 +177,6 @@
+@@ -258,8 +262,6 @@ namespace QT_NAMESPACE {}
#endif
#if defined(Q_OS_DARWIN)
@@ -29,7 +29,7 @@ $NetBSD: patch-ad,v 1.6 2007/10/13 12:02:14 adam Exp $
# if defined(Q_OS_DARWIN64)
# define Q_OS_MAC64
# elif defined(Q_OS_DARWIN32)
-@@ -584,8 +586,6 @@
+@@ -705,8 +707,6 @@ namespace QT_NAMESPACE {}
# error "Qt does not work with OS/2 Presentation Manager or Workplace Shell"
#elif defined(Q_OS_UNIX)
# if defined(Q_OS_MAC) && !defined(__USE_WS_X11__) && !defined(Q_WS_QWS)
diff --git a/x11/qt4-libs/patches/patch-ae b/x11/qt4-libs/patches/patch-ae
index 6e566ade1ef..d7e7ce273cb 100644
--- a/x11/qt4-libs/patches/patch-ae
+++ b/x11/qt4-libs/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.4 2007/10/13 12:02:14 adam Exp $
+$NetBSD: patch-ae,v 1.5 2008/07/24 12:55:20 markd Exp $
---- qmake/generators/unix/unixmake.cpp.orig 2007-10-01 15:06:33.000000000 +0200
+--- qmake/generators/unix/unixmake.cpp.orig 2008-04-28 15:11:14.000000000 +0200
+++ qmake/generators/unix/unixmake.cpp
-@@ -310,27 +310,29 @@ UnixMakefileGenerator::init()
+@@ -320,27 +320,29 @@ UnixMakefileGenerator::init()
if(libtoolify[i].startsWith("QMAKE_LINK") || libtoolify[i] == "QMAKE_AR_CMD") {
libtool_flags += " --mode=link";
if(project->isActiveConfig("staticlib")) {
@@ -42,7 +42,7 @@ $NetBSD: patch-ae,v 1.4 2007/10/13 12:02:14 adam Exp $
} else {
libtool_flags += " --mode=compile";
}
-@@ -658,7 +660,6 @@ UnixMakefileGenerator::defaultInstall(co
+@@ -668,7 +670,6 @@ UnixMakefileGenerator::defaultInstall(co
QString targetdir = Option::fixPathToTargetOS(project->first("target.path"), false);
if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep)
destdir += Option::dir_sep;
@@ -50,7 +50,7 @@ $NetBSD: patch-ae,v 1.4 2007/10/13 12:02:14 adam Exp $
if(targetdir.right(1) != Option::dir_sep)
targetdir += Option::dir_sep;
-@@ -696,10 +697,14 @@ UnixMakefileGenerator::defaultInstall(co
+@@ -706,10 +707,14 @@ UnixMakefileGenerator::defaultInstall(co
QString src_targ = target;
if(src_targ == "$(TARGET)")
src_targ = "$(TARGETL)";
diff --git a/x11/qt4-libs/patches/patch-af b/x11/qt4-libs/patches/patch-af
index 4c4f196de0e..ed1b40a4931 100644
--- a/x11/qt4-libs/patches/patch-af
+++ b/x11/qt4-libs/patches/patch-af
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.4 2007/10/13 12:02:14 adam Exp $
+$NetBSD: patch-af,v 1.5 2008/07/24 12:55:20 markd Exp $
---- qmake/Makefile.unix.orig 2007-10-01 15:06:01.000000000 +0200
+--- qmake/Makefile.unix.orig 2008-04-28 15:11:14.000000000 +0200
+++ qmake/Makefile.unix
@@ -3,7 +3,7 @@ BUILD_PATH = @BUILD_PATH@
QTOBJS = @QMAKE_QTOBJS@
@@ -11,16 +11,16 @@ $NetBSD: patch-af,v 1.4 2007/10/13 12:02:14 adam Exp $
#qmake code
OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o \
-@@ -80,7 +80,7 @@ DEPEND_SRC=project.cpp property.cpp meta
- $(SOURCE_PATH)/src/script/qscriptvalue.cpp $(SOURCE_PATH)/src/script/qscriptvalueiterator.cpp \
+@@ -88,7 +88,7 @@ DEPEND_SRC=project.cpp property.cpp meta
+ $(SOURCE_PATH)/src/script/qscriptstring.cpp \
$(QTSRCS)
-CPPFLAGS = -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
+CPPFLAGS += -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
- -I$(SOURCE_PATH)/src/corelib/arch/generic -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
+ -I$(BUILD_PATH)/include -I$(BUILD_PATH)/include/QtCore \
-I$(SOURCE_PATH)/include -I$(SOURCE_PATH)/include/QtCore -I$(BUILD_PATH)/src/corelib/global \
-I$(SOURCE_PATH)/src/script -DQT_NO_PCRE \
-@@ -88,7 +88,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators
+@@ -96,7 +96,7 @@ CPPFLAGS = -I. -Igenerators -Igenerators
-DQT_NO_COMPRESS -I$(QMAKESPEC) -DHAVE_QCONFIG_CPP -DQT_NO_THREAD -DQT_NO_QOBJECT \
-DQT_NO_GEOM_VARIANT $(OPENSOURCE_CXXFLAGS)
diff --git a/x11/qt4-libs/patches/patch-ag b/x11/qt4-libs/patches/patch-ag
index dde0591633b..21465e8aff7 100644
--- a/x11/qt4-libs/patches/patch-ag
+++ b/x11/qt4-libs/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.6 2007/10/13 12:02:14 adam Exp $
+$NetBSD: patch-ag,v 1.7 2008/07/24 12:55:20 markd Exp $
---- qmake/project.cpp.orig 2007-10-01 15:06:01.000000000 +0200
+--- qmake/project.cpp.orig 2008-04-28 15:11:14.000000000 +0200
+++ qmake/project.cpp
-@@ -1601,6 +1601,9 @@ QMakeProject::isActiveConfig(const QStri
+@@ -1617,6 +1617,9 @@ QMakeProject::isActiveConfig(const QStri
else if(x == "false")
return false;
diff --git a/x11/qt4-libs/patches/patch-aj b/x11/qt4-libs/patches/patch-aj
index 32b0f742132..ffeaef95a1b 100644
--- a/x11/qt4-libs/patches/patch-aj
+++ b/x11/qt4-libs/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.4 2007/12/02 12:55:11 wiz Exp $
+$NetBSD: patch-aj,v 1.5 2008/07/24 12:55:20 markd Exp $
---- mkspecs/netbsd-g++/qplatformdefs.h.orig 2007-10-01 15:05:54.000000000 +0200
+--- mkspecs/netbsd-g++/qplatformdefs.h.orig 2008-04-28 15:11:14.000000000 +0200
+++ mkspecs/netbsd-g++/qplatformdefs.h
-@@ -62,6 +62,7 @@
+@@ -67,6 +67,7 @@
#include <sys/types.h>
#include <sys/ioctl.h>
#include <sys/ipc.h>
@@ -10,7 +10,7 @@ $NetBSD: patch-aj,v 1.4 2007/12/02 12:55:11 wiz Exp $
#include <sys/time.h>
#include <sys/shm.h>
#include <sys/socket.h>
-@@ -123,10 +124,14 @@
+@@ -128,10 +129,14 @@
#define QT_SNPRINTF ::snprintf
#define QT_VSNPRINTF ::vsnprintf
diff --git a/x11/qt4-libs/patches/patch-ak b/x11/qt4-libs/patches/patch-ak
index 4a29e8c90e4..8f66b0389cf 100644
--- a/x11/qt4-libs/patches/patch-ak
+++ b/x11/qt4-libs/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.2 2007/10/13 12:02:14 adam Exp $
+$NetBSD: patch-ak,v 1.3 2008/07/24 12:55:20 markd Exp $
---- src/gui/kernel/qcursor_x11.cpp.orig 2007-10-01 15:06:12.000000000 +0200
+--- src/gui/kernel/qcursor_x11.cpp.orig 2008-04-28 15:11:18.000000000 +0200
+++ src/gui/kernel/qcursor_x11.cpp
-@@ -254,7 +254,7 @@ void QCursorData::update()
+@@ -263,7 +263,7 @@ void QCursorData::update()
return;
}
diff --git a/x11/qt4-libs/patches/patch-al b/x11/qt4-libs/patches/patch-al
index d0393460359..388dad53cc7 100644
--- a/x11/qt4-libs/patches/patch-al
+++ b/x11/qt4-libs/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.3 2007/10/13 12:02:15 adam Exp $
+$NetBSD: patch-al,v 1.4 2008/07/24 12:55:20 markd Exp $
---- src/corelib/io/qsettings.cpp.orig 2007-10-01 15:06:03.000000000 +0200
+--- src/corelib/io/qsettings.cpp.orig 2008-04-28 15:11:18.000000000 +0200
+++ src/corelib/io/qsettings.cpp
-@@ -120,9 +120,16 @@ inline bool qt_isEvilFsTypeName(const ch
+@@ -130,9 +130,16 @@ QT_END_INCLUDE_NAMESPACE
static bool isLikelyToBeNfs(int handle)
{
@@ -19,12 +19,12 @@ $NetBSD: patch-al,v 1.3 2007/10/13 12:02:15 adam Exp $
return qt_isEvilFsTypeName(buf.f_fstypename);
}
-@@ -150,7 +157,7 @@ static bool isLikelyToBeNfs(int handle)
+@@ -162,7 +169,7 @@ static bool isLikelyToBeNfs(int handle)
#elif defined(Q_OS_SOLARIS) || defined(Q_OS_IRIX) || defined(Q_OS_AIX) || defined(Q_OS_HPUX) \
|| defined(Q_OS_OSF) || defined(Q_OS_QNX) || defined(Q_OS_QNX6) || defined(Q_OS_SCO) \
- || defined(Q_OS_UNIXWARE) || defined(Q_OS_RELIANT) || defined(Q_OS_NETBSD)
+ || defined(Q_OS_UNIXWARE) || defined(Q_OS_RELIANT)
+ QT_BEGIN_INCLUDE_NAMESPACE
# include <sys/statvfs.h>
-
- static bool isLikelyToBeNfs(int handle)
+ QT_END_INCLUDE_NAMESPACE
diff --git a/x11/qt4-libs/patches/patch-an b/x11/qt4-libs/patches/patch-an
deleted file mode 100644
index 6e63da73f78..00000000000
--- a/x11/qt4-libs/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.3 2008/01/07 21:09:05 ghen Exp $
-
---- src/script/qscriptlexer.cpp.orig 2007-12-04 17:43:06.000000000 +0100
-+++ src/script/qscriptlexer.cpp
-@@ -704,7 +704,7 @@ int QScript::Lexer::lex()
-
- double dval = 0;
- if (state == Number) {
--#if defined(Q_WS_WIN) || defined(Q_OS_SOLARIS) || defined(Q_OS_IRIX) || defined(Q_CC_HPACC) || defined(Q_OS_AIX) || defined(Q_OS_OPENBSD)
-+#if defined(Q_WS_WIN) || defined(Q_OS_SOLARIS) || defined(Q_OS_IRIX) || defined(Q_CC_HPACC) || defined(Q_OS_AIX) || defined(Q_OS_OPENBSD) || defined(__DragonFly__) || ( defined(Q_OS_NETBSD) && (__NetBSD_Version__ < 400000000) )
- // ### This may cause autotest failure, but that's just plain weird...
- dval = strtod(buffer8, 0L);
- #else
diff --git a/x11/qt4-libs/patches/patch-ao b/x11/qt4-libs/patches/patch-ao
index 7eebb7fd8ff..c7ad8159942 100644
--- a/x11/qt4-libs/patches/patch-ao
+++ b/x11/qt4-libs/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.3 2008/05/13 18:35:19 drochner Exp $
+$NetBSD: patch-ao,v 1.4 2008/07/24 12:55:20 markd Exp $
---- src/corelib/codecs/qiconvcodec.cpp.orig 2007-12-04 18:42:55 +0200
-+++ src/corelib/codecs/qiconvcodec.cpp 2008-05-13 09:47:40 +0300
-@@ -43,9 +43,14 @@
+--- src/corelib/codecs/qiconvcodec.cpp.orig 2008-04-28 15:11:18.000000000 +0200
++++ src/corelib/codecs/qiconvcodec.cpp
+@@ -50,9 +50,14 @@
#include <stdio.h>
#include <dlfcn.h>
@@ -18,17 +18,17 @@ $NetBSD: patch-ao,v 1.3 2008/05/13 18:35:19 drochner Exp $
# include <langinfo.h>
#endif
-@@ -55,6 +60,9 @@
- #elif defined(Q_OS_AIX)
- # define NO_BOM
- # define UTF16 "UCS-2"
-+#elif defined(__DragonFly__) && __DragonFly_version < 197700
+@@ -69,6 +74,9 @@
+ # else
+ # define UTF16 "UTF-16LE"
+ # endif
++#elif defined(__DragonFly__) && __DragonFly_version__ < 197700
+# define NO_BOM
+# define UTF16 "UTF-16"
#else
# define UTF16 "UTF-16"
#endif
-@@ -129,7 +137,7 @@ QString QIconvCodec::convertToUnicode(co
+@@ -146,7 +154,7 @@ QString QIconvCodec::convertToUnicode(co
QByteArray ba;
size_t outBytesLeft = len * 2 + 2;
ba.resize(outBytesLeft);
@@ -37,7 +37,7 @@ $NetBSD: patch-ao,v 1.3 2008/05/13 18:35:19 drochner Exp $
// GNU doesn't disagree with POSIX :/
const char *inBytes = chars;
#else
-@@ -189,7 +197,7 @@ QByteArray QIconvCodec::convertFromUnico
+@@ -206,7 +214,7 @@ QByteArray QIconvCodec::convertFromUnico
ba.resize(outBytesLeft);
char *outBytes = ba.data();
@@ -46,7 +46,7 @@ $NetBSD: patch-ao,v 1.3 2008/05/13 18:35:19 drochner Exp $
const char *inBytes;
#else
char *inBytes;
-@@ -199,7 +207,7 @@ QByteArray QIconvCodec::convertFromUnico
+@@ -216,7 +224,7 @@ QByteArray QIconvCodec::convertFromUnico
#if !defined(NO_BOM)
// give iconv() a BOM
QChar bom[] = { QChar(QChar::ByteOrderMark) };
@@ -55,7 +55,7 @@ $NetBSD: patch-ao,v 1.3 2008/05/13 18:35:19 drochner Exp $
// GNU doesn't disagree with POSIX :/
inBytes = reinterpret_cast<const char *>(bom);
#else
-@@ -213,7 +221,7 @@ QByteArray QIconvCodec::convertFromUnico
+@@ -230,7 +238,7 @@ QByteArray QIconvCodec::convertFromUnico
#endif // NO_BOM
// now feed iconv() the real data
@@ -64,7 +64,7 @@ $NetBSD: patch-ao,v 1.3 2008/05/13 18:35:19 drochner Exp $
// GNU doesn't disagree with POSIX :/
inBytes = reinterpret_cast<const char *>(uc);
#else
-@@ -278,7 +286,7 @@ iconv_t QIconvCodec::createIconv_t(const
+@@ -296,7 +304,7 @@ iconv_t QIconvCodec::createIconv_t(const
char *codeset = 0;
#endif
diff --git a/x11/qt4-libs/patches/patch-aq b/x11/qt4-libs/patches/patch-aq
index 5a9a4ec9a9c..d574125034a 100644
--- a/x11/qt4-libs/patches/patch-aq
+++ b/x11/qt4-libs/patches/patch-aq
@@ -1,16 +1,16 @@
-$NetBSD: patch-aq,v 1.1 2008/01/08 08:35:19 markd Exp $
+$NetBSD: patch-aq,v 1.2 2008/07/24 12:55:20 markd Exp $
Dont default QT_NO_DBUS on in qconfig.h to be consistent with qt4-qdbus
package.
---- configure.orig 2007-12-05 05:42:56.000000000 +1300
+--- configure.orig 2008-04-29 01:11:12.000000000 +1200
+++ configure
-@@ -5281,7 +5281,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
+@@ -5837,7 +5837,7 @@ QMakeVar set sql-plugins "$SQL_PLUGINS"
[ "$CFG_TABLET" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_TABLET"
[ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6"
[ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE"
--[ "$CFG_QDBUS" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
-+#[ "$CFG_QDBUS" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
+-[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
++#[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS"
# X11/Unix/Mac only configs
[ "$CFG_CUPS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CUPS"
diff --git a/x11/qt4-libs/patches/patch-ar b/x11/qt4-libs/patches/patch-ar
index 73bcec3700b..7a17cf7b8fb 100644
--- a/x11/qt4-libs/patches/patch-ar
+++ b/x11/qt4-libs/patches/patch-ar
@@ -1,8 +1,8 @@
-$NetBSD: patch-ar,v 1.1 2008/02/11 23:06:01 hubertf Exp $
+$NetBSD: patch-ar,v 1.2 2008/07/24 12:55:20 markd Exp $
---- src/corelib/global/qglobal.h.orig 2007-12-04 17:42:55.000000000 +0100
+--- src/corelib/global/qglobal.h.orig 2008-05-21 19:56:16.000000000 +0200
+++ src/corelib/global/qglobal.h
-@@ -89,7 +89,7 @@
+@@ -173,7 +173,7 @@ namespace QT_NAMESPACE {}
*/
#if defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__))
diff --git a/x11/qt4-libs/patches/patch-as b/x11/qt4-libs/patches/patch-as
new file mode 100644
index 00000000000..292d78689e0
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-as
@@ -0,0 +1,22 @@
+$NetBSD: patch-as,v 1.1 2008/07/24 12:55:20 markd Exp $
+
+--- tools/assistant/lib/fulltextsearch/qclucene-config_p.h.orig 2008-04-29 01:11:20.000000000 +1200
++++ tools/assistant/lib/fulltextsearch/qclucene-config_p.h
+@@ -89,7 +89,7 @@ configure.
+ #define _CL_HAVE_FCNTL_H 1
+ #endif
+
+-#if !defined(__xlC__) && !defined(__xlc__) && !defined (__MINGW32__) && \
++#if !defined(__xlC__) && !defined(__xlc__) && !defined (__MINGW32__) && !defined(__NetBSD__) && \
+ !defined(__HP_aCC) && !defined(__SUNPRO_C) && !defined(__SUNPRO_CC) || \
+ defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x550) || (defined(__HP_aCC) && defined(__ia64))
+ /* Define to 1 if the system has the type `float_t'. */
+@@ -425,7 +425,7 @@ configure.
+ # endif
+ #endif
+
+-#if defined(__SUNPRO_CC) || defined(__SUNPRO_C) || defined(__HP_aCC)
++#if defined(__SUNPRO_CC) || defined(__SUNPRO_C) || defined(__HP_aCC) || defined(__NetBSD__)
+ /* Define to 1 if you have a functioning <wchar.h> header file. */
+ # ifndef _CL_HAVE_WCTYPE_H
+ # define _CL_HAVE_WCTYPE_H
diff --git a/x11/qt4-libs/patches/patch-at b/x11/qt4-libs/patches/patch-at
new file mode 100644
index 00000000000..23da14d65b9
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.1 2008/07/24 12:55:20 markd Exp $
+
+--- ./src/3rdparty/webkit/JavaScriptCore/kjs/collector.cpp.orig 2008-04-29 01:11:16.000000000 +1200
++++ ./src/3rdparty/webkit/JavaScriptCore/kjs/collector.cpp
+@@ -347,7 +347,7 @@ static inline void* currentThreadStackBa
+ if (stackBase == 0 || thread != stackThread) {
+ pthread_attr_t sattr;
+ pthread_attr_init(&sattr);
+-#if HAVE(PTHREAD_NP_H)
++#if HAVE(PTHREAD_NP_H) || defined(__NetBSD__)
+ // e.g. on FreeBSD 5.4, neundorf@kde.org
+ pthread_attr_get_np(thread, &sattr);
+ #else
diff --git a/x11/qt4-qdbus/Makefile b/x11/qt4-qdbus/Makefile
index cdacb5dbba4..aa900d78c72 100644
--- a/x11/qt4-qdbus/Makefile
+++ b/x11/qt4-qdbus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/02/18 09:49:38 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2008/07/24 12:55:20 markd Exp $
.include "../../x11/qt4-libs/Makefile.common"
@@ -18,6 +18,7 @@ post-configure:
ln -s ${QTPREFIX}/bin/rcc ${WRKSRC}/bin/rcc
do-build:
+ cd ${WRKSRC}/src/dbus && env ${MAKE_ENV} ${GMAKE}
cd ${WRKSRC}/tools/qdbus && env ${MAKE_ENV} ${GMAKE}
do-install:
@@ -26,8 +27,8 @@ do-install:
${SED} -e "s:${WRKSRC}:${QTPREFIX}:g" \
${WRKSRC}/lib/pkgconfig/QtDBus.pc > ${WRKDIR}/QtDBus.pc
${INSTALL_DATA} ${WRKDIR}/QtDBus.pc ${PREFIX}/lib/pkgconfig/
- cd ${WRKSRC}/tools/qdbus/src && env ${MAKE_ENV} \
- ${MAKE_PROGRAM} install_qtdbus_headers
+ cd ${WRKSRC}/src/dbus && env ${MAKE_ENV} \
+ ${MAKE_PROGRAM} install_flat_headers install_targ_headers
.for prog in qdbus qdbuscpp2xml qdbusviewer qdbusxml2cpp
${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} \
${QTPREFIX}/bin
diff --git a/x11/qt4-qdbus/PLIST b/x11/qt4-qdbus/PLIST
index 855b3b08770..f685db24707 100644
--- a/x11/qt4-qdbus/PLIST
+++ b/x11/qt4-qdbus/PLIST
@@ -1,38 +1,53 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/12/06 11:28:09 markd Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/07/24 12:55:20 markd Exp $
lib/pkgconfig/QtDBus.pc
qt4/bin/qdbus
qt4/bin/qdbuscpp2xml
qt4/bin/qdbusviewer
qt4/bin/qdbusxml2cpp
-qt4/include/QtDBus/qdbusargument.h
-qt4/include/QtDBus/qdbusabstractadaptor.h
-qt4/include/QtDBus/qdbusabstractinterface.h
-qt4/include/QtDBus/qdbusconnectioninterface.h
-qt4/include/QtDBus/qdbusserver.h
-qt4/include/QtDBus/qdbusreply.h
-qt4/include/QtDBus/qdbuscontext.h
-qt4/include/QtDBus/qdbusinterface.h
-qt4/include/QtDBus/qdbusextratypes.h
-qt4/include/QtDBus/qdbuserror.h
-qt4/include/QtDBus/qdbusmetatype.h
-qt4/include/QtDBus/qdbusconnection.h
-qt4/include/QtDBus/qdbusmessage.h
-qt4/include/QtDBus/qdbusmacros.h
-qt4/include/QtDBus/QtDBus
-qt4/include/QtDBus/QDBusArgument
+qt4/include/Qt/QtDBus
+qt4/include/Qt/qdbusabstractadaptor.h
+qt4/include/Qt/qdbusabstractinterface.h
+qt4/include/Qt/qdbusargument.h
+qt4/include/Qt/qdbusconnection.h
+qt4/include/Qt/qdbusconnectioninterface.h
+qt4/include/Qt/qdbuscontext.h
+qt4/include/Qt/qdbuserror.h
+qt4/include/Qt/qdbusextratypes.h
+qt4/include/Qt/qdbusinterface.h
+qt4/include/Qt/qdbusmacros.h
+qt4/include/Qt/qdbusmessage.h
+qt4/include/Qt/qdbusmetatype.h
+qt4/include/Qt/qdbusreply.h
+qt4/include/Qt/qdbusserver.h
qt4/include/QtDBus/QDBusAbstractAdaptor
qt4/include/QtDBus/QDBusAbstractInterface
+qt4/include/QtDBus/QDBusArgument
+qt4/include/QtDBus/QDBusConnection
qt4/include/QtDBus/QDBusConnectionInterface
-qt4/include/QtDBus/QDBusServer
-qt4/include/QtDBus/QDBusReply
qt4/include/QtDBus/QDBusContext
+qt4/include/QtDBus/QDBusError
qt4/include/QtDBus/QDBusInterface
+qt4/include/QtDBus/QDBusMessage
+qt4/include/QtDBus/QDBusMetaType
qt4/include/QtDBus/QDBusObjectPath
+qt4/include/QtDBus/QDBusReply
+qt4/include/QtDBus/QDBusServer
qt4/include/QtDBus/QDBusSignature
qt4/include/QtDBus/QDBusVariant
-qt4/include/QtDBus/QDBusError
-qt4/include/QtDBus/QDBusMetaType
-qt4/include/QtDBus/QDBusConnection
-qt4/include/QtDBus/QDBusMessage
+qt4/include/QtDBus/QtDBus
+qt4/include/QtDBus/qdbusabstractadaptor.h
+qt4/include/QtDBus/qdbusabstractinterface.h
+qt4/include/QtDBus/qdbusargument.h
+qt4/include/QtDBus/qdbusconnection.h
+qt4/include/QtDBus/qdbusconnectioninterface.h
+qt4/include/QtDBus/qdbuscontext.h
+qt4/include/QtDBus/qdbuserror.h
+qt4/include/QtDBus/qdbusextratypes.h
+qt4/include/QtDBus/qdbusinterface.h
+qt4/include/QtDBus/qdbusmacros.h
+qt4/include/QtDBus/qdbusmessage.h
+qt4/include/QtDBus/qdbusmetatype.h
+qt4/include/QtDBus/qdbusreply.h
+qt4/include/QtDBus/qdbusserver.h
qt4/lib/libQtDBus.la
@dirrm qt4/include/QtDBus
diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile
index 0d4c6fe8d5f..0b6c2fdc43d 100644
--- a/x11/qt4-tools/Makefile
+++ b/x11/qt4-tools/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2008/06/03 20:14:45 abs Exp $
+# $NetBSD: Makefile,v 1.21 2008/07/24 12:55:21 markd Exp $
PKG_DESTDIR_SUPPORT= user-destdir
.include "../../x11/qt4-libs/Makefile.common"
PKGNAME= qt4-tools-${QTVERSION}
-PKGREVISION= 3
COMMENT= QT GUI (WYSIWYG) builder and other tools
DEPENDS+= libtool-base-[0-9]*:../../devel/libtool-base
@@ -29,28 +28,24 @@ post-configure:
ln -s ${QTPREFIX}/bin/rcc ${WRKSRC}/bin/rcc
do-install:
-.for prog in assistant lrelease lupdate qmake qt3to4
+.for prog in assistant_adp lrelease lupdate pixeltool qmake qt3to4
${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/
.endfor
-.for prog in designer linguist qtconfig
+.for prog in assistant designer linguist qtconfig
${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} \
${DESTDIR}${QTPREFIX}/bin
.endfor
cd ${WRKSRC}/tools/assistant/lib && env ${MAKE_ENV} ${INSTALL_ENV} \
+ ${MAKE_PROGRAM} install_flat_headers install_targ_headers
+ cd ${WRKSRC}/tools/assistant/compat/lib && env ${MAKE_ENV} ${INSTALL_ENV} \
${MAKE_PROGRAM} install_assistant_headers
cd ${WRKSRC}/tools/designer/src/lib && env ${MAKE_ENV} ${INSTALL_ENV} \
${MAKE_PROGRAM} install_designer_headers
cd ${WRKSRC}/tools/designer/src/uitools && env ${MAKE_ENV} ${INSTALL_ENV} \
${MAKE_PROGRAM} install_quitools_headers
- cd ${WRKSRC}/tools/qtestlib/src && env ${MAKE_ENV} ${INSTALL_ENV} \
- ${MAKE_PROGRAM} install_qtestlib_headers
-.for lib in QtAssistantClient QtDesigner QtDesignerComponents QtTest
+.for lib in QtAssistantClient QtCLucene QtDesigner QtDesignerComponents QtHelp QtUiTools
${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \
${DESTDIR}${QTPREFIX}/lib/
-.endfor
- ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/libQtUiTools.la \
- ${DESTDIR}${QTPREFIX}/lib/
-.for lib in QtUiTools QtTest
sed -e "s:${WRKSRC}:${QTPREFIX}:g" \
${WRKSRC}/lib/pkgconfig/${lib}.pc > ${WRKDIR}/${lib}.pc
${INSTALL_DATA} ${WRKDIR}/${lib}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/
diff --git a/x11/qt4-tools/PLIST b/x11/qt4-tools/PLIST
index d0bbb45a66a..6e9d994db64 100644
--- a/x11/qt4-tools/PLIST
+++ b/x11/qt4-tools/PLIST
@@ -1,11 +1,17 @@
-@comment $NetBSD: PLIST,v 1.11 2008/01/05 22:15:24 wiz Exp $
-lib/pkgconfig/QtTest.pc
+@comment $NetBSD: PLIST,v 1.12 2008/07/24 12:55:21 markd Exp $
+lib/pkgconfig/QtAssistantClient.pc
+lib/pkgconfig/QtCLucene.pc
+lib/pkgconfig/QtDesigner.pc
+lib/pkgconfig/QtDesignerComponents.pc
+lib/pkgconfig/QtHelp.pc
lib/pkgconfig/QtUiTools.pc
qt4/bin/assistant
+qt4/bin/assistant_adp
qt4/bin/designer
qt4/bin/linguist
qt4/bin/lrelease
qt4/bin/lupdate
+qt4/bin/pixeltool
qt4/bin/qmake
qt4/bin/qt3to4
qt4/bin/qtconfig
@@ -13,6 +19,15 @@ qt4/include/QtAssistant/QAssistantClient
qt4/include/QtAssistant/QtAssistant
qt4/include/QtAssistant/qassistantclient.h
qt4/include/QtAssistant/qassistantclient_global.h
+qt4/include/Qt/QtHelp
+qt4/include/Qt/qhelp_global.h
+qt4/include/Qt/qhelpcontentwidget.h
+qt4/include/Qt/qhelpengine.h
+qt4/include/Qt/qhelpenginecore.h
+qt4/include/Qt/qhelpindexwidget.h
+qt4/include/Qt/qhelpsearchengine.h
+qt4/include/Qt/qhelpsearchquerywidget.h
+qt4/include/Qt/qhelpsearchresultwidget.h
qt4/include/QtDesigner/QAbstractExtensionFactory
qt4/include/QtDesigner/QAbstractExtensionManager
qt4/include/QtDesigner/QAbstractFormBuilder
@@ -92,42 +107,34 @@ qt4/include/QtDesigner/qextensionmanager.h
qt4/include/QtDesigner/sdk_global.h
qt4/include/QtDesigner/taskmenu.h
qt4/include/QtDesigner/uilib_global.h
-qt4/include/QtTest/QEventSizeOfChecker
-qt4/include/QtTest/QSignalSpy
-qt4/include/QtTest/QSpontaneKeyEvent
-qt4/include/QtTest/QTest
-qt4/include/QtTest/QTestAccessibility
-qt4/include/QtTest/QTestAccessibilityEvent
-qt4/include/QtTest/QTestData
-qt4/include/QtTest/QTestDelayEvent
-qt4/include/QtTest/QTestEvent
-qt4/include/QtTest/QTestEventList
-qt4/include/QtTest/QTestEventLoop
-qt4/include/QtTest/QTestKeyClicksEvent
-qt4/include/QtTest/QTestKeyEvent
-qt4/include/QtTest/QTestMouseEvent
-qt4/include/QtTest/QtTest
-qt4/include/QtTest/qsignalspy.h
-qt4/include/QtTest/qtest.h
-qt4/include/QtTest/qtest_global.h
-qt4/include/QtTest/qtest_gui.h
-qt4/include/QtTest/qtestaccessible.h
-qt4/include/QtTest/qtestassert.h
-qt4/include/QtTest/qtestcase.h
-qt4/include/QtTest/qtestdata.h
-qt4/include/QtTest/qtestevent.h
-qt4/include/QtTest/qtesteventloop.h
-qt4/include/QtTest/qtestkeyboard.h
-qt4/include/QtTest/qtestmouse.h
-qt4/include/QtTest/qtestspontaneevent.h
-qt4/include/QtTest/qtestsystem.h
+qt4/include/QtHelp/QHelpContentItem
+qt4/include/QtHelp/QHelpContentModel
+qt4/include/QtHelp/QHelpContentWidget
+qt4/include/QtHelp/QHelpEngine
+qt4/include/QtHelp/QHelpEngineCore
+qt4/include/QtHelp/QHelpIndexModel
+qt4/include/QtHelp/QHelpIndexWidget
+qt4/include/QtHelp/QHelpSearchEngine
+qt4/include/QtHelp/QHelpSearchQuery
+qt4/include/QtHelp/QHelpSearchQueryWidget
+qt4/include/QtHelp/QHelpSearchResultWidget
+qt4/include/QtHelp/QtHelp
+qt4/include/QtHelp/qhelp_global.h
+qt4/include/QtHelp/qhelpcontentwidget.h
+qt4/include/QtHelp/qhelpengine.h
+qt4/include/QtHelp/qhelpenginecore.h
+qt4/include/QtHelp/qhelpindexwidget.h
+qt4/include/QtHelp/qhelpsearchengine.h
+qt4/include/QtHelp/qhelpsearchquerywidget.h
+qt4/include/QtHelp/qhelpsearchresultwidget.h
qt4/include/QtUiTools/QUiLoader
qt4/include/QtUiTools/QtUiTools
qt4/include/QtUiTools/quiloader.h
qt4/lib/libQtAssistantClient.la
+qt4/lib/libQtCLucene.la
qt4/lib/libQtDesigner.la
qt4/lib/libQtDesignerComponents.la
-qt4/lib/libQtTest.la
+qt4/lib/libQtHelp.la
qt4/lib/libQtUiTools.la
qt4/mkspecs/aix-g++-64/qmake.conf
qt4/mkspecs/aix-g++-64/qplatformdefs.h
@@ -139,15 +146,21 @@ qt4/mkspecs/aix-xlc/qmake.conf
qt4/mkspecs/aix-xlc/qplatformdefs.h
qt4/mkspecs/common/g++.conf
qt4/mkspecs/common/linux.conf
+qt4/mkspecs/common/llvm.conf
qt4/mkspecs/common/mac-g++.conf
qt4/mkspecs/common/mac.conf
+qt4/mkspecs/common/mac-llvm.conf
qt4/mkspecs/common/qmake.conf
qt4/mkspecs/common/unix.conf
+qt4/mkspecs/cygwin-g++/qmake.conf
+qt4/mkspecs/cygwin-g++/qplatformdefs.h
qt4/mkspecs/darwin-g++/qmake.conf
qt4/mkspecs/darwin-g++/qplatformdefs.h
qt4/mkspecs/default
qt4/mkspecs/features/assistant.prf
qt4/mkspecs/features/build_pass.prf
+qt4/mkspecs/features/dbusadaptors.prf
+qt4/mkspecs/features/dbusinterfaces.prf
qt4/mkspecs/features/debug.prf
qt4/mkspecs/features/debug_and_release.prf
qt4/mkspecs/features/default_post.prf
@@ -155,6 +168,7 @@ qt4/mkspecs/features/default_pre.prf
qt4/mkspecs/features/designer.prf
qt4/mkspecs/features/dll.prf
qt4/mkspecs/features/exclusive_builds.prf
+qt4/mkspecs/features/help.prf
qt4/mkspecs/features/incredibuild_xge.prf
qt4/mkspecs/features/lex.prf
qt4/mkspecs/features/link_pkgconfig.prf
@@ -208,6 +222,7 @@ qt4/mkspecs/features/win32/embed_manifest_exe.prf
qt4/mkspecs/features/win32/exceptions.prf
qt4/mkspecs/features/win32/exceptions_off.prf
qt4/mkspecs/features/win32/opengl.prf
+qt4/mkspecs/features/win32/profiling.prf
qt4/mkspecs/features/win32/qaxcontainer.prf
qt4/mkspecs/features/win32/qaxserver.prf
qt4/mkspecs/features/win32/qt_dll.prf
@@ -271,6 +286,8 @@ qt4/mkspecs/linux-icc/qmake.conf
qt4/mkspecs/linux-icc/qplatformdefs.h
qt4/mkspecs/linux-kcc/qmake.conf
qt4/mkspecs/linux-kcc/qplatformdefs.h
+qt4/mkspecs/linux-llvm/qmake.conf
+qt4/mkspecs/linux-llvm/qplatformdefs.h
qt4/mkspecs/linux-lsb-g++/qmake.conf
qt4/mkspecs/linux-lsb-g++/qplatformdefs.h
qt4/mkspecs/linux-pgcc/qmake.conf
@@ -283,6 +300,10 @@ qt4/mkspecs/macx-g++/qmake.conf
qt4/mkspecs/macx-g++/qplatformdefs.h
qt4/mkspecs/macx-icc/qmake.conf
qt4/mkspecs/macx-icc/qplatformdefs.h
+qt4/mkspecs/macx-llvm/Info.plist.app
+qt4/mkspecs/macx-llvm/Info.plist.lib
+qt4/mkspecs/macx-llvm/qmake.conf
+qt4/mkspecs/macx-llvm/qplatformdefs.h
qt4/mkspecs/macx-pbuilder/Info.plist.app
qt4/mkspecs/macx-pbuilder/qmake.conf
qt4/mkspecs/macx-pbuilder/qplatformdefs.h
@@ -301,8 +322,12 @@ qt4/mkspecs/qws/freebsd-generic-g++/qmake.conf
qt4/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h
qt4/mkspecs/qws/linux-arm-g++/qmake.conf
qt4/mkspecs/qws/linux-arm-g++/qplatformdefs.h
+qt4/mkspecs/qws/linux-avr32-g++/qmake.conf
+qt4/mkspecs/qws/linux-avr32-g++/qplatformdefs.h
qt4/mkspecs/qws/linux-cellon-g++/qmake.conf
qt4/mkspecs/qws/linux-cellon-g++/qplatformdefs.h
+qt4/mkspecs/qws/linux-dm7000-g++/qmake.conf
+qt4/mkspecs/qws/linux-dm7000-g++/qplatformdefs.h
qt4/mkspecs/qws/linux-generic-g++-32/qmake.conf
qt4/mkspecs/qws/linux-generic-g++-32/qplatformdefs.h
qt4/mkspecs/qws/linux-generic-g++/qmake.conf
@@ -356,8 +381,34 @@ qt4/mkspecs/win32-msvc/features/incremental.prf
qt4/mkspecs/win32-msvc/features/incremental_off.prf
qt4/mkspecs/win32-msvc/qmake.conf
qt4/mkspecs/win32-msvc/qplatformdefs.h
+qt4/mkspecs/win32-msvc2002/qmake.conf
+qt4/mkspecs/win32-msvc2002/qplatformdefs.h
+qt4/mkspecs/win32-msvc2003/qmake.conf
+qt4/mkspecs/win32-msvc2003/qplatformdefs.h
qt4/mkspecs/win32-msvc2005/qmake.conf
qt4/mkspecs/win32-msvc2005/qplatformdefs.h
+qt4/mkspecs/win32-msvc2008/qmake.conf
+qt4/mkspecs/win32-msvc2008/qplatformdefs.h
+qt4/mkspecs/wince50standard-armv4i-msvc2005/qmake.conf
+qt4/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h
+qt4/mkspecs/wince50standard-mipsii-msvc2005/qmake.conf
+qt4/mkspecs/wince50standard-mipsii-msvc2005/qplatformdefs.h
+qt4/mkspecs/wince50standard-mipsiv-msvc2005/qmake.conf
+qt4/mkspecs/wince50standard-mipsiv-msvc2005/qplatformdefs.h
+qt4/mkspecs/wince50standard-sh4-msvc2005/qmake.conf
+qt4/mkspecs/wince50standard-sh4-msvc2005/qplatformdefs.h
+qt4/mkspecs/wince50standard-x86-msvc2005/qmake.conf
+qt4/mkspecs/wince50standard-x86-msvc2005/qplatformdefs.h
+qt4/mkspecs/wince60standard-armv4i-msvc2005/qmake.conf
+qt4/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h
+qt4/mkspecs/wincewm50pocket-msvc2005/qmake.conf
+qt4/mkspecs/wincewm50pocket-msvc2005/qplatformdefs.h
+qt4/mkspecs/wincewm50smart-msvc2005/qmake.conf
+qt4/mkspecs/wincewm50smart-msvc2005/qplatformdefs.h
+qt4/mkspecs/wincewm60professional-msvc2005/qmake.conf
+qt4/mkspecs/wincewm60professional-msvc2005/qplatformdefs.h
+qt4/mkspecs/wincewm60standard-msvc2005/qmake.conf
+qt4/mkspecs/wincewm60standard-msvc2005/qplatformdefs.h
qt4/phrasebooks/danish.qph
qt4/phrasebooks/dutch.qph
qt4/phrasebooks/finnish.qph
@@ -373,7 +424,20 @@ qt4/phrasebooks/swedish.qph
qt4/plugins/designer/libqt3supportwidgets.la
@dirrm qt4/plugins/designer
@dirrm qt4/phrasebooks
+@dirrm qt4/mkspecs/wincewm60standard-msvc2005
+@dirrm qt4/mkspecs/wincewm60professional-msvc2005
+@dirrm qt4/mkspecs/wincewm50smart-msvc2005
+@dirrm qt4/mkspecs/wincewm50pocket-msvc2005
+@dirrm qt4/mkspecs/wince60standard-armv4i-msvc2005
+@dirrm qt4/mkspecs/wince50standard-x86-msvc2005
+@dirrm qt4/mkspecs/wince50standard-sh4-msvc2005
+@dirrm qt4/mkspecs/wince50standard-mipsiv-msvc2005
+@dirrm qt4/mkspecs/wince50standard-mipsii-msvc2005
+@dirrm qt4/mkspecs/wince50standard-armv4i-msvc2005
+@dirrm qt4/mkspecs/win32-msvc2008
@dirrm qt4/mkspecs/win32-msvc2005
+@dirrm qt4/mkspecs/win32-msvc2003
+@dirrm qt4/mkspecs/win32-msvc2002
@dirrm qt4/mkspecs/win32-msvc/features
@dirrm qt4/mkspecs/win32-msvc.net
@dirrm qt4/mkspecs/win32-msvc
@@ -398,9 +462,11 @@ qt4/plugins/designer/libqt3supportwidgets.la
@dirrm qt4/mkspecs/qws/linux-mips-g++
@dirrm qt4/mkspecs/qws/linux-lsb-g++
@dirrm qt4/mkspecs/qws/linux-ipaq-g++
-@dirrm qt4/mkspecs/qws/linux-generic-g++
@dirrm qt4/mkspecs/qws/linux-generic-g++-32
+@dirrm qt4/mkspecs/qws/linux-generic-g++
+@dirrm qt4/mkspecs/qws/linux-dm7000-g++
@dirrm qt4/mkspecs/qws/linux-cellon-g++
+@dirrm qt4/mkspecs/qws/linux-avr32-g++
@dirrm qt4/mkspecs/qws/linux-arm-g++
@dirrm qt4/mkspecs/qws/freebsd-generic-g++
@dirrm qt4/mkspecs/qws
@@ -409,11 +475,13 @@ qt4/plugins/designer/libqt3supportwidgets.la
@dirrm qt4/mkspecs/macx-xlc
@dirrm qt4/mkspecs/macx-xcode
@dirrm qt4/mkspecs/macx-pbuilder
+@dirrm qt4/mkspecs/macx-llvm
@dirrm qt4/mkspecs/macx-icc
@dirrm qt4/mkspecs/macx-g++
@dirrm qt4/mkspecs/lynxos-g++
@dirrm qt4/mkspecs/linux-pgcc
@dirrm qt4/mkspecs/linux-lsb-g++
+@dirrm qt4/mkspecs/linux-llvm
@dirrm qt4/mkspecs/linux-kcc
@dirrm qt4/mkspecs/linux-icc-64
@dirrm qt4/mkspecs/linux-icc-32
@@ -445,6 +513,7 @@ qt4/plugins/designer/libqt3supportwidgets.la
@dirrm qt4/mkspecs/features/mac
@dirrm qt4/mkspecs/features
@dirrm qt4/mkspecs/darwin-g++
+@dirrm qt4/mkspecs/cygwin-g++
@dirrm qt4/mkspecs/common
@dirrm qt4/mkspecs/aix-xlc-64
@dirrm qt4/mkspecs/aix-xlc
@@ -452,6 +521,6 @@ qt4/plugins/designer/libqt3supportwidgets.la
@dirrm qt4/mkspecs/aix-g++
@dirrm qt4/mkspecs
@dirrm qt4/include/QtUiTools
-@dirrm qt4/include/QtTest
+@dirrm qt4/include/QtHelp
@dirrm qt4/include/QtDesigner
@dirrm qt4/include/QtAssistant
diff --git a/x11/qt4/Makefile.common b/x11/qt4/Makefile.common
index b3b56b822ed..e257646350e 100644
--- a/x11/qt4/Makefile.common
+++ b/x11/qt4/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.13 2008/06/12 12:50:18 abs Exp $
+# $NetBSD: Makefile.common,v 1.14 2008/07/24 12:55:20 markd Exp $
# used by x11/qt4-libs/Makefile.common
# used by x11/qt4-tools/Makefile
-QTVERSION= 4.3.3
+QTVERSION= 4.4.0
MAINTAINER?= adam@NetBSD.org
HOMEPAGE= http://www.trolltech.com/products/qt/
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-10 02:00:50 +0000