4 files changed, 40 insertions, 54 deletions

diff --git a/www/qt4-webkit/Makefile b/www/qt4-webkit/Makefile
index d4790bc40336..cee79f5286bd 100644
--- a/www/qt4-webkit/Makefile
+++ b/www/qt4-webkit/Makefile
@@ -11,11 +11,11 @@ CATEGORIES?=	www
 PKGNAMEPREFIX=	qt4-
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt4 webkit engine
+COMMENT=	Qt4 WebKit engine
 
 USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build moc_build rcc_build corelib gui network xml \
-		dbus phonon phonon-gst
+		dbus phonon phonon-gst script scripttools xmlpatterns
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 MAKE_JOBS_SAFE=	yes
@@ -26,36 +26,40 @@ USE_LDCONFIG=	${PREFIX}/lib/qt4
 ALL_TARGET=	first
 CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
 MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
-		PATH=${WRKSRC}/bin:$$PATH
+		PATH=${WRKSRC}/bin:$$PATH MAKEOBJDIR=.
 
 DO_NOT_EXTRACT=	demos doc examples mkspecs qmake tools translations \
-		src/opengl \
-		src/qt3support src/sql src/svg src/testlib \
-		src/tools src/xmlpatterns src/3rdparty/clucene
+		src/activeqt src/dbus src/multimedia src/opengl src/openvg \
+		src/qt3support src/s60installs src/s60main src/scripttools \
+		src/sql src/svg src/testlib src/tools src/winmain \
+		src/3rdparty/clucene src/3rdparty/freetype \
+		src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \
+		src/3rdparty/libtiff
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf -
 .for dne in ${DO_NOT_EXTRACT}
 EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 .endfor
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src/3rdparty/${PORTNAME}/WebCore
-CONFIGURE_WRKSRC=${WRKSRC}/../../../../
+BUILD_WRKSRC=	${WRKSRC}/src/3rdparty/${PORTNAME}/WebCore
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 CONFIGURE_ARGS+=	-I../../../../include/Qt -I../../../../include
 
+EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
+
 pre-configure:
