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 :)
svn path=/head/; revision=338902
2024-11-21 00:25:50 +00:00 · 2014-01-06 16:16:52 +00:00 · 2014-01-06 16:16:52 +00:00 · 7d5e6b666c · 2021-03-31 03:12:20 +00:00
commit 7d5e6b666c
parent b60b2bc8f4
189 changed files with 10428 additions and 10843 deletions
--- a/5
+++ b/5
@ -5360,3 +5360,8 @@ net-im/xfce4-messenger-plugin||2014-01-04|Has expired: Deprecated and no update
 multimedia/xfce4-media|multimedia/xfce4-parole|2014-01-04|Has expired: Upstream development dead, use multimedia/xfce4-parole instead
 devel/py-gevent-zeromq|devel/py-pyzmq|2014-01-06|Has expired: devel/py-pyzmq has gevent support built in
 net/erlyvideo||2014-01-06|Has expired: Development of erlyvideo is abandoned upstream. Use flussonic instead
+devel/qt4-declarative|x11-toolkits/qt4-declarative|2014-01-06|Moved to unify with Qt 5
+devel/qt4-qtestlib|devel/qt4-testlib|2014-01-06|Renamed to unify with Qt 5
+textproc/qt4-clucene|textproc/clucene-qt4|2014-01-06|Renamed to unify with Qt 5
+www/qt4-webkit|www/webkit-qt4||2014-01-06|Renamed to unify with Qt 5
+x11/qt4-opengl|graphics/qt4-opengl|2014-01-06|Moved to unify with Qt 5
--- a/Mk/Uses/qmake.mk
+++ b/Mk/Uses/qmake.mk
@ -1,15 +1,16 @@
 # $FreeBSD$
 #
-# Provide support for qmake based projects
+# Provide support for qmake-based projects
 #
 # MAINTAINER: kde@FreeBSD.org
 #
 # Feature:		qmake
 # Usage:		USES=qmake or USES=qmake:ARGS
-#			Must be used along with	'USE_QT4='
-# Valid ARGS:		norecursive
+#			Must be used along with	'USE_QT*=#'
+# Valid ARGS:		norecursive outsource
 # ARGS description:
 # norecursive		Don't pass -recursive argument to qmake binary
+# outsource		Perform an out-of-source build
 #
 #
 # Variables for ports:
@ -18,7 +19,8 @@
 # QMAKE_ARGS		- Arguments passed to qmake.
 #			Default: see below
 # QMAKE_SOURCE_PATH	- Path to qmake project files.
-#			Default: empty (autodetect)
+#			Default: ${WRKSRC} if out-of-source build is
+#			requested, empty otherwise.
 #
 # User defined variables:
 # QMAKE_VERBOSE		- Enable verbose configure output.
@ -27,25 +29,51 @@
 .if !defined(_INCLUDE_USES_QMAKE_MK)
 _INCLUDE_USES_QMAKE_MK=	yes

-.if !defined(NO_STAGE)
-DESTDIRNAME=	INSTALL_ROOT
+# _QT_VERSION is defined in bsd.qt.mk, only if a correct Qt version was selected
+# via USE_QT*.
+.if empty(_QT_VERSION)
+IGNORE=	'USES+= qmake' must be accompanied with 'USE_QT[${_QT_SUPPORTED:S/ //g}]= #'
 .endif

+# _env is a private argument used only by bsd.qt.mk to get variables and custom
+# targets (currently, only qmake-configure), without qmake being added to the
+# configure stage.
+_VALID_ARGS=	norecursive outsource _env
+_qmake_ARGS=	${qmake_ARGS:S/\:/ /g}
+
 .if defined(qmake_ARGS)
-. if ${qmake_ARGS} == "norecursive"
-QMAKE_NORECURSIVE=	yes
-. else
-IGNORE=	Incorrect 'USES+= qmake' usage: argument '${qmake_ARGS}' is not recognized
-. endif
+. for arg in ${_qmake_ARGS}
+.  if empty(_VALID_ARGS:M${arg})
+IGNORE=	Incorrect 'USES+= qmake' usage: argument '${arg}' is not recognized
+.  endif
+. endfor
 .endif

-.if !defined(USE_QT4)
-IGNORE=	'USES+= qmake' must be accompanied with 'USE_QT4= #'
+.if ! ${_qmake_ARGS:M_env}
+USE_QT${_QT_VERSION:R:R}+=	qmake_build
 .endif

-USE_QT4+=	qmake_build
+# QMAKESPEC belongs to bsd.qt.mk.
+QMAKE_ENV?=	${CONFIGURE_ENV}
+QMAKE_ARGS+=	-spec ${QMAKESPEC} \
+		QMAKE_CC="${CC}" QMAKE_CXX="${CXX}" \
+		QMAKE_LINK_C="${CC}" QMAKE_LINK_C_SHLIB="${CC}" \
+		QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}" \
+		QMAKE_CFLAGS="${CFLAGS}" \
+		QMAKE_CXXFLAGS="${CXXFLAGS}" \
+		QMAKE_LFLAGS="${LDFLAGS}" \
+		PREFIX="${PREFIX}"

-.if !defined(QMAKE_NORECURSIVE)
+.if defined(WITH_DEBUG)
+QMAKE_ARGS+=	CONFIG+="debug" \
+		CONFIG-="release"
+.else
+QMAKE_ARGS+=	CONFIG+="release" \
+		CONFIG-="debug separate_debug_info"
+.endif # defined(WITH_DEBUG)
+
+# We set -recursive by default to keep qmake from running in the build stage.
+.if ! ${_qmake_ARGS:Mnorecursive}
 QMAKE_ARGS+=	-recursive
 .endif

@ -53,11 +81,33 @@ QMAKE_ARGS+=	-recursive
 QMAKE_ARGS+=	-d
 .endif

-QMAKE_SOURCE_PATH?=	${QMAKE_PRO}
-
-.if !target(do-configure)
-do-configure:
-	@cd ${CONFIGURE_WRKSRC} && ${SETENV} ${QMAKE_ENV} ${QMAKE} ${QMAKE_ARGS} ${QMAKE_SOURCE_PATH}
+# _QMAKE_WRKSRC (and _QMAKE, below) are needed to abstract the qmake target and
+# use it for both qtbase and USES=qmake ports. They are private, not supposed to
+# be used anywhere else.
+_QMAKE_WRKSRC?=	${CONFIGURE_WRKSRC}
+.if ${_qmake_ARGS:Moutsource}
+CONFIGURE_WRKSRC=	${WRKDIR}/.build
+BUILD_WRKSRC=		${CONFIGURE_WRKSRC}
+INSTALL_WRKSRC=		${BUILD_WRKSRC}
+QMAKE_SOURCE_PATH?=	${WRKSRC}
+.else
+QMAKE_SOURCE_PATH?=	# empty
 .endif

-.endif #!defined(_INCLUDE_USES_QMAKE_MK)
+.if !defined(NO_STAGE) && ! ${_qmake_ARGS:M_env}
+DESTDIRNAME=	INSTALL_ROOT
+.endif
+
+# Define a custom target to make it usable by bsd.qt.mk for internal Qt
+# configuration.
+qmake-configure:
+	@${MKDIR} ${_QMAKE_WRKSRC}
+	@cd ${_QMAKE_WRKSRC} && \
+		${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${QMAKE_SOURCE_PATH}
+
+.if !target(do-configure) && ! ${_qmake_ARGS:M_env}
+do-configure: qmake-configure
+	@${DO_NADA}
+.endif
+
+.endif # !defined(_INCLUDE_USES_QMAKE_MK)
--- a/Mk/bsd.qt.mk
+++ b/Mk/bsd.qt.mk
@ -1,373 +1,624 @@
+#-*- tab-width: 4; -*-
+# ex:ts=4
+#
 # $FreeBSD$
 #
-# Variables:
+# Port variables:
+# USE_QT*			- List of Qt modules to depend on, with optional '_build'
+#					  and '_run' suffixes. Define it empty to include this file
+#					  without depending on Qt ports.
+# QT_DIST			- The port belongs to the Qt distribution. Set to 'yes' for
+#					  Qt 4, or to the distribution name(s) for newer versions.
 # QT_NONSTANDARD	- Suppress modification of configure and make environment.
-# QT_DIST		- Package being built is part of the Qt distribution.
 #
-# Global switches (add this to /etc/make.conf):
-# QT4_OPTIONS		- A list of options, can be CUPS, NAS and/or QGTKSTYLE.
-#				If set, Qt will be built with support for:
-#				- Common UNIX Printing System (CUPS);
-#				- Network Audio System (NAS);
-#				- Qt style that renders using GTK (QGTKSTYLE).
+# Global switches (for inclusion into /etc/make.conf):
+# QT4_OPTIONS		- A list of (Qt 4-only) global options; can be CUPS, NAS
+#					  and/or QGTKSTYLE. If set, Qt will be built with support
+#					  for:
+#					   * Common UNIX Printing System (CUPS);
+#					   * Network Audio System (NAS);
+#					   * GTK+-based Qt theme (QGTKSTYLE).

 .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_INCDIR} \
-		--with-qt-libraries=${QT_LIBDIR} \
-		--with-extra-libs=${LOCALBASE}/lib \
-		--with-extra-includes=${LOCALBASE}/include
-CONFIGURE_ENV+=	MOC="${MOC}" UIC="${UIC}" LIBS="${QTCFGLIBS}" \
-		QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" QTDIR="${QT_PREFIX}"
-CPPFLAGS+=	${QTCPPFLAGS}
-MAKE_ENV+=	QMAKESPEC="${QMAKESPEC}"
-.endif # !defined(QT_NONSTANDARD)
+Qt_Include_MAINTAINER=	kde@FreeBSD.org
+Qt_Pre_Include=	bsd.qt.mk
+
+# Qt versions currently supported by the framework.
+_QT_SUPPORTED?=	4 5
+QT4_VERSION?=	4.8.5
+QT5_VERSION?=	5.2.0-beta1
+
+QT_PREFIX?=		${LOCALBASE}
+
+_QT_RELNAME=	qt${_QT_VERSION:R:R}
+_QT_VERSION=	# empty
+.for ver in ${_QT_SUPPORTED}
+. if defined(USE_QT${ver})
+.  if empty(_QT_VERSION)
+_QT_VERSION=	${QT${ver}_VERSION}
+.  else
+# Reject different USE_QT*.
+IGNORE?=		can't be installed: different Qt versions specified via USE_QT[${_QT_SUPPORTED:S/ //g}] #'
+.  endif
+. endif
+.endfor
+
+.if empty(_QT_VERSION)
+# The file was included without USE_QT*.
+IGNORE?=		can't be installed: bsd.qt.mk may only be included via USE_QT[${_QT_SUPPORTED:S/ //g}] #'
+.endif

 .if defined(QT_DIST)
-DISTINFO_FILE=	${PORTSDIR}/devel/qt4/distinfo
+QT_NONSTANDARD=	yes
+
+. if ! ${.MAKEFLAGS:MPREFIX=*}
+PREFIX=			${QT_PREFIX}
+. endif
+
 MASTER_SITES=	${MASTER_SITE_QT}
-MASTER_SITE_SUBDIR=	official_releases/qt/${QT4_VERSION:R}/${QT4_VERSION}
-DISTNAME=	qt-everywhere-opensource-src-${QT4_VERSION}
+# Useless, as it must be defined before including bsd.port.pre.mk (at least
+# because of bsd.options.mk).
+#PKGNAMEPREFIX?=	${_QT_RELNAME}-
 DIST_SUBDIR=	KDE
-#CONFLICTS+=	Currently there are no conflicts \o/
+DISTINFO_FILE=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/distinfo

+# Can go after a while.
+CONFLICTS_BUILD=qt-3.* qt-copy-3.*

-# Stage support
+LICENSE?=		LGPL21
+
+. if !exists(${PKGDIR}/pkg-descr)
+DESCR?=			${.CURDIR:H:H}/devel/${_QT_RELNAME}/pkg-descr
+. endif
+
+# Stage support.
 DESTDIRNAME=	INSTALL_ROOT

-# rene: can go after a while
-CONFLICTS_BUILD=	qt-3.* qt-copy-3.*
+. if ${_QT_VERSION:M4*}
+MASTER_SITE_SUBDIR=	official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/
+DISTNAME=		qt-everywhere-opensource-src-${_QT_VERSION}
+. else
+.  if ${_QT_VERSION:M*-*}
+# Pre-releases.
+MASTER_SITE_SUBDIR=	development_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules/
+.  else
+MASTER_SITE_SUBDIR=	official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules/
+.  endif
+DISTNAME=		${QT_DIST:S,^,qt,:S,$,-opensource-src-${_QT_VERSION},}
+DISTFILES=		${DISTNAME:S,$,${EXTRACT_SUFX},}
+USE_XZ=			yes

-# Let configure handle its well known compilers defined in the mkspecs
-# (i.e. `cc` and `c++` are not supported by configure tests).
-CONFIGURE_ENV+=	CC="" CXX=""
+.  if ${.TARGETS:Mmakesum} || ${.TARGETS:Mfetch} && \
+	defined(DISABLE_SIZE) && defined(NO_CHECKSUM)
+# Ensure that the "makesum" target (with its inner "fetch" one) uses
+# devel/qt*/distinfo for every port.
+QT_DIST=		base declarative doc graphicaleffects imageformats \
+				multimedia quick1 quickcontrols script serialport svg tools \
+				translations webkit webkit-examples x11extras xmlpatterns
+.  endif

-# Keep in sync with devel/qmake4/files/qconfig.cpp
-CONFIGURE_ARGS+=-fast -platform ${QMAKESPEC} \
-		-system-libjpeg -system-libpng \
-		-system-libmng -system-libtiff -system-zlib \
-		-opensource -confirm-license \
-		-no-pch \
-		-prefix ${PREFIX} \
-		-bindir ${PREFIX}/bin \
-		-libdir ${PREFIX}/${QT_LIBDIR_REL} \
-		-docdir ${PREFIX}/share/doc/qt4 \
-		-headerdir ${PREFIX}/${QT_INCDIR_REL} \
-		-plugindir ${PREFIX}/${QT_PLUGINDIR_REL} \
-		-importdir ${PREFIX}/${QT_LIBDIR_REL}/imports \
-		-datadir ${PREFIX}/share/qt4 \
-		-translationdir ${PREFIX}/share/qt4/translations \
-		-sysconfdir ${PREFIX}/etc/xdg \
-		-examplesdir ${PREFIX}/share/examples/qt4/examples \
-		-demosdir ${PREFIX}/share/examples/qt4/demos \
-		-phonon -no-phonon-backend
+.  if ${QT_DIST} == "base" && ${PORTNAME} != "qmake"
+# Qt configure requires pkg-config to detect dependencies.
+USES+=			pkgconfig

-PLIST_SUB+=	SHLIB_VER=${QT4_VERSION:C/-.*//} \
-		SHLIB_SHVER=${QT4_VERSION:R}
+# Use mkspecs installed in QMAKEPATH/mkspecs when building qtbase.
+CONFIGURE_ENV+=	QMAKEPATH="${QT_MKSPECDIR:H}"
+MAKE_ENV+=		QMAKEPATH="${QT_MKSPECDIR:H}"
+.  endif

-# SIMD support is detected on runtime, no need to disable on build.
-#.if defined(PACKAGE_BUILDING)
-#CONFIGURE_ARGS+=-no-mmx -no-3dnow -no-sse -no-sse2 -no-sse3 \
-#		-no-ssse3 -no-sse4.1 -no-sse4.2
-#.endif #defined(PACKAGE_BUILDING)
+# -nomake flags aren't enough.
+EXTRACT_AFTER_ARGS?=	${DISTNAME:S,$,/examples,:S,^,--exclude ,} \
+				${DISTNAME:S,$,/tests,:S,^,--exclude ,}
+. endif # ! ${_QT_VERSION:M4*}

-# .if defined(PORTNAME) && ${PORTNAME} != "xmlpatterns"
-# CONFIGURE_ARGS+=-no-exceptions
-# .endif
+CONFIGURE_ENV+=	MAKE="${MAKE:T}"

-.if defined(WANT_QT_DEBUG) || defined(WITH_DEBUG)
+CONFIGURE_ARGS+=-opensource -confirm-license \
+				-platform ${QMAKESPEC} \
+				-no-pch \
+				-prefix ${PREFIX} \
+				-bindir ${PREFIX}/${QT_BINDIR_REL} \
+				-headerdir ${PREFIX}/${QT_INCDIR_REL} \
+				-libdir ${PREFIX}/${QT_LIBDIR_REL} \
+				-plugindir ${PREFIX}/${QT_PLUGINDIR_REL} \
+				-importdir ${PREFIX}/${QT_IMPORTDIR_REL} \
+				-datadir ${PREFIX}/${QT_DATADIR_REL} \
+				-docdir ${PREFIX}/${QT_DOCDIR_REL} \
+				-translationdir ${PREFIX}/${QT_L10NDIR_REL} \
+				-sysconfdir ${PREFIX}/${QT_ETCDIR_REL}
+
+. if ${_QT_VERSION:M4*}
+CONFIGURE_ARGS+=-fast \
+				-system-libjpeg -system-libpng \
+				-system-libmng -system-libtiff -system-zlib \
+				-no-phonon-backend \
+				-examplesdir ${PREFIX}/${QT_EXAMPLEDIR_REL}/examples \
+				-demosdir ${PREFIX}/${QT_EXAMPLEDIR_REL}/demos
+. else
+CONFIGURE_ARGS+=-dont-process \
+				-nomake examples -nomake tests \
+				-archdatadir ${PREFIX}/${QT_ARCHDIR_REL} \
+				-libexecdir ${PREFIX}/${QT_LIBEXECDIR_REL} \
+				-qmldir ${PREFIX}/${QT_QMLDIR_REL} \
+				-examplesdir ${PREFIX}/${QT_EXAMPLEDIR_REL} \
+				-testsdir ${PREFIX}/${QT_TESTDIR_REL}
+. endif
+
+. if defined(WANT_QT_DEBUG) || defined(WITH_DEBUG)
+WITH_DEBUG=		yes
+STRIP=			# It's done prior to bsd.qt.mk inclusion.
 CONFIGURE_ARGS+=-debug -separate-debug-info
-PLIST_SUB+=	DEBUG=""
-.else
+# Override configuration in global qconfig.pri.
+QMAKE_ARGS+=	QT_CONFIG+="debug separate_debug_info" \
+				QT_CONFIG-="release"
+PLIST_SUB+=		DEBUG=""
+. else
 CONFIGURE_ARGS+=-release -no-separate-debug-info
-PLIST_SUB+=	DEBUG="@comment "
-.endif
+QMAKE_ARGS+=	QT_CONFIG+="release" \
+				QT_CONFIG-="debug separate_debug_info"
+PLIST_SUB+=		DEBUG="@comment "
+. endif

-.if defined(WANT_QT_VERBOSE_CONFIGURE)
+. if defined(WANT_QT_VERBOSE_CONFIGURE)
 CONFIGURE_ARGS+=-verbose
+. endif
+
+. if ${QT_DIST} == "base" || ${_QT_VERSION:M4*}
+EXTRA_PATCHES?=	${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure
+.  if ${_QT_VERSION:M5*}
+EXTRA_PATCHES+=	${.CURDIR:H:H}/devel/qt5-core/files/extrapatch-src__corelib__tools__qdatetime.cpp
+.  endif
+. endif
+
+# Override settings installed in qconfig.h and *.pri files. The flags will be
+# installed along with the port, but have to be passed as arguments while
+# building the port itself. Flags prefixed with "-" (e.g., "-CUPS" and "-cups")
+# are needed to disable some features.
+. if !defined(${QT_MODNAME}) || empty(${QT_MODNAME})
+# Used for both qconfig-*.h and qt_config_*.pri; it can't be empty.
+QT_MODNAME=		${PORTNAME}
+. endif
+QT_DEFINES?=	# For qconfig.h flags (without "QT_" prefix).
+QT_CONFIG?=		# For *.pri files QT_CONFIG flags.
+. if ${QT_DEFINES}
+QMAKE_ARGS+=	DEFINES+="${QT_DEFINES:O:u:C/^([^-])/QT_\1/:C/^-/QT_NO_/:O}"
+.  if ${QT_DEFINES:N-*}
+# Use a script to cleanup qconfig-modules.h (see qt-post-install).
+PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
+.  endif
+. endif
+. if ${QT_CONFIG:N-*}
+QMAKE_ARGS+=	QT_CONFIG+="${QT_CONFIG:N-*:O:u}"
+. endif
+. if ${QT_CONFIG:M-*}
+QMAKE_ARGS+=	QT_CONFIG-="${QT_CONFIG:M-*:O:u:C/^-//}"
+. endif
+
+PLIST_SUB+=		SHORTVER=${_QT_VERSION:R} \
+				FULLVER=${_QT_VERSION:C/-.*//}
+.endif # defined(QT_DIST)
+
+.if !defined(QT_NONSTANDARD)
+CONFIGURE_ENV+=	QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}" \
+				MOC="${MOC}" RCC="${RCC}" UIC="${UIC}" \
+				QMAKESPEC="${QMAKESPEC}"
+CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \
+				--with-qt-libraries=${QT_LIBDIR} \
+				--with-extra-includes=${LOCALBASE}/include \
+				--with-extra-libs=${LOCALBASE}/lib
+.endif # !defined(QT_NONSTANDARD)
+
+.if ${_QT_VERSION:M4*}
+QT_BINDIR_REL?=	bin
+QT_LIBDIR_REL?=	lib/${_QT_RELNAME}
+QT_PLUGINDIR_REL?=	${QT_LIBDIR_REL}/plugins
+QT_IMPORTDIR_REL?=	${QT_LIBDIR_REL}/imports
 .endif
-.endif #defined(QT_DIST)

-QT_INCDIR_REL=	include/qt4
-QT_LIBDIR_REL=	lib/qt4
-QT_PLUGINDIR_REL=	lib/qt4/plugins
+# A wrapper (qtchooser) is used to invoke binaries.
+QT_BINDIR_REL?=	${QT_ARCHDIR_REL}/bin
+QT_INCDIR_REL?=	include/${_QT_RELNAME}
+QT_LIBDIR_REL?=	lib
+QT_ARCHDIR_REL?=${QT_LIBDIR_REL}/${_QT_RELNAME}
+QT_PLUGINDIR_REL?=	${QT_ARCHDIR_REL}/plugins
+QT_LIBEXECDIR_REL?=	libexec/${_QT_RELNAME}
+QT_IMPORTDIR_REL?=	${QT_ARCHDIR_REL}/imports
+QT_QMLDIR_REL?=	${QT_ARCHDIR_REL}/qml
+QT_DATADIR_REL?=share/${_QT_RELNAME}
+QT_DOCDIR_REL?=	share/doc/${_QT_RELNAME}
+QT_L10NDIR_REL?=${QT_DATADIR_REL}/translations
+QT_ETCDIR_REL?=	etc/xdg
+QT_EXAMPLEDIR_REL?=	share/examples/${_QT_RELNAME}
+QT_TESTDIR_REL?=${QT_DATADIR_REL}/tests

-PLIST_SUB+=	QT_INCDIR=${QT_INCDIR_REL} \
-		QT_LIBDIR=${QT_LIBDIR_REL} \
-		QT_PLUGINDIR=${QT_PLUGINDIR_REL}
+# Not customizable.
+.if ${_QT_VERSION:M4*}
+QT_MKSPECDIR_REL=	${QT_DATADIR_REL}/mkspecs

-QT_PREFIX?=	${LOCALBASE}
-QT_INCDIR?=	${QT_PREFIX}/${QT_INCDIR_REL}
-QT_LIBDIR?=	${QT_PREFIX}/${QT_LIBDIR_REL}
-QT_PLUGINDIR?=	${QT_PREFIX}/${QT_PLUGINDIR_REL}
-LRELEASE?=	${QT_PREFIX}/bin/lrelease-qt4
-LUPDATE?=	${QT_PREFIX}/bin/lupdate-qt4
-MOC?=		${QT_PREFIX}/bin/moc-qt4
-UIC?=		${QT_PREFIX}/bin/uic-qt4
-RCC?=		${QT_PREFIX}/bin/rcc
-QMAKE?=		${QT_PREFIX}/bin/qmake-qt4
-# QMAKEFLAGS will be superseded by QMAKE_ARGS
-QMAKEFLAGS+=	QMAKE_CC="${CC}" QMAKE_CXX="${CXX}" \
-		QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}" \
-		QMAKE_LINK_C="${CC}" QMAKE_LINK_C_SHLIB="${CC}" \
-		QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}"
-QMAKE_ENV?=	${CONFIGURE_ENV}
-QMAKE_ARGS+=	-spec ${QMAKESPEC} \
-		QMAKE_CC="${CC}" QMAKE_CXX="${CXX}" \
-		QMAKE_LINK="${CXX}" QMAKE_LINK_SHLIB="${CXX}" \
-		QMAKE_LINK_C="${CC}" QMAKE_LINK_C_SHLIB="${CC}" \
-		QMAKE_CFLAGS="${CFLAGS}" QMAKE_CXXFLAGS="${CXXFLAGS}" \
-		QMAKE_LFLAGS="${LDFLAGS}" PREFIX="${PREFIX}"
+_QT_LIBVER=		# empty
+_QT_BINSUFX=	-${_QT_RELNAME}
+.else
+QT_MKSPECDIR_REL=	${QT_ARCHDIR_REL}/mkspecs

-QTCPPFLAGS?=
-QTCGFLIBS?=
+_QT_LIBVER=		${_QT_VERSION:R:R}
+_QT_BINSUFX=	# empty
+.endif
+
+LRELEASE?=		${QT_BINDIR}/lrelease${_QT_BINSUFX}
+LUPDATE?=		${QT_BINDIR}/lupdate${_QT_BINSUFX}
+MOC?=			${QT_BINDIR}/moc${_QT_BINSUFX}
+RCC?=			${QT_BINDIR}/rcc
+UIC?=			${QT_BINDIR}/uic${_QT_BINSUFX}
+QMAKE?=			${QT_BINDIR}/qmake${_QT_BINSUFX}
+# Needed to redefine the qmake target for internal Qt configuration.
+_QMAKE?=		${QMAKE}
+QMAKESPEC?=		${QT_MKSPECDIR}/freebsd-${QMAKE_COMPILER}
+
+# The whole Qt distribution should be built with the same compiler, but it's
+# better to support custom settings. Dereferencing the detection allows to
+# avoid forking a shell on each inclusion of this file, and to catch any CXX
+# customization (via USE_GCC, etc.).
+QMAKE_COMPILER=	$$(ccver="$$(${CXX} --version)"; case "$$ccver" in *clang*) echo clang ;; *) echo g++ ;; esac)
+
+# Import QMAKE_ENV and QMAKE_ARGS definitions.
+USES+=			qmake:_env
+
+PLIST_SUB+=		QT_PREFIX="${QT_PREFIX}"
+
+.for dir in BIN INC LIB ARCH PLUGIN LIBEXEC IMPORT \
+	QML DATA DOC L10N ETC EXAMPLE TEST MKSPEC
+QT_${dir}DIR=	${QT_PREFIX}/${QT_${dir}DIR_REL}
+PLIST_SUB+=		QT_${dir}DIR="${QT_${dir}DIR_REL}"
+.endfor

 .endif # !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include)

-#
-# QT4 version
-#
-QT4_VERSION?=		4.8.5
+.if defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include)

-_USE_QT4_ALL=	accessible assistant assistant-adp assistantclient \
-			clucene codecs-cn codecs-jp codecs-kr codecs-tw corelib \
-			dbus declarative demo designer doc \
-			graphicssystems-opengl gui help help-tools \
-			iconengines imageformats inputmethods \
-			linguist l10n makeqpf moc multimedia network opengl \
-			pixeltool porting phonon phonon-gst \
-			qdbusviewer qmlviewer qdoc3 qmake qt3support qtconfig qtestlib \
-			qvfb rcc script scripttools sql sql-ibase sql-mysql \
-			sql-odbc sql-pgsql sql-sqlite2 sql-sqlite3 svg uic uic3 \
-			webkit xml xmlpatterns xmlpatterns-tool
+Qt_Post_Include=	bsd.qt.mk

-accessible_PORT=	accessibility/qt4-accessible
-accessible_DEPENDS=	${QT_PLUGINDIR}/accessible/libqtaccessiblewidgets.so
+_USE_QT_ALL=	assistant clucene dbus declarative designer gui help \
+				imageformats linguist multimedia network opengl pixeltool \
+				qdbusviewer qmake script scripttools sql sql-ibase sql-mysql \
+				sql-odbc sql-pgsql sql-sqlite2 sql-sqlite3 svg testlib webkit \
+				xml xmlpatterns

-assistant_PORT=		devel/qt4-assistant
-assistant_DEPENDS=	${QT_PREFIX}/bin/assistant-qt4
+_USE_QT4_ONLY=	accessible assistant-adp assistantclient codecs-cn codecs-jp \
+				codecs-kr codecs-tw corelib demo doc graphicssystems-opengl \
+				help-tools iconengines inputmethods l10n makeqpf moc phonon \
+				phonon-gst porting qdoc3 qmlviewer qt3support qtconfig \
+				qtestlib qvfb rcc uic uic3 xmlpatterns-tool

-assistant-adp_PORT=	devel/qt4-assistant-adp
-assistant-adp_DEPENDS=	${QT_PREFIX}/bin/assistant_adp
+_USE_QT5_ONLY=	buildtools concurrent core graphicaleffects linguisttools \
+				printsupport qdbus qdoc qev qml qmldevtools quick uitools \
+				widgets

-assistantclient_PORT=		devel/qt4-libqtassistantclient
-assistantclient_DEPENDS=	${QT_LIBDIR}/libQtAssistantClient.so
+accessible_PORT=	accessibility/${_QT_RELNAME}-accessible
+accessible_PATH=	${QT_PLUGINDIR}/accessible/libqtaccessiblewidgets.so

-clucene_PORT=		textproc/qt4-clucene
-clucene_DEPENDS=	${QT_LIBDIR}/libQtCLucene.so
+assistant_PORT=		devel/${_QT_RELNAME}-assistant
+assistant_PATH=		${QT_BINDIR}/assistant${_QT_BINSUFX}

-codecs-cn_PORT=		chinese/qt4-codecs-cn
-codecs-cn_DEPENDS=	${QT_PLUGINDIR}/codecs/libqcncodecs.so
+assistant-adp_PORT=	devel/${_QT_RELNAME}-assistant-adp
+assistant-adp_PATH=	${QT_BINDIR}/assistant_adp

-codecs-jp_PORT=		japanese/qt4-codecs-jp
-codecs-jp_DEPENDS=	${QT_PLUGINDIR}/codecs/libqjpcodecs.so
+assistantclient_PORT=	devel/${_QT_RELNAME}-libqtassistantclient
+assistantclient_PATH=	${QT_LIBDIR}/libQt${_QT_LIBVER}AssistantClient.so

