3 files changed, 18 insertions, 15 deletions

diff --git a/devel/qt4-moc/Makefile b/devel/qt4-moc/Makefile
index 81844215a8e3..1a90e67c1666 100644
--- a/devel/qt4-moc/Makefile
+++ b/devel/qt4-moc/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	moc
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	0
 CATEGORIES?=	devel
 PKGNAMEPREFIX=	qt4-
 
@@ -29,27 +28,31 @@ 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/gui src/network src/opengl \
-		src/phonon src/qt3support src/script src/sql src/svg \
-		src/testlib src/xmlpatterns src/3rdparty/clucene \
-		src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit
+		src/activeqt src/dbus src/gui src/multimedia src/network \
+		src/opengl src/openvg src/phonon src/qt3support \
+		src/s60installs src/s60main src/script src/scripttools src/sql \
+		src/svg src/testlib src/winmain 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/tools/${PORTNAME}
-CONFIGURE_WRKSRC=${WRKSRC}/../../../
+BUILD_WRKSRC=	${WRKSRC}/src/tools/${PORTNAME}
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
 
 pre-configure:
-	${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
 	${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \
 			-e 's|^TARGET.*|TARGET=moc-qt4|g' \
-		${WRKSRC}/${PORTNAME}.pro
-	${MKDIR} ${WRKSRC}/../../../mkspecs
-	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../bin/qmake
+		${BUILD_WRKSRC}/${PORTNAME}.pro
+	${MKDIR} ${WRKSRC}/mkspecs
+	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
 
-do-build:
-	cd ${CONFIGURE_WRKSRC}/src/tools/bootstrap/ && make
+pre-build:
+	cd ${BUILD_WRKSRC}/../bootstrap && ${MAKE}
 
 .include <bsd.port.mk>
diff --git a/devel/qt4-moc/pkg-descr b/devel/qt4-moc/pkg-descr
index efc79b9aaf24..36bc69717e98 100644
--- a/devel/qt4-moc/pkg-descr
+++ b/devel/qt4-moc/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/devel/qt4-moc/pkg-plist b/devel/qt4-moc/pkg-plist
index 90cb1d7dc8b1..690446be106a 100644
--- a/devel/qt4-moc/pkg-plist
+++ b/devel/qt4-moc/pkg-plist
@@ -1,2 +1,2 @@
 bin/moc-qt4
-%%DEBUG%%bin/moc-qt4.debug
\ No newline at end of file
+%%DEBUG%%bin/moc-qt4.debug