In preparation for Qt 5 ports:

Mk/Uses/qmake.mk:
- Add support for out-of-source builds
- Add support for Qt 5 ports
- Respect WITH_DEBUG

Mk/bsd.qt.mk:
- Massive rework for Qt 5 ports
- Remove '-phonon' from global configure args, thus allow qt4-designer and
  qt4-qtconfig to be built without Phonon support [1]

devel/qmake4:
- Improve mkspecs for gcc (mainly sync with linux version) and clang

devel/qt4-corelib:
- Convert to USES=iconv
- Remove ancient patch

devel/qt4-designer:
- Remove reference to WRKSRC from installed pkgconfig files [2]
- Don't build Qt Designer plugin for Phonon from outdated Qt sources.
  Separate port for plugin will be committed later

devel/qt4-assistant-adp, devel/qt4-libqtassistantclient:
- Convert to USES=qmake

Clean up Qt4 ports:
- Update comments
- Update description; use common description
- Consistently use QT_INCDIR, QT_LIBDIR, etc.
- Use options helpers
- Convert to new LIB_DEPENDS syntax
- Update DESKTOP_ENTRIES to avoid conflicts with Qt 5 ports
- Rename/move several ports for unification with Qt 5 ports

PR:		ports/184620 [1]
Reported by:	Kevin Zheng <kevinz5000@gmail.com>

PR:		ports/181141 [2]
Reported by:	thierry

PR:		ports/185101
Exp-run by:	bdrewery

This is mostly solely avilla's work in area51, kudos to him! And a couple
commits from myself, so you know who's collecting pointyhats :)

13 files changed, 162 insertions, 120 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 0f1668bf6818..a09f943b30c7 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -881,6 +881,7 @@
     SUBDIR += qslim
     SUBDIR += qt4-iconengines
     SUBDIR += qt4-imageformats
+    SUBDIR += qt4-opengl
     SUBDIR += qt4-pixeltool
     SUBDIR += qt4-svg
     SUBDIR += qtgtl
diff --git a/graphics/qt4-iconengines/Makefile b/graphics/qt4-iconengines/Makefile
index 240e057aa011..c53482c4d4a1 100644
--- a/graphics/qt4-iconengines/Makefile
+++ b/graphics/qt4-iconengines/Makefile
@@ -3,18 +3,16 @@
 
 PORTNAME=	iconengines
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	graphics
+CATEGORIES=	graphics
 PKGNAMEPREFIX=	qt4-
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt SVG icon engine plugin
+COMMENT=	Qt SVG icon engine
 
+USES=		pkgconfig
 USE_QT4=	qmake_build moc_build corelib gui svg xml
-QT_NONSTANDARD=	yes
 QT_DIST=	yes
 
-USES=		pkgconfig
-
 HAS_CONFIGURE=	yes
 
 ALL_TARGET=	first
@@ -37,11 +35,9 @@ EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 BUILD_WRKSRC=	${WRKSRC}/src/plugins/${PORTNAME}/svgiconengine
 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 ${QMAKE} ${WRKSRC}/bin/qmake
+	${LN} -sf ${MOC} ${WRKSRC}/bin/moc
 
 .include <bsd.port.mk>
diff --git a/graphics/qt4-iconengines/pkg-descr b/graphics/qt4-iconengines/pkg-descr
deleted file mode 100644
index 36bc69717e98..000000000000
--- a/graphics/qt4-iconengines/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/graphics/qt4-imageformats/Makefile b/graphics/qt4-imageformats/Makefile
index 1641fbd10e16..8088c2eea1d6 100644
--- a/graphics/qt4-imageformats/Makefile
+++ b/graphics/qt4-imageformats/Makefile
@@ -3,23 +3,21 @@
 
 PORTNAME=	imageformats
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	graphics
+CATEGORIES=	graphics
 PKGNAMEPREFIX=	qt4-
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt imageformat plugins for GIF, JPEG, MNG and SVG
+COMMENT=	Qt plugins for several image formats
 
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
-		mng:${PORTSDIR}/graphics/libmng \
-		png15:${PORTSDIR}/graphics/png \
-		tiff:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libmng.so:${PORTSDIR}/graphics/libmng \
+		libpng15.so:${PORTSDIR}/graphics/png \
+		libtiff.so:${PORTSDIR}/graphics/tiff
 
+USES=		pkgconfig
 USE_QT4=	qmake_build moc_build rcc_build corelib gui svg xml
-QT_NONSTANDARD=	yes
 QT_DIST=	yes
 
-USES=		pkgconfig
-
 HAS_CONFIGURE=	yes
 
 ALL_TARGET=	first