-codecs-kr_PORT=		korean/qt4-codecs-kr
-codecs-kr_DEPENDS=	${QT_PLUGINDIR}/codecs/libqkrcodecs.so
+buildtools_PORT=	devel/${_QT_RELNAME}-buildtools
+buildtools_PATH=	${MOC}

-codecs-tw_PORT=		chinese/qt4-codecs-tw
-codecs-tw_DEPENDS=	${QT_PLUGINDIR}/codecs/libqtwcodecs.so
+clucene_PORT=		textproc/clucene-${_QT_RELNAME}
+clucene_PATH=		${QT_LIBDIR}/libQt${_QT_LIBVER}CLucene.so

-corelib_PORT=		devel/qt4-corelib
-corelib_DEPENDS=	${QT_LIBDIR}/libQtCore.so
+codecs-cn_PORT=		chinese/${_QT_RELNAME}-codecs-cn
+codecs-cn_PATH=		${QT_PLUGINDIR}/codecs/libqcncodecs.so

-dbus_PORT=	devel/dbus-qt4
-dbus_DEPENDS=	${QT_LIBDIR}/libQtDBus.so
+codecs-jp_PORT=		japanese/${_QT_RELNAME}-codecs-jp
+codecs-jp_PATH=		${QT_PLUGINDIR}/codecs/libqjpcodecs.so

-declarative_PORT=	devel/qt4-declarative
-declarative_DEPENDS=	${QT_LIBDIR}/libQtDeclarative.so
+codecs-kr_PORT=		korean/${_QT_RELNAME}-codecs-kr
+codecs-kr_PATH=		${QT_PLUGINDIR}/codecs/libqkrcodecs.so

-demo_PORT=	misc/qt4-qtdemo
-demo_DEPENDS=	${QT_PREFIX}/bin/qtdemo
+codecs-tw_PORT=		chinese/${_QT_RELNAME}-codecs-tw
+codecs-tw_PATH=		${QT_PLUGINDIR}/codecs/libqtwcodecs.so

-designer_PORT=		devel/qt4-designer
-designer_DEPENDS=	${QT_PREFIX}/bin/designer-qt4
+concurrent_PORT=	devel/${_QT_RELNAME}-concurrent
+concurrent_PATH=	${QT_LIBDIR}/libQt${_QT_LIBVER}Concurrent.so

-doc_PORT=	misc/qt4-doc
-doc_DEPENDS=	qt4-doc>=4
+core_PORT=			devel/${_QT_RELNAME}-core
+core_PATH=			${QT_LIBDIR}/libQt${_QT_LIBVER}Core.so

-graphicssystems-opengl_PORT=	x11/qt4-graphicssystems-opengl
-graphicssystems-opengl_DEPENDS=	${QT_PLUGINDIR}/graphicssystems/libqglgraphicssystem.so
+corelib_PORT=		devel/${_QT_RELNAME}-corelib
+corelib_PATH=		${core_PATH}

-gui_PORT=	x11-toolkits/qt4-gui
-gui_DEPENDS=	${QT_LIBDIR}/libQtGui.so
+dbus_PORT=			devel/dbus-${_QT_RELNAME}
+dbus_PATH=			${QT_LIBDIR}/libQt${_QT_LIBVER}DBus.so

-help_PORT=	devel/qt4-help
-help_DEPENDS=	${QT_LIBDIR}/libQtHelp.so
+declarative_PORT=	x11-toolkits/${_QT_RELNAME}-declarative
+declarative_PATH=	${QT_LIBDIR}/libQt${_QT_LIBVER}Declarative.so

-help-tools_PORT=	devel/qt4-help-tools
-help-tools_DEPENDS=	${QT_PREFIX}/bin/qhelpgenerator
+demo_PORT=			misc/${_QT_RELNAME}-qtdemo
+demo_PATH=			${QT_BINDIR}/qtdemo

-iconengines_PORT=	graphics/qt4-iconengines
-iconengines_DEPENDS=	${QT_PLUGINDIR}/iconengines/libqsvgicon.so
+designer_PORT=		devel/${_QT_RELNAME}-designer
+designer_PATH=		${QT_BINDIR}/designer${_QT_BINSUFX}

-imageformats_PORT=	graphics/qt4-imageformats
-imageformats_DEPENDS=	${QT_PLUGINDIR}/imageformats/libqjpeg.so
+doc_PORT=			misc/${_QT_RELNAME}-doc
+doc_PATH=			${_QT_RELNAME}-doc>=${_QT_VERSION:R:R}

-inputmethods_PORT=	x11/qt4-inputmethods
-inputmethods_DEPENDS=	${QT_PLUGINDIR}/inputmethods/libqimsw-multi.so
+graphicaleffects_PORT=	graphics/${_QT_RELNAME}-graphicaleffects
+graphicaleffects_PATH=	${QT_QMLDIR}/QtGraphicalEffects/qmldir

-linguist_PORT=		devel/qt4-linguist
-linguist_DEPENDS=	${QT_PREFIX}/bin/linguist-qt4
+graphicssystems-opengl_PORT=	x11/${_QT_RELNAME}-graphicssystems-opengl
+graphicssystems-opengl_PATH=	${QT_PLUGINDIR}/graphicssystems/libqglgraphicssystem.so

-l10n_PORT=	misc/qt4-l10n
-l10n_DEPENDS=	qt4-l10n>=4
+gui_PORT=			x11-toolkits/${_QT_RELNAME}-gui
+gui_PATH=			${QT_LIBDIR}/libQt${_QT_LIBVER}Gui.so

-makeqpf_PORT=		devel/qt4-makeqpf
-makeqpf_DEPENDS=	${QT_PREFIX}/bin/makeqpf-qt4
+help_PORT=			devel/${_QT_RELNAME}-help
+help_PATH=			${QT_LIBDIR}/libQt${_QT_LIBVER}Help.so

-moc_PORT=	devel/qt4-moc
-moc_DEPENDS=	${MOC}
+help-tools_PORT=	devel/${_QT_RELNAME}-help-tools
+help-tools_PATH=	${QT_BINDIR}/qhelpgenerator

-multimedia_PORT=	multimedia/qt4-multimedia
-multimedia_DEPENDS=	${QT_LIBDIR}/libQtMultimedia.so
+iconengines_PORT=	graphics/${_QT_RELNAME}-iconengines
+iconengines_PATH=	${QT_PLUGINDIR}/iconengines/libqsvgicon.so

-network_PORT=		net/qt4-network
-network_DEPENDS=	${QT_LIBDIR}/libQtNetwork.so
+imageformats_PORT=	graphics/${_QT_RELNAME}-imageformats
+imageformats_PATH=	${QT_PLUGINDIR}/imageformats/libqtiff.so

-opengl_PORT=	x11/qt4-opengl
-opengl_DEPENDS=	${QT_LIBDIR}/libQtOpenGL.so
+inputmethods_PORT=	x11/${_QT_RELNAME}-inputmethods
+inputmethods_PATH=	${QT_PLUGINDIR}/inputmethods/libqimsw-multi.so

-pixeltool_PORT=		graphics/qt4-pixeltool
-pixeltool_DEPENDS=	${QT_PREFIX}/bin/pixeltool
+linguist_PORT=		devel/${_QT_RELNAME}-linguist
+linguist_PATH=		${QT_BINDIR}/linguist${_QT_BINSUFX}

-phonon_PORT=	multimedia/phonon
-phonon_DEPENDS=	${QT_LIBDIR}/libphonon.so
+linguisttools_PORT=	devel/${_QT_RELNAME}-linguisttools
+linguisttools_PATH=	${LRELEASE}
+
+l10n_PORT=			misc/${_QT_RELNAME}-l10n
+l10n_PATH=			${_QT_RELNAME}-l10n>=${_QT_VERSION:R:R}
+
+makeqpf_PORT=		devel/${_QT_RELNAME}-makeqpf
+makeqpf_PATH=		${QT_BINDIR}/makeqpf${_QT_BINSUFX}
+
+moc_PORT=			devel/${_QT_RELNAME}-moc
+moc_PATH=			${MOC}
+
+multimedia_PORT=	multimedia/${_QT_RELNAME}-multimedia
+multimedia_PATH=	${QT_LIBDIR}/libQt${_QT_LIBVER}Multimedia.so
+
+network_PORT=		net/${_QT_RELNAME}-network
+network_PATH=		${QT_LIBDIR}/libQt${_QT_LIBVER}Network.so
+
+opengl_PORT=		graphics/${_QT_RELNAME}-opengl
+opengl_PATH=		${QT_LIBDIR}/libQt${_QT_LIBVER}OpenGL.so
+
+pixeltool_PORT=		graphics/${_QT_RELNAME}-pixeltool
+pixeltool_PATH=		${QT_BINDIR}/pixeltool
+
+phonon_PORT=		multimedia/phonon
+phonon_PATH=		${QT_LIBDIR}/libphonon.so

 phonon-gst_PORT=	multimedia/phonon-gstreamer
-phonon-gst_DEPENDS=	${QT_PLUGINDIR}/phonon_backend/libphonon_gstreamer.so
+phonon-gst_PATH=	${QT_PLUGINDIR}/phonon_backend/libphonon_gstreamer.so

-porting_PORT=		devel/qt4-porting
-porting_DEPENDS=	${QT_PREFIX}/bin/qt3to4
+porting_PORT=		devel/${_QT_RELNAME}-porting
+porting_PATH=		${QT_BINDIR}/qt3to4

-qdbusviewer_PORT=	devel/qt4-qdbusviewer
-qdbusviewer_DEPENDS=	${QT_PREFIX}/bin/qdbusviewer
+printsupport_PORT=	print/${_QT_RELNAME}-printsupport
+printsupport_PATH=	${QT_LIBDIR}/libQt${_QT_LIBVER}PrintSupport.so

-qmlviewer_PORT=		devel/qt4-qmlviewer
-qmlviewer_DEPENDS=	${QT_PREFIX}/bin/qmlviewer
+qdbus_PORT=			devel/${_QT_RELNAME}-qdbus
+qdbus_PATH=			${QT_BINDIR}/qdbus

-qdoc3_PORT=	devel/qt4-qdoc3
-qdoc3_DEPENDS=	${QT_PREFIX}/bin/qdoc3
+qdbusviewer_PORT=	devel/${_QT_RELNAME}-qdbusviewer
+qdbusviewer_PATH=	${QT_BINDIR}/qdbusviewer

-qmake_PORT=	devel/qmake4
-qmake_DEPENDS=	${QMAKE}
+qdoc_PORT=			devel/${_QT_RELNAME}-qdoc
+qdoc_PATH=			${QT_BINDIR}/qdoc

-qt3support_PORT=	devel/qt4-qt3support
-qt3support_DEPENDS=	${QT_LIBDIR}/libQt3Support.so
+qdoc3_PORT=			devel/${_QT_RELNAME}-qdoc3
+qdoc3_PATH=			${QT_BINDIR}/qdoc3

-qtconfig_PORT=		misc/qt4-qtconfig
-qtconfig_DEPENDS=	${QT_PREFIX}/bin/qtconfig-qt4
+qev_PORT=			x11/${_QT_RELNAME}-qev
+qev_PATH=			${QT_BINDIR}/qev

-qtestlib_PORT=		devel/qt4-qtestlib
-qtestlib_DEPENDS=	${QT_LIBDIR}/libQtTest.so
+qmake_PORT=			devel/qmake${_QT_VERSION:R:R}
+qmake_PATH=			${QMAKE}

-qvfb_PORT=	devel/qt4-qvfb
-qvfb_DEPENDS=	${QT_PREFIX}/bin/qvfb-qt4
+qml_PORT=			lang/${_QT_RELNAME}-qml
+qml_PATH=			${QT_LIBDIR}/libQt${_QT_LIBVER}Qml.so

-rcc_PORT=		devel/qt4-rcc
-rcc_DEPENDS=		${RCC}
+qmldevtools_PORT=	devel/${_QT_RELNAME}-qmldevtools
+qmldevtools_PATH=	${QT_LIBDIR}/libQt${_QT_LIBVER}QmlDevTools.a

-script_PORT=		devel/qt4-script
-script_DEPENDS=		${QT_LIBDIR}/libQtScript.so
+qmlviewer_PORT=		devel/${_QT_RELNAME}-qmlviewer
+qmlviewer_PATH=		${QT_BINDIR}/qmlviewer

-scripttools_PORT=	devel/qt4-scripttools
-scripttools_DEPENDS=	${QT_LIBDIR}/libQtScriptTools.so
+qt3support_PORT=	devel/${_QT_RELNAME}-qt3support
+qt3support_PATH=	${QT_LIBDIR}/libQt${_QT_LIBVER}3Support.so

-sql_PORT=	databases/qt4-sql
-sql_DEPENDS=	${QT_LIBDIR}/libQtSql.so
+qtconfig_PORT=		misc/${_QT_RELNAME}-qtconfig
+qtconfig_PATH=		${QT_BINDIR}/qtconfig${_QT_BINSUFX}

-sql-ibase_PORT=		databases/qt4-ibase-plugin
-sql-ibase_DEPENDS=	${QT_PLUGINDIR}/sqldrivers/libqsqlibase.so
+qtestlib_PORT=		${testlib_PORT}
+qtestlib_PATH=		${testlib_PATH}

-sql-mysql_PORT=		databases/qt4-mysql-plugin
-sql-mysql_DEPENDS=	${QT_PLUGINDIR}/sqldrivers/libqsqlmysql.so
+quick_PORT=			x11-toolkits/${_QT_RELNAME}-quick
+quick_PATH=			${QT_LIBDIR}/libQt${_QT_LIBVER}Quick.so

-sql-odbc_PORT=		databases/qt4-odbc-plugin
-sql-odbc_DEPENDS=	${QT_PLUGINDIR}/sqldrivers/libqsqlodbc.so
+qvfb_PORT=			devel/${_QT_RELNAME}-qvfb
+qvfb_PATH=			${QT_BINDIR}/qvfb${_QT_BINSUFX}

-sql-pgsql_PORT=		databases/qt4-pgsql-plugin
-sql-pgsql_DEPENDS=	${QT_PLUGINDIR}/sqldrivers/libqsqlpsql.so
+rcc_PORT=			devel/${_QT_RELNAME}-rcc
+rcc_PATH=			${RCC}

-sql-sqlite2_PORT=	databases/qt4-sqlite-plugin
-sql-sqlite2_DEPENDS=	${QT_PLUGINDIR}/sqldrivers/libqsqlite2.so
+script_PORT=		devel/${_QT_RELNAME}-script
+script_PATH=		${QT_LIBDIR}/libQt${_QT_LIBVER}Script.so

-sql-sqlite3_PORT=	databases/qt4-sqlite3-plugin
-sql-sqlite3_DEPENDS=	${QT_PLUGINDIR}/sqldrivers/libqsqlite.so
+scripttools_PORT=	devel/${_QT_RELNAME}-scripttools
+scripttools_PATH=	${QT_LIBDIR}/libQt${_QT_LIBVER}ScriptTools.so

-svg_PORT=	graphics/qt4-svg
-svg_DEPENDS=	${QT_LIBDIR}/libQtSvg.so
+sql_PORT=			databases/${_QT_RELNAME}-sql
+sql_PATH=			${QT_LIBDIR}/libQt${_QT_LIBVER}Sql.so

-uic_PORT=	devel/qt4-uic
-uic_DEPENDS=	${UIC}
+sql-pgsql_PATH=		${QT_PLUGINDIR}/sqldrivers/libqsqlpsql.so

-uic3_PORT=	devel/qt4-uic3
-uic3_DEPENDS=	${QT_PREFIX}/bin/uic3
-
-webkit_PORT=	www/qt4-webkit
-webkit_DEPENDS=	${QT_LIBDIR}/libQtWebKit.so
-
-xml_PORT=	textproc/qt4-xml
-xml_DEPENDS=	${QT_LIBDIR}/libQtXml.so
-
-xmlpatterns_PORT=	textproc/qt4-xmlpatterns
-xmlpatterns_DEPENDS=	${QT_LIBDIR}/libQtXmlPatterns.so
-
-xmlpatterns-tool_PORT=		textproc/qt4-xmlpatterns-tool
-xmlpatterns-tool_DEPENDS=	${QT_PREFIX}/bin/xmlpatterns
-
-.if defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include)
-Qt_Post_Include= bsd.qt.mk
-
-#
-# Translate `c++` to its real name and select the appropriate mkspec.
-#
-QMAKE_BASE_COMPILER!=	(cc --version 2> /dev/null | ${AWK} 'NR == 1 { gsub(/[()]/, "", $$2); print $$2 }') || ${ECHO_CMD} "gcc"
-.if ${QMAKE_BASE_COMPILER:L} == "gcc"
-QMAKE_BASE_COMPILER=	g++
+.if ${_QT_VERSION:M4*}
+sql-sqlite2_PORT=	databases/${_QT_RELNAME}-sqlite-plugin
 .endif
-.if ${CXX} == "c++"
-# Why CXX instead of CXX:T? Because if you're setting the full path of
-# `c++` you probably want to define QMAKESPEC by hand too.
-QMAKE_COMPILER=	${QMAKE_BASE_COMPILER}
-.elif ${CXX:T} == "clang++"
-QMAKE_COMPILER=	clang
-.elif ${CXX:C/c\+\+/g++/:T} == "llvm-g++"
-QMAKE_COMPILER=	llvm
-.elif ${CXX:T} == "icpc"
-QMAKE_COMPILER=	icc
+
+sql-sqlite3_PATH=	${QT_PLUGINDIR}/sqldrivers/libqsqlite.so
+
+.for db in ibase mysql odbc pgsql sqlite2 sqlite3
+.if ${_QT_VERSION:M4*}
+sql-${db}_PORT?=	databases/${_QT_RELNAME}-${db}-plugin
 .else
-# Handle all the other cases (mainly g++*).
-QMAKE_COMPILER=	${CXX:C/c\+\+/g++/:T}
+sql-${db}_PORT?=	databases/${_QT_RELNAME}-sqldrivers-${db}
 .endif
