Update qt4 to 4.4.0

Qt 4.4 introduces many new features as well as many improvements and
bugfixes over the 4.3.x series. For more details, see the online
documentation which is included in this distribution. The
documentation is also available at http://doc.trolltech.com/4.4

The Qt version 4.4 series is binary compatible with the 4.3.x series.
A long list of changes can be found in the changes-4.4.0 file in the
distribution.

Update OKed (and initial work provided) by adam@..

2 files changed, 42 insertions, 26 deletions

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