-	${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
-	${MKDIR} ${WRKSRC}/../../../../mkspecs
-	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../../bin/qmake
-	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../../../bin/moc
-	${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../../../bin/rcc
+	${MKDIR} ${WRKSRC}/mkspecs
+	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
+	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc
+	${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc
 
 post-configure:
 	${REINPLACE_CMD} \
 		-e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 		-e 's|.*$$(QMAKE).*||g' \
-		${WRKSRC}/Makefile
+		${BUILD_WRKSRC}/Makefile
 	${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
 			-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
-		${WRKSRC}/../../../../lib/pkgconfig/QtWebKit.pc
+		${WRKSRC}/lib/pkgconfig/QtWebKit.pc
 
 .include <bsd.port.mk>
diff --git a/www/qt4-webkit/files/patch-JavaScriptCore-wtf-Threading.h b/www/qt4-webkit/files/patch-JavaScriptCore-wtf-Threading.h
deleted file mode 100644
index 53e2c5f1ec03..000000000000
--- a/www/qt4-webkit/files/patch-JavaScriptCore-wtf-Threading.h
+++ /dev/null
@@ -1,31 +0,0 @@
---- ../JavaScriptCore/wtf/Threading.h.orig      2009-05-07 07:06:48.000000000 +0000
-+++ ../JavaScriptCore/wtf/Threading.h   2009-05-07 08:00:22.000000000 +0000
-@@ -196,8 +196,8 @@
- #elif COMPILER(GCC)
- #define WTF_USE_LOCKFREE_THREADSAFESHARED 1
- 
--inline void atomicIncrement(int volatile* addend) { __gnu_cxx::__atomic_add(addend, 1); }
--inline int atomicDecrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; }
-+inline void atomicIncrement(_Atomic_word volatile* addend) { __gnu_cxx::__atomic_add(addend, 1); }
-+inline int atomicDecrement(_Atomic_word volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; }
- 
- #endif
- 
-@@ -211,7 +211,7 @@
-     void ref()
-     {
- #if USE(LOCKFREE_THREADSAFESHARED)
--        atomicIncrement(&m_refCount);
-+        atomicIncrement((_Atomic_word *)&m_refCount);
- #else
-         MutexLocker locker(m_mutex);
-         ++m_refCount;
-@@ -221,7 +221,7 @@
-     void deref()
-     {
- #if USE(LOCKFREE_THREADSAFESHARED)
--        if (atomicDecrement(&m_refCount) <= 0)
-+        if (atomicDecrement((_Atomic_word *)&m_refCount) <= 0)
- #else
-         {
-             MutexLocker locker(m_mutex);
\ No newline at end of file
diff --git a/www/qt4-webkit/pkg-descr b/www/qt4-webkit/pkg-descr
index efc79b9aaf24..36bc69717e98 100644
--- a/www/qt4-webkit/pkg-descr
+++ b/www/qt4-webkit/pkg-descr
@@ -9,4 +9,4 @@ the application programmer with a single, common API for all operating systems.
 The native C APIs are encapsulated in a set of well-designed, fully
 object-oriented C++ classes. 
 
-WWW: http://www.trolltech.com/products/qt/index.html
+WWW: http://qt.nokia.com/products/qt/index.html
diff --git a/www/qt4-webkit/pkg-plist b/www/qt4-webkit/pkg-plist
index 748148fc5324..9c8cb8f7b230 100644
--- a/www/qt4-webkit/pkg-plist
+++ b/www/qt4-webkit/pkg-plist
@@ -1,34 +1,46 @@
-include/qt4/Qt/qwebframe.h
+include/qt4/Qt/QtWebKit
+include/qt4/Qt/qgraphicswebview.h
 include/qt4/Qt/qwebdatabase.h
-include/qt4/Qt/qwebsecurityorigin.h
+include/qt4/Qt/qwebelement.h
+include/qt4/Qt/qwebframe.h
 include/qt4/Qt/qwebhistory.h
 include/qt4/Qt/qwebhistoryinterface.h
+include/qt4/Qt/qwebinspector.h
 include/qt4/Qt/qwebkitglobal.h
+include/qt4/Qt/qwebkitversion.h
 include/qt4/Qt/qwebpage.h
 include/qt4/Qt/qwebpluginfactory.h
+include/qt4/Qt/qwebsecurityorigin.h
 include/qt4/Qt/qwebsettings.h
 include/qt4/Qt/qwebview.h
-include/qt4/Qt/QtWebKit
+include/qt4/QtWebKit/QGraphicsWebView
+include/qt4/QtWebKit/QWebDatabase
+include/qt4/QtWebKit/QWebElement
+include/qt4/QtWebKit/QWebElementCollection
 include/qt4/QtWebKit/QWebFrame
 include/qt4/QtWebKit/QWebHistory
 include/qt4/QtWebKit/QWebHistoryInterface
 include/qt4/QtWebKit/QWebHistoryItem
 include/qt4/QtWebKit/QWebHitTestResult
+include/qt4/QtWebKit/QWebInspector
 include/qt4/QtWebKit/QWebPage
 include/qt4/QtWebKit/QWebPluginFactory
+include/qt4/QtWebKit/QWebSecurityOrigin
 include/qt4/QtWebKit/QWebSettings
-include/qt4/QtWebKit/QWebDatabase
 include/qt4/QtWebKit/QWebView
 include/qt4/QtWebKit/QtWebKit
-include/qt4/QtWebKit/QWebSecurityOrigin
-include/qt4/QtWebKit/qwebframe.h
+include/qt4/QtWebKit/qgraphicswebview.h
 include/qt4/QtWebKit/qwebdatabase.h
-include/qt4/QtWebKit/qwebsecurityorigin.h
+include/qt4/QtWebKit/qwebelement.h
+include/qt4/QtWebKit/qwebframe.h
 include/qt4/QtWebKit/qwebhistory.h
 include/qt4/QtWebKit/qwebhistoryinterface.h
+include/qt4/QtWebKit/qwebinspector.h
 include/qt4/QtWebKit/qwebkitglobal.h
+include/qt4/QtWebKit/qwebkitversion.h
 include/qt4/QtWebKit/qwebpage.h
 include/qt4/QtWebKit/qwebpluginfactory.h
+include/qt4/QtWebKit/qwebsecurityorigin.h
 include/qt4/QtWebKit/qwebsettings.h
 include/qt4/QtWebKit/qwebview.h
 lib/qt4/libQtWebKit.la
@@ -39,6 +51,7 @@ lib/qt4/libQtWebKit.so.%%SHLIB_SHVER%%
 lib/qt4/libQtWebKit.so.%%SHLIB_VER%%
 @comment %%DEBUG%%lib/qt4/libQtWebKit.so.%%SHLIB_VER%%.debug
 libdata/pkgconfig/QtWebKit.pc
+@dirrmtry lib/qt4
 @dirrm include/qt4/QtWebKit
 @dirrmtry include/qt4/Qt
 @dirrmtry include/qt4