-.if exists(${QT_PREFIX}/share/qt4/mkspecs/freebsd-${QMAKE_COMPILER})
-QMAKESPEC?=	${QT_PREFIX}/share/qt4/mkspecs/freebsd-${QMAKE_COMPILER}
-.else
-# If something went wrong, default to the base configuration.
-QMAKESPEC?=	${QT_PREFIX}/share/qt4/mkspecs/freebsd-${QMAKE_BASE_COMPILER}
-.endif
-
-.for component in ${_USE_QT4_ALL}
-${component}_BUILD_DEPENDS?=	${${component}_DEPENDS}:${PORTSDIR}/${${component}_PORT}
-${component}_RUN_DEPENDS?=	${${component}_DEPENDS}:${PORTSDIR}/${${component}_PORT}
-
-${component}_build_BUILD_DEPENDS?=	${${component}_BUILD_DEPENDS}
-${component}_run_RUN_DEPENDS?=		${${component}_RUN_DEPENDS}
-
-_USE_QT4_ALL_SUFFIXED+=	${component} ${component}_build ${component}_run
+sql-${db}_PATH?=	${QT_PLUGINDIR}/sqldrivers/libqsql${db:C/^sql//}.so
 .endfor

-.if defined(USE_QT4)
-. for component in ${USE_QT4:O:u}
-.  if ${_USE_QT4_ALL_SUFFIXED:M${component}}!= ""
-BUILD_DEPENDS+=	${${component}_BUILD_DEPENDS}
-RUN_DEPENDS+=	${${component}_RUN_DEPENDS}
-.  else
-IGNORE=	can't be installed: unknown USE_QT4 component '${component}'
-.  endif
-. endfor
-.endif
+svg_PORT=			graphics/${_QT_RELNAME}-svg
+svg_PATH=			${QT_LIBDIR}/libQt${_QT_LIBVER}Svg.so

-.endif
+testlib_PORT=		devel/${_QT_RELNAME}-testlib
+testlib_PATH=		${QT_LIBDIR}/libQt${_QT_LIBVER}Test.so
+
+uic_PORT=			devel/${_QT_RELNAME}-uic
+uic_PATH=			${UIC}
+
+uic3_PORT=			devel/${_QT_RELNAME}-uic3
+uic3_PATH=			${QT_BINDIR}/uic3
+
+uitools_PORT=		devel/${_QT_RELNAME}-uitools
+uitools_PATH=		${QT_LIBDIR}/libQt${_QT_LIBVER}UiTools.a
+
+webkit_PORT=		www/webkit-${_QT_RELNAME}
+webkit_PATH=		${QT_LIBDIR}/libQt${_QT_LIBVER}WebKit.so
+
+widgets_PORT=		x11-toolkits/${_QT_RELNAME}-widgets
+widgets_PATH=		${QT_LIBDIR}/libQt${_QT_LIBVER}Widgets.so
+
+xml_PORT=			textproc/${_QT_RELNAME}-xml
+xml_PATH=			${QT_LIBDIR}/libQt${_QT_LIBVER}Xml.so
+
+xmlpatterns_PORT=	textproc/${_QT_RELNAME}-xmlpatterns
+xmlpatterns_PATH=	${QT_LIBDIR}/libQt${_QT_LIBVER}XmlPatterns.so
+
+xmlpatterns-tool_PORT=	textproc/${_QT_RELNAME}-xmlpatterns-tool
+xmlpatterns-tool_PATH=	${QT_BINDIR}/xmlpatterns
+
+_USE_QT_ALL+=	${_USE_QT${_QT_VERSION:R:R}_ONLY}
+.for comp in ${_USE_QT_ALL}
+${comp}_BUILD_DEPENDS?=	${${comp}_PATH}:${PORTSDIR}/${${comp}_PORT}
+${comp}_RUN_DEPENDS?=	${${comp}_PATH}:${PORTSDIR}/${${comp}_PORT}
+${comp}_build_BUILD_DEPENDS?=	${${comp}_BUILD_DEPENDS}
+${comp}_run_RUN_DEPENDS?=	${${comp}_RUN_DEPENDS}
+_USE_QT_ALL_SUFFIXED+=	${comp} ${comp}_build ${comp}_run
+.endfor
+
+_USE_QT=		${USE_QT${_QT_VERSION:R:R}}
+.for comp in ${_USE_QT:O:u}
+. if ${_USE_QT_ALL_SUFFIXED:M${comp}}
+BUILD_DEPENDS+=	${${comp}_BUILD_DEPENDS}
+RUN_DEPENDS+=	${${comp}_RUN_DEPENDS}
+. else
+IGNORE?=		can't be installed: unknown USE_QT${_QT_VERSION:R:R} component '${comp}' #'
+. endif
+.endfor
+
+.if defined(QT_DIST) && ! ${_QT_VERSION:M4*}
+. if ${QT_DIST} == "base"
+# qtbase requires some tools to be symlinked to the build directory.
+_QT_TOOLS=		# empty
+.  if ${PORTNAME} != "qmake"
+_QT_TOOLS+=		${QMAKE}
+.  endif
+.  if ${PORTNAME} != "buildtools"
+_QT_TOOLS+=		${MOC} qdoc ${RCC}
+.  endif
+.  if ${PORTNAME} != "dbus"
+_QT_TOOLS+=		qdbuscpp2xml qdbusxml2cpp
+.  endif
+.  if ${PORTNAME} != "widgets"
+_QT_TOOLS+=		${UIC}
+.  endif
+
+pre-configure: qtbase-pre-configure
+qtbase-pre-configure:
+.  if ${PORTNAME} != "qmake"
+	@${RM} -rf ${CONFIGURE_WRKSRC}/mkspecs
+	@${MKDIR} ${CONFIGURE_WRKSRC}/mkspecs
+.  endif
+.  for tool in ${_QT_TOOLS}
+	@${TEST} -e ${QT_BINDIR}/${tool:T} && \
+		${LN} -sf ${QT_BINDIR}/${tool:T} ${CONFIGURE_WRKSRC}/bin/${tool:T} || \
+		${TRUE}
+.  endfor
+
+.  if ${PORTNAME} != "qmake"
+_QMAKE_WRKSRC=	${BUILD_WRKSRC}
+QMAKE_SOURCE_PATH=	${_QMAKE_WRKSRC}
+_QMAKE=			${CONFIGURE_WRKSRC}/bin/qmake
+
+post-configure: qmake-configure
+.  endif
+. endif # ${QT_DIST} == "base"
+
+pre-install: qt-pre-install
+qt-pre-install:
+# Search both in CONFIGURE_WRKSRC and WRKSRC, as the former is not
+# a subdirectory of the latter for out-of-source builds.
+	@${FIND} ${WRKSRC} ${CONFIGURE_WRKSRC} -name "Makefile*" -type f | \
+		${XARGS} ${REINPLACE_CMD} -e 's,${PREFIX}/${QT_LIBDIR_REL}/pkgconfig,${PREFIX}/libdata/pkgconfig,g'
+
+post-install: qt-post-install
+qt-post-install:
+. if ${QT_DEFINES:N-*}
+# We can't use SUB_FILES with a shared pkg-deinstall.in.
+# We need it to be a script instead of a group of @unexecs, otherwise
+# qconfig-modules.h cleanup will be run in pre-deinstall stage, which is
+# useless. This will probably be replaced by a Keywords/ script in the future.
+	@${SED} -e 's,%%QT_MODNAME%%,${QT_MODNAME},g' \
+		-e 's,%%QT_INCDIR%%,${QT_INCDIR},g' \
+		${.CURDIR:H:H}/devel/${_QT_RELNAME}/${FILESDIR:T}/${PKGDEINSTALL:T}.in > \
+		${PKGDEINSTALL}
+	@${MKDIR} ${STAGEDIR}${QT_INCDIR}/QtCore/modules
+	@${ECHO_CMD} -n \
+		> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
+.  for def in ${QT_DEFINES:N-*:O:u}
+	@${ECHO_CMD} "#if !defined(QT_${def}) && !defined(QT_NO_${def})" \
+		>> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
+	${ECHO_CMD} "# define QT_${def}" \
+		>> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
+	@${ECHO_CMD} "#endif" \
+		>> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
+	@${ECHO_CMD} \
+		>> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
+.  endfor
+	@${ECHO_CMD} "@cwd ${QT_PREFIX}" >> ${TMPPLIST}
+	@${ECHO_CMD} "${QT_INCDIR_REL}/QtCore/modules/qconfig-${QT_MODNAME}.h" \
+		>> ${TMPPLIST}
+	@${ECHO_CMD} "@exec echo '#include <QtCore/modules/qconfig-${QT_MODNAME}.h>' >> %D/${QT_INCDIR_REL}/QtCore/qconfig-modules.h" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrmtry ${QT_INCDIR_REL}/QtCore/modules" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrmtry ${QT_INCDIR_REL}/QtCore" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrmtry ${QT_INCDIR_REL}" >> ${TMPPLIST}
+. endif # ${QT_DEFINES:N-*}
+. if ${QT_CONFIG:N-*}
+	@${MKDIR} ${STAGEDIR}${QT_MKSPECDIR}/modules
+	${ECHO_CMD} "QT_CONFIG += ${QT_CONFIG:N-*:O:u}" \
+		> ${STAGEDIR}${QT_MKSPECDIR}/modules/qt_config_${QT_MODNAME}.pri
+	@${ECHO_CMD} "@cwd ${QT_PREFIX}" >> ${TMPPLIST}
+	@${ECHO_CMD} "${QT_MKSPECDIR_REL}/modules/qt_config_${QT_MODNAME}.pri" \
+		>> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrmtry ${QT_MKSPECDIR_REL}/modules" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrmtry ${QT_MKSPECDIR_REL}" >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrmtry ${QT_ARCHDIR_REL}" >> ${TMPPLIST}
+. endif # ${QT_CONFIG:N-*}
+.endif # defined(QT_DIST) && ! ${_QT_VERSION:M4*}
+
+.endif # defined(_POSTMKINCLUDED) && !defined(Qt_Post_Include)
--- a/accessibility/qt4-accessible/Makefile
+++ b/accessibility/qt4-accessible/Makefile
@ -3,14 +3,13 @@

 PORTNAME=	accessible
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	accessibility
+CATEGORIES=	accessibility
 PKGNAMEPREFIX=	qt4-

 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt accessibility widgets

 USE_QT4=	qmake_build moc_build qt3support corelib gui network sql xml
-QT_NONSTANDARD=	yes
 QT_DIST=	yes

 HAS_CONFIGURE=	yes
@ -35,11 +34,9 @@ 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 ${QMAKE} ${WRKSRC}/bin/qmake
+	${LN} -sf ${MOC} ${WRKSRC}/bin/moc

 .include <bsd.port.mk>
--- a/accessibility/qt4-accessible/pkg-descr
+++ b/accessibility/qt4-accessible/pkg-descr
@ -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
--- a/chinese/qt4-codecs-cn/Makefile
+++ b/chinese/qt4-codecs-cn/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	codecs
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	chinese
+CATEGORIES=	chinese
 PKGNAMEPREFIX=	qt4-
 PKGNAMESUFFIX=	-cn

@ -11,7 +11,6 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt GB 18030 codec plugin

 USE_QT4=	qmake_build corelib
-QT_NONSTANDARD=	yes
 QT_DIST=	yes

 HAS_CONFIGURE=	yes
@ -36,11 +35,9 @@ EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 BUILD_WRKSRC=	${WRKSRC}/src/plugins/${PORTNAME}/cn
 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 ${QMAKE} ${WRKSRC}/bin/qmake

 post-configure:
 	${REINPLACE_CMD} -e 's|(test -z.*||g' ${BUILD_WRKSRC}/Makefile
--- a/chinese/qt4-codecs-cn/pkg-descr
+++ b/chinese/qt4-codecs-cn/pkg-descr
@ -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
--- a/chinese/qt4-codecs-tw/Makefile
+++ b/chinese/qt4-codecs-tw/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	codecs
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	chinese
+CATEGORIES=	chinese
 PKGNAMEPREFIX=	qt4-
 PKGNAMESUFFIX=	-tw

@ -11,7 +11,6 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt Big-5 codec plugin

 USE_QT4=	qmake_build corelib
-QT_NONSTANDARD=	yes
 QT_DIST=	yes

 HAS_CONFIGURE=	yes
@ -36,11 +35,9 @@ EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 BUILD_WRKSRC=	${WRKSRC}/src/plugins/${PORTNAME}/tw
 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 ${QMAKE} ${WRKSRC}/bin/qmake

 post-configure:
 	${REINPLACE_CMD} -e 's|(test -z.*||g' ${BUILD_WRKSRC}/Makefile
--- a/chinese/qt4-codecs-tw/pkg-descr
+++ b/chinese/qt4-codecs-tw/pkg-descr
@ -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
--- a/databases/qt4-ibase-plugin/Makefile
+++ b/databases/qt4-ibase-plugin/Makefile
@ -6,13 +6,12 @@ DISTVERSION=	${QT4_VERSION}
 CATEGORIES=	databases

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt IBase/Firebird database plugin
+COMMENT=	Qt InterBase/Firebird database plugin

 DB=		ibase

 USE_FIREBIRD=	yes
 USE_QT4=	moc_build sql
-QT_NONSTANDARD=	yes
 QT_DIST=	yes

 DRIVER=		src/sql/drivers/${DB}
@ -23,12 +22,12 @@ EXTRACT_AFTER_ARGS?=	${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN} \
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV+=	DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
 		PLUGIN="${PLUGIN}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		QT_INCDIR="${QT_INCDIR}" \
 		QT_LIBDIR="${QT_LIBDIR}"
 PLIST_SUB=	DB=${DB}

+EXTRA_PATCHES=	# empty
+
 SQL_PLUGINDIR=	${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers

 do-install:
--- a/databases/qt4-ibase-plugin/pkg-descr
+++ b/databases/qt4-ibase-plugin/pkg-descr
@ -1,4 +0,0 @@
-The IBase/Firebird Plugin from Qt 4, which provides an easy access method from
-within Qt applications.
-
-WWW:	http://doc.trolltech.com/4.0/sql.html
--- a/databases/qt4-mysql-plugin/Makefile
+++ b/databases/qt4-mysql-plugin/Makefile
@ -11,7 +11,6 @@ COMMENT=	Qt MySQL database plugin
 DB=		mysql

 USE_QT4=	moc_build sql
-QT_NONSTANDARD=	yes
 QT_DIST=	yes

 USE_MYSQL=	yes
@ -22,12 +21,12 @@ EXTRACT_AFTER_ARGS?=	${DISTNAME}/${DRIVER} \
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV+=	DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
 		PLUGIN="${PLUGIN}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		QT_INCDIR="${QT_INCDIR}" \
 		QT_LIBDIR="${QT_LIBDIR}"
 PLIST_SUB=	DB=${DB}

+EXTRA_PATCHES=	# empty
+
 SQL_PLUGINDIR=	${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers

 do-install:
--- a/databases/qt4-mysql-plugin/files/Makefile.bsd
+++ b/databases/qt4-mysql-plugin/files/Makefile.bsd
@ -8,7 +8,7 @@ CXXFLAGS+=	-I${DRIVER} \
 		-I${LOCALBASE}/include \
 		-DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_PLUGIN \
 		-DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE -DQT_SHARED
-LDADD=		-L${QT_LIBDIR} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql -pthread -lQtSql -lmysqlclient_r 
+LDADD=		-L${QT_LIBDIR} -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql -pthread -lQtSql -lmysqlclient_r
 MOC?=		${LOCALBASE}/bin/moc-qt4
 SRCS=		main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp qsql_${DB}.moc

--- a/databases/qt4-mysql-plugin/pkg-descr
+++ b/databases/qt4-mysql-plugin/pkg-descr
@ -1,4 +0,0 @@
-The MySQL-Plugin from Qt 4, which provides an easy access
-method from within Qt applications.
-
-WWW:	http://doc.trolltech.com/4.0/sql.html
--- a/databases/qt4-odbc-plugin/Makefile
+++ b/databases/qt4-odbc-plugin/Makefile
@ -6,14 +6,13 @@ DISTVERSION=	${QT4_VERSION}
 CATEGORIES=	databases

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt ODBC database plugin
+COMMENT=	Qt Open Database Connectivity plugin

 DB=		odbc

 LIB_DEPENDS+=	libiodbc.so:${PORTSDIR}/databases/libiodbc

 USE_QT4=	moc_build sql
-QT_NONSTANDARD=	yes
 QT_DIST=	yes

 DRIVER=		src/sql/drivers/${DB}
@ -23,12 +22,12 @@ EXTRACT_AFTER_ARGS?=	${DISTNAME}/${DRIVER} \
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV+=	DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
 		PLUGIN="${PLUGIN}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		QT_INCDIR="${QT_INCDIR}" \
 		QT_LIBDIR="${QT_LIBDIR}"
 PLIST_SUB=	DB=${DB}

+EXTRA_PATCHES=	# empty
+
 SQL_PLUGINDIR=	${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers

 do-install:
--- a/databases/qt4-odbc-plugin/pkg-descr
+++ b/databases/qt4-odbc-plugin/pkg-descr
@ -1,4 +0,0 @@
-The ODBC Plugin from Qt 4, which provides an easy access method from
-within Qt applications.
-
-WWW:	http://doc.trolltech.com/4.0/sql.html
--- a/databases/qt4-pgsql-plugin/Makefile
+++ b/databases/qt4-pgsql-plugin/Makefile
@ -11,7 +11,6 @@ COMMENT=	Qt PostgreSQL database plugin
 DB=		psql

 USE_QT4=	moc_build sql
-QT_NONSTANDARD=	yes
 QT_DIST=	yes

 USE_PGSQL=	yes
@ -22,12 +21,12 @@ EXTRACT_AFTER_ARGS?=	${DISTNAME}/${DRIVER} \
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV+=	DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
 		PLUGIN="${PLUGIN}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		QT_INCDIR="${QT_INCDIR}" \
 		QT_LIBDIR="${QT_LIBDIR}"
 PLIST_SUB=	DB=${DB}

+EXTRA_PATCHES=	# empty
+
 SQL_PLUGINDIR=	${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers

 do-install:
--- a/databases/qt4-pgsql-plugin/pkg-descr
+++ b/databases/qt4-pgsql-plugin/pkg-descr
@ -1,4 +0,0 @@
-The PostgreSQL Plugin from Qt 4, which provides an easy access method from
-within Qt applications.
-
-WWW:	http://doc.trolltech.com/4.0/sql.html
--- a/databases/qt4-sql/Makefile
+++ b/databases/qt4-sql/Makefile
@ -3,18 +3,17 @@

 PORTNAME=	sql
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	databases
+CATEGORIES=	databases
 PKGNAMEPREFIX=	qt4-

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt SQL library
+COMMENT=	Qt SQL database integration module

 USE_QT4=	qmake_build moc_build corelib
-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,19 +35,17 @@ 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=).*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/QtSql.pc

 .include <bsd.port.mk>
--- a/databases/qt4-sql/pkg-descr
+++ b/databases/qt4-sql/pkg-descr
@ -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
--- a/databases/qt4-sql/pkg-message
+++ b/databases/qt4-sql/pkg-message
@ -1,12 +1,12 @@
-*******************************************************************************
+======================================================================

-	To enable QT's database support, install the database plugin ports.
-	The following plugin ports are available:
+To enable Qt database support, install the database plugin ports. The
+following plugin ports are available:
+ - databases/qt4-ibase-plugin		InterBase/Firebird
+ - databases/qt4-mysql-plugin		MySQL
+ - databases/qt4-odbc-plugin		Open Database Connectivity
+ - databases/qt4-pgsql-plugin		PostgreSQL
+ - databases/qt4-sqlite-plugin		SQLite 2
+ - databases/qt4-sqlite3-plugin		SQLite 3

-		IBase/Firebird 	- databases/qt4-ibase-plugin
-		MySQL		- databases/qt4-mysql-plugin
-		ODBC		- databases/qt4-odbc-plugin
-		PostgreSQL	- databases/qt4-pgsql-plugin
-		SQLite		- databases/qt4-sqlite-plugin				
-
-*******************************************************************************
+======================================================================
--- a/databases/qt4-sql/pkg-plist
+++ b/databases/qt4-sql/pkg-plist
@ -1,99 +1,99 @@
-include/qt4/Qt/QtSql
-include/qt4/Qt/qsql.h
-include/qt4/Qt/qsql_db2.h
-include/qt4/Qt/qsql_ibase.h
-include/qt4/Qt/qsql_mysql.h
-include/qt4/Qt/qsql_oci.h
-include/qt4/Qt/qsql_odbc.h
-include/qt4/Qt/qsql_psql.h
-include/qt4/Qt/qsql_sqlite.h
-include/qt4/Qt/qsql_sqlite2.h
-include/qt4/Qt/qsql_symsql.h
-include/qt4/Qt/qsql_tds.h
-include/qt4/Qt/qsqldatabase.h
-include/qt4/Qt/qsqldriver.h
-include/qt4/Qt/qsqldriverplugin.h
-include/qt4/Qt/qsqlerror.h
-include/qt4/Qt/qsqlfield.h
-include/qt4/Qt/qsqlindex.h
-include/qt4/Qt/qsqlquery.h
-include/qt4/Qt/qsqlquerymodel.h
-include/qt4/Qt/qsqlrecord.h
-include/qt4/Qt/qsqlrelationaldelegate.h
-include/qt4/Qt/qsqlrelationaltablemodel.h
-include/qt4/Qt/qsqlresult.h
-include/qt4/Qt/qsqltablemodel.h
-include/qt4/QtSql/QDB2Driver
-include/qt4/QtSql/QDB2Result
-include/qt4/QtSql/QIBaseDriver
-include/qt4/QtSql/QIBaseResult
-include/qt4/QtSql/QMYSQLDriver
-include/qt4/QtSql/QMYSQLResult
-include/qt4/QtSql/QOCIDriver
-include/qt4/QtSql/QOCIResult
-include/qt4/QtSql/QODBCDriver
-include/qt4/QtSql/QODBCResult
-include/qt4/QtSql/QPSQLDriver
-include/qt4/QtSql/QPSQLResult
-include/qt4/QtSql/QSQLite2Driver
-include/qt4/QtSql/QSQLite2Result
-include/qt4/QtSql/QSQLiteDriver
-include/qt4/QtSql/QSQLiteResult
-include/qt4/QtSql/QSqlDatabase
-include/qt4/QtSql/QSqlDriver
-include/qt4/QtSql/QSqlDriverCreator
-include/qt4/QtSql/QSqlDriverCreatorBase
-include/qt4/QtSql/QSqlDriverFactoryInterface
-include/qt4/QtSql/QSqlDriverPlugin
-include/qt4/QtSql/QSqlError
-include/qt4/QtSql/QSqlField
-include/qt4/QtSql/QSqlIndex
-include/qt4/QtSql/QSqlQuery
-include/qt4/QtSql/QSqlQueryModel
-include/qt4/QtSql/QSqlRecord
-include/qt4/QtSql/QSqlRelation
-include/qt4/QtSql/QSqlRelationalDelegate
-include/qt4/QtSql/QSqlRelationalTableModel
-include/qt4/QtSql/QSqlResult
-include/qt4/QtSql/QSqlTableModel
-include/qt4/QtSql/QSymSQLDriver
-include/qt4/QtSql/QSymSQLResult
-include/qt4/QtSql/QTDSDriver
-include/qt4/QtSql/QTDSResult
-include/qt4/QtSql/QtSql
-include/qt4/QtSql/qsql.h
-include/qt4/QtSql/qsql_db2.h
-include/qt4/QtSql/qsql_ibase.h
-include/qt4/QtSql/qsql_mysql.h
-include/qt4/QtSql/qsql_oci.h
-include/qt4/QtSql/qsql_odbc.h
-include/qt4/QtSql/qsql_psql.h
-include/qt4/QtSql/qsql_sqlite.h
-include/qt4/QtSql/qsql_sqlite2.h
-include/qt4/QtSql/qsql_symsql.h
-include/qt4/QtSql/qsql_tds.h
-include/qt4/QtSql/qsqldatabase.h
-include/qt4/QtSql/qsqldriver.h
-include/qt4/QtSql/qsqldriverplugin.h
-include/qt4/QtSql/qsqlerror.h
-include/qt4/QtSql/qsqlfield.h
-include/qt4/QtSql/qsqlindex.h
-include/qt4/QtSql/qsqlquery.h
-include/qt4/QtSql/qsqlquerymodel.h
-include/qt4/QtSql/qsqlrecord.h
-include/qt4/QtSql/qsqlrelationaldelegate.h
-include/qt4/QtSql/qsqlrelationaltablemodel.h
-include/qt4/QtSql/qsqlresult.h
-include/qt4/QtSql/qsqltablemodel.h
-lib/qt4/libQtSql.la
-lib/qt4/libQtSql.prl
-lib/qt4/libQtSql.so
-lib/qt4/libQtSql.so.4
-lib/qt4/libQtSql.so.%%SHLIB_SHVER%%
-lib/qt4/libQtSql.so.%%SHLIB_VER%%
-%%DEBUG%%lib/qt4/libQtSql.so.%%SHLIB_VER%%.debug
+%%QT_INCDIR%%/Qt/QtSql
+%%QT_INCDIR%%/Qt/qsql.h
+%%QT_INCDIR%%/Qt/qsql_db2.h
+%%QT_INCDIR%%/Qt/qsql_ibase.h
+%%QT_INCDIR%%/Qt/qsql_mysql.h
+%%QT_INCDIR%%/Qt/qsql_oci.h
+%%QT_INCDIR%%/Qt/qsql_odbc.h
+%%QT_INCDIR%%/Qt/qsql_psql.h
+%%QT_INCDIR%%/Qt/qsql_sqlite.h
+%%QT_INCDIR%%/Qt/qsql_sqlite2.h
+%%QT_INCDIR%%/Qt/qsql_symsql.h
+%%QT_INCDIR%%/Qt/qsql_tds.h
+%%QT_INCDIR%%/Qt/qsqldatabase.h
+%%QT_INCDIR%%/Qt/qsqldriver.h
+%%QT_INCDIR%%/Qt/qsqldriverplugin.h
+%%QT_INCDIR%%/Qt/qsqlerror.h
+%%QT_INCDIR%%/Qt/qsqlfield.h
+%%QT_INCDIR%%/Qt/qsqlindex.h
+%%QT_INCDIR%%/Qt/qsqlquery.h
+%%QT_INCDIR%%/Qt/qsqlquerymodel.h
+%%QT_INCDIR%%/Qt/qsqlrecord.h
+%%QT_INCDIR%%/Qt/qsqlrelationaldelegate.h
+%%QT_INCDIR%%/Qt/qsqlrelationaltablemodel.h
+%%QT_INCDIR%%/Qt/qsqlresult.h
+%%QT_INCDIR%%/Qt/qsqltablemodel.h
+%%QT_INCDIR%%/QtSql/QDB2Driver
+%%QT_INCDIR%%/QtSql/QDB2Result
+%%QT_INCDIR%%/QtSql/QIBaseDriver
+%%QT_INCDIR%%/QtSql/QIBaseResult
+%%QT_INCDIR%%/QtSql/QMYSQLDriver
+%%QT_INCDIR%%/QtSql/QMYSQLResult
+%%QT_INCDIR%%/QtSql/QOCIDriver
+%%QT_INCDIR%%/QtSql/QOCIResult
+%%QT_INCDIR%%/QtSql/QODBCDriver
+%%QT_INCDIR%%/QtSql/QODBCResult
+%%QT_INCDIR%%/QtSql/QPSQLDriver
+%%QT_INCDIR%%/QtSql/QPSQLResult
+%%QT_INCDIR%%/QtSql/QSQLite2Driver
+%%QT_INCDIR%%/QtSql/QSQLite2Result
+%%QT_INCDIR%%/QtSql/QSQLiteDriver
+%%QT_INCDIR%%/QtSql/QSQLiteResult
+%%QT_INCDIR%%/QtSql/QSqlDatabase
+%%QT_INCDIR%%/QtSql/QSqlDriver
+%%QT_INCDIR%%/QtSql/QSqlDriverCreator
+%%QT_INCDIR%%/QtSql/QSqlDriverCreatorBase
+%%QT_INCDIR%%/QtSql/QSqlDriverFactoryInterface
+%%QT_INCDIR%%/QtSql/QSqlDriverPlugin
+%%QT_INCDIR%%/QtSql/QSqlError
+%%QT_INCDIR%%/QtSql/QSqlField
+%%QT_INCDIR%%/QtSql/QSqlIndex
+%%QT_INCDIR%%/QtSql/QSqlQuery
+%%QT_INCDIR%%/QtSql/QSqlQueryModel
+%%QT_INCDIR%%/QtSql/QSqlRecord
+%%QT_INCDIR%%/QtSql/QSqlRelation
+%%QT_INCDIR%%/QtSql/QSqlRelationalDelegate
+%%QT_INCDIR%%/QtSql/QSqlRelationalTableModel
+%%QT_INCDIR%%/QtSql/QSqlResult
+%%QT_INCDIR%%/QtSql/QSqlTableModel
+%%QT_INCDIR%%/QtSql/QSymSQLDriver
+%%QT_INCDIR%%/QtSql/QSymSQLResult
+%%QT_INCDIR%%/QtSql/QTDSDriver
+%%QT_INCDIR%%/QtSql/QTDSResult
+%%QT_INCDIR%%/QtSql/QtSql
+%%QT_INCDIR%%/QtSql/qsql.h
+%%QT_INCDIR%%/QtSql/qsql_db2.h
+%%QT_INCDIR%%/QtSql/qsql_ibase.h
+%%QT_INCDIR%%/QtSql/qsql_mysql.h
+%%QT_INCDIR%%/QtSql/qsql_oci.h
+%%QT_INCDIR%%/QtSql/qsql_odbc.h
+%%QT_INCDIR%%/QtSql/qsql_psql.h
+%%QT_INCDIR%%/QtSql/qsql_sqlite.h
+%%QT_INCDIR%%/QtSql/qsql_sqlite2.h
+%%QT_INCDIR%%/QtSql/qsql_symsql.h
+%%QT_INCDIR%%/QtSql/qsql_tds.h
+%%QT_INCDIR%%/QtSql/qsqldatabase.h
+%%QT_INCDIR%%/QtSql/qsqldriver.h
+%%QT_INCDIR%%/QtSql/qsqldriverplugin.h
+%%QT_INCDIR%%/QtSql/qsqlerror.h
+%%QT_INCDIR%%/QtSql/qsqlfield.h
+%%QT_INCDIR%%/QtSql/qsqlindex.h
+%%QT_INCDIR%%/QtSql/qsqlquery.h
+%%QT_INCDIR%%/QtSql/qsqlquerymodel.h
+%%QT_INCDIR%%/QtSql/qsqlrecord.h
+%%QT_INCDIR%%/QtSql/qsqlrelationaldelegate.h
+%%QT_INCDIR%%/QtSql/qsqlrelationaltablemodel.h
+%%QT_INCDIR%%/QtSql/qsqlresult.h
+%%QT_INCDIR%%/QtSql/qsqltablemodel.h
+%%QT_LIBDIR%%/libQtSql.la
+%%QT_LIBDIR%%/libQtSql.prl
+%%QT_LIBDIR%%/libQtSql.so
+%%QT_LIBDIR%%/libQtSql.so.4
+%%QT_LIBDIR%%/libQtSql.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQtSql.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQtSql.so.%%FULLVER%%.debug
 libdata/pkgconfig/QtSql.pc
-@dirrmtry lib/qt4
-@dirrm include/qt4/QtSql
-@dirrmtry include/qt4/Qt
-@dirrmtry include/qt4
+@dirrmtry %%QT_LIBDIR%%
+@dirrm %%QT_INCDIR%%/QtSql
+@dirrmtry %%QT_INCDIR%%/Qt
+@dirrmtry %%QT_INCDIR%%
--- a/databases/qt4-sqlite-plugin/Makefile
+++ b/databases/qt4-sqlite-plugin/Makefile
@ -6,15 +6,13 @@ DISTVERSION=	${QT4_VERSION}
 CATEGORIES=	databases

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt SQLite 2.x database plugin
+COMMENT=	Qt SQLite 2 database plugin

 DB=		sqlite2

-LIB_DEPENDS+=	libsqlite.so:${PORTSDIR}/databases/sqlite2
-
 USE_QT4=	moc_build sql
-QT_NONSTANDARD=	yes
 QT_DIST=	yes
+USE_SQLITE=	2

 DRIVER=		src/sql/drivers/${DB}
 PLUGIN=		src/plugins/sqldrivers/${DB}
@ -24,12 +22,12 @@ EXTRACT_AFTER_ARGS?=	${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN} \
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV+=	DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
 		PLUGIN="${PLUGIN}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		QT_INCDIR="${QT_INCDIR}" \
 		QT_LIBDIR="${QT_LIBDIR}"
 PLIST_SUB=	DB=${DB}

+EXTRA_PATCHES=	# empty
+
 SQL_PLUGINDIR=	${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers

 do-install:
--- a/databases/qt4-sqlite-plugin/pkg-descr
+++ b/databases/qt4-sqlite-plugin/pkg-descr
@ -1,4 +0,0 @@
-The SQLite Plugin from Qt 4, which provides an easy access method from
-within Qt applications.
-
-WWW:	http://doc.trolltech.com/4.0/sql.html
--- a/databases/qt4-sqlite3-plugin/Makefile
+++ b/databases/qt4-sqlite3-plugin/Makefile
@ -6,16 +6,13 @@ DISTVERSION=	${QT4_VERSION}
 CATEGORIES=	databases

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt SQLite 3.x database plugin
+COMMENT=	Qt SQLite 3 database plugin

 DB=		sqlite
-DISTINFO_FILE=	${PORTSDIR}/devel/qt4/distinfo
-
-LIB_DEPENDS+=	libsqlite3.so:${PORTSDIR}/databases/sqlite3

 USE_QT4=	moc_build sql
-QT_NONSTANDARD=	yes
 QT_DIST=	yes
+USE_SQLITE=	3

 DRIVER=		src/sql/drivers/${DB}
 PLUGIN=		src/plugins/sqldrivers/${DB}
@ -25,12 +22,12 @@ EXTRACT_AFTER_ARGS?=	${DISTNAME}/${DRIVER} ${DISTNAME}/${PLUGIN} \
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV+=	DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
 		PLUGIN="${PLUGIN}" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		QT_INCDIR="${QT_INCDIR}" \
 		QT_LIBDIR="${QT_LIBDIR}"
 PLIST_SUB=	DB=${DB}

+EXTRA_PATCHES=	# empty
+
 SQL_PLUGINDIR=	${PREFIX}/${QT_PLUGINDIR_REL}/sqldrivers

 do-install:
--- a/databases/qt4-sqlite3-plugin/pkg-descr
+++ b/databases/qt4-sqlite3-plugin/pkg-descr
@ -1,4 +0,0 @@
-The SQLite Plugin from Qt 4, which provides an easy access method from
-within Qt applications.
-
-WWW:	http://doc.trolltech.com/4.0/sql.html
--- a/devel/Makefile
+++ b/devel/Makefile
@ -3963,7 +3963,6 @@
    SUBDIR += qt4-assistant
    SUBDIR += qt4-assistant-adp
    SUBDIR += qt4-corelib
-    SUBDIR += qt4-declarative
    SUBDIR += qt4-designer
    SUBDIR += qt4-help
    SUBDIR += qt4-help-tools
@ -3976,13 +3975,13 @@
    SUBDIR += qt4-qdoc3
    SUBDIR += qt4-qmlviewer
    SUBDIR += qt4-qt3support
-    SUBDIR += qt4-qtestlib
    SUBDIR += qt4-qtsolutions-singleapplication
    SUBDIR += qt4-qtsolutions-soap
    SUBDIR += qt4-qvfb
    SUBDIR += qt4-rcc
    SUBDIR += qt4-script
    SUBDIR += qt4-scripttools
+    SUBDIR += qt4-testlib
    SUBDIR += qt4-uic
    SUBDIR += qt4-uic3
    SUBDIR += qtcreator
--- a/devel/dbus-qt4/Makefile
+++ b/devel/dbus-qt4/Makefile
@ -3,22 +3,21 @@

 PORTNAME=	dbus
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	devel
+CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt4 bindings for the D-BUS messaging system
+COMMENT=	Qt D-Bus inter-process communication module

-LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus

 USES=		pkgconfig
 USE_QT4=	qmake_build moc_build rcc_build corelib xml
-QT_NONSTANDARD=	yes
 QT_DIST=	yes
 MAKE_JOBS_UNSAFE=	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
@ -40,8 +39,6 @@ EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 BUILD_WRKSRC=	${WRKSRC}/tools/qdbus
 INSTALL_WRKSRC=	${BUILD_WRKSRC}

-EXTRA_PATCHES+=	${.CURDIR}/../../devel/qt4/files/patch-configure
-
 .include <bsd.port.pre.mk>

 # Without this workaround, qdbus crashes.
@ -55,17 +52,17 @@ CONFIGURE_ARGS+=	--no-gui \
 pre-configure:
 	${REINPLACE_CMD} -e 's|SUBDIRS = qdbus|SUBDIRS = ../../src/${PORTNAME} qdbus|g' \
 		${BUILD_WRKSRC}/qdbus.pro
-	${REINPLACE_CMD} -e 's|"/moc"|"/moc-qt4"|' \
+	${REINPLACE_CMD} -e 's|"/moc"|"/${MOC:T}"|' \
 		${BUILD_WRKSRC}/qdbuscpp2xml/qdbuscpp2xml.cpp
 	${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

 post-configure:
-	${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' ${WRKSRC}/src/${PORTNAME}/Makefile
+	${REINPLACE_CMD} -e 's|${PREFIX}/${QT_LIBDIR_REL}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' ${WRKSRC}/src/${PORTNAME}/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/QtDBus.pc

 .include <bsd.port.post.mk>
--- a/devel/dbus-qt4/pkg-descr
+++ b/devel/dbus-qt4/pkg-descr
@ -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
--- a/devel/dbus-qt4/pkg-plist
+++ b/devel/dbus-qt4/pkg-plist
@ -1,81 +1,81 @@
-bin/qdbus
-%%DEBUG%%bin/qdbus.debug
-bin/qdbuscpp2xml
-%%DEBUG%%bin/qdbuscpp2xml.debug
-bin/qdbusxml2cpp
-%%DEBUG%%bin/qdbusxml2cpp.debug
-include/qt4/Qt/QtDBus
-include/qt4/Qt/qdbusabstractadaptor.h
-include/qt4/Qt/qdbusabstractinterface.h
-include/qt4/Qt/qdbusargument.h
-include/qt4/Qt/qdbusconnection.h
-include/qt4/Qt/qdbusconnectioninterface.h
-include/qt4/Qt/qdbuscontext.h
-include/qt4/Qt/qdbuserror.h
-include/qt4/Qt/qdbusextratypes.h
-include/qt4/Qt/qdbusinterface.h
-include/qt4/Qt/qdbusmacros.h
-include/qt4/Qt/qdbusmessage.h
-include/qt4/Qt/qdbusmetatype.h
-include/qt4/Qt/qdbuspendingcall.h
-include/qt4/Qt/qdbuspendingreply.h
-include/qt4/Qt/qdbusreply.h
-include/qt4/Qt/qdbusserver.h
-include/qt4/Qt/qdbusservicewatcher.h
-include/qt4/Qt/qdbusunixfiledescriptor.h
-include/qt4/Qt/qdbusvirtualobject.h
-include/qt4/QtDBus/QDBusAbstractAdaptor
-include/qt4/QtDBus/QDBusAbstractInterface
-include/qt4/QtDBus/QDBusAbstractInterfaceBase
-include/qt4/QtDBus/QDBusArgument
-include/qt4/QtDBus/QDBusConnection
-include/qt4/QtDBus/QDBusConnectionInterface
-include/qt4/QtDBus/QDBusContext
-include/qt4/QtDBus/QDBusError
-include/qt4/QtDBus/QDBusInterface
-include/qt4/QtDBus/QDBusMessage
-include/qt4/QtDBus/QDBusMetaType
-include/qt4/QtDBus/QDBusObjectPath
-include/qt4/QtDBus/QDBusPendingCall
-include/qt4/QtDBus/QDBusPendingCallWatcher
-include/qt4/QtDBus/QDBusPendingReply
-include/qt4/QtDBus/QDBusPendingReplyData
-include/qt4/QtDBus/QDBusReply
-include/qt4/QtDBus/QDBusServer
-include/qt4/QtDBus/QDBusServiceWatcher
-include/qt4/QtDBus/QDBusSignature
-include/qt4/QtDBus/QDBusUnixFileDescriptor
-include/qt4/QtDBus/QDBusVariant
-include/qt4/QtDBus/QDBusVirtualObject
-include/qt4/QtDBus/QtDBus
-include/qt4/QtDBus/qdbusabstractadaptor.h
-include/qt4/QtDBus/qdbusabstractinterface.h
-include/qt4/QtDBus/qdbusargument.h
-include/qt4/QtDBus/qdbusconnection.h
-include/qt4/QtDBus/qdbusconnectioninterface.h
-include/qt4/QtDBus/qdbuscontext.h
-include/qt4/QtDBus/qdbuserror.h
-include/qt4/QtDBus/qdbusextratypes.h
-include/qt4/QtDBus/qdbusinterface.h
-include/qt4/QtDBus/qdbusmacros.h
-include/qt4/QtDBus/qdbusmessage.h
-include/qt4/QtDBus/qdbusmetatype.h
-include/qt4/QtDBus/qdbuspendingcall.h
-include/qt4/QtDBus/qdbuspendingreply.h
-include/qt4/QtDBus/qdbusreply.h
-include/qt4/QtDBus/qdbusserver.h
-include/qt4/QtDBus/qdbusservicewatcher.h
-include/qt4/QtDBus/qdbusunixfiledescriptor.h
-include/qt4/QtDBus/qdbusvirtualobject.h
-lib/qt4/libQtDBus.la
-lib/qt4/libQtDBus.prl
-lib/qt4/libQtDBus.so
-lib/qt4/libQtDBus.so.4
-lib/qt4/libQtDBus.so.%%SHLIB_SHVER%%
-lib/qt4/libQtDBus.so.%%SHLIB_VER%%
-%%DEBUG%%lib/qt4/libQtDBus.so.%%SHLIB_VER%%.debug
+%%QT_BINDIR%%/qdbus
+%%DEBUG%%%%QT_BINDIR%%/qdbus.debug
+%%QT_BINDIR%%/qdbuscpp2xml
+%%DEBUG%%%%QT_BINDIR%%/qdbuscpp2xml.debug
+%%QT_BINDIR%%/qdbusxml2cpp
+%%DEBUG%%%%QT_BINDIR%%/qdbusxml2cpp.debug
+%%QT_INCDIR%%/Qt/QtDBus
+%%QT_INCDIR%%/Qt/qdbusabstractadaptor.h
+%%QT_INCDIR%%/Qt/qdbusabstractinterface.h
+%%QT_INCDIR%%/Qt/qdbusargument.h
+%%QT_INCDIR%%/Qt/qdbusconnection.h
+%%QT_INCDIR%%/Qt/qdbusconnectioninterface.h
+%%QT_INCDIR%%/Qt/qdbuscontext.h
+%%QT_INCDIR%%/Qt/qdbuserror.h
+%%QT_INCDIR%%/Qt/qdbusextratypes.h
+%%QT_INCDIR%%/Qt/qdbusinterface.h
+%%QT_INCDIR%%/Qt/qdbusmacros.h
+%%QT_INCDIR%%/Qt/qdbusmessage.h
+%%QT_INCDIR%%/Qt/qdbusmetatype.h
+%%QT_INCDIR%%/Qt/qdbuspendingcall.h
+%%QT_INCDIR%%/Qt/qdbuspendingreply.h
+%%QT_INCDIR%%/Qt/qdbusreply.h
+%%QT_INCDIR%%/Qt/qdbusserver.h
+%%QT_INCDIR%%/Qt/qdbusservicewatcher.h
+%%QT_INCDIR%%/Qt/qdbusunixfiledescriptor.h
+%%QT_INCDIR%%/Qt/qdbusvirtualobject.h
+%%QT_INCDIR%%/QtDBus/QDBusAbstractAdaptor
+%%QT_INCDIR%%/QtDBus/QDBusAbstractInterface
+%%QT_INCDIR%%/QtDBus/QDBusAbstractInterfaceBase
+%%QT_INCDIR%%/QtDBus/QDBusArgument
+%%QT_INCDIR%%/QtDBus/QDBusConnection
+%%QT_INCDIR%%/QtDBus/QDBusConnectionInterface
+%%QT_INCDIR%%/QtDBus/QDBusContext
+%%QT_INCDIR%%/QtDBus/QDBusError
+%%QT_INCDIR%%/QtDBus/QDBusInterface
+%%QT_INCDIR%%/QtDBus/QDBusMessage
+%%QT_INCDIR%%/QtDBus/QDBusMetaType
+%%QT_INCDIR%%/QtDBus/QDBusObjectPath
+%%QT_INCDIR%%/QtDBus/QDBusPendingCall
+%%QT_INCDIR%%/QtDBus/QDBusPendingCallWatcher
+%%QT_INCDIR%%/QtDBus/QDBusPendingReply
+%%QT_INCDIR%%/QtDBus/QDBusPendingReplyData
+%%QT_INCDIR%%/QtDBus/QDBusReply
+%%QT_INCDIR%%/QtDBus/QDBusServer
+%%QT_INCDIR%%/QtDBus/QDBusServiceWatcher
+%%QT_INCDIR%%/QtDBus/QDBusSignature
+%%QT_INCDIR%%/QtDBus/QDBusUnixFileDescriptor
+%%QT_INCDIR%%/QtDBus/QDBusVariant
+%%QT_INCDIR%%/QtDBus/QDBusVirtualObject
+%%QT_INCDIR%%/QtDBus/QtDBus
+%%QT_INCDIR%%/QtDBus/qdbusabstractadaptor.h
+%%QT_INCDIR%%/QtDBus/qdbusabstractinterface.h
+%%QT_INCDIR%%/QtDBus/qdbusargument.h
+%%QT_INCDIR%%/QtDBus/qdbusconnection.h
+%%QT_INCDIR%%/QtDBus/qdbusconnectioninterface.h
+%%QT_INCDIR%%/QtDBus/qdbuscontext.h
+%%QT_INCDIR%%/QtDBus/qdbuserror.h
+%%QT_INCDIR%%/QtDBus/qdbusextratypes.h
+%%QT_INCDIR%%/QtDBus/qdbusinterface.h
+%%QT_INCDIR%%/QtDBus/qdbusmacros.h
+%%QT_INCDIR%%/QtDBus/qdbusmessage.h
+%%QT_INCDIR%%/QtDBus/qdbusmetatype.h
+%%QT_INCDIR%%/QtDBus/qdbuspendingcall.h
+%%QT_INCDIR%%/QtDBus/qdbuspendingreply.h
+%%QT_INCDIR%%/QtDBus/qdbusreply.h
+%%QT_INCDIR%%/QtDBus/qdbusserver.h
+%%QT_INCDIR%%/QtDBus/qdbusservicewatcher.h
+%%QT_INCDIR%%/QtDBus/qdbusunixfiledescriptor.h
+%%QT_INCDIR%%/QtDBus/qdbusvirtualobject.h
+%%QT_LIBDIR%%/libQtDBus.la
+%%QT_LIBDIR%%/libQtDBus.prl
+%%QT_LIBDIR%%/libQtDBus.so
+%%QT_LIBDIR%%/libQtDBus.so.4
+%%QT_LIBDIR%%/libQtDBus.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQtDBus.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQtDBus.so.%%FULLVER%%.debug
 libdata/pkgconfig/QtDBus.pc
-@dirrmtry lib/qt4
-@dirrm include/qt4/QtDBus
-@dirrmtry include/qt4/Qt
-@dirrmtry include/qt4
+@dirrmtry %%QT_LIBDIR%%
+@dirrm %%QT_INCDIR%%/QtDBus
+@dirrmtry %%QT_INCDIR%%/Qt
+@dirrmtry %%QT_INCDIR%%
--- a/devel/qmake4/Makefile
+++ b/devel/qmake4/Makefile
@ -3,21 +3,29 @@

 PORTNAME=	qmake
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	The build utility of the Qt project
+COMMENT=	Qt Makefile generator

-USE_QT4=	#empty
-QT_NONSTANDARD=	yes
+USE_QT4=	# empty
 QT_DIST=	yes
 REINPLACE_ARGS=	-i ""
-WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
+WRKSRC_SUBDIR=	${PORTNAME}
 MAKEFILE=	${FILESDIR}/Makefile.bsd
-MAKE_ENV+=	FILESDIR="${FILESDIR}"
+MAKE_ENV+=	FILESDIR="${FILESDIR}" \
+		QMAKE_COMPILER="${QMAKE_COMPILER}" \
+		QMAKE="${QMAKE}" \
+		QT_BINDIR_REL="${QT_BINDIR_REL}" \
+		QT_MKSPECDIR_REL="${QT_MKSPECDIR_REL}"
 TODAY_CMD=	/bin/date +%Y-%m-%d

+SUB_FILES=	qconfig.cpp
+SUB_LIST=	TODAY="$$(${TODAY_CMD})" \
+		${PLIST_SUB:NPREFIX=*}
+
 EXTRACT_AFTER_ARGS= \
 	'${DISTNAME}/mkspecs' \
 	'${DISTNAME}/include/*/*' \
@ -36,55 +44,39 @@ EXTRACT_AFTER_ARGS= \
 	'${DISTNAME}/tools/shared/symbian' \
 	'${DISTNAME}/tools/shared/windows'

-post-patch:
-	@${REINPLACE_CMD} -e 's|-O2|${CXXFLAGS}|' \
-		-e 's|/usr/local|${LOCALBASE}|' \
-		-e 's|/usr/X11R6|${LOCALBASE}|' \
-		-e 's|release|release thread|' \
-		-e 's|uic|uic-qt4|' \
-		-e 's|moc|moc-qt4|' \
-		${WRKSRC}/../mkspecs/freebsd-*/qmake.conf
-	@${REINPLACE_CMD} -e 's|@QMAKE_QTOBJS@||g' ${WRKSRC}/Makefile.unix
+EXTRA_PATCHES=	# empty

-# FIXME: This is ugly
-	@${RM} ${WRKSRC}/../mkspecs/features/unix/*.orig
-	@${RM} ${WRKSRC}/../mkspecs/freebsd-g++/*.orig
-	@${RM} ${WRKSRC}/../mkspecs/freebsd-g++46/*.orig
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
+		-e 's|release|release thread|' \
+		-e 's|uic|${UIC:T}|' \
+		-e 's|moc|${MOC:T}|' \
+		${WRKSRC:H}/mkspecs/common/freebsd.conf
+	@${REINPLACE_CMD} -e 's|@QMAKE_QTOBJS@||g' ${WRKSRC}/Makefile.unix
+	@${REINPLACE_CMD} -e 's|unix.conf|freebsd.conf|' \
+		${WRKSRC:H}/mkspecs/freebsd-icc/qmake.conf
+	@${RM} -Rf ${WRKSRC:H}/mkspecs/freebsd-g++46

 # Add mkspec for clang
-	@${CP} -PpR ${WRKSRC}/../mkspecs/freebsd-g++46 ${WRKSRC}/../mkspecs/freebsd-clang
-	@${REINPLACE_CMD} -e 's|g++-unix.conf|clang.conf|g' \
-		-e 's|freebsd-g++46|freebsd-clang|g' \
-		-e 's|gcc46|clang|g' \
-		-e 's|g++46|clang++|g' \
-		${WRKSRC}/../mkspecs/freebsd-clang/qmake.conf
-# mkspec for devel/clang33
-	@${CP} -PpR ${WRKSRC}/../mkspecs/freebsd-g++46 ${WRKSRC}/../mkspecs/freebsd-clang++33
-	@${REINPLACE_CMD} -e 's|g++-unix.conf|clang.conf|g' \
-		-e 's|freebsd-g++46|freebsd-clang++33|g' \
-		-e 's|gcc46|clang33|g' \
-		-e 's|g++46|clang++33|g' \
-		${WRKSRC}/../mkspecs/freebsd-clang++33/qmake.conf
+	@${CP} -a ${WRKSRC:H}/mkspecs/freebsd-g++ \
+		${WRKSRC:H}/mkspecs/freebsd-clang
+	@${REINPLACE_CMD} -e 's|g++|clang|g' \
+		-e '/gcc-base-unix.conf/d' \
+		${WRKSRC:H}/mkspecs/freebsd-clang/qmake.conf

-# Add mkspecs for the different GCC versions in the ports tree
-.for v in 42 44 47 48 49
-	@${CP} -PpR ${WRKSRC}/../mkspecs/freebsd-g++46 ${WRKSRC}/../mkspecs/freebsd-g++${v}
-	@${REINPLACE_CMD} -e 's|46|${v}|g' \
-		${WRKSRC}/../mkspecs/freebsd-g++${v}/qmake.conf
-.endfor
+	@${RM} ${WRKSRC:H}/mkspecs/features/unix/*.orig
+	@${RM} ${WRKSRC:H}/mkspecs/*/*.orig

-do-configure:
-	${SED} -e 's|/usr/local|${PREFIX}|g' \
-		-e "s|TODAY|$$(${TODAY_CMD})|g" \
-		< ${FILESDIR}/qconfig.cpp \
-		> ${WRKSRC:H}/src/corelib/global/qconfig.cpp
+do-configure: apply-slist
+	${MV} ${WRKDIR}/qconfig.cpp \
+		${WRKSRC:H}/src/corelib/global/qconfig.cpp
 	${ECHO} '/* empty */' > ${WRKSRC}/qconfig.h
-	${LN} ${WRKSRC}/qconfig.h ${WRKSRC}/../src/corelib/global/qconfig.h
+	${LN} ${WRKSRC}/qconfig.h ${WRKSRC:H}/src/corelib/global/qconfig.h

 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/qmake-qt4 ${STAGEDIR}${PREFIX}/bin
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/qt4 && \
-	cd ${WRKSRC}/.. && ${COPYTREE_SHARE} mkspecs ${STAGEDIR}${PREFIX}/share/qt4
-	${LN} -sf ${PREFIX}/share/qt4/mkspecs/freebsd-${QMAKE_BASE_COMPILER} ${STAGEDIR}${PREFIX}/share/qt4/mkspecs/default
+	${INSTALL_PROGRAM} ${WRKSRC}/${QMAKE:T} ${STAGEDIR}${PREFIX}/${QT_BINDIR_REL}
+	${MKDIR} ${STAGEDIR}${PREFIX}/${QT_MKSPECDIR_REL:H} && \
+	cd ${WRKSRC}/.. && ${COPYTREE_SHARE} mkspecs ${STAGEDIR}${PREFIX}/${QT_MKSPECDIR_REL:H}
+	${LN} -sf freebsd-${QMAKE_COMPILER} ${STAGEDIR}${PREFIX}/share/qt4/mkspecs/default

 .include <bsd.port.mk>
--- a/devel/qmake4/files/Makefile.bsd
+++ b/devel/qmake4/files/Makefile.bsd
@ -2,7 +2,7 @@

 _OBJS!=	${MAKE} -f Makefile.unix -V OBJS -V QOBJS
 # We'd like to avoid using qconfig.cpp, but can't -- see the comment
-# next to -DHAVE_CONFIG_CPP below: 
+# next to -DHAVE_CONFIG_CPP below:
 #_OBJS:=	${_OBJS:S/qconfig.o//}
 SRCS:=	${_OBJS:.o=.cpp}
 NO_MAN=	true	# qmake.1 anyone?
@ -14,7 +14,7 @@ NO_MAN=	true	# qmake.1 anyone?
 	${.CURDIR:H}/src/3rdparty/md5 ${.CURDIR:H}/src/3rdparty/sha1 \
 	${.CURDIR:H}/tools/shared/symbian ${.CURDIR:H}/tools/shared/windows

-CXXFLAGS+=-I${.CURDIR:H}/mkspecs/freebsd-g++
+CXXFLAGS+=-I${.CURDIR:H}/mkspecs/freebsd-${QMAKE_COMPILER}

 .for s in src/corelib/arch/generic src/corelib/global src/corelib/tools \
 		src/corelib/kernel src/corelib/codecs \
@ -41,7 +41,7 @@ CXXFLAGS+=-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT \
 # it:
 # -DHAVE_QCONFIG_CPP

-PROG_CXX=	qmake-qt4
-BINDIR=	${PREFIX}/bin
+PROG_CXX=${QMAKE:T}
+BINDIR=	${PREFIX}/${QT_BINDIR_REL}

 .include <bsd.prog.mk>
--- a/devel/qmake4/files/patch-mkspecscommonclang-unix.conf
+++ b/devel/qmake4/files/patch-mkspecscommonclang-unix.conf
@ -0,0 +1,18 @@
+--- ../mkspecs/common/clang-unix.conf.orig	2013-12-05 22:57:53.135156000 +0000
+++ ../mkspecs/common/clang-unix.conf	2013-12-05 23:09:36.960149415 +0000
+@@ -0,0 +1,15 @@
+#
+# Qmake configuration for the Clang compiler on *nix-systems
+#
+# Before making changes to this file, please read the comment in
+# gcc-base.conf, to make sure the change goes in the right place.
+#
+# To verify that your change has the desired effect on the final configuration
+# you can use the manual test in tests/manual/mkspecs.
+#
+
+include(gcc-base-unix.conf)
+include(clang.conf)
+
+QMAKE_LFLAGS_RELEASE += -Wl,-O1
+QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined
--- a/devel/qmake4/files/patch-mkspecscommonfreebsd.conf
+++ b/devel/qmake4/files/patch-mkspecscommonfreebsd.conf
@ -0,0 +1,55 @@
+--- ../mkspecs/common/freebsd.conf.orig	2013-12-05 22:57:28.140145000 +0000
+++ ../mkspecs/common/freebsd.conf	2013-12-05 23:10:22.897149108 +0000
+@@ -0,0 +1,52 @@
+#
+# qmake configuration for FreeBSD
+#
+
+QMAKE_CFLAGS_THREAD	= -pthread -D_THREAD_SAFE
+
+QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
+
+# Addon software goes into /usr/local on the BSDs, by default we will look there
+QMAKE_INCDIR		= $$[QT_INSTALL_HEADERS] /usr/local/include
+QMAKE_LIBDIR		= $$[QT_INSTALL_LIBS] /usr/local/lib
+QMAKE_INCDIR_X11	= /usr/local/include
+QMAKE_LIBDIR_X11	= /usr/local/lib
+QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
+QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
+QMAKE_INCDIR_OPENGL	= /usr/local/include
+QMAKE_LIBDIR_OPENGL	= /usr/local/lib
+
+QMAKE_LFLAGS_THREAD	= -pthread
+
+QMAKE_LIBS		=
+QMAKE_LIBS_DYNLOAD	=
+QMAKE_LIBS_X11		= -lXext -lX11 -lm
+QMAKE_LIBS_X11SM	= -lSM -lICE
+QMAKE_LIBS_OPENGL	= -lGL
+QMAKE_LIBS_OPENGL_QT	= -lGL
+QMAKE_LIBS_THREAD	=
+
+QMAKE_MOC		= $$[QT_INSTALL_BINS]/moc
+QMAKE_UIC		= $$[QT_INSTALL_BINS]/uic
+
+QMAKE_AR		= ar cqs
+QMAKE_OBJCOPY           = objcopy
+QMAKE_RANLIB		=
+
+QMAKE_TAR		= tar -cf
+QMAKE_GZIP		= gzip -9f
+
+QMAKE_COPY		= cp -f
+QMAKE_COPY_FILE		= $$QMAKE_COPY
+QMAKE_COPY_DIR		= $$QMAKE_COPY -R
+QMAKE_MOVE		= mv -f
+QMAKE_DEL_FILE		= rm -f
+QMAKE_DEL_DIR		= rmdir
+QMAKE_STRIP		= strip
+QMAKE_STRIPFLAGS_LIB	+= --strip-unneeded
+QMAKE_CHK_DIR_EXISTS	= test -d
+QMAKE_MKDIR		= mkdir -p
+QMAKE_INSTALL_FILE	= install -m 644 -p
+QMAKE_INSTALL_PROGRAM	= install -m 755 -p
+
+include(unix.conf)
--- a/devel/qmake4/files/patch-mkspecsfreebsd-g++qmake.conf
+++ b/devel/qmake4/files/patch-mkspecsfreebsd-g++qmake.conf
@ -0,0 +1,51 @@
+--- ../mkspecs/freebsd-g++/qmake.conf.orig	2013-06-07 05:17:00.000000000 +0000
+++ ../mkspecs/freebsd-g++/qmake.conf	2013-12-05 23:07:25.210153920 +0000
+@@ -8,47 +8,7 @@
+ CONFIG			+= qt warn_on release link_prl gdb_dwarf_index
+ QT			+= core gui
+ 
+-QMAKE_CFLAGS_THREAD	= -pthread -D_THREAD_SAFE
+-
+-QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
+-
+-# Addon software goes into /usr/local on the BSDs, by default we will look there
+-QMAKE_INCDIR		= /usr/local/include
+-QMAKE_LIBDIR		= /usr/local/lib
+-QMAKE_INCDIR_X11	= /usr/X11R6/include
+-QMAKE_LIBDIR_X11	= /usr/X11R6/lib
+-QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
+-QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
+-QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
+-
+-QMAKE_LFLAGS_THREAD	= -pthread
+-
+-QMAKE_LIBS		=
+-QMAKE_LIBS_DYNLOAD	=
+-QMAKE_LIBS_X11		= -lXext -lX11 -lm
+-QMAKE_LIBS_X11SM	= -lSM -lICE
+-QMAKE_LIBS_OPENGL	= -lGL
+-QMAKE_LIBS_OPENGL_QT	= -lGL
+-QMAKE_LIBS_THREAD	=
+-
+-QMAKE_MOC		= $$[QT_INSTALL_BINS]/moc
+-QMAKE_UIC		= $$[QT_INSTALL_BINS]/uic
+-
+-QMAKE_AR		= ar cqs
+-QMAKE_OBJCOPY           = objcopy
+-QMAKE_RANLIB		=
+-
+-QMAKE_TAR		= tar -cf
+-QMAKE_GZIP		= gzip -9f
+-
+-QMAKE_COPY		= cp -f
+-QMAKE_MOVE		= mv -f
+-QMAKE_DEL_FILE		= rm -f
+-QMAKE_DEL_DIR		= rmdir
+-QMAKE_CHK_DIR_EXISTS	= test -d
+-QMAKE_MKDIR		= mkdir -p
+-include(../common/unix.conf)
+include(../common/freebsd.conf)
+ include(../common/gcc-base-unix.conf)
+ include(../common/g++-unix.conf)
+ load(qt_config)
--- a/devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff
+++ b/devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff
@ -1,26 +0,0 @@
--- ../mkspecs/freebsd-g++/qmake.conf.orig	2012-09-10 18:36:35.000000000 -0700
-+++ ../mkspecs/freebsd-g++/qmake.conf	2012-09-16 16:13:00.894513577 -0700
-@@ -13,8 +13,8 @@
- QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
- 
- # Addon software goes into /usr/local on the BSDs, by default we will look there
-QMAKE_INCDIR		= /usr/local/include
-QMAKE_LIBDIR		= /usr/local/lib
-+QMAKE_INCDIR		= $$[QT_INSTALL_HEADERS] /usr/local/include
-+QMAKE_LIBDIR		= $$[QT_INSTALL_LIBS] /usr/local/lib
- QMAKE_INCDIR_X11	= /usr/X11R6/include
- QMAKE_LIBDIR_X11	= /usr/X11R6/lib
- QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
--- ../mkspecs/freebsd-g++46/qmake.conf.orig	2012-09-10 18:36:35.000000000 -0700
-+++ ../mkspecs/freebsd-g++46/qmake.conf	2012-09-16 16:13:00.894513577 -0700
-@@ -13,8 +13,8 @@
- QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
- 
- # Addon software goes into /usr/local on the BSDs, by default we will look there
-QMAKE_INCDIR		= /usr/local/include
-QMAKE_LIBDIR		= /usr/local/lib
-+QMAKE_INCDIR		= $$[QT_INSTALL_HEADERS] /usr/local/include
-+QMAKE_LIBDIR		= $$[QT_INSTALL_LIBS] /usr/local/lib
- QMAKE_INCDIR_X11	= /usr/X11R6/include
- QMAKE_LIBDIR_X11	= /usr/X11R6/lib
- QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
--- a/devel/qmake4/files/qconfig.cpp
+++ b/devel/qmake4/files/qconfig.cpp
@ -1,23 +0,0 @@
-/*
- * $FreeBSD$
- * Hand-crafted...
- * The default prefix (/ usr / local) is dynamicly replaced
- * at configure time.
- */
-/* Installation date */
-static const char qt_configure_installation          [12+11]    = "qt_instdate=TODAY";
-
-#define QT_CONFIGURE_LICENSEE "Open Source";
-#define QT_CONFIGURE_LICENSED_PRODUCTS "OpenSource";
-#define QT_CONFIGURE_PREFIX_PATH "/usr/local";
-#define QT_CONFIGURE_DOCUMENTATION_PATH "/usr/local/share/doc/qt4";
-#define QT_CONFIGURE_HEADERS_PATH "/usr/local/include/qt4";
-#define QT_CONFIGURE_LIBRARIES_PATH "/usr/local/lib/qt4";
-#define QT_CONFIGURE_BINARIES_PATH "/usr/local/bin";
-#define QT_CONFIGURE_PLUGINS_PATH "/usr/local/lib/qt4/plugins";
-#define QT_CONFIGURE_IMPORTS_PATH "/usr/local/lib/qt4/imports";
-#define QT_CONFIGURE_DATA_PATH "/usr/local/share/qt4";
-#define QT_CONFIGURE_TRANSLATIONS_PATH "/usr/local/share/qt4/translations";
-#define QT_CONFIGURE_SETTINGS_PATH "/usr/local/etc/xdg";
-#define QT_CONFIGURE_EXAMPLES_PATH "/usr/local/share/examples/qt4/examples";
-#define QT_CONFIGURE_DEMOS_PATH "/usr/local/share/examples/qt4/demos/";
--- a/devel/qmake4/files/qconfig.cpp.in
+++ b/devel/qmake4/files/qconfig.cpp.in
@ -0,0 +1,21 @@
+/*
+ * $FreeBSD$
+ */
+
+/* Installation date */
+static const char qt_configure_installation          [12+11]    = "qt_instdate=%%TODAY%%";
+
+#define QT_CONFIGURE_LICENSEE "Open Source";
+#define QT_CONFIGURE_LICENSED_PRODUCTS "OpenSource";
+#define QT_CONFIGURE_PREFIX_PATH "%%PREFIX%%";
+#define QT_CONFIGURE_DOCUMENTATION_PATH "%%PREFIX%%/%%QT_DOCDIR%%";
+#define QT_CONFIGURE_HEADERS_PATH "%%PREFIX%%/%%QT_INCDIR%%";
+#define QT_CONFIGURE_LIBRARIES_PATH "%%PREFIX%%/%%QT_LIBDIR%%";
+#define QT_CONFIGURE_BINARIES_PATH "%%PREFIX%%/%%QT_BINDIR%%";
+#define QT_CONFIGURE_PLUGINS_PATH "%%PREFIX%%/%%QT_PLUGINDIR%%";
+#define QT_CONFIGURE_IMPORTS_PATH "%%PREFIX%%/%%QT_IMPORTDIR%%";
+#define QT_CONFIGURE_DATA_PATH "%%PREFIX%%/%%QT_DATADIR%%";
+#define QT_CONFIGURE_TRANSLATIONS_PATH "%%PREFIX%%/%%QT_L10NDIR%%";
+#define QT_CONFIGURE_SETTINGS_PATH "%%PREFIX%%/%%QT_ETCDIR%%";
+#define QT_CONFIGURE_EXAMPLES_PATH "%%PREFIX%%/%%QT_EXAMPLEDIR%%/examples";
+#define QT_CONFIGURE_DEMOS_PATH "%%PREFIX%%/%%QT_EXAMPLEDIR%%/demos/";
--- a/devel/qmake4/pkg-descr
+++ b/devel/qmake4/pkg-descr
@ -1,8 +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.
-
-Qmake is a project and makefile creating utility, that is part of Qt.
-For ease of maintainance it is split out into a port of its own.
-
-WWW: http://qt.nokia.com/products/qt/index.html
--- a/devel/qmake4/pkg-plist
+++ b/devel/qmake4/pkg-plist
--- a/devel/qt4-assistant-adp/Makefile
+++ b/devel/qt4-assistant-adp/Makefile
@ -4,7 +4,7 @@
 PORTNAME=	assistant
 PORTVERSION=	4.6.3
 PORTREVISION=	1
-CATEGORIES?=	devel
+CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 MASTER_SITE_SUBDIR=	archive/qt/${PORTVERSION:R}
 PKGNAMEPREFIX=	qt4-
@ -13,15 +13,17 @@ DISTNAME=	qt-assistant-qassistantclient-library-compat-src-${PORTVERSION}
 DIST_SUBDIR=	KDE

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt documentation browser, adp compat version
+COMMENT=	Qt *.adp-compatible documentation browser

-USE_QT4=	qmake_build moc_build rcc_build uic_build corelib \
+USE_QT4=	moc_build rcc_build uic_build corelib \
 		gui network xml doc dbus
+USES=		qmake
+QMAKE_ARGS=	QT_CONFIG+="dbus" QT_PRODUCT="OpenSource"

-# stage support
-DESTDIRNAME=	INSTALL_ROOT
 ALL_TARGET=	first

+DESCR=		${.CURDIR:H:H}/devel/qt4/pkg-descr
+
 WRKSRC=		${WRKDIR}/${DISTNAME:C/src/version/}

 PLIST_FILES=	bin/assistant_adp
@ -30,9 +32,4 @@ pre-configure:
 	${REINPLACE_CMD} -e 's|$$$$\[QT_INSTALL_BINS]|${PREFIX}/bin|g' \
 		${WRKSRC}/compat.pro

-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} -spec ${QMAKESPEC} QT_CONFIG+="dbus" \
-		QT_PRODUCT="OpenSource" ${QMAKEFLAGS}
-
 .include <bsd.port.mk>
--- a/devel/qt4-assistant-adp/pkg-descr
+++ b/devel/qt4-assistant-adp/pkg-descr
@ -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
--- a/devel/qt4-assistant/Makefile
+++ b/devel/qt4-assistant/Makefile
@ -3,16 +3,16 @@

 PORTNAME=	assistant
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	devel
+PORTREVISION=	1
+CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt documentation browser
+COMMENT=	Qt 4 documentation browser

 USE_QT4=	qmake_build moc_build rcc_build uic_build \
 		corelib gui help network sql webkit xml \
 		doc_run sql-sqlite3_run
-QT_NONSTANDARD=	yes
 QT_DIST=	yes

 HAS_CONFIGURE=	yes
@ -22,9 +22,10 @@ CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
 MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \
 		PATH=${WRKSRC}/bin:$$PATH

-DESKTOP_ENTRIES="Qt Assistant" "${COMMENT}" \
+DESKTOP_ENTRIES="Qt 4 Assistant" "" \
 		"${PREFIX}/share/pixmaps/assistant-qt4.png" \
-		"${PREFIX}/bin/assistant-qt4" "Development;Qt;" true
+		"${PREFIX}/${QT_BINDIR_REL}/assistant${_QT_BINSUFX}" \
+		"Development;Qt;" true

 DO_NOT_EXTRACT=	demos doc examples mkspecs qmake translations \
 		src/activeqt src/dbus src/multimedia src/opengl src/openvg \
@ -40,20 +41,18 @@ EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 BUILD_WRKSRC=	${WRKSRC}/tools/${PORTNAME}/tools/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}

-EXTRA_PATCHES+=	${.CURDIR}/../../devel/qt4/files/patch-configure
-
 pre-configure:
 	${REINPLACE_CMD} \
-		-e 's|^TARGET.*|TARGET=assistant-qt4|g' \
+		-e 's|^TARGET.*|TARGET=assistant${_QT_BINSUFX}|g' \
 		${BUILD_WRKSRC}/${PORTNAME}.pro
 	${MKDIR} ${WRKSRC}/mkspecs/modules
-	${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 ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc
+	${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake
+	${LN} -sf ${MOC} ${WRKSRC}/bin/moc
+	${LN} -sf ${UIC} ${WRKSRC}/bin/uic
+	${LN} -sf ${RCC} ${WRKSRC}/bin/rcc

 post-install:
-	${INSTALL_DATA} ${BUILD_WRKSRC}/images/assistant-128.png \
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/images/assistant-128.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/assistant-qt4.png

 .include <bsd.port.mk>
--- a/devel/qt4-assistant/pkg-descr
+++ b/devel/qt4-assistant/pkg-descr
@ -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
--- a/devel/qt4-assistant/pkg-plist
+++ b/devel/qt4-assistant/pkg-plist
@ -1,3 +1,3 @@
-bin/assistant-qt4
-%%DEBUG%%bin/assistant-qt4.debug
+%%QT_BINDIR%%/assistant-qt4
+%%DEBUG%%%%QT_BINDIR%%/assistant-qt4.debug
 share/pixmaps/assistant-qt4.png
--- a/devel/qt4-corelib/Makefile
+++ b/devel/qt4-corelib/Makefile
@ -3,22 +3,22 @@

 PORTNAME=	corelib
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	devel
+PORTREVISION=	1
+CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt core library
+COMMENT=	Qt core non-graphical module

-LIB_DEPENDS=	icui18n:${PORTSDIR}/devel/icu
+LIB_DEPENDS=	libicui18n.so:${PORTSDIR}/devel/icu

-USES=		pkgconfig
 USE_GNOME=	glib20
 USE_QT4=	qmake_build moc_build
-QT_NONSTANDARD=	yes
 QT_DIST=	yes
+USES=		iconv pkgconfig

 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
@ -40,8 +40,6 @@ EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}

-EXTRA_PATCHES+=	${.CURDIR}/../../devel/qt4/files/patch-configure
-
 .include "${.CURDIR}/../../devel/qt4/files/Makefile.options"

 .if empty(QT4_OPTIONS:MCUPS)
@ -64,22 +62,22 @@ post-patch:

 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=).*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/QtCore.pc

 post-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/qt4/plugins
-	${TOUCH} ${STAGEDIR}${PREFIX}/lib/qt4/plugins/.keep_me
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/qt4/mkspecs
-	${INSTALL_DATA} ${WRKSRC}/mkspecs/qconfig.pri ${STAGEDIR}${PREFIX}/share/qt4/mkspecs/
+	${MKDIR} ${STAGEDIR}${PREFIX}/${QT_PLUGINDIR_REL}
+	${TOUCH} ${STAGEDIR}${PREFIX}/${QT_PLUGINDIR_REL}/.keep_me
+	${MKDIR} ${STAGEDIR}${PREFIX}/${QT_MKSPECDIR_REL}
+	${INSTALL_DATA} ${WRKSRC}/mkspecs/qconfig.pri ${STAGEDIR}${PREFIX}/${QT_MKSPECDIR_REL}/

 .include <bsd.port.mk>
--- a/devel/qt4-corelib/files/patch-0185-fix-format-strings.diff
+++ b/devel/qt4-corelib/files/patch-0185-fix-format-strings.diff
@ -1,42 +0,0 @@
--- src/corelib/global/qglobal.h.orig	2009-09-07 13:00:30.000000000 +0200
-+++ src/corelib/global/qglobal.h	2009-09-14 12:46:30.965296640 +0200
-@@ -1594,8 +1594,16 @@
- #ifdef QT3_SUPPORT
- Q_CORE_EXPORT QT3_SUPPORT void qSystemWarning(const char *msg, int code = -1);
- #endif /* QT3_SUPPORT */
-Q_CORE_EXPORT void qErrnoWarning(int code, const char *msg, ...);
-Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...);
-+Q_CORE_EXPORT void qErrnoWarning(int code, const char *msg, ...)
-+#if defined(Q_CC_GNU) && !defined(__INSURE__)
-+    __attribute__ ((format (printf, 2, 3)))
-+#endif
-+    ;
-+Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...)
-+#if defined(Q_CC_GNU) && !defined(__INSURE__)
-+    __attribute__ ((format (printf, 1, 2)))
-+#endif
-+    ;
- 
- #if (defined(QT_NO_DEBUG_OUTPUT) || defined(QT_NO_TEXTSTREAM)) && !defined(QT_NO_DEBUG_STREAM)
- #define QT_NO_DEBUG_STREAM
--- src/corelib/tools/qbytearray.h.orig	2009-09-07 13:00:30.000000000 +0200
-+++ src/corelib/tools/qbytearray.h	2009-09-14 12:44:29.801547129 +0200
-@@ -95,8 +95,16 @@
- Q_CORE_EXPORT int qstrnicmp(const char *, const char *, uint len);
- 
- // implemented in qvsnprintf.cpp
-Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap);
-Q_CORE_EXPORT int qsnprintf(char *str, size_t n, const char *fmt, ...);
-+Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap)
-+#if defined(Q_CC_GNU) && !defined(__INSURE__)
-+        __attribute__ ((format (printf, 3, 0)))
-+#endif
-+    ;
-+Q_CORE_EXPORT int qsnprintf(char *str, size_t n, const char *fmt, ...)
-+#if defined(Q_CC_GNU) && !defined(__INSURE__)
-+        __attribute__ ((format (printf, 3, 4)))
-+#endif
-+    ;
- 
- #ifdef QT3_SUPPORT
- inline QT3_SUPPORT void *qmemmove(void *dst, const void *src, uint len)
--- a/devel/qt4-corelib/pkg-descr
+++ b/devel/qt4-corelib/pkg-descr
@ -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
--- a/devel/qt4-corelib/pkg-plist
+++ b/devel/qt4-corelib/pkg-plist
--- a/devel/qt4-declarative/pkg-descr
+++ b/devel/qt4-declarative/pkg-descr
@ -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
--- a/devel/qt4-declarative/pkg-plist
+++ b/devel/qt4-declarative/pkg-plist
@ -1,82 +0,0 @@
-include/qt4/Qt/QtDeclarative
-include/qt4/Qt/qdeclarative.h
-include/qt4/Qt/qdeclarativecomponent.h
-include/qt4/Qt/qdeclarativecontext.h
-include/qt4/Qt/qdeclarativedebug.h
-include/qt4/Qt/qdeclarativeengine.h
-include/qt4/Qt/qdeclarativeerror.h
-include/qt4/Qt/qdeclarativeexpression.h
-include/qt4/Qt/qdeclarativeextensioninterface.h
-include/qt4/Qt/qdeclarativeextensionplugin.h
-include/qt4/Qt/qdeclarativeimageprovider.h
-include/qt4/Qt/qdeclarativeinfo.h
-include/qt4/Qt/qdeclarativeitem.h
-include/qt4/Qt/qdeclarativelist.h
-include/qt4/Qt/qdeclarativenetworkaccessmanagerfactory.h
-include/qt4/Qt/qdeclarativeparserstatus.h
-include/qt4/Qt/qdeclarativeprivate.h
-include/qt4/Qt/qdeclarativeproperty.h
-include/qt4/Qt/qdeclarativepropertymap.h
-include/qt4/Qt/qdeclarativepropertyvalueinterceptor.h
-include/qt4/Qt/qdeclarativepropertyvaluesource.h
-include/qt4/Qt/qdeclarativescriptstring.h
-include/qt4/Qt/qdeclarativeview.h
-include/qt4/QtDeclarative/QDeclarativeAttachedPropertiesFunc
-include/qt4/QtDeclarative/QDeclarativeComponent
-include/qt4/QtDeclarative/QDeclarativeContext
-include/qt4/QtDeclarative/QDeclarativeDebuggingEnabler
-include/qt4/QtDeclarative/QDeclarativeEngine
-include/qt4/QtDeclarative/QDeclarativeError
-include/qt4/QtDeclarative/QDeclarativeExpression
-include/qt4/QtDeclarative/QDeclarativeExtensionInterface
-include/qt4/QtDeclarative/QDeclarativeExtensionPlugin
-include/qt4/QtDeclarative/QDeclarativeImageProvider
-include/qt4/QtDeclarative/QDeclarativeInfo
-include/qt4/QtDeclarative/QDeclarativeItem
-include/qt4/QtDeclarative/QDeclarativeListProperty
-include/qt4/QtDeclarative/QDeclarativeListReference
-include/qt4/QtDeclarative/QDeclarativeNetworkAccessManagerFactory
-include/qt4/QtDeclarative/QDeclarativeParserStatus
-include/qt4/QtDeclarative/QDeclarativeProperties
-include/qt4/QtDeclarative/QDeclarativeProperty
-include/qt4/QtDeclarative/QDeclarativePropertyMap
-include/qt4/QtDeclarative/QDeclarativePropertyValueInterceptor
-include/qt4/QtDeclarative/QDeclarativePropertyValueSource
-include/qt4/QtDeclarative/QDeclarativeScriptString
-include/qt4/QtDeclarative/QDeclarativeTypeInfo
-include/qt4/QtDeclarative/QDeclarativeView
-include/qt4/QtDeclarative/QtDeclarative
-include/qt4/QtDeclarative/qdeclarative.h
-include/qt4/QtDeclarative/qdeclarativecomponent.h
-include/qt4/QtDeclarative/qdeclarativecontext.h
-include/qt4/QtDeclarative/qdeclarativedebug.h
-include/qt4/QtDeclarative/qdeclarativeengine.h
-include/qt4/QtDeclarative/qdeclarativeerror.h
-include/qt4/QtDeclarative/qdeclarativeexpression.h
-include/qt4/QtDeclarative/qdeclarativeextensioninterface.h
-include/qt4/QtDeclarative/qdeclarativeextensionplugin.h
-include/qt4/QtDeclarative/qdeclarativeimageprovider.h
-include/qt4/QtDeclarative/qdeclarativeinfo.h
-include/qt4/QtDeclarative/qdeclarativeitem.h
-include/qt4/QtDeclarative/qdeclarativelist.h
-include/qt4/QtDeclarative/qdeclarativenetworkaccessmanagerfactory.h
-include/qt4/QtDeclarative/qdeclarativeparserstatus.h
-include/qt4/QtDeclarative/qdeclarativeprivate.h
-include/qt4/QtDeclarative/qdeclarativeproperty.h
-include/qt4/QtDeclarative/qdeclarativepropertymap.h
-include/qt4/QtDeclarative/qdeclarativepropertyvalueinterceptor.h
-include/qt4/QtDeclarative/qdeclarativepropertyvaluesource.h
-include/qt4/QtDeclarative/qdeclarativescriptstring.h
-include/qt4/QtDeclarative/qdeclarativeview.h
-lib/qt4/libQtDeclarative.la
-lib/qt4/libQtDeclarative.prl
-lib/qt4/libQtDeclarative.so
-lib/qt4/libQtDeclarative.so.4
-lib/qt4/libQtDeclarative.so.%%SHLIB_SHVER%%
-lib/qt4/libQtDeclarative.so.%%SHLIB_VER%%
-%%DEBUG%%lib/qt4/libQtDeclarative.so.%%SHLIB_VER%%.debug
-libdata/pkgconfig/QtDeclarative.pc
-@dirrmtry lib/qt4
-@dirrm include/qt4/QtDeclarative
-@dirrmtry include/qt4/Qt
-@dirrmtry include/qt4
--- a/devel/qt4-designer/Makefile
+++ b/devel/qt4-designer/Makefile
@ -1,33 +1,34 @@
-# Created by: lofi@FreeBSD.org
+# Created by: Michael Nottebrock <lofi@FreeBSD.org>
 # $FreeBSD$

 PORTNAME=	designer
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	devel
+PORTREVISION=	1
+CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt ui editor
+COMMENT=	Qt 4 graphical user interface designer

 USE_QT4=	qmake_build moc_build rcc_build uic_build assistant_run \
 		qt3support corelib declarative gui network script sql xml \
-		webkit phonon
-QT_NONSTANDARD=	yes
+		webkit
 QT_DIST=	yes

 HAS_CONFIGURE=	yes
-#Try to fix linking when previous version is installed
-CONFIGURE_ARGS+=	-L${WRKSRC}/lib
-USE_LDCONFIG=	${PREFIX}/lib/qt4
+# Try to fix linking when previous version is installed
+CONFIGURE_ARGS=	-L${WRKSRC}/lib -no-phonon
+USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}

 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

