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

4 files changed, 116 insertions, 131 deletions

diff --git a/databases/qt4-sql/Makefile b/databases/qt4-sql/Makefile
index 7ec16f5c18a0..b33e73028730 100644
--- 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>
diff --git a/databases/qt4-sql/pkg-descr b/databases/qt4-sql/pkg-descr
deleted file mode 100644
index 36bc69717e98..000000000000
--- a/databases/qt4-sql/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/databases/qt4-sql/pkg-message b/databases/qt4-sql/pkg-message
index 689cff508712..b975be431ace 100644
--- 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				
-
-*******************************************************************************
+======================================================================
diff --git a/databases/qt4-sql/pkg-plist b/databases/qt4-sql/pkg-plist
index b3e6b909d38e..3f745d3b8eeb 100644
--- 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%%