4 files changed, 130 insertions, 171 deletions

diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk
index db0640bc0f53..559021f950c3 100644
--- a/Mk/bsd.kde.mk
+++ b/Mk/bsd.kde.mk
@@ -12,11 +12,9 @@ KDE_MAINTAINER=		kde@FreeBSD.org
 # This section contains the USE_ definitions.
 # XXX: Write HAVE_ definitions sometime.
 
-# QT_COMPONENTS		- Triggers individual Qt4 component port dependencies. Possible 
-#			  values: See _QT_COMPONENTS_ALL below. Only works if USE_QT_VER is set
-#			  to 4.
 # USE_QT_VER		- Says that the port uses the Qt toolkit.  Possible values:
 #					  3, 4; each specify the major version of Qt to use.
+#					  Note: 4 is handled by bsd.qt.mk.
 # USE_KDELIBS_VER	- Says that the port uses KDE libraries.  Possible values:
 #					  3 specifies the major version of KDE to use.
 #					  This implies USE_QT of the appropriate version.
@@ -136,88 +134,6 @@ CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGL
 				QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"
 .endif # !defined(QT_NONSTANDARD)
 
-.elif ${USE_QT_VER} == 4
-
-# Qt 4.x common stuff
-QT_PREFIX?=	${LOCALBASE}
-MOC?=		${QT_PREFIX}/bin/moc-qt4
-UIC?=		${QT_PREFIX}/bin/uic-qt4
-QMAKE?=		${QT_PREFIX}/bin/qmake-qt4
-QMAKESPEC?=	${QT_PREFIX}/share/qt4/mkspecs/freebsd-g++
-
-QTCPPFLAGS?=
-QTCGFLIBS?=
-
-.if !defined(QT_NONSTANDARD)
-CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \
-				--with-qt-libraries=${QT_PREFIX}/lib \
-				--with-extra-libs=${LOCALBASE}/lib \
-				--with-extra-includes=${LOCALBASE}/include
-CONFIGURE_ENV+=	MOC="${MOC}" UIC="${UIC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
-		QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"
-MAKE_ENV+=	QMAKESPEC="${QMAKESPEC}"
-.endif # !defined(QT_NONSTANDARD)
-
-QT4_VERSION=	4.2.3
-
-_QT_COMPONENTS_ALL=	accessible assistant codecs-cn codecs-jp codecs-kr \
-			codecs-tw corelib designer doc gui iconengines \
-			imageformats inputmethods assistantclient \
-			linguist moc network opengl pixeltool porting \
-			qmake qt3support qtconfig qtestlib qvfb rcc sql svg \
-			uic uic3 xml
-
-accessible_DEPENDS=	accessibility/qt4-acessible
-assistant_DEPENDS=	devel/qt4-assistant
-codecs-cn_DEPENDS=	chinese/qt4-codecs-cn
-codecs-jp_DEPENDS=	japanese/qt4-codecs-jp
-codecs-kr_DEPENDS=	korean/qt4-codecs-kr
-codecs-tw_DEPENDS=	chinese/qt4-codecs-tw
-corelib_DEPENDS=	devel/qt4-corelib
-designer_DEPENDS=	devel/qt4-designer
-doc_DEPENDS=		misc/qt4-doc
-gui_DEPENDS=		x11-toolkits/qt4-gui
-iconengines_DEPENDS=	graphics/qt4-iconengines
-imageformats_DEPENDS=	graphics/qt4-imageformats
-inputmethods_DEPENDS=	x11/qt4-inputmethods
-assistantclient_DEPENDS=devel/qt4-libqtassistantclient
-assistantclient_NAME=	libQtAssistantClient
-linguist_DEPENDS=	devel/qt4-linguist
-moc_DEPENDS=		devel/qt4-moc
-network_DEPENDS=	net/qt4-network
-opengl_DEPENDS=		x11/qt4-opengl
-pixeltool_DEPENDS=	graphics/qt4-pixeltool
-porting_DEPENDS=	devel/qt4-porting
-qmake_DEPENDS=		devel/qmake4
-qmake_QT4_PREFIX=	# empty
-qt3support_DEPENDS=	devel/qt4-qt3support
-qtconfig_DEPENDS=	devel/qtconfig
-qtestlib_DEPENDS=	devel/qt4-qtestlib
-qvfb_DEPENDS=		devel/qt4-qvfb
-rcc_DEPENDS=		devel/qt4-rcc
-sql_DEPENDS=		databases/qt4-sql
-svg_DEPENDS=		graphics/qt4-svg
-uic_DEPENDS=		devel/qt4-uic
-uic3_DEPENDS=		devel/qt4-uic3
-xml_DEPENDS=		textproc/qt4-xml
-
-.if defined(QT_COMPONENTS)
-.for ext in ${QT_COMPONENTS}
-${ext}_QT4_PREFIX?=	qt4-
-${ext}_QT4_VERSION?=	${QT4_VERSION}
-${ext}_NAME?=		${ext}
-.if ${_QT_COMPONENTS_ALL:M${ext}}!= ""
-BUILD_DEPENDS+=	${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
-RUN_DEPENDS+=	${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
-.else
-IGNORE= cannot install: unknown Qt4 component -- ${ext}
-.endif
-.endfor
-.else
-BUILD_DEPENDS+=		qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
-RUN_DEPENDS+=		qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
-.endif
-
 .else
 IGNORE=			cannot install: unsupported value of USE_QT_VER
 .endif # defined(USE_QT_VER)
diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
index db0640bc0f53..559021f950c3 100644
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@@ -12,11 +12,9 @@ KDE_MAINTAINER=		kde@FreeBSD.org
 # This section contains the USE_ definitions.
 # XXX: Write HAVE_ definitions sometime.
 
-# QT_COMPONENTS		- Triggers individual Qt4 component port dependencies. Possible 
-#			  values: See _QT_COMPONENTS_ALL below. Only works if USE_QT_VER is set
-#			  to 4.
 # USE_QT_VER		- Says that the port uses the Qt toolkit.  Possible values:
 #					  3, 4; each specify the major version of Qt to use.
+#					  Note: 4 is handled by bsd.qt.mk.
 # USE_KDELIBS_VER	- Says that the port uses KDE libraries.  Possible values:
 #					  3 specifies the major version of KDE to use.
 #					  This implies USE_QT of the appropriate version.
@@ -136,88 +134,6 @@ CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGL
 				QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"
 .endif # !defined(QT_NONSTANDARD)
 
-.elif ${USE_QT_VER} == 4
-
-# Qt 4.x common stuff
-QT_PREFIX?=	${LOCALBASE}
-MOC?=		${QT_PREFIX}/bin/moc-qt4
-UIC?=		${QT_PREFIX}/bin/uic-qt4
-QMAKE?=		${QT_PREFIX}/bin/qmake-qt4
-QMAKESPEC?=	${QT_PREFIX}/share/qt4/mkspecs/freebsd-g++
-
-QTCPPFLAGS?=
-QTCGFLIBS?=
-
-.if !defined(QT_NONSTANDARD)
-CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \
-				--with-qt-libraries=${QT_PREFIX}/lib \
-				--with-extra-libs=${LOCALBASE}/lib \
-				--with-extra-includes=${LOCALBASE}/include
-CONFIGURE_ENV+=	MOC="${MOC}" UIC="${UIC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
-		QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"
-MAKE_ENV+=	QMAKESPEC="${QMAKESPEC}"
-.endif # !defined(QT_NONSTANDARD)
-
-QT4_VERSION=	4.2.3
-
-_QT_COMPONENTS_ALL=	accessible assistant codecs-cn codecs-jp codecs-kr \
-			codecs-tw corelib designer doc gui iconengines \
-			imageformats inputmethods assistantclient \
-			linguist moc network opengl pixeltool porting \
-			qmake qt3support qtconfig qtestlib qvfb rcc sql svg \
-			uic uic3 xml
-
-accessible_DEPENDS=	accessibility/qt4-acessible
-assistant_DEPENDS=	devel/qt4-assistant
-codecs-cn_DEPENDS=	chinese/qt4-codecs-cn
-codecs-jp_DEPENDS=	japanese/qt4-codecs-jp
-codecs-kr_DEPENDS=	korean/qt4-codecs-kr
-codecs-tw_DEPENDS=	chinese/qt4-codecs-tw
-corelib_DEPENDS=	devel/qt4-corelib
-designer_DEPENDS=	devel/qt4-designer
-doc_DEPENDS=		misc/qt4-doc
-gui_DEPENDS=		x11-toolkits/qt4-gui
-iconengines_DEPENDS=	graphics/qt4-iconengines
-imageformats_DEPENDS=	graphics/qt4-imageformats
-inputmethods_DEPENDS=	x11/qt4-inputmethods
-assistantclient_DEPENDS=devel/qt4-libqtassistantclient
-assistantclient_NAME=	libQtAssistantClient
-linguist_DEPENDS=	devel/qt4-linguist
-moc_DEPENDS=		devel/qt4-moc
-network_DEPENDS=	net/qt4-network
-opengl_DEPENDS=		x11/qt4-opengl
-pixeltool_DEPENDS=	graphics/qt4-pixeltool
-porting_DEPENDS=	devel/qt4-porting
-qmake_DEPENDS=		devel/qmake4
-qmake_QT4_PREFIX=	# empty
-qt3support_DEPENDS=	devel/qt4-qt3support
-qtconfig_DEPENDS=	devel/qtconfig
-qtestlib_DEPENDS=	devel/qt4-qtestlib
-qvfb_DEPENDS=		devel/qt4-qvfb
-rcc_DEPENDS=		devel/qt4-rcc
-sql_DEPENDS=		databases/qt4-sql
-svg_DEPENDS=		graphics/qt4-svg
-uic_DEPENDS=		devel/qt4-uic
-uic3_DEPENDS=		devel/qt4-uic3
-xml_DEPENDS=		textproc/qt4-xml
-
-.if defined(QT_COMPONENTS)
-.for ext in ${QT_COMPONENTS}
-${ext}_QT4_PREFIX?=	qt4-
-${ext}_QT4_VERSION?=	${QT4_VERSION}
-${ext}_NAME?=		${ext}
-.if ${_QT_COMPONENTS_ALL:M${ext}}!= ""
-BUILD_DEPENDS+=	${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
-RUN_DEPENDS+=	${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
-.else
-IGNORE= cannot install: unknown Qt4 component -- ${ext}
-.endif
-.endfor
-.else
-BUILD_DEPENDS+=		qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
-RUN_DEPENDS+=		qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
-.endif
-
 .else
 IGNORE=			cannot install: unsupported value of USE_QT_VER
 .endif # defined(USE_QT_VER)
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index cef3fccae2ed..647c161e8805 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1587,10 +1587,14 @@ PERL=		${LOCALBASE}/bin/perl
 .include "${PORTSDIR}/Mk/bsd.apache.mk"
 .endif
 
-.if defined(USE_QT_VER) || defined(USE_KDELIBS_VER) || defined(USE_KDEBASE_VER)
+.if (defined(USE_QT_VER) && ${USE_QT_VER:L} == 3) || defined(USE_KDELIBS_VER) || defined(USE_KDEBASE_VER)
 .include "${PORTSDIR}/Mk/bsd.kde.mk"
 .endif
 
+.if defined (USE_QT_VER) && ${USE_QT_VER:L} == 4
+.include "${PORTSDIR}/Mk/bsd.qt.mk"
+.endif
+
 .if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK)
 .include "${PORTSDIR}/Mk/bsd.gnome.mk"
 .endif
@@ -2100,6 +2104,10 @@ RUN_DEPENDS+=	${PERL5}:${PORTSDIR}/lang/${PERL_PORT}
 .include "${PORTSDIR}/Mk/bsd.linux-rpm.mk"
 .endif
 
+.if defined (USE_QT_VER) && ${USE_QT_VER:L} == 4
+.include "${PORTSDIR}/Mk/bsd.qt.mk"
+.endif
+
 .if defined(USE_SCONS)
 .include "${PORTSDIR}/Mk/bsd.scons.mk"
 .endif
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk
new file mode 100644
index 000000000000..58a24f10708c
--- /dev/null
+++ b/Mk/bsd.qt.mk
@@ -0,0 +1,119 @@
+.if !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include)
+Qt_Include_MAINTAINER=	kde@freebsd.org
+Qt_Pre_Include=		bsd.qt.mk
+
+.if !defined(QT_NONSTANDARD)
+CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \
+				--with-qt-libraries=${QT_PREFIX}/lib \
+				--with-extra-libs=${LOCALBASE}/lib \
+				--with-extra-includes=${LOCALBASE}/include
+CONFIGURE_ENV+=	MOC="${MOC}" UIC="${UIC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
+		QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" QTDIR="${QT_PREFIX}"
+MAKE_ENV+=	QMAKESPEC="${QMAKESPEC}"
+.endif # !defined(QT_NONSTANDARD)
+
+.if defined(QT_DIST)
+#CONFLICTS+=	Currently there are no conflicts \o/
+CONFIGURE_ARGS+=-fast -no-exceptions ${CUPS} \
+		-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
+		-qt-gif -release -system-libjpeg -system-libpng \
+		-system-libmng -system-libtiff -system-zlib \
+		-confirm-license \
+                -prefix ${PREFIX} \
+                -docdir ${PREFIX}/share/doc/qt4 \
+                -headerdir ${PREFIX}/include \
+                -plugindir ${PREFIX}/lib/plugins \
+                -datadir ${PREFIX}/share/qt4 \
+                -libdir ${PREFIX}/lib \
+                -translationdir ${PREFIX}/share/qt4/translations \
+                -sysconfdir ${PREFIX}/local/etc/xdg \
+                -examplesdir ${PREFIX}/share/qt4/examples \
+                -demosdir ${PREFIX}/share/qt4/demos \
+                -bindir ${PREFIX}/bin
+.if defined(PACKAGE_BUILDING)
+CONFIGURE_ARGS+=-no-3dnow -no-sse -no-sse2
+.endif #defined(PACKAGE_BUILDING)
+
+.if defined(QT_WANT_VERBOSE_CONFIGURE)
+CONFIGURE_ARGS+=-v
+.endif
+.endif #defined(QT_DIST)
+
+QT_PREFIX?=	${LOCALBASE}
+MOC?=		${QT_PREFIX}/bin/moc-qt4
+UIC?=		${QT_PREFIX}/bin/uic-qt4
+QMAKE?=		${QT_PREFIX}/bin/qmake-qt4
+QMAKESPEC?=	${QT_PREFIX}/share/qt4/mkspecs/freebsd-g++
+
+QTCPPFLAGS?=
+QTCGFLIBS?=
+.endif # !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include)
+
+QT4_VERSION?=		4.3.0
+
+_QT_COMPONENTS_ALL=	accessible assistant assistantclient codecs-cn \
+			codecs-jp codecs-kr codecs-tw corelib dbus designer \
+			doc gui iconengines imageformats inputmethods linguist \
+			makeqpf moc network opengl pixeltool porting qdbusviewer \
+			qmake qt3support qtconfig qtestlib qvfb rcc script sql \
+			svg uic uic3 xml
+
+accessible_DEPENDS=	accessibility/qt4-acessible
+assistant_DEPENDS=	devel/qt4-assistant
+assistantclient_DEPENDS=devel/qt4-libqtassistantclient
+assistantclient_NAME=	libQtAssistantClient
+codecs-cn_DEPENDS=	chinese/qt4-codecs-cn
+codecs-jp_DEPENDS=	japanese/qt4-codecs-jp
+codecs-kr_DEPENDS=	korean/qt4-codecs-kr
+codecs-tw_DEPENDS=	chinese/qt4-codecs-tw
+corelib_DEPENDS=	devel/qt4-corelib
+dbus_DEPENDS=		devel/dbus-qt4
+designer_DEPENDS=	devel/qt4-designer
+doc_DEPENDS=		misc/qt4-doc
+gui_DEPENDS=		x11-toolkits/qt4-gui
+iconengines_DEPENDS=	graphics/qt4-iconengines
+imageformats_DEPENDS=	graphics/qt4-imageformats
+inputmethods_DEPENDS=	x11/qt4-inputmethods
+linguist_DEPENDS=	devel/qt4-linguist
+makeqpf_DEPENDS=	devel/qt4-makeqpf
+moc_DEPENDS=		devel/qt4-moc
+network_DEPENDS=	net/qt4-network
+opengl_DEPENDS=		x11/qt4-opengl
+pixeltool_DEPENDS=	graphics/qt4-pixeltool
+porting_DEPENDS=	devel/qt4-porting
+qdbusviewer_DEPENDS=	devel/qt4-qdbusviewer
+qmake_DEPENDS=		devel/qmake4
+qmake_QT4_PREFIX=	# empty
+qt3support_DEPENDS=	devel/qt4-qt3support
+qtconfig_DEPENDS=	devel/qtconfig
+qtestlib_DEPENDS=	devel/qt4-qtestlib
+qvfb_DEPENDS=		devel/qt4-qvfb
+rcc_DEPENDS=		devel/qt4-rcc
+script_DEPENDS=		devel/qt4-script
+sql_DEPENDS=		databases/qt4-sql
+svg_DEPENDS=		graphics/qt4-svg
+uic_DEPENDS=		devel/qt4-uic
+uic3_DEPENDS=		devel/qt4-uic3
+xml_DEPENDS=		textproc/qt4-xml
+
+.if defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include)
+Qt_Post_Include= bsd.qt.mk
+
+.if defined(QT_COMPONENTS)
+.for ext in ${QT_COMPONENTS}
+${ext}_QT4_PREFIX?=     qt4-
+${ext}_QT4_VERSION?=    ${QT4_VERSION}
+${ext}_NAME?=           ${ext}
+.if ${_QT_COMPONENTS_ALL:M${ext}}!= ""
+BUILD_DEPENDS+= ${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
+RUN_DEPENDS+=   ${${ext}_QT4_PREFIX}${${ext}_NAME}>=${${ext}_QT4_VERSION}:${PORTSDIR}/${${ext}_DEPENDS}
+.else
+IGNORE= cannot install: unknown Qt4 component -- ${ext}
+.endif
+.endfor
+.else
+BUILD_DEPENDS+=         qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
+RUN_DEPENDS+=           qt4>=${QT4_VERSION}:${PORTSDIR}/devel/qt4
+.endif
+
+.endif