-DESKTOP_ENTRIES="Qt Designer" "${COMMENT}" \
+DESKTOP_ENTRIES="Qt 4 Designer" "" \
 		"${PREFIX}/share/pixmaps/designer-qt4.png" \
-		"${PREFIX}/bin/designer-qt4" "Development;Qt;" true
+		"${PREFIX}/${QT_BINDIR_REL}/designer${_QT_BINSUFX}" \
+		"Development;Qt;" true

 DO_NOT_EXTRACT=	demos doc examples mkspecs qmake translations \
 		src/activeqt src/dbus src/multimedia src/opengl src/openvg \
@ -42,34 +43,34 @@ 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.*|TARGET=designer-qt4|g' \
+	${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=designer${_QT_BINSUFX}|g' \
 		${BUILD_WRKSRC}/src/${PORTNAME}/${PORTNAME}.pro
+	${REINPLACE_CMD} -e '/QLatin1String/ s|("assistant")|("assistant${_QT_BINSUFX}")|' \
+		${BUILD_WRKSRC}/src/${PORTNAME}/assistantclient.cpp
 # fix build when previous version is installed
 	${REINPLACE_CMD} -e '/^CONFIG/s|depend_prl||' \
 		${BUILD_WRKSRC}/src/components/lib/lib.pro
 	${MKDIR} ${WRKSRC}/mkspecs/modules
