3 files changed, 21 insertions, 17 deletions

diff --git a/accessibility/qt4-accessible/Makefile b/accessibility/qt4-accessible/Makefile
index 4197cff2c9e4..7f8009ebd053 100644
--- a/accessibility/qt4-accessible/Makefile
+++ b/accessibility/qt4-accessible/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	accessible
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=0
 CATEGORIES?=	accessibility
 PKGNAMEPREFIX=	qt4-
 
@@ -29,22 +28,26 @@ MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
 		PATH=${WRKSRC}/bin:$$PATH
 
 DO_NOT_EXTRACT=	demos doc examples mkspecs qmake tools translations \
-		src/dbus src/opengl src/phonon \
-		src/script src/svg src/testlib \
-		src/tools src/xmlpatterns src/3rdparty/clucene \
-		src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit
+		src/activeqt src/dbus src/multimedia src/network src/opengl \
+		src/openvg src/phonon src/s60installs src/s60main src/script \
+		src/scripttools src/sql src/svg src/testlib src/tools \
+		src/winmain src/xml src/xmlpatterns src/3rdparty/clucene \
+		src/3rdparty/freetype src/3rdparty/libjpeg src/3rdparty/libmng \
+		src/3rdparty/libpng src/3rdparty/libtiff src/3rdparty/phonon \
+		src/3rdparty/webkit
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf -
 .for dne in ${DO_NOT_EXTRACT}
 EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 .endfor
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src/plugins/${PORTNAME}
-CONFIGURE_WRKSRC=${WRKSRC}/../../..
+BUILD_WRKSRC=	${WRKSRC}/src/plugins/${PORTNAME}
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+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
+	${MKDIR} ${WRKSRC}/mkspecs
+	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
+	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc
 
 .include <bsd.port.mk>
diff --git a/accessibility/qt4-accessible/pkg-descr b/accessibility/qt4-accessible/pkg-descr
index efc79b9aaf24..36bc69717e98 100644
--- a/accessibility/qt4-accessible/pkg-descr
+++ b/accessibility/qt4-accessible/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/accessibility/qt4-accessible/pkg-plist b/accessibility/qt4-accessible/pkg-plist
index b8588dd81f60..fd9cdd7d7716 100644
--- a/accessibility/qt4-accessible/pkg-plist
+++ b/accessibility/qt4-accessible/pkg-plist
@@ -1,5 +1,6 @@
-lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so
-%%DEBUG%%lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so.debug
-lib/qt4/plugins/accessible/libqtaccessiblewidgets.so
-%%DEBUG%%lib/qt4/plugins/accessible/libqtaccessiblewidgets.so.debug
-@dirrm lib/qt4/plugins/accessible
+%%QT_PLUGINDIR_REL%%/accessible/libqtaccessiblecompatwidgets.so
+%%DEBUG%%%%QT_PLUGINDIR_REL%%/accessible/libqtaccessiblecompatwidgets.so.debug
+%%QT_PLUGINDIR_REL%%/accessible/libqtaccessiblewidgets.so
+%%DEBUG%%%%QT_PLUGINDIR_REL%%/accessible/libqtaccessiblewidgets.so.debug
+@dirrm %%QT_PLUGINDIR_REL%%/accessible
+@dirrmtry %%QT_PLUGINDIR_REL%%