3 files changed, 58 insertions, 73 deletions

diff --git a/multimedia/qt4-multimedia/Makefile b/multimedia/qt4-multimedia/Makefile
index 152d58973bd8..68b6274b70d1 100644
--- a/multimedia/qt4-multimedia/Makefile
+++ b/multimedia/qt4-multimedia/Makefile
@@ -2,18 +2,17 @@
 
 PORTNAME=	multimedia
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	multimedia
+CATEGORIES=	multimedia
 PKGNAMEPREFIX=	qt4-
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt4 low-level multimedia API
+COMMENT=	Qt low-level multimedia API
 
 USE_QT4=	qmake_build moc_build uic_build corelib gui
-QT_NONSTANDARD=	yes
 QT_DIST=	yes
 
 HAS_CONFIGURE=	yes
-USE_LDCONFIG=	${PREFIX}/lib/qt4
+USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
 ALL_TARGET=	first
 CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
@@ -35,21 +34,19 @@ EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-EXTRA_PATCHES+=	${.CURDIR}/../../devel/qt4/files/patch-configure
-
 pre-configure:
 	${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/uic-qt4 ${WRKSRC}/bin/uic
+	${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake
+	${LN} -sf ${MOC} ${WRKSRC}/bin/moc
+	${LN} -sf ${UIC} ${WRKSRC}/bin/uic
 
 post-configure:
 	${REINPLACE_CMD} \
-		-e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
+		-e 's|${PREFIX}/${QT_LIBDIR_REL}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
 		-e 's|.*$$(QMAKE).*||g' ${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' \
-			-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
+			-E -e 's|(.*location=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \
+			-E -e 's|(.*location=).*uic|\1${PREFIX}/${QT_BINDIR_REL}/${UIC:T}|g' \
 		${WRKSRC}/lib/pkgconfig/QtMultimedia.pc
 
 .include <bsd.port.mk>
diff --git a/multimedia/qt4-multimedia/pkg-descr b/multimedia/qt4-multimedia/pkg-descr
deleted file mode 100644
index 36bc69717e98..000000000000
--- a/multimedia/qt4-multimedia/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Qt is a C++ toolkit for application development.  It lets application
-developers target all major operating systems with a single application
-source code.
-
-Qt provides a platform-independent API to all central platform functionality:
-GUI, database access, networking, file handling, etc.  The Qt library
-encapsulates the different APIs of different operating systems, providing
-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://qt.nokia.com/products/qt/index.html
diff --git a/multimedia/qt4-multimedia/pkg-plist b/multimedia/qt4-multimedia/pkg-plist
index e86d13f95448..cec936145d5d 100644
--- a/multimedia/qt4-multimedia/pkg-plist
+++ b/multimedia/qt4-multimedia/pkg-plist
@@ -1,50 +1,50 @@
-include/qt4/Qt/QtMultimedia
-include/qt4/Qt/qabstractvideobuffer.h
-include/qt4/Qt/qabstractvideosurface.h
-include/qt4/Qt/qaudio.h
-include/qt4/Qt/qaudiodeviceinfo.h
-include/qt4/Qt/qaudioengine.h
-include/qt4/Qt/qaudioengineplugin.h
-include/qt4/Qt/qaudioformat.h
-include/qt4/Qt/qaudioinput.h
-include/qt4/Qt/qaudiooutput.h
-include/qt4/Qt/qvideoframe.h
-include/qt4/Qt/qvideosurfaceformat.h
-include/qt4/QtMultimedia/QAbstractAudioDeviceInfo
-include/qt4/QtMultimedia/QAbstractAudioInput
-include/qt4/QtMultimedia/QAbstractAudioOutput
-include/qt4/QtMultimedia/QAbstractVideoBuffer
-include/qt4/QtMultimedia/QAbstractVideoSurface
-include/qt4/QtMultimedia/QAudio
-include/qt4/QtMultimedia/QAudioDeviceInfo
-include/qt4/QtMultimedia/QAudioEngineFactoryInterface
-include/qt4/QtMultimedia/QAudioEnginePlugin
-include/qt4/QtMultimedia/QAudioFormat
-include/qt4/QtMultimedia/QAudioInput
-include/qt4/QtMultimedia/QAudioOutput
-include/qt4/QtMultimedia/QVideoFrame
-include/qt4/QtMultimedia/QVideoSurfaceFormat
-include/qt4/QtMultimedia/QtMultimedia
-include/qt4/QtMultimedia/qabstractvideobuffer.h
-include/qt4/QtMultimedia/qabstractvideosurface.h
-include/qt4/QtMultimedia/qaudio.h
-include/qt4/QtMultimedia/qaudiodeviceinfo.h
-include/qt4/QtMultimedia/qaudioengine.h
-include/qt4/QtMultimedia/qaudioengineplugin.h
-include/qt4/QtMultimedia/qaudioformat.h
-include/qt4/QtMultimedia/qaudioinput.h
-include/qt4/QtMultimedia/qaudiooutput.h
-include/qt4/QtMultimedia/qvideoframe.h
-include/qt4/QtMultimedia/qvideosurfaceformat.h
-lib/qt4/libQtMultimedia.la
-lib/qt4/libQtMultimedia.prl
-lib/qt4/libQtMultimedia.so
-lib/qt4/libQtMultimedia.so.4
-lib/qt4/libQtMultimedia.so.%%SHLIB_SHVER%%
-lib/qt4/libQtMultimedia.so.%%SHLIB_VER%%
-%%DEBUG%%lib/qt4/libQtMultimedia.so.%%SHLIB_VER%%.debug
+%%QT_INCDIR%%/Qt/QtMultimedia
+%%QT_INCDIR%%/Qt/qabstractvideobuffer.h
+%%QT_INCDIR%%/Qt/qabstractvideosurface.h
+%%QT_INCDIR%%/Qt/qaudio.h
+%%QT_INCDIR%%/Qt/qaudiodeviceinfo.h
+%%QT_INCDIR%%/Qt/qaudioengine.h
+%%QT_INCDIR%%/Qt/qaudioengineplugin.h
+%%QT_INCDIR%%/Qt/qaudioformat.h
+%%QT_INCDIR%%/Qt/qaudioinput.h
+%%QT_INCDIR%%/Qt/qaudiooutput.h
+%%QT_INCDIR%%/Qt/qvideoframe.h
+%%QT_INCDIR%%/Qt/qvideosurfaceformat.h
+%%QT_INCDIR%%/QtMultimedia/QAbstractAudioDeviceInfo
+%%QT_INCDIR%%/QtMultimedia/QAbstractAudioInput
+%%QT_INCDIR%%/QtMultimedia/QAbstractAudioOutput
+%%QT_INCDIR%%/QtMultimedia/QAbstractVideoBuffer
+%%QT_INCDIR%%/QtMultimedia/QAbstractVideoSurface
+%%QT_INCDIR%%/QtMultimedia/QAudio
+%%QT_INCDIR%%/QtMultimedia/QAudioDeviceInfo
+%%QT_INCDIR%%/QtMultimedia/QAudioEngineFactoryInterface
+%%QT_INCDIR%%/QtMultimedia/QAudioEnginePlugin
+%%QT_INCDIR%%/QtMultimedia/QAudioFormat
+%%QT_INCDIR%%/QtMultimedia/QAudioInput
+%%QT_INCDIR%%/QtMultimedia/QAudioOutput
+%%QT_INCDIR%%/QtMultimedia/QVideoFrame
+%%QT_INCDIR%%/QtMultimedia/QVideoSurfaceFormat
+%%QT_INCDIR%%/QtMultimedia/QtMultimedia
+%%QT_INCDIR%%/QtMultimedia/qabstractvideobuffer.h
+%%QT_INCDIR%%/QtMultimedia/qabstractvideosurface.h
+%%QT_INCDIR%%/QtMultimedia/qaudio.h
+%%QT_INCDIR%%/QtMultimedia/qaudiodeviceinfo.h
+%%QT_INCDIR%%/QtMultimedia/qaudioengine.h
+%%QT_INCDIR%%/QtMultimedia/qaudioengineplugin.h
+%%QT_INCDIR%%/QtMultimedia/qaudioformat.h
+%%QT_INCDIR%%/QtMultimedia/qaudioinput.h
+%%QT_INCDIR%%/QtMultimedia/qaudiooutput.h
+%%QT_INCDIR%%/QtMultimedia/qvideoframe.h
+%%QT_INCDIR%%/QtMultimedia/qvideosurfaceformat.h
+%%QT_LIBDIR%%/libQtMultimedia.la
+%%QT_LIBDIR%%/libQtMultimedia.prl
+%%QT_LIBDIR%%/libQtMultimedia.so
+%%QT_LIBDIR%%/libQtMultimedia.so.4
+%%QT_LIBDIR%%/libQtMultimedia.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQtMultimedia.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQtMultimedia.so.%%FULLVER%%.debug
 libdata/pkgconfig/QtMultimedia.pc
-@dirrmtry lib/qt4
-@dirrm include/qt4/QtMultimedia
-@dirrmtry include/qt4/Qt
-@dirrmtry include/qt4
+@dirrmtry %%QT_LIBDIR%%
+@dirrm %%QT_INCDIR%%/QtMultimedia
+@dirrmtry %%QT_INCDIR%%/Qt
+@dirrmtry %%QT_INCDIR%%