- bsd.qt.mk:

QT_COMPONENTS can now be depended on at runtime or buildtime only by
specifiying them as <component>_build or <component>_run, respectively.
Specifying <component> without any suffix will depend on the component
at both build- and runtime just like before.

- Convert Qt core ports to use the new dependency switches.

- Add a patch to corelib to fix Qt4 on ARM, submitted by:
  Björn König <bkoenig@alpha-tierchen.de>

8 files changed, 17 insertions, 28 deletions

diff --git a/graphics/qt4-iconengines/Makefile b/graphics/qt4-iconengines/Makefile
index 8721d617a53d..69e31eada906 100644
--- a/graphics/qt4-iconengines/Makefile
+++ b/graphics/qt4-iconengines/Makefile
@@ -19,7 +19,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt SVG icon engine plugin
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake moc corelib gui svg xml
+QT_COMPONENTS=	qmake_build moc_build corelib gui svg xml
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 		
@@ -43,8 +43,6 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
 WRKSRC=		${WRKDIR}/${DISTNAME}/src/plugins/${PORTNAME}
 CONFIGURE_WRKSRC=${WRKSRC}/../../..
 
-.include <bsd.port.pre.mk>
-
 pre-configure:
 	${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
 	${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib/plugins/iconengines|g' \
@@ -53,4 +51,4 @@ pre-configure:
 	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../bin/qmake
 	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../../bin/moc
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/qt4-iconengines/pkg-plist b/graphics/qt4-iconengines/pkg-plist
index d2c62653b89c..df8e9182b729 100644
--- a/graphics/qt4-iconengines/pkg-plist
+++ b/graphics/qt4-iconengines/pkg-plist
@@ -1,3 +1,3 @@
 lib/plugins/iconengines/libqsvg.so
-lib/plugins/iconengines/libqsvg.so.debug
+%%DEBUG%%lib/plugins/iconengines/libqsvg.so.debug
 @dirrm lib/plugins/iconengines
diff --git a/graphics/qt4-imageformats/Makefile b/graphics/qt4-imageformats/Makefile
index 0598124b8063..a85ded00688d 100644
--- a/graphics/qt4-imageformats/Makefile
+++ b/graphics/qt4-imageformats/Makefile
@@ -24,7 +24,7 @@ LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		tiff:${PORTSDIR}/graphics/tiff
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake moc rcc corelib gui svg xml
+QT_COMPONENTS=	qmake_build moc_build rcc_build corelib gui svg xml
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 
@@ -48,8 +48,6 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
 WRKSRC=		${WRKDIR}/${DISTNAME}/src/plugins/${PORTNAME}
 CONFIGURE_WRKSRC=${WRKSRC}/../../..
 
-.include <bsd.port.pre.mk>
-
 pre-configure:
 	${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
 	${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib/plugins/imageformats|g' \
@@ -66,4 +64,4 @@ post-build:
 post-install:
 	cd ${WRKSRC}/gif; make -f Makefile install
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/qt4-imageformats/pkg-plist b/graphics/qt4-imageformats/pkg-plist
index 4f61b248e9a8..a15660aa8d84 100644
--- a/graphics/qt4-imageformats/pkg-plist
+++ b/graphics/qt4-imageformats/pkg-plist
@@ -1,11 +1,11 @@
 lib/plugins/imageformats/libqgif.so
-lib/plugins/imageformats/libqgif.so.debug
+%%DEBUG%%lib/plugins/imageformats/libqgif.so.debug
 lib/plugins/imageformats/libqjpeg.so
-lib/plugins/imageformats/libqjpeg.so.debug
+%%DEBUG%%lib/plugins/imageformats/libqjpeg.so.debug
 lib/plugins/imageformats/libqmng.so
-lib/plugins/imageformats/libqmng.so.debug
+%%DEBUG%%lib/plugins/imageformats/libqmng.so.debug
 lib/plugins/imageformats/libqsvg.so
-lib/plugins/imageformats/libqsvg.so.debug
+%%DEBUG%%lib/plugins/imageformats/libqsvg.so.debug
 lib/plugins/imageformats/libqtiff.so
-lib/plugins/imageformats/libqtiff.so.debug
+%%DEBUG%%lib/plugins/imageformats/libqtiff.so.debug
 @dirrm lib/plugins/imageformats
diff --git a/graphics/qt4-pixeltool/Makefile b/graphics/qt4-pixeltool/Makefile
index bd8fe5ff3a64..58fcc3e7eae9 100644
--- a/graphics/qt4-pixeltool/Makefile
+++ b/graphics/qt4-pixeltool/Makefile
@@ -19,7 +19,8 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt screen magnification utility
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake moc uic assistantclient corelib gui network
+QT_COMPONENTS=	qmake_build moc_build uic_build assistantclient corelib gui \
+		network
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 
diff --git a/graphics/qt4-pixeltool/pkg-plist b/graphics/qt4-pixeltool/pkg-plist
index 883736ed2f6e..04df01386af6 100644
--- a/graphics/qt4-pixeltool/pkg-plist
+++ b/graphics/qt4-pixeltool/pkg-plist
@@ -1,2 +1,2 @@
 bin/pixeltool
-bin/pixeltool.debug
+%%DEBUG%%bin/pixeltool.debug
diff --git a/graphics/qt4-svg/Makefile b/graphics/qt4-svg/Makefile
index 67b4ada6bb66..7dd3a3e403bd 100644
--- a/graphics/qt4-svg/Makefile
+++ b/graphics/qt4-svg/Makefile
@@ -19,7 +19,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt SVG library
 
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake moc corelib gui xml
+QT_COMPONENTS=	qmake_build moc_build corelib gui xml
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
 
@@ -45,15 +45,6 @@ EXTRACT_AFTER_ARGS=| ${TAR} -xf - \
 WRKSRC=		${WRKDIR}/${DISTNAME}/src/${PORTNAME}
 CONFIGURE_WRKSRC=${WRKSRC}/../../
 
-.include <bsd.port.pre.mk>
-
-.if defined(PKGNAMESUFFIX) && (${PKGNAMESUFFIX} == "-debug" || ${PKGNAMESUFFIX} == "-static-debug")
-CONFIGURE_ARGS+=-debug
-.endif
-.if defined(PKGNAMESUFFIX) && (${PKGNAMESUFFIX} == "-static" || ${PKGNAMESUFFIX} == "-static-debug")
-CONFIGURE_ARGS+=-static
-.endif
-
 pre-configure:
 	${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
 	${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib|g' \
@@ -66,10 +57,10 @@ pre-configure:
 
 post-configure:
 	${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
-		-e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${WRKSRC}/Makefile
+		-e 's|.*$$(QMAKE).*||g' ${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' \
 		${WRKSRC}/../../lib/pkgconfig/*Qt*
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/qt4-svg/pkg-plist b/graphics/qt4-svg/pkg-plist
index 7699fb340b95..63683b71cdab 100644
--- a/graphics/qt4-svg/pkg-plist
+++ b/graphics/qt4-svg/pkg-plist
@@ -18,5 +18,6 @@ lib/libQtSvg.so
 lib/libQtSvg.so.4
 lib/libQtSvg.so.4.3
 lib/libQtSvg.so.4.3.0
+%%DEBUG%%lib/libQtSvg.so.4.3.0.debug
 libdata/pkgconfig/QtSvg.pc
 @dirrm include/QtSvg