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 :)

3 files changed, 90 insertions, 105 deletions

diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile
index 2fd1a920d624..78a56bc50853 100644
--- 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>
diff --git a/devel/dbus-qt4/pkg-descr b/devel/dbus-qt4/pkg-descr
deleted file mode 100644
index 36bc69717e98..000000000000
--- a/devel/dbus-qt4/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-Qt is a C++ toolkit for application development.  It lets application
-developers target all major operating systems with a single application
-source code.
-
-Qt provides a platform-independent API to all central platform functionality:
-GUI, database access, networking, file handling, etc.  The Qt library
-encapsulates the different APIs of different operating systems, providing
-the application programmer with a single, common API for all operating systems.
-The native C APIs are encapsulated in a set of well-designed, fully
-object-oriented C++ classes. 
-
-WWW: http://qt.nokia.com/products/qt/index.html
diff --git a/devel/dbus-qt4/pkg-plist b/devel/dbus-qt4/pkg-plist
index 5db4e9402f90..0e66f956a2d2 100644
--- 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%%