@@ -42,12 +40,10 @@ EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 BUILD_WRKSRC=	${WRKSRC}/src/plugins/${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/rcc ${WRKSRC}/bin/rcc
+	${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake
+	${LN} -sf ${MOC} ${WRKSRC}/bin/moc
+	${LN} -sf ${RCC} ${WRKSRC}/bin/rcc
 
 .include <bsd.port.mk>
diff --git a/graphics/qt4-imageformats/pkg-descr b/graphics/qt4-imageformats/pkg-descr
deleted file mode 100644
index 36bc69717e98..000000000000
--- a/graphics/qt4-imageformats/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/graphics/qt4-opengl/Makefile b/graphics/qt4-opengl/Makefile
new file mode 100644
index 000000000000..1f771e890a3a
--- /dev/null
+++ b/graphics/qt4-opengl/Makefile
@@ -0,0 +1,55 @@
+# Created by: lofi@FreeBSD.org
+# $FreeBSD$
+
+PORTNAME=	opengl
+DISTVERSION=	${QT4_VERSION}
+CATEGORIES=	graphics
+PKGNAMEPREFIX=	qt4-
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Qt OpenGL support module
+
+USE_QT4=	qmake_build moc_build corelib gui
+QT_DIST=	yes
+
+HAS_CONFIGURE=	yes
+USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
+USE_GL=		gl
+USE_XORG=	x11
+
+ALL_TARGET=	first
+CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
+MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \
+		PATH=${WRKSRC}/bin:$$PATH
+
+DO_NOT_EXTRACT=	demos doc examples mkspecs qmake tools translations \
+		src/activeqt src/dbus src/multimedia src/network src/openvg \
+		src/phonon src/qt3support 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
+.for dne in ${DO_NOT_EXTRACT}
+EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
+.endfor
+
+BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+
+CONFIGURE_ARGS+=	-I../../include/QtCore -I../../include/QtGui \
+			-I../../include/Qt -I../../include
+
+pre-configure:
+	${MKDIR} ${WRKSRC}/mkspecs
+	${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake
+	${LN} -sf ${MOC} ${WRKSRC}/bin/moc
+
+post-configure:
+	${REINPLACE_CMD} -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}/${QT_BINDIR_REL}/${MOC:T}|g' \
+		${WRKSRC}/lib/pkgconfig/QtOpenGL.pc
+
+.include <bsd.port.mk>
diff --git a/graphics/qt4-opengl/pkg-plist b/graphics/qt4-opengl/pkg-plist
new file mode 100644
index 000000000000..4ccb120f67e7
--- /dev/null
+++ b/graphics/qt4-opengl/pkg-plist
@@ -0,0 +1,48 @@
+%%QT_INCDIR%%/Qt/QtOpenGL
+%%QT_INCDIR%%/Qt/qgl.h
+%%QT_INCDIR%%/Qt/qglbuffer.h
+%%QT_INCDIR%%/Qt/qglcolormap.h
+%%QT_INCDIR%%/Qt/qglframebufferobject.h
+%%QT_INCDIR%%/Qt/qglfunctions.h
+%%QT_INCDIR%%/Qt/qglpixelbuffer.h
+%%QT_INCDIR%%/Qt/qglscreen_qws.h
+%%QT_INCDIR%%/Qt/qglshaderprogram.h
+%%QT_INCDIR%%/QtOpenGL/QGLBuffer
+%%QT_INCDIR%%/QtOpenGL/QGLColormap
+%%QT_INCDIR%%/QtOpenGL/QGLContext
+%%QT_INCDIR%%/QtOpenGL/QGLFormat
+%%QT_INCDIR%%/QtOpenGL/QGLFramebufferObject
+%%QT_INCDIR%%/QtOpenGL/QGLFramebufferObjectFormat
+%%QT_INCDIR%%/QtOpenGL/QGLFunctions
+%%QT_INCDIR%%/QtOpenGL/QGLFunctionsPrivate
+%%QT_INCDIR%%/QtOpenGL/QGLPixelBuffer
+%%QT_INCDIR%%/QtOpenGL/QGLScreen
+%%QT_INCDIR%%/QtOpenGL/QGLScreenSurfaceFunctions
+%%QT_INCDIR%%/QtOpenGL/QGLShader
+%%QT_INCDIR%%/QtOpenGL/QGLShaderProgram
+%%QT_INCDIR%%/QtOpenGL/QGLWidget
+%%QT_INCDIR%%/QtOpenGL/QMacCompatGLenum
+%%QT_INCDIR%%/QtOpenGL/QMacCompatGLint
+%%QT_INCDIR%%/QtOpenGL/QMacCompatGLuint
+%%QT_INCDIR%%/QtOpenGL/QMacGLCompatTypes
+%%QT_INCDIR%%/QtOpenGL/QtOpenGL
+%%QT_INCDIR%%/QtOpenGL/qgl.h
+%%QT_INCDIR%%/QtOpenGL/qglbuffer.h
+%%QT_INCDIR%%/QtOpenGL/qglcolormap.h
+%%QT_INCDIR%%/QtOpenGL/qglframebufferobject.h
+%%QT_INCDIR%%/QtOpenGL/qglfunctions.h
+%%QT_INCDIR%%/QtOpenGL/qglpixelbuffer.h
+%%QT_INCDIR%%/QtOpenGL/qglscreen_qws.h
+%%QT_INCDIR%%/QtOpenGL/qglshaderprogram.h
+%%QT_LIBDIR%%/libQtOpenGL.la
+%%QT_LIBDIR%%/libQtOpenGL.prl
+%%QT_LIBDIR%%/libQtOpenGL.so
+%%QT_LIBDIR%%/libQtOpenGL.so.4
+%%QT_LIBDIR%%/libQtOpenGL.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQtOpenGL.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQtOpenGL.so.%%FULLVER%%.debug
+libdata/pkgconfig/QtOpenGL.pc
+@dirrmtry %%QT_LIBDIR%%
+@dirrm %%QT_INCDIR%%/QtOpenGL
+@dirrmtry %%QT_INCDIR%%/Qt
+@dirrmtry %%QT_INCDIR%%
diff --git a/graphics/qt4-pixeltool/Makefile b/graphics/qt4-pixeltool/Makefile
index 560b277b8f15..d9fa14591c8b 100644
--- a/graphics/qt4-pixeltool/Makefile
+++ b/graphics/qt4-pixeltool/Makefile
@@ -3,14 +3,14 @@
 
 PORTNAME=	pixeltool
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	graphics
+PORTREVISION=	1
+CATEGORIES=	graphics
 PKGNAMEPREFIX=	qt4-
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt screen magnification utility
+COMMENT=	Qt 4 screen magnifier
 
 USE_QT4=	qmake_build moc_build corelib gui network
-QT_NONSTANDARD=	yes
 QT_DIST=	yes
 
 HAS_CONFIGURE=	yes
@@ -21,9 +21,10 @@ MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \
 		PATH=${WRKSRC}/bin:$$PATH
 
 # qtlogo.png is installed by qt4-gui
-DESKTOP_ENTRIES="Qt PixelTool" "${COMMENT}" \
-		"${LOCALBASE}/share/pixmaps/qtlogo.png" \
-		"${PREFIX}/bin/pixeltool" "Graphics;Qt;" true
+DESKTOP_ENTRIES="Qt 4 PixelTool" "" \
+		"${QT_PREFIX}/share/pixmaps/qtlogo.png" \
+		"${PREFIX}/${QT_BINDIR_REL}/pixeltool" \
+		"Graphics;Qt;" true
 
 DO_NOT_EXTRACT=	demos doc examples mkspecs qmake translations \
 		src/activeqt src/dbus src/multimedia src/network src/opengl \
@@ -40,13 +41,9 @@ EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 BUILD_WRKSRC=	${WRKSRC}/tools/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-EXTRA_PATCHES+=	${.CURDIR}/../../devel/qt4/files/patch-configure
-
 pre-configure:
-	${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \
-		${BUILD_WRKSRC}/${PORTNAME}.pro
 	${MKDIR} ${WRKSRC}/mkspecs
-	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
-	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc
+	${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake
+	${LN} -sf ${MOC} ${WRKSRC}/bin/moc
 
 .include <bsd.port.mk>
diff --git a/graphics/qt4-pixeltool/pkg-descr b/graphics/qt4-pixeltool/pkg-descr
deleted file mode 100644
index 36bc69717e98..000000000000
--- a/graphics/qt4-pixeltool/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/graphics/qt4-pixeltool/pkg-plist b/graphics/qt4-pixeltool/pkg-plist
index 04df01386af6..4038b18358ec 100644
--- a/graphics/qt4-pixeltool/pkg-plist
+++ b/graphics/qt4-pixeltool/pkg-plist
@@ -1,2 +1,2 @@
-bin/pixeltool
-%%DEBUG%%bin/pixeltool.debug
+%%QT_BINDIR%%/pixeltool
+%%DEBUG%%%%QT_BINDIR%%/pixeltool.debug
diff --git a/graphics/qt4-svg/Makefile b/graphics/qt4-svg/Makefile
index 4e17c4941546..ccd5ace5fa81 100644
--- a/graphics/qt4-svg/Makefile
+++ b/graphics/qt4-svg/Makefile
@@ -3,18 +3,17 @@
 
 PORTNAME=	svg
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	graphics
+CATEGORIES=	graphics
 PKGNAMEPREFIX=	qt4-
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt SVG library
+COMMENT=	Qt SVG support module
 
 USE_QT4=	qmake_build moc_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
@@ -36,18 +35,16 @@ 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 ${QMAKE} ${WRKSRC}/bin/qmake
+	${LN} -sf ${MOC} ${WRKSRC}/bin/moc
 
 post-configure:
-	${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
+	${REINPLACE_CMD} -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=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \
 		${WRKSRC}/lib/pkgconfig/QtSvg.pc
 
 .include <bsd.port.mk>
diff --git a/graphics/qt4-svg/pkg-descr b/graphics/qt4-svg/pkg-descr
deleted file mode 100644
index 36bc69717e98..000000000000
--- a/graphics/qt4-svg/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/graphics/qt4-svg/pkg-plist b/graphics/qt4-svg/pkg-plist
index f7171bbbf1c3..d69f1ebe6860 100644
--- a/graphics/qt4-svg/pkg-plist
+++ b/graphics/qt4-svg/pkg-plist
@@ -1,26 +1,26 @@
-include/qt4/Qt/QtSvg
-include/qt4/Qt/qgraphicssvgitem.h
-include/qt4/Qt/qsvggenerator.h
-include/qt4/Qt/qsvgrenderer.h
-include/qt4/Qt/qsvgwidget.h
-include/qt4/QtSvg/QGraphicsSvgItem
-include/qt4/QtSvg/QSvgGenerator
-include/qt4/QtSvg/QSvgRenderer
-include/qt4/QtSvg/QSvgWidget
-include/qt4/QtSvg/QtSvg
-include/qt4/QtSvg/qgraphicssvgitem.h
-include/qt4/QtSvg/qsvggenerator.h
-include/qt4/QtSvg/qsvgrenderer.h
-include/qt4/QtSvg/qsvgwidget.h
-lib/qt4/libQtSvg.la
-lib/qt4/libQtSvg.prl
-lib/qt4/libQtSvg.so
-lib/qt4/libQtSvg.so.4
-lib/qt4/libQtSvg.so.%%SHLIB_SHVER%%
-lib/qt4/libQtSvg.so.%%SHLIB_VER%%
-%%DEBUG%%lib/qt4/libQtSvg.so.%%SHLIB_VER%%.debug
+%%QT_INCDIR%%/Qt/QtSvg
+%%QT_INCDIR%%/Qt/qgraphicssvgitem.h
+%%QT_INCDIR%%/Qt/qsvggenerator.h
+%%QT_INCDIR%%/Qt/qsvgrenderer.h
+%%QT_INCDIR%%/Qt/qsvgwidget.h
+%%QT_INCDIR%%/QtSvg/QGraphicsSvgItem
+%%QT_INCDIR%%/QtSvg/QSvgGenerator
+%%QT_INCDIR%%/QtSvg/QSvgRenderer
+%%QT_INCDIR%%/QtSvg/QSvgWidget
+%%QT_INCDIR%%/QtSvg/QtSvg
+%%QT_INCDIR%%/QtSvg/qgraphicssvgitem.h
+%%QT_INCDIR%%/QtSvg/qsvggenerator.h
+%%QT_INCDIR%%/QtSvg/qsvgrenderer.h
+%%QT_INCDIR%%/QtSvg/qsvgwidget.h
+%%QT_LIBDIR%%/libQtSvg.la
+%%QT_LIBDIR%%/libQtSvg.prl
+%%QT_LIBDIR%%/libQtSvg.so
+%%QT_LIBDIR%%/libQtSvg.so.4
+%%QT_LIBDIR%%/libQtSvg.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQtSvg.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQtSvg.so.%%FULLVER%%.debug
 libdata/pkgconfig/QtSvg.pc
-@dirrmtry lib/qt4
-@dirrm include/qt4/QtSvg
-@dirrmtry include/qt4/Qt
-@dirrmtry include/qt4
+@dirrmtry %%QT_LIBDIR%%
+@dirrm %%QT_INCDIR%%/QtSvg
+@dirrmtry %%QT_INCDIR%%/Qt
+@dirrmtry %%QT_INCDIR%%