-	${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 ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc
+	${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake
+	${LN} -sf ${MOC} ${WRKSRC}/bin/moc
+	${LN} -sf ${UIC} ${WRKSRC}/bin/uic
+	${LN} -sf ${RCC} ${WRKSRC}/bin/rcc

 pre-install:
-	${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' \
+	${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-everywhere-opensource.[^[:space:]]*lib||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/QtUiTools.pc \
 		${WRKSRC}/lib/pkgconfig/QtDesigner.pc \
 		${WRKSRC}/lib/pkgconfig/QtDesignerComponents.pc
-	${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' \
 		${BUILD_WRKSRC}/src/lib/Makefile \
 		${BUILD_WRKSRC}/src/uitools/Makefile \
 		${BUILD_WRKSRC}/src/components/lib/Makefile

 post-install:
-	${INSTALL_DATA} ${BUILD_WRKSRC}/src/designer/images/designer.png \
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/src/designer/images/designer.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/designer-qt4.png

 .include <bsd.port.mk>
--- a/devel/qt4-designer/files/patch-toolsdesignersrcdesignerassistantclient.cpp
+++ b/devel/qt4-designer/files/patch-toolsdesignersrcdesignerassistantclient.cpp
@ -1,11 +0,0 @@
--- ./tools/designer/src/designer/assistantclient.cpp.orig	2008-04-28 17:11:20.000000000 +0400
-+++ ./tools/designer/src/designer/assistantclient.cpp	2008-06-17 01:30:25.000000000 +0400
-@@ -115,7 +115,7 @@
- {
-     QString app = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator();
- #if !defined(Q_OS_MAC)
-    app += QLatin1String("assistant");
-+    app += QLatin1String("assistant-qt4");
- #else
-     app += QLatin1String("Assistant.app/Contents/MacOS/Assistant");    
- #endif
--- a/devel/qt4-designer/pkg-descr
+++ b/devel/qt4-designer/pkg-descr
@ -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
--- a/devel/qt4-designer/pkg-plist
+++ b/devel/qt4-designer/pkg-plist
@ -1,103 +1,101 @@
-bin/designer-qt4
-%%DEBUG%%bin/designer-qt4.debug
-include/qt4/QtDesigner/QAbstractExtensionFactory
-include/qt4/QtDesigner/QAbstractExtensionManager
-include/qt4/QtDesigner/QAbstractFormBuilder
-include/qt4/QtDesigner/QDesignerActionEditorInterface
-include/qt4/QtDesigner/QDesignerBrushManagerInterface
-include/qt4/QtDesigner/QDesignerComponents
-include/qt4/QtDesigner/QDesignerContainerExtension
-include/qt4/QtDesigner/QDesignerCustomWidgetCollectionInterface
-include/qt4/QtDesigner/QDesignerCustomWidgetInterface
-include/qt4/QtDesigner/QDesignerDnDItemInterface
-include/qt4/QtDesigner/QDesignerDynamicPropertySheetExtension
-include/qt4/QtDesigner/QDesignerExportWidget
-include/qt4/QtDesigner/QDesignerExtraInfoExtension
-include/qt4/QtDesigner/QDesignerFormEditorInterface
-include/qt4/QtDesigner/QDesignerFormEditorPluginInterface
-include/qt4/QtDesigner/QDesignerFormWindowCursorInterface
-include/qt4/QtDesigner/QDesignerFormWindowInterface
-include/qt4/QtDesigner/QDesignerFormWindowManagerInterface
-include/qt4/QtDesigner/QDesignerFormWindowToolInterface
-include/qt4/QtDesigner/QDesignerIconCacheInterface
-include/qt4/QtDesigner/QDesignerIntegrationInterface
-include/qt4/QtDesigner/QDesignerLanguageExtension
-include/qt4/QtDesigner/QDesignerLayoutDecorationExtension
-include/qt4/QtDesigner/QDesignerMemberSheetExtension
-include/qt4/QtDesigner/QDesignerMetaDataBaseInterface
-include/qt4/QtDesigner/QDesignerMetaDataBaseItemInterface
-include/qt4/QtDesigner/QDesignerObjectInspectorInterface
-include/qt4/QtDesigner/QDesignerPromotionInterface
-include/qt4/QtDesigner/QDesignerPropertyEditorInterface
-include/qt4/QtDesigner/QDesignerPropertySheetExtension
-include/qt4/QtDesigner/QDesignerResourceBrowserInterface
-include/qt4/QtDesigner/QDesignerTaskMenuExtension
-include/qt4/QtDesigner/QDesignerWidgetBoxInterface
-include/qt4/QtDesigner/QDesignerWidgetDataBaseInterface
-include/qt4/QtDesigner/QDesignerWidgetDataBaseItemInterface
-include/qt4/QtDesigner/QDesignerWidgetFactoryInterface
-include/qt4/QtDesigner/QExtensionFactory
-include/qt4/QtDesigner/QExtensionManager
-include/qt4/QtDesigner/QFormBuilder
-include/qt4/QtDesigner/QtDesigner
-include/qt4/QtDesigner/abstractactioneditor.h
-include/qt4/QtDesigner/abstractbrushmanager.h
-include/qt4/QtDesigner/abstractdnditem.h
-include/qt4/QtDesigner/abstractformbuilder.h
-include/qt4/QtDesigner/abstractformeditor.h
-include/qt4/QtDesigner/abstractformeditorplugin.h
-include/qt4/QtDesigner/abstractformwindow.h
-include/qt4/QtDesigner/abstractformwindowcursor.h
-include/qt4/QtDesigner/abstractformwindowmanager.h
-include/qt4/QtDesigner/abstractformwindowtool.h
-include/qt4/QtDesigner/abstracticoncache.h
-include/qt4/QtDesigner/abstractintegration.h
-include/qt4/QtDesigner/abstractlanguage.h
-include/qt4/QtDesigner/abstractmetadatabase.h
-include/qt4/QtDesigner/abstractobjectinspector.h
-include/qt4/QtDesigner/abstractpromotioninterface.h
-include/qt4/QtDesigner/abstractpropertyeditor.h
-include/qt4/QtDesigner/abstractresourcebrowser.h
-include/qt4/QtDesigner/abstractwidgetbox.h
-include/qt4/QtDesigner/abstractwidgetdatabase.h
-include/qt4/QtDesigner/abstractwidgetfactory.h
-include/qt4/QtDesigner/container.h
-include/qt4/QtDesigner/customwidget.h
-include/qt4/QtDesigner/default_extensionfactory.h
-include/qt4/QtDesigner/dynamicpropertysheet.h
-include/qt4/QtDesigner/extension.h
-include/qt4/QtDesigner/extension_global.h
-include/qt4/QtDesigner/extrainfo.h
-include/qt4/QtDesigner/formbuilder.h
-include/qt4/QtDesigner/layoutdecoration.h
-include/qt4/QtDesigner/membersheet.h
-include/qt4/QtDesigner/propertysheet.h
-include/qt4/QtDesigner/qdesigner_components.h
-include/qt4/QtDesigner/qdesigner_components_global.h
-include/qt4/QtDesigner/qdesignerexportwidget.h
-include/qt4/QtDesigner/qextensionmanager.h
-include/qt4/QtDesigner/sdk_global.h
-include/qt4/QtDesigner/taskmenu.h
-include/qt4/QtDesigner/uilib_global.h
-include/qt4/QtUiTools/QUiLoader
-include/qt4/QtUiTools/QtUiTools
-include/qt4/QtUiTools/quiloader.h
-lib/qt4/libQtDesigner.prl
-lib/qt4/libQtDesigner.so
-lib/qt4/libQtDesigner.so.4
-lib/qt4/libQtDesigner.so.%%SHLIB_SHVER%%
-lib/qt4/libQtDesigner.so.%%SHLIB_VER%%
-%%DEBUG%%lib/qt4/libQtDesigner.so.%%SHLIB_VER%%.debug
-lib/qt4/libQtDesignerComponents.prl
-lib/qt4/libQtDesignerComponents.so
-lib/qt4/libQtDesignerComponents.so.4
-lib/qt4/libQtDesignerComponents.so.%%SHLIB_SHVER%%
-lib/qt4/libQtDesignerComponents.so.%%SHLIB_VER%%
-%%DEBUG%%lib/qt4/libQtDesignerComponents.so.%%SHLIB_VER%%.debug
-lib/qt4/libQtUiTools.a
-lib/qt4/libQtUiTools.prl
-%%QT_PLUGINDIR%%/designer/libphononwidgets.so
-%%DEBUG%%%%QT_PLUGINDIR%%/designer/libphononwidgets.so.debug
+%%QT_BINDIR%%/designer-qt4
+%%DEBUG%%%%QT_BINDIR%%/designer-qt4.debug
+%%QT_INCDIR%%/QtDesigner/QAbstractExtensionFactory
+%%QT_INCDIR%%/QtDesigner/QAbstractExtensionManager
+%%QT_INCDIR%%/QtDesigner/QAbstractFormBuilder
+%%QT_INCDIR%%/QtDesigner/QDesignerActionEditorInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerBrushManagerInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerComponents
+%%QT_INCDIR%%/QtDesigner/QDesignerContainerExtension
+%%QT_INCDIR%%/QtDesigner/QDesignerCustomWidgetCollectionInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerCustomWidgetInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerDnDItemInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerDynamicPropertySheetExtension
+%%QT_INCDIR%%/QtDesigner/QDesignerExportWidget
+%%QT_INCDIR%%/QtDesigner/QDesignerExtraInfoExtension
+%%QT_INCDIR%%/QtDesigner/QDesignerFormEditorInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerFormEditorPluginInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerFormWindowCursorInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerFormWindowInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerFormWindowManagerInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerFormWindowToolInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerIconCacheInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerIntegrationInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerLanguageExtension
+%%QT_INCDIR%%/QtDesigner/QDesignerLayoutDecorationExtension
+%%QT_INCDIR%%/QtDesigner/QDesignerMemberSheetExtension
+%%QT_INCDIR%%/QtDesigner/QDesignerMetaDataBaseInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerMetaDataBaseItemInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerObjectInspectorInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerPromotionInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerPropertyEditorInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerPropertySheetExtension
+%%QT_INCDIR%%/QtDesigner/QDesignerResourceBrowserInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerTaskMenuExtension
+%%QT_INCDIR%%/QtDesigner/QDesignerWidgetBoxInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerWidgetDataBaseInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerWidgetDataBaseItemInterface
+%%QT_INCDIR%%/QtDesigner/QDesignerWidgetFactoryInterface
+%%QT_INCDIR%%/QtDesigner/QExtensionFactory
+%%QT_INCDIR%%/QtDesigner/QExtensionManager
+%%QT_INCDIR%%/QtDesigner/QFormBuilder
+%%QT_INCDIR%%/QtDesigner/QtDesigner
+%%QT_INCDIR%%/QtDesigner/abstractactioneditor.h
+%%QT_INCDIR%%/QtDesigner/abstractbrushmanager.h
+%%QT_INCDIR%%/QtDesigner/abstractdnditem.h
+%%QT_INCDIR%%/QtDesigner/abstractformbuilder.h
+%%QT_INCDIR%%/QtDesigner/abstractformeditor.h
+%%QT_INCDIR%%/QtDesigner/abstractformeditorplugin.h
+%%QT_INCDIR%%/QtDesigner/abstractformwindow.h
+%%QT_INCDIR%%/QtDesigner/abstractformwindowcursor.h
+%%QT_INCDIR%%/QtDesigner/abstractformwindowmanager.h
+%%QT_INCDIR%%/QtDesigner/abstractformwindowtool.h
+%%QT_INCDIR%%/QtDesigner/abstracticoncache.h
+%%QT_INCDIR%%/QtDesigner/abstractintegration.h
+%%QT_INCDIR%%/QtDesigner/abstractlanguage.h
+%%QT_INCDIR%%/QtDesigner/abstractmetadatabase.h
+%%QT_INCDIR%%/QtDesigner/abstractobjectinspector.h
+%%QT_INCDIR%%/QtDesigner/abstractpromotioninterface.h
+%%QT_INCDIR%%/QtDesigner/abstractpropertyeditor.h
+%%QT_INCDIR%%/QtDesigner/abstractresourcebrowser.h
+%%QT_INCDIR%%/QtDesigner/abstractwidgetbox.h
+%%QT_INCDIR%%/QtDesigner/abstractwidgetdatabase.h
+%%QT_INCDIR%%/QtDesigner/abstractwidgetfactory.h
+%%QT_INCDIR%%/QtDesigner/container.h
+%%QT_INCDIR%%/QtDesigner/customwidget.h
+%%QT_INCDIR%%/QtDesigner/default_extensionfactory.h
+%%QT_INCDIR%%/QtDesigner/dynamicpropertysheet.h
+%%QT_INCDIR%%/QtDesigner/extension.h
+%%QT_INCDIR%%/QtDesigner/extension_global.h
+%%QT_INCDIR%%/QtDesigner/extrainfo.h
+%%QT_INCDIR%%/QtDesigner/formbuilder.h
+%%QT_INCDIR%%/QtDesigner/layoutdecoration.h
+%%QT_INCDIR%%/QtDesigner/membersheet.h
+%%QT_INCDIR%%/QtDesigner/propertysheet.h
+%%QT_INCDIR%%/QtDesigner/qdesigner_components.h
+%%QT_INCDIR%%/QtDesigner/qdesigner_components_global.h
+%%QT_INCDIR%%/QtDesigner/qdesignerexportwidget.h
+%%QT_INCDIR%%/QtDesigner/qextensionmanager.h
+%%QT_INCDIR%%/QtDesigner/sdk_global.h
+%%QT_INCDIR%%/QtDesigner/taskmenu.h
+%%QT_INCDIR%%/QtDesigner/uilib_global.h
+%%QT_INCDIR%%/QtUiTools/QUiLoader
+%%QT_INCDIR%%/QtUiTools/QtUiTools
+%%QT_INCDIR%%/QtUiTools/quiloader.h
+%%QT_LIBDIR%%/libQtDesigner.prl
+%%QT_LIBDIR%%/libQtDesigner.so
+%%QT_LIBDIR%%/libQtDesigner.so.4
+%%QT_LIBDIR%%/libQtDesigner.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQtDesigner.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQtDesigner.so.%%FULLVER%%.debug
+%%QT_LIBDIR%%/libQtDesignerComponents.prl
+%%QT_LIBDIR%%/libQtDesignerComponents.so
+%%QT_LIBDIR%%/libQtDesignerComponents.so.4
+%%QT_LIBDIR%%/libQtDesignerComponents.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQtDesignerComponents.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQtDesignerComponents.so.%%FULLVER%%.debug
+%%QT_LIBDIR%%/libQtUiTools.a
+%%QT_LIBDIR%%/libQtUiTools.prl
 %%QT_PLUGINDIR%%/designer/libqdeclarativeview.so
 %%DEBUG%%%%QT_PLUGINDIR%%/designer/libqdeclarativeview.so.debug
 %%QT_PLUGINDIR%%/designer/libqt3supportwidgets.so
@ -110,7 +108,7 @@ libdata/pkgconfig/QtUiTools.pc
 share/pixmaps/designer-qt4.png
@dirrmtry %%QT_PLUGINDIR%%/designer
@dirrmtry %%QT_PLUGINDIR%%
-@dirrmtry lib/qt4
-@dirrm include/qt4/QtUiTools
-@dirrm include/qt4/QtDesigner
-@dirrmtry include/qt4
+@dirrmtry %%QT_LIBDIR%%
+@dirrm %%QT_INCDIR%%/QtUiTools
+@dirrm %%QT_INCDIR%%/QtDesigner
+@dirrmtry %%QT_INCDIR%%
--- a/devel/qt4-help-tools/Makefile
+++ b/devel/qt4-help-tools/Makefile
@ -3,16 +3,15 @@

 PORTNAME=	help
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	devel
+CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-
 PKGNAMESUFFIX=	-tools

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	QtHelp tools to generate and convert documentation
+COMMENT=	Qt utilities for generating documentation

 USE_QT4=	qmake_build moc_build rcc_build uic_build corelib \
 		gui sql xml doc help
-QT_NONSTANDARD=	yes
 QT_DIST=	yes

 HAS_CONFIGURE=	yes
@ -37,15 +36,13 @@ EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 BUILD_WRKSRC=	${WRKSRC}/tools/assistant/tools
 INSTALL_WRKSRC=	${BUILD_WRKSRC}

-EXTRA_PATCHES+=	${.CURDIR}/../../devel/qt4/files/patch-configure
-
 pre-configure:
 	${REINPLACE_CMD} -e 's|assistant||' \
 		${BUILD_WRKSRC}/tools.pro
 	${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 ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc
+	${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake
+	${LN} -sf ${MOC} ${WRKSRC}/bin/moc
+	${LN} -sf ${UIC} ${WRKSRC}/bin/uic
+	${LN} -sf ${RCC} ${WRKSRC}/bin/rcc

 .include <bsd.port.mk>
--- a/devel/qt4-help-tools/pkg-descr
+++ b/devel/qt4-help-tools/pkg-descr
@ -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
--- a/devel/qt4-help-tools/pkg-plist
+++ b/devel/qt4-help-tools/pkg-plist
@ -1,6 +1,6 @@
-bin/qhelpgenerator
-%%DEBUG%%bin/qhelpgenerator.debug
-bin/qcollectiongenerator
-%%DEBUG%%bin/qcollectiongenerator.debug
-bin/qhelpconverter
-%%DEBUG%%bin/qhelpconverter.debug
+%%QT_BINDIR%%/qhelpgenerator
+%%DEBUG%%%%QT_BINDIR%%/qhelpgenerator.debug
+%%QT_BINDIR%%/qcollectiongenerator
+%%DEBUG%%%%QT_BINDIR%%/qcollectiongenerator.debug
+%%QT_BINDIR%%/qhelpconverter
+%%DEBUG%%%%QT_BINDIR%%/qhelpconverter.debug
--- a/devel/qt4-help/Makefile
+++ b/devel/qt4-help/Makefile
@ -3,19 +3,18 @@

 PORTNAME=	help
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	devel
+CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	QtHelp module provides QHelpEngine API and is used by Assistant
+COMMENT=	Qt online help integration module

 USE_QT4=	qmake_build moc_build rcc_build corelib clucene \
 		gui sql sql-sqlite3_run xml network
-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
@ -37,22 +36,20 @@ EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 BUILD_WRKSRC=	${WRKSRC}/tools/assistant/lib
 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

 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=).*rcc|\1${PREFIX}/bin/rcc|g' \
+			-E -e 's|(.*location=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \
+			-E -e 's|(.*location=).*rcc|\1${PREFIX}/${QT_BINDIR_REL}/rcc|g' \
 		${WRKSRC}/lib/pkgconfig/QtHelp.pc

 .include <bsd.port.mk>
--- a/devel/qt4-help/pkg-descr
+++ b/devel/qt4-help/pkg-descr
@ -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
--- a/devel/qt4-help/pkg-plist
+++ b/devel/qt4-help/pkg-plist
@ -1,42 +1,42 @@
-include/qt4/Qt/QtHelp
-include/qt4/Qt/qhelp_global.h
-include/qt4/Qt/qhelpcontentwidget.h
-include/qt4/Qt/qhelpengine.h
-include/qt4/Qt/qhelpenginecore.h
-include/qt4/Qt/qhelpindexwidget.h
-include/qt4/Qt/qhelpsearchengine.h
-include/qt4/Qt/qhelpsearchquerywidget.h
-include/qt4/Qt/qhelpsearchresultwidget.h
-include/qt4/QtHelp/QHelpContentItem
-include/qt4/QtHelp/QHelpContentModel
-include/qt4/QtHelp/QHelpContentWidget
-include/qt4/QtHelp/QHelpGlobal
-include/qt4/QtHelp/QHelpEngine
-include/qt4/QtHelp/QHelpEngineCore
-include/qt4/QtHelp/QHelpIndexModel
-include/qt4/QtHelp/QHelpIndexWidget
-include/qt4/QtHelp/QHelpSearchEngine
-include/qt4/QtHelp/QHelpSearchQuery
-include/qt4/QtHelp/QHelpSearchQueryWidget
-include/qt4/QtHelp/QHelpSearchResultWidget
-include/qt4/QtHelp/QtHelp
-include/qt4/QtHelp/qhelp_global.h
-include/qt4/QtHelp/qhelpcontentwidget.h
-include/qt4/QtHelp/qhelpengine.h
-include/qt4/QtHelp/qhelpenginecore.h
-include/qt4/QtHelp/qhelpindexwidget.h
-include/qt4/QtHelp/qhelpsearchengine.h
-include/qt4/QtHelp/qhelpsearchquerywidget.h
-include/qt4/QtHelp/qhelpsearchresultwidget.h
-lib/qt4/libQtHelp.la
-lib/qt4/libQtHelp.prl
-lib/qt4/libQtHelp.so
-lib/qt4/libQtHelp.so.4
-lib/qt4/libQtHelp.so.%%SHLIB_SHVER%%
-lib/qt4/libQtHelp.so.%%SHLIB_VER%%
-%%DEBUG%%lib/qt4/libQtHelp.so.%%SHLIB_VER%%.debug
+%%QT_INCDIR%%/Qt/QtHelp
+%%QT_INCDIR%%/Qt/qhelp_global.h
+%%QT_INCDIR%%/Qt/qhelpcontentwidget.h
+%%QT_INCDIR%%/Qt/qhelpengine.h
+%%QT_INCDIR%%/Qt/qhelpenginecore.h
+%%QT_INCDIR%%/Qt/qhelpindexwidget.h
+%%QT_INCDIR%%/Qt/qhelpsearchengine.h
+%%QT_INCDIR%%/Qt/qhelpsearchquerywidget.h
+%%QT_INCDIR%%/Qt/qhelpsearchresultwidget.h
+%%QT_INCDIR%%/QtHelp/QHelpContentItem
+%%QT_INCDIR%%/QtHelp/QHelpContentModel
+%%QT_INCDIR%%/QtHelp/QHelpContentWidget
+%%QT_INCDIR%%/QtHelp/QHelpGlobal
+%%QT_INCDIR%%/QtHelp/QHelpEngine
+%%QT_INCDIR%%/QtHelp/QHelpEngineCore
+%%QT_INCDIR%%/QtHelp/QHelpIndexModel
+%%QT_INCDIR%%/QtHelp/QHelpIndexWidget
+%%QT_INCDIR%%/QtHelp/QHelpSearchEngine
+%%QT_INCDIR%%/QtHelp/QHelpSearchQuery
+%%QT_INCDIR%%/QtHelp/QHelpSearchQueryWidget
+%%QT_INCDIR%%/QtHelp/QHelpSearchResultWidget
+%%QT_INCDIR%%/QtHelp/QtHelp
+%%QT_INCDIR%%/QtHelp/qhelp_global.h
+%%QT_INCDIR%%/QtHelp/qhelpcontentwidget.h
+%%QT_INCDIR%%/QtHelp/qhelpengine.h
+%%QT_INCDIR%%/QtHelp/qhelpenginecore.h
+%%QT_INCDIR%%/QtHelp/qhelpindexwidget.h
+%%QT_INCDIR%%/QtHelp/qhelpsearchengine.h
+%%QT_INCDIR%%/QtHelp/qhelpsearchquerywidget.h
+%%QT_INCDIR%%/QtHelp/qhelpsearchresultwidget.h
+%%QT_LIBDIR%%/libQtHelp.la
+%%QT_LIBDIR%%/libQtHelp.prl
+%%QT_LIBDIR%%/libQtHelp.so
+%%QT_LIBDIR%%/libQtHelp.so.4
+%%QT_LIBDIR%%/libQtHelp.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQtHelp.so.%%FULLVER%%
+%%DEBUG%%%%QT_LIBDIR%%/libQtHelp.so.%%FULLVER%%.debug
 libdata/pkgconfig/QtHelp.pc
-@dirrmtry lib/qt4
-@dirrm include/qt4/QtHelp
-@dirrmtry include/qt4/Qt
-@dirrmtry include/qt4
+@dirrmtry %%QT_LIBDIR%%
+@dirrm %%QT_INCDIR%%/QtHelp
+@dirrmtry %%QT_INCDIR%%/Qt
+@dirrmtry %%QT_INCDIR%%
--- a/devel/qt4-libqtassistantclient/Makefile
+++ b/devel/qt4-libqtassistantclient/Makefile
@ -4,7 +4,7 @@
 PORTNAME=	libQtAssistantClient
 PORTVERSION=	4.6.3
 PORTREVISION=	1
-CATEGORIES?=	devel
+CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 MASTER_SITE_SUBDIR=	archive/qt/${PORTVERSION:R}
 PKGNAMEPREFIX=	qt4-
@ -12,47 +12,42 @@ DISTNAME=	qt-assistant-qassistantclient-library-compat-src-${PORTVERSION}
 DIST_SUBDIR=	KDE

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt documentation browser integration library
+COMMENT=	Qt documentation browser integration module

-USE_QT4=	qmake_build moc_build rcc_build corelib gui network
+USE_QT4=	moc_build rcc_build corelib gui network
+USES=		qmake
+QMAKE_ARGS=	CONFIG+="create_prl link_prl" VERSION="${PORTVERSION}"

 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}

 ALL_TARGET=	first
-# stage support
-DESTDIRNAME=	INSTALL_ROOT

-WRKSRC=		${WRKDIR}/${DISTNAME:C/src/version/}
-BUILD_WRKSRC=	${WRKSRC}/lib
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
+DESCR=		${.CURDIR:H:H}/devel/qt4/pkg-descr
+
+WRKSRC=		${WRKDIR}/${DISTNAME:C/src/version/}/lib

 pre-configure:
 	${REINPLACE_CMD} -e 's|$$$$\[QT_INSTALL_HEADERS]|${PREFIX}/${QT_INCDIR_REL}|g' \
 		-e 's|$$$$\[QT_INSTALL_LIBS]|${PREFIX}/${QT_LIBDIR_REL}|g' \
-		${BUILD_WRKSRC}/lib.pro
-
-do-configure:
-	@cd ${BUILD_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} -spec ${QMAKESPEC} CONFIG+="create_prl link_prl" \
-		VERSION="${PORTVERSION}" ${QMAKEFLAGS}
+		${WRKSRC}/lib.pro

 post-configure:
-	${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
-			-e 's|.*$$(QMAKE).*||g' ${BUILD_WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's|${PREFIX}/${QT_LIBDIR_REL}/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
+			-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' \
-		${BUILD_WRKSRC}/lib/pkgconfig/QtAssistantClient.pc
+			-E -e 's|(.*location=).*moc|\1${PREFIX}/${QT_BINDIR_REL}/${MOC:T}|g' \
+		${WRKSRC}/lib/pkgconfig/QtAssistantClient.pc

 pre-build:
-	${MKDIR} ${BUILD_WRKSRC}/QtAssistant
-	${CP} ${BUILD_WRKSRC}/qassistantclient_global.h \
-		${BUILD_WRKSRC}/QtAssistant
+	${MKDIR} ${WRKSRC}/QtAssistant
+	${CP} ${WRKSRC}/qassistantclient_global.h \
+		${WRKSRC}/QtAssistant

 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtAssistant
 	${INSTALL_DATA} ${FILESDIR}/QAssistantClient ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtAssistant
 	${INSTALL_DATA} ${FILESDIR}/QtAssistant ${STAGEDIR}${PREFIX}/${QT_INCDIR_REL}/QtAssistant
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/qt4/mkspecs/features
-	${INSTALL_DATA} ${WRKSRC}/features/assistant.prf ${STAGEDIR}${PREFIX}/share/qt4/mkspecs/features
+	${MKDIR} ${STAGEDIR}${PREFIX}/${QT_MKSPECDIR_REL}/features
+	${INSTALL_DATA} ${WRKSRC:H}/features/assistant.prf ${STAGEDIR}${PREFIX}/${QT_MKSPECDIR_REL}/features

 .include <bsd.port.mk>
--- a/devel/qt4-libqtassistantclient/files/patch-lib__lib.pro
+++ b/devel/qt4-libqtassistantclient/files/patch-lib__lib.pro
@ -1,5 +1,5 @@
--- ./lib/lib.pro.orig	2010-06-18 05:01:10.000000000 -0400
-+++ ./lib/lib.pro	2010-08-13 05:16:02.000000000 -0400
+--- ./lib.pro.orig	2010-06-18 05:01:10.000000000 -0400
+++ ./lib.pro	2010-08-13 05:16:02.000000000 -0400
@@ -1,11 +1,6 @@
 TEMPLATE        = lib
 QT += network
--- a/devel/qt4-libqtassistantclient/pkg-descr
+++ b/devel/qt4-libqtassistantclient/pkg-descr
@ -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
--- a/devel/qt4-libqtassistantclient/pkg-plist
+++ b/devel/qt4-libqtassistantclient/pkg-plist
@ -1,17 +1,17 @@
-include/qt4/QtAssistant/QAssistantClient
-include/qt4/QtAssistant/QtAssistant
-include/qt4/QtAssistant/qassistantclient.h
-include/qt4/QtAssistant/qassistantclient_global.h
-lib/qt4/libQtAssistantClient.prl
-lib/qt4/libQtAssistantClient.so
-lib/qt4/libQtAssistantClient.so.4
-lib/qt4/libQtAssistantClient.so.4.6
-lib/qt4/libQtAssistantClient.so.4.6.3
+%%QT_INCDIR%%/QtAssistant/QAssistantClient
+%%QT_INCDIR%%/QtAssistant/QtAssistant
+%%QT_INCDIR%%/QtAssistant/qassistantclient.h
+%%QT_INCDIR%%/QtAssistant/qassistantclient_global.h
+%%QT_LIBDIR%%/libQtAssistantClient.prl
+%%QT_LIBDIR%%/libQtAssistantClient.so
+%%QT_LIBDIR%%/libQtAssistantClient.so.4
+%%QT_LIBDIR%%/libQtAssistantClient.so.4.6
+%%QT_LIBDIR%%/libQtAssistantClient.so.4.6.3
 libdata/pkgconfig/QtAssistantClient.pc
-share/qt4/mkspecs/features/assistant.prf
-@dirrmtry share/qt4/mkspecs/features
-@dirrmtry share/qt4/mkspecs
-@dirrmtry share/qt4
-@dirrmtry lib/qt4
-@dirrm include/qt4/QtAssistant
-@dirrmtry include/qt4
+%%QT_MKSPECDIR%%/features/assistant.prf
+@dirrmtry %%QT_MKSPECDIR%%/features
+@dirrmtry %%QT_MKSPECDIR%%
+@dirrmtry %%QT_DATADIR%%
+@dirrmtry %%QT_LIBDIR%%
+@dirrm %%QT_INCDIR%%/QtAssistant
+@dirrmtry %%QT_INCDIR%%
--- a/devel/qt4-linguist/Makefile
+++ b/devel/qt4-linguist/Makefile
@ -3,15 +3,15 @@

 PORTNAME=	linguist
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	devel
+PORTREVISION=	1
+CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt localisation tool
+COMMENT=	Qt 4 localization tools

 USE_QT4=	qmake_build designer_build moc_build rcc_build uic_build \
 		assistant_run gui network xml
-QT_NONSTANDARD=	yes
 QT_DIST=	yes

 HAS_CONFIGURE=	yes
@ -21,9 +21,10 @@ CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
 MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \
 		PATH=${WRKSRC}/bin:$$PATH

-DESKTOP_ENTRIES="Qt Linguist" "${COMMENT}" \
+DESKTOP_ENTRIES="Qt 4 Linguist" "" \
 		"${PREFIX}/share/pixmaps/linguist-qt4.png" \
-		"${PREFIX}/bin/linguist-qt4" "Development;Qt;" true
+		"${PREFIX}/${QT_BINDIR_REL}/linguist${_QT_BINSUFX}" \
+		"Development;Qt;" true

 DO_NOT_EXTRACT=	demos doc examples mkspecs qmake translations \
 		src/activeqt src/dbus src/multimedia src/network src/opengl \
@ -40,20 +41,18 @@ 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 -e 's|^TARGET[[:blank:]]*=[[:blank:]]*([a-z]+)|TARGET=\1-qt4|g' \
+	${REINPLACE_CMD} -E -e 's|^TARGET[[:blank:]]*=[[:blank:]]*([a-z]+)|TARGET=\1${_QT_BINSUFX}|g' \
 		${BUILD_WRKSRC}/${PORTNAME}.pro ${BUILD_WRKSRC}/${PORTNAME}/${PORTNAME}.pro \
 		${BUILD_WRKSRC}/lrelease/lrelease.pro ${BUILD_WRKSRC}/lupdate/lupdate.pro
 	${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 ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc
+	${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake
+	${LN} -sf ${MOC} ${WRKSRC}/bin/moc
+	${LN} -sf ${UIC} ${WRKSRC}/bin/uic
+	${LN} -sf ${RCC} ${WRKSRC}/bin/rcc

 post-install:
-	${INSTALL_DATA} ${BUILD_WRKSRC}/linguist/images/icons/linguist-128-32.png \
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/linguist/images/icons/linguist-128-32.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/linguist-qt4.png

 .include <bsd.port.mk>
--- a/devel/qt4-linguist/pkg-descr
+++ b/devel/qt4-linguist/pkg-descr
@ -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
--- a/devel/qt4-linguist/pkg-plist
+++ b/devel/qt4-linguist/pkg-plist
@ -1,24 +1,24 @@
-bin/lconvert
-%%DEBUG%%bin/lconvert.debug
-bin/linguist-qt4
-%%DEBUG%%bin/linguist-qt4.debug
-bin/lrelease-qt4
-%%DEBUG%%bin/lrelease-qt4.debug
-bin/lupdate-qt4
-%%DEBUG%%bin/lupdate-qt4.debug
+%%QT_BINDIR%%/lconvert
+%%DEBUG%%%%QT_BINDIR%%/lconvert.debug
+%%QT_BINDIR%%/linguist-qt4
+%%DEBUG%%%%QT_BINDIR%%/linguist-qt4.debug
+%%QT_BINDIR%%/lrelease-qt4
+%%DEBUG%%%%QT_BINDIR%%/lrelease-qt4.debug
+%%QT_BINDIR%%/lupdate-qt4
+%%DEBUG%%%%QT_BINDIR%%/lupdate-qt4.debug
 share/pixmaps/linguist-qt4.png
-share/qt4/phrasebooks/danish.qph
-share/qt4/phrasebooks/dutch.qph
-share/qt4/phrasebooks/finnish.qph
-share/qt4/phrasebooks/french.qph
-share/qt4/phrasebooks/german.qph
-share/qt4/phrasebooks/hungarian.qph
-share/qt4/phrasebooks/italian.qph
-share/qt4/phrasebooks/japanese.qph
-share/qt4/phrasebooks/norwegian.qph
-share/qt4/phrasebooks/polish.qph
-share/qt4/phrasebooks/russian.qph
-share/qt4/phrasebooks/spanish.qph
-share/qt4/phrasebooks/swedish.qph
-@dirrm share/qt4/phrasebooks
-@dirrmtry share/qt4
+%%QT_DATADIR%%/phrasebooks/danish.qph
+%%QT_DATADIR%%/phrasebooks/dutch.qph
+%%QT_DATADIR%%/phrasebooks/finnish.qph
+%%QT_DATADIR%%/phrasebooks/french.qph
+%%QT_DATADIR%%/phrasebooks/german.qph
+%%QT_DATADIR%%/phrasebooks/hungarian.qph
+%%QT_DATADIR%%/phrasebooks/italian.qph
+%%QT_DATADIR%%/phrasebooks/japanese.qph
+%%QT_DATADIR%%/phrasebooks/norwegian.qph
+%%QT_DATADIR%%/phrasebooks/polish.qph
+%%QT_DATADIR%%/phrasebooks/russian.qph
+%%QT_DATADIR%%/phrasebooks/spanish.qph
+%%QT_DATADIR%%/phrasebooks/swedish.qph
+@dirrm %%QT_DATADIR%%/phrasebooks
+@dirrmtry %%QT_DATADIR%%
--- a/devel/qt4-makeqpf/Makefile
+++ b/devel/qt4-makeqpf/Makefile
@ -3,16 +3,15 @@

 PORTNAME=	makeqpf
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	devel
+CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt qtopia font creator
+COMMENT=	Qt QPF2 font generator

 BROKEN_sparc64=	does not compile

 USE_QT4=	qmake_build moc_build rcc_build uic_build corelib gui
-QT_NONSTANDARD=	yes
 QT_DIST=	yes

 HAS_CONFIGURE=	yes
@ -37,15 +36,13 @@ 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[[:blank:]]*=[[:blank:]]*|TARGET=${PORTNAME}-qt4|g' \
+	${REINPLACE_CMD} -e 's|^TARGET[[:blank:]]*=[[:blank:]]*|TARGET=${PORTNAME}${_QT_BINSUFX}|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 ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/bin/uic
-	${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc
+	${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake
+	${LN} -sf ${MOC} ${WRKSRC}/bin/moc
+	${LN} -sf ${UIC} ${WRKSRC}/bin/uic
+	${LN} -sf ${RCC} ${WRKSRC}/bin/rcc

 .include <bsd.port.mk>
--- a/devel/qt4-makeqpf/pkg-descr
+++ b/devel/qt4-makeqpf/pkg-descr
@ -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
--- a/devel/qt4-makeqpf/pkg-plist
+++ b/devel/qt4-makeqpf/pkg-plist
@ -1,2 +1,2 @@
-bin/makeqpf-qt4
-%%DEBUG%%bin/makeqpf-qt4.debug
+%%QT_BINDIR%%/makeqpf-qt4
+%%DEBUG%%%%QT_BINDIR%%/makeqpf-qt4.debug
--- a/devel/qt4-moc/Makefile
+++ b/devel/qt4-moc/Makefile
@ -3,16 +3,15 @@

 PORTNAME=	moc
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	devel
+CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt meta object compiler
+COMMENT=	Qt Meta-Object Compiler

 BROKEN_arm=	does not compile

 USE_QT4=	qmake_build
-QT_NONSTANDARD=	yes
 QT_DIST=	yes

 HAS_CONFIGURE=	yes
@ -37,14 +36,11 @@ EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 BUILD_WRKSRC=	${WRKSRC}/src/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' \
-			-e 's|^TARGET.*|TARGET=moc-qt4|g' \
+	${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=${MOC:T}|g' \
 		${BUILD_WRKSRC}/${PORTNAME}.pro
 	${MKDIR} ${WRKSRC}/mkspecs
-	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
+	${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake

 pre-build:
 	cd ${BUILD_WRKSRC}/../bootstrap && ${MAKE}
--- a/devel/qt4-moc/pkg-descr
+++ b/devel/qt4-moc/pkg-descr
@ -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
--- a/devel/qt4-moc/pkg-plist
+++ b/devel/qt4-moc/pkg-plist
@ -1,2 +1,2 @@
-bin/moc-qt4
-%%DEBUG%%bin/moc-qt4.debug
+%%QT_BINDIR%%/moc-qt4
+%%DEBUG%%%%QT_BINDIR%%/moc-qt4.debug
--- a/devel/qt4-porting/Makefile
+++ b/devel/qt4-porting/Makefile
@ -3,14 +3,13 @@

 PORTNAME=	porting
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	devel
+CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt utility to assist with porting Qt3 applications to Qt4
+COMMENT=	Qt utility to assist with porting from Qt 3 to Qt 4

 USE_QT4=	qmake_build moc_build rcc_build corelib xml
-QT_NONSTANDARD=	yes
 QT_DIST=	yes

 HAS_CONFIGURE=	yes
@ -35,12 +34,10 @@ 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:
 	${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>
--- a/devel/qt4-porting/pkg-descr
+++ b/devel/qt4-porting/pkg-descr
@ -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
--- a/devel/qt4-porting/pkg-plist
+++ b/devel/qt4-porting/pkg-plist
@ -1,4 +1,4 @@
-bin/qt3to4
-%%DEBUG%%bin/qt3to4.debug
-share/qt4/q3porting.xml
-@dirrmtry share/qt4
+%%QT_BINDIR%%/qt3to4
+%%DEBUG%%%%QT_BINDIR%%/qt3to4.debug
+%%QT_DATADIR%%/q3porting.xml
+@dirrmtry %%QT_DATADIR%%
--- a/devel/qt4-qdbusviewer/Makefile
+++ b/devel/qt4-qdbusviewer/Makefile
@ -3,18 +3,18 @@

 PORTNAME=	qdbusviewer
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	devel
+PORTREVISION=	1
+CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt4 D-Bus viewer
+COMMENT=	Qt 4 graphical interface to D-Bus

-LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus

 USES=		pkgconfig
 USE_QT4=	qmake_build moc_build rcc_build corelib dbus gui xml \
 		clucene
-QT_NONSTANDARD=	yes
 QT_DIST=	yes

 HAS_CONFIGURE=	yes
@ -24,9 +24,10 @@ CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
 MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \
 		PATH=${WRKSRC}/bin:$$PATH

-DESKTOP_ENTRIES="Qt D-Bus viewer" "${COMMENT}" \
-		"${PREFIX}/share/pixmaps/qdbusviewer.png" \
-		"${PREFIX}/bin/qdbusviewer" "Development;Qt;" true
+DESKTOP_ENTRIES="Qt 4 D-Bus viewer" "" \
+		"${PREFIX}/share/pixmaps/qdbusviewer-qt4.png" \
+		"${PREFIX}/${QT_BINDIR_REL}/qdbusviewer" \
+		"Development;Qt;" true

 DO_NOT_EXTRACT=	demos doc examples mkspecs qmake translations \
 		src/activeqt src/multimedia src/network src/opengl src/openvg \
@ -43,16 +44,14 @@ EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 BUILD_WRKSRC=	${WRKSRC}/tools/qdbus/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}

-EXTRA_PATCHES+=	${.CURDIR}/../../devel/qt4/files/patch-configure
-
 post-patch:
 	${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

 post-install:
-	${INSTALL_DATA} ${BUILD_WRKSRC}/images/qdbusviewer-128.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps/qdbusviewer.png
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/images/qdbusviewer-128.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/qdbusviewer-qt4.png

 .include <bsd.port.mk>
--- a/devel/qt4-qdbusviewer/pkg-descr
+++ b/devel/qt4-qdbusviewer/pkg-descr
@ -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
--- a/devel/qt4-qdbusviewer/pkg-plist
+++ b/devel/qt4-qdbusviewer/pkg-plist
@ -1,3 +1,3 @@
-bin/qdbusviewer
-%%DEBUG%%bin/qdbusviewer.debug
-share/pixmaps/qdbusviewer.png
+%%QT_BINDIR%%/qdbusviewer
+%%DEBUG%%%%QT_BINDIR%%/qdbusviewer.debug
+share/pixmaps/qdbusviewer-qt4.png
--- a/devel/qt4-qdoc3/Makefile
+++ b/devel/qt4-qdoc3/Makefile
@ -10,7 +10,6 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt documentation generator

 USE_QT4=	qmake_build corelib gui xml
-QT_NONSTANDARD=	yes
 QT_DIST=	yes

 HAS_CONFIGURE=	yes
@ -27,13 +26,11 @@ DO_NOT_EXTRACT=	demos doc examples mkspecs qmake translations \
 EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 .endfor

-EXTRA_PATCHES+=	${.CURDIR}/../../devel/qt4/files/patch-configure
-
 BUILD_WRKSRC=	${WRKSRC}/tools/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}

 pre-configure:
 	${MKDIR} ${WRKSRC}/mkspecs/modules
-	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
+	${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake

 .include <bsd.port.mk>
--- a/devel/qt4-qdoc3/pkg-descr
+++ b/devel/qt4-qdoc3/pkg-descr
@ -1,7 +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.
-
-qdoc3 is the tool used to generate the Qt reference documentation.
-
-WWW: http://qt.nokia.com/products/qt/index.html
--- a/devel/qt4-qdoc3/pkg-plist
+++ b/devel/qt4-qdoc3/pkg-plist
@ -1,2 +1,2 @@
-bin/qdoc3
-%%DEBUG%%bin/qdoc3.debug
+%%QT_BINDIR%%/qdoc3
+%%DEBUG%%%%QT_BINDIR%%/qdoc3.debug
--- a/devel/qt4-qmlviewer/Makefile
+++ b/devel/qt4-qmlviewer/Makefile
@ -3,15 +3,15 @@

 PORTNAME=	qmlviewer
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	devel
+PORTREVISION=	1
+CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt4 QML viewer
+COMMENT=	Qt 4 utility for QML application testing

 USE_QT4=	qmake_build moc_build rcc_build uic_build declarative script \
 		svg xmlpatterns sql opengl network corelib
-QT_NONSTANDARD=	yes
 QT_DIST=	yes

 HAS_CONFIGURE=	yes
@ -22,9 +22,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 QML viewer" "${COMMENT}" \
-		"${LOCALBASE}/share/pixmaps/qtlogo.png" \
-		"${PREFIX}/bin/qmlviewer" "Development;Qt;" true
+DESKTOP_ENTRIES="Qt 4 QML viewer" "" \
+		"${QT_PREFIX}/share/pixmaps/qtlogo.png" \
+		"${PREFIX}/${QT_BINDIR_REL}/qmlviewer" \
+		"Development;Qt;" true

 DO_NOT_EXTRACT=	demos doc examples mkspecs qmake translations \
 		src/activeqt src/multimedia src/openvg \
@ -41,13 +42,11 @@ EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 BUILD_WRKSRC=	${WRKSRC}/tools/qml/
 INSTALL_WRKSRC=	${BUILD_WRKSRC}

-EXTRA_PATCHES+=	${.CURDIR}/../../devel/qt4/files/patch-configure
-
 post-patch:
 	${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 ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/bin/uic
+	${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake
+	${LN} -sf ${MOC} ${WRKSRC}/bin/moc
+	${LN} -sf ${RCC} ${WRKSRC}/bin/rcc
+	${LN} -sf ${UIC} ${WRKSRC}/bin/uic

 .include <bsd.port.mk>
--- a/devel/qt4-qmlviewer/pkg-descr
+++ b/devel/qt4-qmlviewer/pkg-descr
@ -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
--- a/devel/qt4-qmlviewer/pkg-plist
+++ b/devel/qt4-qmlviewer/pkg-plist
@ -1,2 +1,2 @@
-bin/qmlviewer
-%%DEBUG%%bin/qmlviewer.debug
+%%QT_BINDIR%%/qmlviewer
+%%DEBUG%%%%QT_BINDIR%%/qmlviewer.debug
--- a/devel/qt4-qt3support/Makefile
+++ b/devel/qt4-qt3support/Makefile
@ -3,19 +3,18 @@

 PORTNAME=	qt3support
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	devel x11-toolkits
+CATEGORIES=	devel x11-toolkits
 PKGNAMEPREFIX=	qt4-

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt3 compatibility library
+COMMENT=	Qt 3 compatibility module

-USES=		pkgconfig
 USE_QT4=	qmake_build moc_build corelib gui network sql xml
-QT_NONSTANDARD=	yes
 QT_DIST=	yes
+USES=		pkgconfig

 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,17 +35,15 @@ 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/Qt3Support.pc

 .include <bsd.port.mk>
--- a/devel/qt4-qt3support/pkg-descr
+++ b/devel/qt4-qt3support/pkg-descr
@ -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
--- a/devel/qt4-qt3support/pkg-plist
+++ b/devel/qt4-qt3support/pkg-plist
@ -1,415 +1,415 @@
-include/qt4/Qt/Qt3Support
-include/qt4/Qt/q3accel.h
-include/qt4/Qt/q3action.h
-include/qt4/Qt/q3asciicache.h
-include/qt4/Qt/q3asciidict.h
-include/qt4/Qt/q3boxlayout.h
-include/qt4/Qt/q3button.h
-include/qt4/Qt/q3buttongroup.h
-include/qt4/Qt/q3cache.h
-include/qt4/Qt/q3canvas.h
-include/qt4/Qt/q3cleanuphandler.h
-include/qt4/Qt/q3combobox.h
-include/qt4/Qt/q3cstring.h
-include/qt4/Qt/q3databrowser.h
-include/qt4/Qt/q3datatable.h
-include/qt4/Qt/q3dataview.h
-include/qt4/Qt/q3datetimeedit.h
-include/qt4/Qt/q3deepcopy.h
-include/qt4/Qt/q3dict.h
-include/qt4/Qt/q3dns.h
-include/qt4/Qt/q3dockarea.h
-include/qt4/Qt/q3dockwindow.h
-include/qt4/Qt/q3dragobject.h
-include/qt4/Qt/q3dropsite.h
-include/qt4/Qt/q3editorfactory.h
-include/qt4/Qt/q3filedialog.h
-include/qt4/Qt/q3frame.h
-include/qt4/Qt/q3ftp.h
-include/qt4/Qt/q3garray.h
-include/qt4/Qt/q3gcache.h
-include/qt4/Qt/q3gdict.h
-include/qt4/Qt/q3glist.h
-include/qt4/Qt/q3grid.h
-include/qt4/Qt/q3gridlayout.h
-include/qt4/Qt/q3gridview.h
-include/qt4/Qt/q3groupbox.h
-include/qt4/Qt/q3gvector.h
-include/qt4/Qt/q3hbox.h
-include/qt4/Qt/q3header.h
-include/qt4/Qt/q3hgroupbox.h
-include/qt4/Qt/q3http.h
-include/qt4/Qt/q3iconview.h
-include/qt4/Qt/q3intcache.h
-include/qt4/Qt/q3intdict.h
-include/qt4/Qt/q3listbox.h
-include/qt4/Qt/q3listview.h
-include/qt4/Qt/q3localfs.h
-include/qt4/Qt/q3mainwindow.h
-include/qt4/Qt/q3memarray.h
-include/qt4/Qt/q3mimefactory.h
-include/qt4/Qt/q3multilineedit.h
-include/qt4/Qt/q3network.h
-include/qt4/Qt/q3networkprotocol.h
-include/qt4/Qt/q3objectdict.h
-include/qt4/Qt/q3paintdevicemetrics.h
-include/qt4/Qt/q3painter.h
-include/qt4/Qt/q3picture.h
-include/qt4/Qt/q3pointarray.h
-include/qt4/Qt/q3polygonscanner.h
-include/qt4/Qt/q3popupmenu.h
-include/qt4/Qt/q3process.h
-include/qt4/Qt/q3progressbar.h
-include/qt4/Qt/q3progressdialog.h
-include/qt4/Qt/q3ptrcollection.h
-include/qt4/Qt/q3ptrdict.h
-include/qt4/Qt/q3ptrlist.h
-include/qt4/Qt/q3ptrqueue.h
-include/qt4/Qt/q3ptrstack.h
-include/qt4/Qt/q3ptrvector.h
-include/qt4/Qt/q3rangecontrol.h
-include/qt4/Qt/q3scrollview.h
-include/qt4/Qt/q3semaphore.h
-include/qt4/Qt/q3serversocket.h
-include/qt4/Qt/q3shared.h
-include/qt4/Qt/q3signal.h
-include/qt4/Qt/q3simplerichtext.h
-include/qt4/Qt/q3socket.h
-include/qt4/Qt/q3socketdevice.h
-include/qt4/Qt/q3sortedlist.h
-include/qt4/Qt/q3sqlcursor.h
-include/qt4/Qt/q3sqleditorfactory.h
-include/qt4/Qt/q3sqlfieldinfo.h
-include/qt4/Qt/q3sqlform.h
-include/qt4/Qt/q3sqlpropertymap.h
-include/qt4/Qt/q3sqlrecordinfo.h
-include/qt4/Qt/q3sqlselectcursor.h
-include/qt4/Qt/q3strlist.h
-include/qt4/Qt/q3strvec.h
-include/qt4/Qt/q3stylesheet.h
-include/qt4/Qt/q3syntaxhighlighter.h
-include/qt4/Qt/q3tabdialog.h
-include/qt4/Qt/q3table.h
-include/qt4/Qt/q3textbrowser.h
-include/qt4/Qt/q3textedit.h
-include/qt4/Qt/q3textstream.h
-include/qt4/Qt/q3textview.h
-include/qt4/Qt/q3tl.h
-include/qt4/Qt/q3toolbar.h
-include/qt4/Qt/q3url.h
-include/qt4/Qt/q3urloperator.h
-include/qt4/Qt/q3valuelist.h
-include/qt4/Qt/q3valuestack.h
-include/qt4/Qt/q3valuevector.h
-include/qt4/Qt/q3vbox.h
-include/qt4/Qt/q3vgroupbox.h
-include/qt4/Qt/q3whatsthis.h
-include/qt4/Qt/q3widgetstack.h
-include/qt4/Qt/q3wizard.h
-include/qt4/Qt/qiconset.h
-include/qt4/Qt3Support/Q3Accel
-include/qt4/Qt3Support/Q3Action
-include/qt4/Qt3Support/Q3ActionGroup
-include/qt4/Qt3Support/Q3AsciiBucket
-include/qt4/Qt3Support/Q3AsciiCache
-include/qt4/Qt3Support/Q3AsciiCacheIterator
-include/qt4/Qt3Support/Q3AsciiDict
-include/qt4/Qt3Support/Q3AsciiDictIterator
-include/qt4/Qt3Support/Q3BaseBucket
-include/qt4/Qt3Support/Q3BoxLayout
-include/qt4/Qt3Support/Q3Button
-include/qt4/Qt3Support/Q3ButtonGroup
-include/qt4/Qt3Support/Q3CString
-include/qt4/Qt3Support/Q3Cache
-include/qt4/Qt3Support/Q3CacheIterator
-include/qt4/Qt3Support/Q3Canvas
-include/qt4/Qt3Support/Q3CanvasEllipse
-include/qt4/Qt3Support/Q3CanvasItem
-include/qt4/Qt3Support/Q3CanvasItemList
-include/qt4/Qt3Support/Q3CanvasLine
-include/qt4/Qt3Support/Q3CanvasPixmap
-include/qt4/Qt3Support/Q3CanvasPixmapArray
-include/qt4/Qt3Support/Q3CanvasPolygon
-include/qt4/Qt3Support/Q3CanvasPolygonalItem
-include/qt4/Qt3Support/Q3CanvasRectangle
-include/qt4/Qt3Support/Q3CanvasSpline
-include/qt4/Qt3Support/Q3CanvasSprite
-include/qt4/Qt3Support/Q3CanvasText
-include/qt4/Qt3Support/Q3CanvasView
-include/qt4/Qt3Support/Q3CheckListItem
-include/qt4/Qt3Support/Q3CheckTableItem
-include/qt4/Qt3Support/Q3CleanupHandler
-include/qt4/Qt3Support/Q3ColorDrag
-include/qt4/Qt3Support/Q3ComboBox
-include/qt4/Qt3Support/Q3ComboTableItem
-include/qt4/Qt3Support/Q3DataBrowser
-include/qt4/Qt3Support/Q3DataTable
-include/qt4/Qt3Support/Q3DataView
-include/qt4/Qt3Support/Q3DateEdit
-include/qt4/Qt3Support/Q3DateTimeEdit
-include/qt4/Qt3Support/Q3DateTimeEditBase
-include/qt4/Qt3Support/Q3DeepCopy
-include/qt4/Qt3Support/Q3Dict
-include/qt4/Qt3Support/Q3DictIterator
-include/qt4/Qt3Support/Q3Dns
-include/qt4/Qt3Support/Q3DnsSocket
-include/qt4/Qt3Support/Q3DockArea
-include/qt4/Qt3Support/Q3DockAreaLayout
-include/qt4/Qt3Support/Q3DockWindow
-include/qt4/Qt3Support/Q3DragObject
-include/qt4/Qt3Support/Q3DropSite
-include/qt4/Qt3Support/Q3EditorFactory
-include/qt4/Qt3Support/Q3FileDialog
-include/qt4/Qt3Support/Q3FileIconProvider
-include/qt4/Qt3Support/Q3FilePreview
-include/qt4/Qt3Support/Q3Frame
-include/qt4/Qt3Support/Q3Ftp
-include/qt4/Qt3Support/Q3GArray
-include/qt4/Qt3Support/Q3GCache
-include/qt4/Qt3Support/Q3GCacheIterator
-include/qt4/Qt3Support/Q3GDict
-include/qt4/Qt3Support/Q3GDictIterator
-include/qt4/Qt3Support/Q3GList
-include/qt4/Qt3Support/Q3GListIterator
-include/qt4/Qt3Support/Q3GListStdIterator
-include/qt4/Qt3Support/Q3GVector
-include/qt4/Qt3Support/Q3Grid
-include/qt4/Qt3Support/Q3GridLayout
-include/qt4/Qt3Support/Q3GridView
-include/qt4/Qt3Support/Q3GroupBox
-include/qt4/Qt3Support/Q3HBox
-include/qt4/Qt3Support/Q3HBoxLayout
-include/qt4/Qt3Support/Q3HButtonGroup
-include/qt4/Qt3Support/Q3HGroupBox
-include/qt4/Qt3Support/Q3Header
-include/qt4/Qt3Support/Q3Http
-include/qt4/Qt3Support/Q3HttpHeader
-include/qt4/Qt3Support/Q3HttpRequestHeader
-include/qt4/Qt3Support/Q3HttpResponseHeader
-include/qt4/Qt3Support/Q3IconDrag
-include/qt4/Qt3Support/Q3IconDragItem
-include/qt4/Qt3Support/Q3IconView
-include/qt4/Qt3Support/Q3IconViewItem
-include/qt4/Qt3Support/Q3ImageDrag
-include/qt4/Qt3Support/Q3IntBucket
-include/qt4/Qt3Support/Q3IntCache
-include/qt4/Qt3Support/Q3IntCacheIterator
-include/qt4/Qt3Support/Q3IntDict
-include/qt4/Qt3Support/Q3IntDictIterator
-include/qt4/Qt3Support/Q3LNode
-include/qt4/Qt3Support/Q3ListBox
-include/qt4/Qt3Support/Q3ListBoxItem
-include/qt4/Qt3Support/Q3ListBoxPixmap
-include/qt4/Qt3Support/Q3ListBoxText
-include/qt4/Qt3Support/Q3ListView
-include/qt4/Qt3Support/Q3ListViewItem
-include/qt4/Qt3Support/Q3ListViewItemIterator
-include/qt4/Qt3Support/Q3LocalFs
-include/qt4/Qt3Support/Q3MainWindow
-include/qt4/Qt3Support/Q3MemArray
-include/qt4/Qt3Support/Q3MimeSourceFactory
-include/qt4/Qt3Support/Q3MultiLineEdit
-include/qt4/Qt3Support/Q3NetworkOperation
-include/qt4/Qt3Support/Q3NetworkProtocol
-include/qt4/Qt3Support/Q3NetworkProtocolDict
-include/qt4/Qt3Support/Q3NetworkProtocolFactory
-include/qt4/Qt3Support/Q3NetworkProtocolFactoryBase
-include/qt4/Qt3Support/Q3ObjectDictionary
-include/qt4/Qt3Support/Q3PaintDeviceMetrics
-include/qt4/Qt3Support/Q3Painter
-include/qt4/Qt3Support/Q3Picture
-include/qt4/Qt3Support/Q3PointArray
-include/qt4/Qt3Support/Q3PolygonScanner
-include/qt4/Qt3Support/Q3PopupMenu
-include/qt4/Qt3Support/Q3Process
-include/qt4/Qt3Support/Q3ProgressBar
-include/qt4/Qt3Support/Q3ProgressDialog
-include/qt4/Qt3Support/Q3PtrBucket
-include/qt4/Qt3Support/Q3PtrCollection
-include/qt4/Qt3Support/Q3PtrDict
-include/qt4/Qt3Support/Q3PtrDictIterator
-include/qt4/Qt3Support/Q3PtrList
-include/qt4/Qt3Support/Q3PtrListIterator
-include/qt4/Qt3Support/Q3PtrListStdIterator
-include/qt4/Qt3Support/Q3PtrQueue
-include/qt4/Qt3Support/Q3PtrStack
-include/qt4/Qt3Support/Q3PtrVector
-include/qt4/Qt3Support/Q3RangeControl
-include/qt4/Qt3Support/Q3ScrollView
-include/qt4/Qt3Support/Q3Semaphore
-include/qt4/Qt3Support/Q3ServerSocket
-include/qt4/Qt3Support/Q3Shared
-include/qt4/Qt3Support/Q3Signal
-include/qt4/Qt3Support/Q3SimpleRichText
-include/qt4/Qt3Support/Q3SingleCleanupHandler
-include/qt4/Qt3Support/Q3Socket
-include/qt4/Qt3Support/Q3SocketDevice
-include/qt4/Qt3Support/Q3SortedList
-include/qt4/Qt3Support/Q3SpinWidget
-include/qt4/Qt3Support/Q3SqlCursor
-include/qt4/Qt3Support/Q3SqlEditorFactory
-include/qt4/Qt3Support/Q3SqlFieldInfo
-include/qt4/Qt3Support/Q3SqlFieldInfoList
-include/qt4/Qt3Support/Q3SqlForm
-include/qt4/Qt3Support/Q3SqlPropertyMap
-include/qt4/Qt3Support/Q3SqlRecordInfo
-include/qt4/Qt3Support/Q3SqlSelectCursor
-include/qt4/Qt3Support/Q3StoredDrag
-include/qt4/Qt3Support/Q3StrIList
-include/qt4/Qt3Support/Q3StrIVec
-include/qt4/Qt3Support/Q3StrList
-include/qt4/Qt3Support/Q3StrListIterator
-include/qt4/Qt3Support/Q3StrVec
-include/qt4/Qt3Support/Q3StringBucket
-include/qt4/Qt3Support/Q3StyleSheet
-include/qt4/Qt3Support/Q3StyleSheetItem
-include/qt4/Qt3Support/Q3SyntaxHighlighter
-include/qt4/Qt3Support/Q3TSFUNC
-include/qt4/Qt3Support/Q3TabDialog
-include/qt4/Qt3Support/Q3Table
-include/qt4/Qt3Support/Q3TableItem
-include/qt4/Qt3Support/Q3TableSelection
-include/qt4/Qt3Support/Q3TextBrowser
-include/qt4/Qt3Support/Q3TextDrag
-include/qt4/Qt3Support/Q3TextEdit
-include/qt4/Qt3Support/Q3TextEditOptimPrivate
-include/qt4/Qt3Support/Q3TextStream
-include/qt4/Qt3Support/Q3TextView
-include/qt4/Qt3Support/Q3TimeEdit
-include/qt4/Qt3Support/Q3ToolBar
-include/qt4/Qt3Support/Q3UriDrag
-include/qt4/Qt3Support/Q3Url
-include/qt4/Qt3Support/Q3UrlOperator
-include/qt4/Qt3Support/Q3VBox
-include/qt4/Qt3Support/Q3VBoxLayout
-include/qt4/Qt3Support/Q3VButtonGroup
-include/qt4/Qt3Support/Q3VGroupBox
-include/qt4/Qt3Support/Q3ValueList
-include/qt4/Qt3Support/Q3ValueListConstIterator
-include/qt4/Qt3Support/Q3ValueListIterator
-include/qt4/Qt3Support/Q3ValueStack
-include/qt4/Qt3Support/Q3ValueVector
-include/qt4/Qt3Support/Q3WhatsThis
-include/qt4/Qt3Support/Q3WidgetStack
-include/qt4/Qt3Support/Q3Wizard
-include/qt4/Qt3Support/Qt3Support
-include/qt4/Qt3Support/q3accel.h
-include/qt4/Qt3Support/q3action.h
-include/qt4/Qt3Support/q3asciicache.h
-include/qt4/Qt3Support/q3asciidict.h
-include/qt4/Qt3Support/q3boxlayout.h
-include/qt4/Qt3Support/q3button.h
-include/qt4/Qt3Support/q3buttongroup.h
-include/qt4/Qt3Support/q3cache.h
-include/qt4/Qt3Support/q3canvas.h
-include/qt4/Qt3Support/q3cleanuphandler.h
-include/qt4/Qt3Support/q3combobox.h
-include/qt4/Qt3Support/q3cstring.h
-include/qt4/Qt3Support/q3databrowser.h
-include/qt4/Qt3Support/q3datatable.h
-include/qt4/Qt3Support/q3dataview.h
-include/qt4/Qt3Support/q3datetimeedit.h
-include/qt4/Qt3Support/q3deepcopy.h
-include/qt4/Qt3Support/q3dict.h
-include/qt4/Qt3Support/q3dns.h
-include/qt4/Qt3Support/q3dockarea.h
-include/qt4/Qt3Support/q3dockwindow.h
-include/qt4/Qt3Support/q3dragobject.h
-include/qt4/Qt3Support/q3dropsite.h
-include/qt4/Qt3Support/q3editorfactory.h
-include/qt4/Qt3Support/q3filedialog.h
-include/qt4/Qt3Support/q3frame.h
-include/qt4/Qt3Support/q3ftp.h
-include/qt4/Qt3Support/q3garray.h
-include/qt4/Qt3Support/q3gcache.h
-include/qt4/Qt3Support/q3gdict.h
-include/qt4/Qt3Support/q3glist.h
-include/qt4/Qt3Support/q3grid.h
-include/qt4/Qt3Support/q3gridlayout.h
-include/qt4/Qt3Support/q3gridview.h
-include/qt4/Qt3Support/q3groupbox.h
-include/qt4/Qt3Support/q3gvector.h
-include/qt4/Qt3Support/q3hbox.h
-include/qt4/Qt3Support/q3header.h
-include/qt4/Qt3Support/q3hgroupbox.h
-include/qt4/Qt3Support/q3http.h
-include/qt4/Qt3Support/q3iconview.h
-include/qt4/Qt3Support/q3intcache.h
-include/qt4/Qt3Support/q3intdict.h
-include/qt4/Qt3Support/q3listbox.h
-include/qt4/Qt3Support/q3listview.h
-include/qt4/Qt3Support/q3localfs.h
-include/qt4/Qt3Support/q3mainwindow.h
-include/qt4/Qt3Support/q3memarray.h
-include/qt4/Qt3Support/q3mimefactory.h
-include/qt4/Qt3Support/q3multilineedit.h
-include/qt4/Qt3Support/q3network.h
-include/qt4/Qt3Support/q3networkprotocol.h
-include/qt4/Qt3Support/q3objectdict.h
-include/qt4/Qt3Support/q3paintdevicemetrics.h
-include/qt4/Qt3Support/q3painter.h
-include/qt4/Qt3Support/q3picture.h
-include/qt4/Qt3Support/q3pointarray.h
-include/qt4/Qt3Support/q3polygonscanner.h
-include/qt4/Qt3Support/q3popupmenu.h
-include/qt4/Qt3Support/q3process.h
-include/qt4/Qt3Support/q3progressbar.h
-include/qt4/Qt3Support/q3progressdialog.h
-include/qt4/Qt3Support/q3ptrcollection.h
-include/qt4/Qt3Support/q3ptrdict.h
-include/qt4/Qt3Support/q3ptrlist.h
-include/qt4/Qt3Support/q3ptrqueue.h
-include/qt4/Qt3Support/q3ptrstack.h
-include/qt4/Qt3Support/q3ptrvector.h
-include/qt4/Qt3Support/q3rangecontrol.h
-include/qt4/Qt3Support/q3scrollview.h
-include/qt4/Qt3Support/q3semaphore.h
-include/qt4/Qt3Support/q3serversocket.h
-include/qt4/Qt3Support/q3shared.h
-include/qt4/Qt3Support/q3signal.h
-include/qt4/Qt3Support/q3simplerichtext.h
-include/qt4/Qt3Support/q3socket.h
-include/qt4/Qt3Support/q3socketdevice.h
-include/qt4/Qt3Support/q3sortedlist.h
-include/qt4/Qt3Support/q3sqlcursor.h
-include/qt4/Qt3Support/q3sqleditorfactory.h
-include/qt4/Qt3Support/q3sqlfieldinfo.h
-include/qt4/Qt3Support/q3sqlform.h
-include/qt4/Qt3Support/q3sqlpropertymap.h
-include/qt4/Qt3Support/q3sqlrecordinfo.h
-include/qt4/Qt3Support/q3sqlselectcursor.h
-include/qt4/Qt3Support/q3strlist.h
-include/qt4/Qt3Support/q3strvec.h
-include/qt4/Qt3Support/q3stylesheet.h
-include/qt4/Qt3Support/q3syntaxhighlighter.h
-include/qt4/Qt3Support/q3tabdialog.h
-include/qt4/Qt3Support/q3table.h
-include/qt4/Qt3Support/q3textbrowser.h
-include/qt4/Qt3Support/q3textedit.h
-include/qt4/Qt3Support/q3textstream.h
-include/qt4/Qt3Support/q3textview.h
-include/qt4/Qt3Support/q3tl.h
-include/qt4/Qt3Support/q3toolbar.h
-include/qt4/Qt3Support/q3url.h
-include/qt4/Qt3Support/q3urloperator.h
-include/qt4/Qt3Support/q3valuelist.h
-include/qt4/Qt3Support/q3valuestack.h
-include/qt4/Qt3Support/q3valuevector.h
-include/qt4/Qt3Support/q3vbox.h
-include/qt4/Qt3Support/q3vgroupbox.h
-include/qt4/Qt3Support/q3whatsthis.h
-include/qt4/Qt3Support/q3widgetstack.h
-include/qt4/Qt3Support/q3wizard.h
-include/qt4/Qt3Support/qiconset.h
-lib/qt4/libQt3Support.la
-lib/qt4/libQt3Support.prl
-lib/qt4/libQt3Support.so
-lib/qt4/libQt3Support.so.4
-lib/qt4/libQt3Support.so.%%SHLIB_SHVER%%
-lib/qt4/libQt3Support.so.%%SHLIB_VER%%
-@comment %%DEBUG%%lib/qt4/libQt3Support.so.%%SHLIB_VER%%.debug
+%%QT_INCDIR%%/Qt/Qt3Support
+%%QT_INCDIR%%/Qt/q3accel.h
+%%QT_INCDIR%%/Qt/q3action.h
+%%QT_INCDIR%%/Qt/q3asciicache.h
+%%QT_INCDIR%%/Qt/q3asciidict.h
+%%QT_INCDIR%%/Qt/q3boxlayout.h
+%%QT_INCDIR%%/Qt/q3button.h
+%%QT_INCDIR%%/Qt/q3buttongroup.h
+%%QT_INCDIR%%/Qt/q3cache.h
+%%QT_INCDIR%%/Qt/q3canvas.h
+%%QT_INCDIR%%/Qt/q3cleanuphandler.h
+%%QT_INCDIR%%/Qt/q3combobox.h
+%%QT_INCDIR%%/Qt/q3cstring.h
+%%QT_INCDIR%%/Qt/q3databrowser.h
+%%QT_INCDIR%%/Qt/q3datatable.h
+%%QT_INCDIR%%/Qt/q3dataview.h
+%%QT_INCDIR%%/Qt/q3datetimeedit.h
+%%QT_INCDIR%%/Qt/q3deepcopy.h
+%%QT_INCDIR%%/Qt/q3dict.h
+%%QT_INCDIR%%/Qt/q3dns.h
+%%QT_INCDIR%%/Qt/q3dockarea.h
+%%QT_INCDIR%%/Qt/q3dockwindow.h
+%%QT_INCDIR%%/Qt/q3dragobject.h
+%%QT_INCDIR%%/Qt/q3dropsite.h
+%%QT_INCDIR%%/Qt/q3editorfactory.h
+%%QT_INCDIR%%/Qt/q3filedialog.h
+%%QT_INCDIR%%/Qt/q3frame.h
+%%QT_INCDIR%%/Qt/q3ftp.h
+%%QT_INCDIR%%/Qt/q3garray.h
+%%QT_INCDIR%%/Qt/q3gcache.h
+%%QT_INCDIR%%/Qt/q3gdict.h
+%%QT_INCDIR%%/Qt/q3glist.h
+%%QT_INCDIR%%/Qt/q3grid.h
+%%QT_INCDIR%%/Qt/q3gridlayout.h
+%%QT_INCDIR%%/Qt/q3gridview.h
+%%QT_INCDIR%%/Qt/q3groupbox.h
+%%QT_INCDIR%%/Qt/q3gvector.h
+%%QT_INCDIR%%/Qt/q3hbox.h
+%%QT_INCDIR%%/Qt/q3header.h
+%%QT_INCDIR%%/Qt/q3hgroupbox.h
+%%QT_INCDIR%%/Qt/q3http.h
+%%QT_INCDIR%%/Qt/q3iconview.h
+%%QT_INCDIR%%/Qt/q3intcache.h
+%%QT_INCDIR%%/Qt/q3intdict.h
+%%QT_INCDIR%%/Qt/q3listbox.h
+%%QT_INCDIR%%/Qt/q3listview.h
+%%QT_INCDIR%%/Qt/q3localfs.h
+%%QT_INCDIR%%/Qt/q3mainwindow.h
+%%QT_INCDIR%%/Qt/q3memarray.h
+%%QT_INCDIR%%/Qt/q3mimefactory.h
+%%QT_INCDIR%%/Qt/q3multilineedit.h
+%%QT_INCDIR%%/Qt/q3network.h
+%%QT_INCDIR%%/Qt/q3networkprotocol.h
+%%QT_INCDIR%%/Qt/q3objectdict.h
+%%QT_INCDIR%%/Qt/q3paintdevicemetrics.h
+%%QT_INCDIR%%/Qt/q3painter.h
+%%QT_INCDIR%%/Qt/q3picture.h
+%%QT_INCDIR%%/Qt/q3pointarray.h
+%%QT_INCDIR%%/Qt/q3polygonscanner.h
+%%QT_INCDIR%%/Qt/q3popupmenu.h
+%%QT_INCDIR%%/Qt/q3process.h
+%%QT_INCDIR%%/Qt/q3progressbar.h
+%%QT_INCDIR%%/Qt/q3progressdialog.h
+%%QT_INCDIR%%/Qt/q3ptrcollection.h
+%%QT_INCDIR%%/Qt/q3ptrdict.h
+%%QT_INCDIR%%/Qt/q3ptrlist.h
+%%QT_INCDIR%%/Qt/q3ptrqueue.h
+%%QT_INCDIR%%/Qt/q3ptrstack.h
+%%QT_INCDIR%%/Qt/q3ptrvector.h
+%%QT_INCDIR%%/Qt/q3rangecontrol.h
+%%QT_INCDIR%%/Qt/q3scrollview.h
+%%QT_INCDIR%%/Qt/q3semaphore.h
+%%QT_INCDIR%%/Qt/q3serversocket.h
+%%QT_INCDIR%%/Qt/q3shared.h
+%%QT_INCDIR%%/Qt/q3signal.h
+%%QT_INCDIR%%/Qt/q3simplerichtext.h
+%%QT_INCDIR%%/Qt/q3socket.h
+%%QT_INCDIR%%/Qt/q3socketdevice.h
+%%QT_INCDIR%%/Qt/q3sortedlist.h
+%%QT_INCDIR%%/Qt/q3sqlcursor.h
+%%QT_INCDIR%%/Qt/q3sqleditorfactory.h
+%%QT_INCDIR%%/Qt/q3sqlfieldinfo.h
+%%QT_INCDIR%%/Qt/q3sqlform.h
+%%QT_INCDIR%%/Qt/q3sqlpropertymap.h
+%%QT_INCDIR%%/Qt/q3sqlrecordinfo.h
+%%QT_INCDIR%%/Qt/q3sqlselectcursor.h
+%%QT_INCDIR%%/Qt/q3strlist.h
+%%QT_INCDIR%%/Qt/q3strvec.h
+%%QT_INCDIR%%/Qt/q3stylesheet.h
+%%QT_INCDIR%%/Qt/q3syntaxhighlighter.h
+%%QT_INCDIR%%/Qt/q3tabdialog.h
+%%QT_INCDIR%%/Qt/q3table.h
+%%QT_INCDIR%%/Qt/q3textbrowser.h
+%%QT_INCDIR%%/Qt/q3textedit.h
+%%QT_INCDIR%%/Qt/q3textstream.h
+%%QT_INCDIR%%/Qt/q3textview.h
+%%QT_INCDIR%%/Qt/q3tl.h
+%%QT_INCDIR%%/Qt/q3toolbar.h
+%%QT_INCDIR%%/Qt/q3url.h
+%%QT_INCDIR%%/Qt/q3urloperator.h
+%%QT_INCDIR%%/Qt/q3valuelist.h
+%%QT_INCDIR%%/Qt/q3valuestack.h
+%%QT_INCDIR%%/Qt/q3valuevector.h
+%%QT_INCDIR%%/Qt/q3vbox.h
+%%QT_INCDIR%%/Qt/q3vgroupbox.h
+%%QT_INCDIR%%/Qt/q3whatsthis.h
+%%QT_INCDIR%%/Qt/q3widgetstack.h
+%%QT_INCDIR%%/Qt/q3wizard.h
+%%QT_INCDIR%%/Qt/qiconset.h
+%%QT_INCDIR%%/Qt3Support/Q3Accel
+%%QT_INCDIR%%/Qt3Support/Q3Action
+%%QT_INCDIR%%/Qt3Support/Q3ActionGroup
+%%QT_INCDIR%%/Qt3Support/Q3AsciiBucket
+%%QT_INCDIR%%/Qt3Support/Q3AsciiCache
+%%QT_INCDIR%%/Qt3Support/Q3AsciiCacheIterator
+%%QT_INCDIR%%/Qt3Support/Q3AsciiDict
+%%QT_INCDIR%%/Qt3Support/Q3AsciiDictIterator
+%%QT_INCDIR%%/Qt3Support/Q3BaseBucket
+%%QT_INCDIR%%/Qt3Support/Q3BoxLayout
+%%QT_INCDIR%%/Qt3Support/Q3Button
+%%QT_INCDIR%%/Qt3Support/Q3ButtonGroup
+%%QT_INCDIR%%/Qt3Support/Q3CString
+%%QT_INCDIR%%/Qt3Support/Q3Cache
+%%QT_INCDIR%%/Qt3Support/Q3CacheIterator
+%%QT_INCDIR%%/Qt3Support/Q3Canvas
+%%QT_INCDIR%%/Qt3Support/Q3CanvasEllipse
+%%QT_INCDIR%%/Qt3Support/Q3CanvasItem
+%%QT_INCDIR%%/Qt3Support/Q3CanvasItemList
+%%QT_INCDIR%%/Qt3Support/Q3CanvasLine
+%%QT_INCDIR%%/Qt3Support/Q3CanvasPixmap
+%%QT_INCDIR%%/Qt3Support/Q3CanvasPixmapArray
+%%QT_INCDIR%%/Qt3Support/Q3CanvasPolygon
+%%QT_INCDIR%%/Qt3Support/Q3CanvasPolygonalItem
+%%QT_INCDIR%%/Qt3Support/Q3CanvasRectangle
+%%QT_INCDIR%%/Qt3Support/Q3CanvasSpline
+%%QT_INCDIR%%/Qt3Support/Q3CanvasSprite
+%%QT_INCDIR%%/Qt3Support/Q3CanvasText
+%%QT_INCDIR%%/Qt3Support/Q3CanvasView
+%%QT_INCDIR%%/Qt3Support/Q3CheckListItem
+%%QT_INCDIR%%/Qt3Support/Q3CheckTableItem
+%%QT_INCDIR%%/Qt3Support/Q3CleanupHandler
+%%QT_INCDIR%%/Qt3Support/Q3ColorDrag
+%%QT_INCDIR%%/Qt3Support/Q3ComboBox
+%%QT_INCDIR%%/Qt3Support/Q3ComboTableItem
+%%QT_INCDIR%%/Qt3Support/Q3DataBrowser
+%%QT_INCDIR%%/Qt3Support/Q3DataTable
+%%QT_INCDIR%%/Qt3Support/Q3DataView
+%%QT_INCDIR%%/Qt3Support/Q3DateEdit
+%%QT_INCDIR%%/Qt3Support/Q3DateTimeEdit
+%%QT_INCDIR%%/Qt3Support/Q3DateTimeEditBase
+%%QT_INCDIR%%/Qt3Support/Q3DeepCopy
+%%QT_INCDIR%%/Qt3Support/Q3Dict
+%%QT_INCDIR%%/Qt3Support/Q3DictIterator
+%%QT_INCDIR%%/Qt3Support/Q3Dns
+%%QT_INCDIR%%/Qt3Support/Q3DnsSocket
+%%QT_INCDIR%%/Qt3Support/Q3DockArea
+%%QT_INCDIR%%/Qt3Support/Q3DockAreaLayout
+%%QT_INCDIR%%/Qt3Support/Q3DockWindow
+%%QT_INCDIR%%/Qt3Support/Q3DragObject
+%%QT_INCDIR%%/Qt3Support/Q3DropSite
+%%QT_INCDIR%%/Qt3Support/Q3EditorFactory
+%%QT_INCDIR%%/Qt3Support/Q3FileDialog
+%%QT_INCDIR%%/Qt3Support/Q3FileIconProvider
+%%QT_INCDIR%%/Qt3Support/Q3FilePreview
+%%QT_INCDIR%%/Qt3Support/Q3Frame
+%%QT_INCDIR%%/Qt3Support/Q3Ftp
+%%QT_INCDIR%%/Qt3Support/Q3GArray
+%%QT_INCDIR%%/Qt3Support/Q3GCache
+%%QT_INCDIR%%/Qt3Support/Q3GCacheIterator
+%%QT_INCDIR%%/Qt3Support/Q3GDict
+%%QT_INCDIR%%/Qt3Support/Q3GDictIterator
+%%QT_INCDIR%%/Qt3Support/Q3GList
+%%QT_INCDIR%%/Qt3Support/Q3GListIterator
+%%QT_INCDIR%%/Qt3Support/Q3GListStdIterator
+%%QT_INCDIR%%/Qt3Support/Q3GVector
+%%QT_INCDIR%%/Qt3Support/Q3Grid
+%%QT_INCDIR%%/Qt3Support/Q3GridLayout
+%%QT_INCDIR%%/Qt3Support/Q3GridView
+%%QT_INCDIR%%/Qt3Support/Q3GroupBox
+%%QT_INCDIR%%/Qt3Support/Q3HBox
+%%QT_INCDIR%%/Qt3Support/Q3HBoxLayout
+%%QT_INCDIR%%/Qt3Support/Q3HButtonGroup
+%%QT_INCDIR%%/Qt3Support/Q3HGroupBox
+%%QT_INCDIR%%/Qt3Support/Q3Header
+%%QT_INCDIR%%/Qt3Support/Q3Http
+%%QT_INCDIR%%/Qt3Support/Q3HttpHeader
+%%QT_INCDIR%%/Qt3Support/Q3HttpRequestHeader
+%%QT_INCDIR%%/Qt3Support/Q3HttpResponseHeader
+%%QT_INCDIR%%/Qt3Support/Q3IconDrag
+%%QT_INCDIR%%/Qt3Support/Q3IconDragItem
+%%QT_INCDIR%%/Qt3Support/Q3IconView
+%%QT_INCDIR%%/Qt3Support/Q3IconViewItem
+%%QT_INCDIR%%/Qt3Support/Q3ImageDrag
+%%QT_INCDIR%%/Qt3Support/Q3IntBucket
+%%QT_INCDIR%%/Qt3Support/Q3IntCache
+%%QT_INCDIR%%/Qt3Support/Q3IntCacheIterator
+%%QT_INCDIR%%/Qt3Support/Q3IntDict
+%%QT_INCDIR%%/Qt3Support/Q3IntDictIterator
+%%QT_INCDIR%%/Qt3Support/Q3LNode
+%%QT_INCDIR%%/Qt3Support/Q3ListBox
+%%QT_INCDIR%%/Qt3Support/Q3ListBoxItem
+%%QT_INCDIR%%/Qt3Support/Q3ListBoxPixmap
+%%QT_INCDIR%%/Qt3Support/Q3ListBoxText
+%%QT_INCDIR%%/Qt3Support/Q3ListView
+%%QT_INCDIR%%/Qt3Support/Q3ListViewItem
+%%QT_INCDIR%%/Qt3Support/Q3ListViewItemIterator
+%%QT_INCDIR%%/Qt3Support/Q3LocalFs
+%%QT_INCDIR%%/Qt3Support/Q3MainWindow
+%%QT_INCDIR%%/Qt3Support/Q3MemArray
+%%QT_INCDIR%%/Qt3Support/Q3MimeSourceFactory
+%%QT_INCDIR%%/Qt3Support/Q3MultiLineEdit
+%%QT_INCDIR%%/Qt3Support/Q3NetworkOperation
+%%QT_INCDIR%%/Qt3Support/Q3NetworkProtocol
+%%QT_INCDIR%%/Qt3Support/Q3NetworkProtocolDict
+%%QT_INCDIR%%/Qt3Support/Q3NetworkProtocolFactory
+%%QT_INCDIR%%/Qt3Support/Q3NetworkProtocolFactoryBase
+%%QT_INCDIR%%/Qt3Support/Q3ObjectDictionary
+%%QT_INCDIR%%/Qt3Support/Q3PaintDeviceMetrics
+%%QT_INCDIR%%/Qt3Support/Q3Painter
+%%QT_INCDIR%%/Qt3Support/Q3Picture
+%%QT_INCDIR%%/Qt3Support/Q3PointArray
+%%QT_INCDIR%%/Qt3Support/Q3PolygonScanner
+%%QT_INCDIR%%/Qt3Support/Q3PopupMenu
+%%QT_INCDIR%%/Qt3Support/Q3Process
+%%QT_INCDIR%%/Qt3Support/Q3ProgressBar
+%%QT_INCDIR%%/Qt3Support/Q3ProgressDialog
+%%QT_INCDIR%%/Qt3Support/Q3PtrBucket
+%%QT_INCDIR%%/Qt3Support/Q3PtrCollection
+%%QT_INCDIR%%/Qt3Support/Q3PtrDict
+%%QT_INCDIR%%/Qt3Support/Q3PtrDictIterator
+%%QT_INCDIR%%/Qt3Support/Q3PtrList
+%%QT_INCDIR%%/Qt3Support/Q3PtrListIterator
+%%QT_INCDIR%%/Qt3Support/Q3PtrListStdIterator
+%%QT_INCDIR%%/Qt3Support/Q3PtrQueue
+%%QT_INCDIR%%/Qt3Support/Q3PtrStack
+%%QT_INCDIR%%/Qt3Support/Q3PtrVector
+%%QT_INCDIR%%/Qt3Support/Q3RangeControl
+%%QT_INCDIR%%/Qt3Support/Q3ScrollView
+%%QT_INCDIR%%/Qt3Support/Q3Semaphore
+%%QT_INCDIR%%/Qt3Support/Q3ServerSocket
+%%QT_INCDIR%%/Qt3Support/Q3Shared
+%%QT_INCDIR%%/Qt3Support/Q3Signal
+%%QT_INCDIR%%/Qt3Support/Q3SimpleRichText
+%%QT_INCDIR%%/Qt3Support/Q3SingleCleanupHandler
+%%QT_INCDIR%%/Qt3Support/Q3Socket
+%%QT_INCDIR%%/Qt3Support/Q3SocketDevice
+%%QT_INCDIR%%/Qt3Support/Q3SortedList
+%%QT_INCDIR%%/Qt3Support/Q3SpinWidget
+%%QT_INCDIR%%/Qt3Support/Q3SqlCursor
+%%QT_INCDIR%%/Qt3Support/Q3SqlEditorFactory
+%%QT_INCDIR%%/Qt3Support/Q3SqlFieldInfo
+%%QT_INCDIR%%/Qt3Support/Q3SqlFieldInfoList
+%%QT_INCDIR%%/Qt3Support/Q3SqlForm
+%%QT_INCDIR%%/Qt3Support/Q3SqlPropertyMap
+%%QT_INCDIR%%/Qt3Support/Q3SqlRecordInfo
+%%QT_INCDIR%%/Qt3Support/Q3SqlSelectCursor
+%%QT_INCDIR%%/Qt3Support/Q3StoredDrag
+%%QT_INCDIR%%/Qt3Support/Q3StrIList
+%%QT_INCDIR%%/Qt3Support/Q3StrIVec
+%%QT_INCDIR%%/Qt3Support/Q3StrList
+%%QT_INCDIR%%/Qt3Support/Q3StrListIterator
+%%QT_INCDIR%%/Qt3Support/Q3StrVec
+%%QT_INCDIR%%/Qt3Support/Q3StringBucket
+%%QT_INCDIR%%/Qt3Support/Q3StyleSheet
+%%QT_INCDIR%%/Qt3Support/Q3StyleSheetItem
+%%QT_INCDIR%%/Qt3Support/Q3SyntaxHighlighter
+%%QT_INCDIR%%/Qt3Support/Q3TSFUNC
+%%QT_INCDIR%%/Qt3Support/Q3TabDialog
+%%QT_INCDIR%%/Qt3Support/Q3Table
+%%QT_INCDIR%%/Qt3Support/Q3TableItem
+%%QT_INCDIR%%/Qt3Support/Q3TableSelection
+%%QT_INCDIR%%/Qt3Support/Q3TextBrowser
+%%QT_INCDIR%%/Qt3Support/Q3TextDrag
+%%QT_INCDIR%%/Qt3Support/Q3TextEdit
+%%QT_INCDIR%%/Qt3Support/Q3TextEditOptimPrivate
+%%QT_INCDIR%%/Qt3Support/Q3TextStream
+%%QT_INCDIR%%/Qt3Support/Q3TextView
+%%QT_INCDIR%%/Qt3Support/Q3TimeEdit
+%%QT_INCDIR%%/Qt3Support/Q3ToolBar
+%%QT_INCDIR%%/Qt3Support/Q3UriDrag
+%%QT_INCDIR%%/Qt3Support/Q3Url
+%%QT_INCDIR%%/Qt3Support/Q3UrlOperator
+%%QT_INCDIR%%/Qt3Support/Q3VBox
+%%QT_INCDIR%%/Qt3Support/Q3VBoxLayout
+%%QT_INCDIR%%/Qt3Support/Q3VButtonGroup
+%%QT_INCDIR%%/Qt3Support/Q3VGroupBox
+%%QT_INCDIR%%/Qt3Support/Q3ValueList
+%%QT_INCDIR%%/Qt3Support/Q3ValueListConstIterator
+%%QT_INCDIR%%/Qt3Support/Q3ValueListIterator
+%%QT_INCDIR%%/Qt3Support/Q3ValueStack
+%%QT_INCDIR%%/Qt3Support/Q3ValueVector
+%%QT_INCDIR%%/Qt3Support/Q3WhatsThis
+%%QT_INCDIR%%/Qt3Support/Q3WidgetStack
+%%QT_INCDIR%%/Qt3Support/Q3Wizard
+%%QT_INCDIR%%/Qt3Support/Qt3Support
+%%QT_INCDIR%%/Qt3Support/q3accel.h
+%%QT_INCDIR%%/Qt3Support/q3action.h
+%%QT_INCDIR%%/Qt3Support/q3asciicache.h
+%%QT_INCDIR%%/Qt3Support/q3asciidict.h
+%%QT_INCDIR%%/Qt3Support/q3boxlayout.h
+%%QT_INCDIR%%/Qt3Support/q3button.h
+%%QT_INCDIR%%/Qt3Support/q3buttongroup.h
+%%QT_INCDIR%%/Qt3Support/q3cache.h
+%%QT_INCDIR%%/Qt3Support/q3canvas.h
+%%QT_INCDIR%%/Qt3Support/q3cleanuphandler.h
+%%QT_INCDIR%%/Qt3Support/q3combobox.h
+%%QT_INCDIR%%/Qt3Support/q3cstring.h
+%%QT_INCDIR%%/Qt3Support/q3databrowser.h
+%%QT_INCDIR%%/Qt3Support/q3datatable.h
+%%QT_INCDIR%%/Qt3Support/q3dataview.h
+%%QT_INCDIR%%/Qt3Support/q3datetimeedit.h
+%%QT_INCDIR%%/Qt3Support/q3deepcopy.h
+%%QT_INCDIR%%/Qt3Support/q3dict.h
+%%QT_INCDIR%%/Qt3Support/q3dns.h
+%%QT_INCDIR%%/Qt3Support/q3dockarea.h
+%%QT_INCDIR%%/Qt3Support/q3dockwindow.h
+%%QT_INCDIR%%/Qt3Support/q3dragobject.h
+%%QT_INCDIR%%/Qt3Support/q3dropsite.h
+%%QT_INCDIR%%/Qt3Support/q3editorfactory.h
+%%QT_INCDIR%%/Qt3Support/q3filedialog.h
+%%QT_INCDIR%%/Qt3Support/q3frame.h
+%%QT_INCDIR%%/Qt3Support/q3ftp.h
+%%QT_INCDIR%%/Qt3Support/q3garray.h
+%%QT_INCDIR%%/Qt3Support/q3gcache.h
+%%QT_INCDIR%%/Qt3Support/q3gdict.h
+%%QT_INCDIR%%/Qt3Support/q3glist.h
+%%QT_INCDIR%%/Qt3Support/q3grid.h
+%%QT_INCDIR%%/Qt3Support/q3gridlayout.h
+%%QT_INCDIR%%/Qt3Support/q3gridview.h
+%%QT_INCDIR%%/Qt3Support/q3groupbox.h
+%%QT_INCDIR%%/Qt3Support/q3gvector.h
+%%QT_INCDIR%%/Qt3Support/q3hbox.h
+%%QT_INCDIR%%/Qt3Support/q3header.h
+%%QT_INCDIR%%/Qt3Support/q3hgroupbox.h
+%%QT_INCDIR%%/Qt3Support/q3http.h
+%%QT_INCDIR%%/Qt3Support/q3iconview.h
+%%QT_INCDIR%%/Qt3Support/q3intcache.h
+%%QT_INCDIR%%/Qt3Support/q3intdict.h
+%%QT_INCDIR%%/Qt3Support/q3listbox.h
+%%QT_INCDIR%%/Qt3Support/q3listview.h
+%%QT_INCDIR%%/Qt3Support/q3localfs.h
+%%QT_INCDIR%%/Qt3Support/q3mainwindow.h
+%%QT_INCDIR%%/Qt3Support/q3memarray.h
+%%QT_INCDIR%%/Qt3Support/q3mimefactory.h
+%%QT_INCDIR%%/Qt3Support/q3multilineedit.h
+%%QT_INCDIR%%/Qt3Support/q3network.h
+%%QT_INCDIR%%/Qt3Support/q3networkprotocol.h
+%%QT_INCDIR%%/Qt3Support/q3objectdict.h
+%%QT_INCDIR%%/Qt3Support/q3paintdevicemetrics.h
+%%QT_INCDIR%%/Qt3Support/q3painter.h
+%%QT_INCDIR%%/Qt3Support/q3picture.h
+%%QT_INCDIR%%/Qt3Support/q3pointarray.h
+%%QT_INCDIR%%/Qt3Support/q3polygonscanner.h
+%%QT_INCDIR%%/Qt3Support/q3popupmenu.h
+%%QT_INCDIR%%/Qt3Support/q3process.h
+%%QT_INCDIR%%/Qt3Support/q3progressbar.h
+%%QT_INCDIR%%/Qt3Support/q3progressdialog.h
+%%QT_INCDIR%%/Qt3Support/q3ptrcollection.h
+%%QT_INCDIR%%/Qt3Support/q3ptrdict.h
+%%QT_INCDIR%%/Qt3Support/q3ptrlist.h
+%%QT_INCDIR%%/Qt3Support/q3ptrqueue.h
+%%QT_INCDIR%%/Qt3Support/q3ptrstack.h
+%%QT_INCDIR%%/Qt3Support/q3ptrvector.h
+%%QT_INCDIR%%/Qt3Support/q3rangecontrol.h
+%%QT_INCDIR%%/Qt3Support/q3scrollview.h
+%%QT_INCDIR%%/Qt3Support/q3semaphore.h
+%%QT_INCDIR%%/Qt3Support/q3serversocket.h
+%%QT_INCDIR%%/Qt3Support/q3shared.h
+%%QT_INCDIR%%/Qt3Support/q3signal.h
+%%QT_INCDIR%%/Qt3Support/q3simplerichtext.h
+%%QT_INCDIR%%/Qt3Support/q3socket.h
+%%QT_INCDIR%%/Qt3Support/q3socketdevice.h
+%%QT_INCDIR%%/Qt3Support/q3sortedlist.h
+%%QT_INCDIR%%/Qt3Support/q3sqlcursor.h
+%%QT_INCDIR%%/Qt3Support/q3sqleditorfactory.h
+%%QT_INCDIR%%/Qt3Support/q3sqlfieldinfo.h
+%%QT_INCDIR%%/Qt3Support/q3sqlform.h
+%%QT_INCDIR%%/Qt3Support/q3sqlpropertymap.h
+%%QT_INCDIR%%/Qt3Support/q3sqlrecordinfo.h
+%%QT_INCDIR%%/Qt3Support/q3sqlselectcursor.h
+%%QT_INCDIR%%/Qt3Support/q3strlist.h
+%%QT_INCDIR%%/Qt3Support/q3strvec.h
+%%QT_INCDIR%%/Qt3Support/q3stylesheet.h
+%%QT_INCDIR%%/Qt3Support/q3syntaxhighlighter.h
+%%QT_INCDIR%%/Qt3Support/q3tabdialog.h
+%%QT_INCDIR%%/Qt3Support/q3table.h
+%%QT_INCDIR%%/Qt3Support/q3textbrowser.h
+%%QT_INCDIR%%/Qt3Support/q3textedit.h
+%%QT_INCDIR%%/Qt3Support/q3textstream.h
+%%QT_INCDIR%%/Qt3Support/q3textview.h
+%%QT_INCDIR%%/Qt3Support/q3tl.h
+%%QT_INCDIR%%/Qt3Support/q3toolbar.h
+%%QT_INCDIR%%/Qt3Support/q3url.h
+%%QT_INCDIR%%/Qt3Support/q3urloperator.h
+%%QT_INCDIR%%/Qt3Support/q3valuelist.h
+%%QT_INCDIR%%/Qt3Support/q3valuestack.h
+%%QT_INCDIR%%/Qt3Support/q3valuevector.h
+%%QT_INCDIR%%/Qt3Support/q3vbox.h
+%%QT_INCDIR%%/Qt3Support/q3vgroupbox.h
+%%QT_INCDIR%%/Qt3Support/q3whatsthis.h
+%%QT_INCDIR%%/Qt3Support/q3widgetstack.h
+%%QT_INCDIR%%/Qt3Support/q3wizard.h
+%%QT_INCDIR%%/Qt3Support/qiconset.h
+%%QT_LIBDIR%%/libQt3Support.la
+%%QT_LIBDIR%%/libQt3Support.prl
+%%QT_LIBDIR%%/libQt3Support.so
+%%QT_LIBDIR%%/libQt3Support.so.4
+%%QT_LIBDIR%%/libQt3Support.so.%%SHORTVER%%
+%%QT_LIBDIR%%/libQt3Support.so.%%FULLVER%%
+@comment %%DEBUG%%%%QT_LIBDIR%%/libQt3Support.so.%%FULLVER%%.debug
 libdata/pkgconfig/Qt3Support.pc
-@dirrmtry lib/qt4
-@dirrm include/qt4/Qt3Support
-@dirrmtry include/qt4/Qt
-@dirrmtry include/qt4
+@dirrmtry %%QT_LIBDIR%%
+@dirrm %%QT_INCDIR%%/Qt3Support
+@dirrmtry %%QT_INCDIR%%/Qt
+@dirrmtry %%QT_INCDIR%%
--- a/devel/qt4-qtestlib/files/patch-0185-fix-format-strings.diff
+++ b/devel/qt4-qtestlib/files/patch-0185-fix-format-strings.diff
@ -1,15 +0,0 @@
--- src/testlib/qtest_global.h
-+++ src/testlib/qtest_global.h
-@@ -59,7 +59,11 @@ namespace QTest
-     enum SkipMode { SkipSingle = 1, SkipAll = 2 };
-     enum TestFailMode { Abort = 1, Continue = 2 };
- 
-    int Q_TESTLIB_EXPORT qt_snprintf(char *str, int size, const char *format, ...);
-+    int Q_TESTLIB_EXPORT qt_snprintf(char *str, int size, const char *format, ...)
-+#if defined(Q_CC_GNU) && !defined(__INSURE__)
-+        __attribute__ ((format (printf, 3, 4)))
-+#endif
-+        ;
- }
- 
- QT_END_HEADER
--- a/devel/qt4-qtestlib/pkg-descr
+++ b/devel/qt4-qtestlib/pkg-descr
@ -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
--- a/devel/qt4-qtestlib/pkg-plist
+++ b/devel/qt4-qtestlib/pkg-plist
@ -1,90 +0,0 @@
-include/qt4/Qt/QtTest
-include/qt4/Qt/qbenchmark.h
-include/qt4/Qt/qbenchmarkmetric.h
-include/qt4/Qt/qsignalspy.h
-include/qt4/Qt/qtest.h
-include/qt4/Qt/qtest_global.h
-include/qt4/Qt/qtest_gui.h
-include/qt4/Qt/qtestaccessible.h
-include/qt4/Qt/qtestassert.h
-include/qt4/Qt/qtestbasicstreamer.h
-include/qt4/Qt/qtestcase.h
-include/qt4/Qt/qtestcoreelement.h
-include/qt4/Qt/qtestcorelist.h
-include/qt4/Qt/qtestdata.h
-include/qt4/Qt/qtestelement.h
-include/qt4/Qt/qtestelementattribute.h
-include/qt4/Qt/qtestevent.h
-include/qt4/Qt/qtesteventloop.h
-include/qt4/Qt/qtestfilelogger.h
-include/qt4/Qt/qtestkeyboard.h
-include/qt4/Qt/qtestlightxmlstreamer.h
-include/qt4/Qt/qtestmouse.h
-include/qt4/Qt/qtestspontaneevent.h
-include/qt4/Qt/qtestsystem.h
-include/qt4/Qt/qtesttouch.h
-include/qt4/Qt/qtestxmlstreamer.h
-include/qt4/Qt/qtestxunitstreamer.h
-include/qt4/QtTest/QEventSizeOfChecker
-include/qt4/QtTest/QSignalSpy
-include/qt4/QtTest/QSpontaneKeyEvent
-include/qt4/QtTest/QTest
-include/qt4/QtTest/QTestAccessibility
-include/qt4/QtTest/QTestAccessibilityEvent
-include/qt4/QtTest/QTestBasicStreamer
-include/qt4/QtTest/QTestCoreElement
-include/qt4/QtTest/QTestCoreList
-include/qt4/QtTest/QTestData
-include/qt4/QtTest/QTestDelayEvent
-include/qt4/QtTest/QTestElement
-include/qt4/QtTest/QTestElementAttribute
-include/qt4/QtTest/QTestEvent
-include/qt4/QtTest/QTestEventList
-include/qt4/QtTest/QTestEventLoop
-include/qt4/QtTest/QTestFileLogger
-include/qt4/QtTest/QTestKeyClicksEvent
-include/qt4/QtTest/QTestKeyEvent
-include/qt4/QtTest/QTestLightXmlStreamer
-include/qt4/QtTest/QTestMouseEvent
-include/qt4/QtTest/QTestXmlStreamer
-include/qt4/QtTest/QTestXunitStreamer
-include/qt4/QtTest/QtTest
-include/qt4/QtTest/QtTestGui
-include/qt4/QtTest/qbenchmark.h
-include/qt4/QtTest/qbenchmarkmetric.h
-include/qt4/QtTest/qsignalspy.h
-include/qt4/QtTest/qtest.h
-include/qt4/QtTest/qtest_global.h
-include/qt4/QtTest/qtest_gui.h
-include/qt4/QtTest/qtestaccessible.h
-include/qt4/QtTest/qtestassert.h
-include/qt4/QtTest/qtestbasicstreamer.h
-include/qt4/QtTest/qtestcase.h
-include/qt4/QtTest/qtestcoreelement.h
-include/qt4/QtTest/qtestcorelist.h
-include/qt4/QtTest/qtestdata.h
-include/qt4/QtTest/qtestelement.h
-include/qt4/QtTest/qtestelementattribute.h
-include/qt4/QtTest/qtestevent.h
-include/qt4/QtTest/qtesteventloop.h
-include/qt4/QtTest/qtestfilelogger.h
-include/qt4/QtTest/qtestkeyboard.h
-include/qt4/QtTest/qtestlightxmlstreamer.h
-include/qt4/QtTest/qtestmouse.h
-include/qt4/QtTest/qtestspontaneevent.h
-include/qt4/QtTest/qtestsystem.h
-include/qt4/QtTest/qtesttouch.h
-include/qt4/QtTest/qtestxmlstreamer.h
-include/qt4/QtTest/qtestxunitstreamer.h
-lib/qt4/libQtTest.la
-lib/qt4/libQtTest.prl
-lib/qt4/libQtTest.so
-lib/qt4/libQtTest.so.4
-lib/qt4/libQtTest.so.%%SHLIB_SHVER%%
-lib/qt4/libQtTest.so.%%SHLIB_VER%%
-%%DEBUG%%lib/qt4/libQtTest.so.%%SHLIB_VER%%.debug
-libdata/pkgconfig/QtTest.pc
-@dirrmtry lib/qt4
-@dirrm include/qt4/QtTest
-@dirrmtry include/qt4/Qt
-@dirrmtry include/qt4
--- a/devel/qt4-qvfb/Makefile
+++ b/devel/qt4-qvfb/Makefile
@ -3,14 +3,14 @@

 PORTNAME=	qvfb
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	devel
+PORTREVISION=	1
+CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt virtual framebuffer utility
+COMMENT=	Qt 4 virtual framebuffer utility

 USE_QT4=	qmake_build moc_build rcc_build uic_build corelib gui opengl
-QT_NONSTANDARD=	yes
 QT_DIST=	yes
 USE_XORG=	xtst

@ -21,9 +21,10 @@ CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
 MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \
 		PATH=${WRKSRC}/bin:$$PATH

-DESKTOP_ENTRIES="Qt Virtual Framebuffer" "${COMMENT}" \
+DESKTOP_ENTRIES="Qt 4 Virtual Framebuffer" "" \
 		"${PREFIX}/share/pixmaps/qvfb-qt4.png" \
-		"${PREFIX}/bin/qvfb-qt4" "Development;Qt;" true
+		"${PREFIX}/${QT_BINDIR_REL}/qvfb${_QT_BINSUFX}" \
+		"Development;Qt;" true

 DO_NOT_EXTRACT=	demos doc examples mkspecs qmake translations \
 		src/activeqt src/dbus src/multimedia src/network src/opengl \
@ -42,19 +43,17 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}

 CONFIGURE_ARGS+=	-I../../include/Qt -I../../include

-EXTRA_PATCHES+=	${.CURDIR}/../../devel/qt4/files/patch-configure
-
 pre-configure:
 	${MKDIR} ${WRKSRC}/mkspecs
-	${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=qvfb-qt4|g' \
+	${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=qvfb${_QT_BINSUFX}|g' \
 		${BUILD_WRKSRC}/qvfb.pro
-	${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 ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc
+	${LN} -sf ${QMAKE} ${WRKSRC}/bin/qmake
+	${LN} -sf ${MOC} ${WRKSRC}/bin/moc
+	${LN} -sf ${UIC} ${WRKSRC}/bin/uic
+	${LN} -sf ${RCC} ${WRKSRC}/bin/rcc

 post-install:
-	${INSTALL_DATA} ${BUILD_WRKSRC}/images/logo.png \
+	${INSTALL_DATA} ${INSTALL_WRKSRC}/images/logo.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/qvfb-qt4.png

 .include <bsd.port.mk>
--- a/devel/qt4-qvfb/pkg-descr
+++ b/devel/qt4-qvfb/pkg-descr
@ -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
--- a/devel/qt4-qvfb/pkg-plist
+++ b/devel/qt4-qvfb/pkg-plist
@ -1,3 +1,3 @@
-bin/qvfb-qt4
-%%DEBUG%%bin/qvfb-qt4.debug
+%%QT_BINDIR%%/qvfb-qt4
+%%DEBUG%%%%QT_BINDIR%%/qvfb-qt4.debug
 share/pixmaps/qvfb-qt4.png
--- a/devel/qt4-rcc/Makefile
+++ b/devel/qt4-rcc/Makefile
@ -3,16 +3,15 @@

 PORTNAME=	rcc
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	devel
+CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt resource compiler
+COMMENT=	Qt Resource Compiler

 BROKEN_arm=	does not compile

 USE_QT4=	qmake_build
-QT_NONSTANDARD=	yes
 QT_DIST=	yes

 HAS_CONFIGURE=	yes
@ -37,13 +36,9 @@ EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 BUILD_WRKSRC=	${WRKSRC}/src/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 ${QMAKE} ${WRKSRC}/bin/qmake

 pre-build:
 	cd ${BUILD_WRKSRC}/../bootstrap && ${MAKE}
--- a/devel/qt4-rcc/pkg-descr
+++ b/devel/qt4-rcc/pkg-descr
@ -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
--- a/devel/qt4-rcc/pkg-plist
+++ b/devel/qt4-rcc/pkg-plist
@ -1,2 +1,2 @@
-bin/rcc
-%%DEBUG%%bin/rcc.debug
+%%QT_BINDIR%%/rcc
+%%DEBUG%%%%QT_BINDIR%%/rcc.debug
--- a/devel/qt4-script/Makefile
+++ b/devel/qt4-script/Makefile
@ -3,19 +3,18 @@

 PORTNAME=	script
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	devel
+CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-

 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Qt script
+COMMENT=	Qt scripting module

 USES=		pkgconfig
 USE_QT4=	qmake_build moc_build corelib
-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
@ -37,18 +36,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/QtScript.pc

 .include <bsd.port.mk>
--- a/devel/qt4-script/files/patch-src3rdpartyjavascriptcoreJavaScriptCorejit__JITStubs.cpp
+++ b/devel/qt4-script/files/patch-src3rdpartyjavascriptcoreJavaScriptCorejit__JITStubs.cpp
@ -0,0 +1,11 @@
+--- ./src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp.orig	2012-12-12 20:18:37.000000000 +0100
+++ ./src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp	2012-12-17 02:10:50.513375070 +0100
+@@ -80,7 +80,7 @@
+ #define THUMB_FUNC_PARAM(name)
+ #endif
+ 
+-#if OS(LINUX) && CPU(X86_64)
+#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
+ #define SYMBOL_STRING_RELOCATION(name) #name "@plt"
+ #else
+ #define SYMBOL_STRING_RELOCATION(name) SYMBOL_STRING(name)
--- a/Show More
+++ b/Show More