KDE/FreeBSD team presents Qt 4.8.4 and QtCreator 2.6.1 ports.

The area51 repository features commits by Alonso Schaich, avilla, fluffy,
jhale, makc and rakuco.

Common changes:
- Trim Makefile header
- Convert to new option framework
- Add/improve desktop entries
- Remove upstreamed patches

Mk/bsd.qt.mk:
- Set QMAKESPEC at late stage (to fix potential problem if USE_GCC is used) [1]

devel/qmake:
- Fix crash due to off-by one error [2]

multimedia/qt4-phonon*:
- Deprecate in favour of multimedia/phonon*

www/qt4-webkit:
- Make dependence on GStreamer optional [3]

devel/qtcreator:
- Enable qml-designer in devel/qtcreator (requires privite Qt headers) [4]

Reported by:	avg via irc [1]
Submitted by:	avg via maillist [2]
PR:		ports/175644 [3]
Submitted by:	danfe [3]
PR:		ports/169809 [4]
Reported by:	tcb <tcberner at gmail.com> [4]

7 files changed, 7 insertions, 42 deletions

diff --git a/databases/qt4-ibase-plugin/Makefile b/databases/qt4-ibase-plugin/Makefile
index 5a8128810d0a..de16bf155ad4 100644
--- a/databases/qt4-ibase-plugin/Makefile
+++ b/databases/qt4-ibase-plugin/Makefile
@@ -1,10 +1,5 @@
-# -*-mode: makefile-*-
-# New ports collection makefile for:		qt-ibase-plugin
-# Date created:                         	27 February 2004
-# Whom:                                        	Michael Nottebrock <lofi@freebsd.org>
-#
+# Created by: Michael Nottebrock <lofi@freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	qt4-${DB}-plugin
 DISTVERSION=	${QT4_VERSION}
diff --git a/databases/qt4-mysql-plugin/Makefile b/databases/qt4-mysql-plugin/Makefile
index c554119f6a89..cd42166a81cd 100644
--- a/databases/qt4-mysql-plugin/Makefile
+++ b/databases/qt4-mysql-plugin/Makefile
@@ -1,10 +1,5 @@
-# -*-mode: makefile-*-
-# New ports collection makefile for:	qt-mysql-plugin
-# Date created:				20 April 2003
-# Whom:					Kay Lehmann <kay_lehmann@web.de>
-#
+# Created by: Kay Lehmann <kay_lehmann@web.de>
 # $FreeBSD$
-#
 
 PORTNAME=	qt4-${DB}-plugin
 DISTVERSION=	${QT4_VERSION}
diff --git a/databases/qt4-odbc-plugin/Makefile b/databases/qt4-odbc-plugin/Makefile
index 148140a7c151..0d771853af34 100644
--- a/databases/qt4-odbc-plugin/Makefile
+++ b/databases/qt4-odbc-plugin/Makefile
@@ -1,10 +1,5 @@
-# -*-mode: makefile-*-
-# New ports collection makefile for:		qt-odbc-plugin
-# Date created:                         	31 December 2003
-# Whom:					Michael Nottebrock <lofi@freebsd.org>
-#
+# Created by: Michael Nottebrock <lofi@freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	qt4-${DB}-plugin
 DISTVERSION=	${QT4_VERSION}
diff --git a/databases/qt4-pgsql-plugin/Makefile b/databases/qt4-pgsql-plugin/Makefile
index 7af82d56a597..c83d0386874f 100644
--- a/databases/qt4-pgsql-plugin/Makefile
+++ b/databases/qt4-pgsql-plugin/Makefile
@@ -1,10 +1,5 @@
-# -*-mode: makefile-*-
-# New ports collection makefile for:		qt-pgsql-plugin
-# Date created:                         	5 August 2003
-# Whom:                                        	Lauri Watts <lauri@kde.org>
-#
+# Created by: Lauri Watts <lauri@kde.org>
 # $FreeBSD$
-#
 
 PORTNAME=	qt4-${DB}-plugin
 DISTVERSION=	${QT4_VERSION}
diff --git a/databases/qt4-sql/Makefile b/databases/qt4-sql/Makefile
index 43a52983414d..36403c57e265 100644
--- a/databases/qt4-sql/Makefile
+++ b/databases/qt4-sql/Makefile
@@ -1,10 +1,5 @@
-# -*-mode: makefile-*-
-# New ports collection makefile for:	qt40
-# Date created:				Wed Jun 29 11:49:42 CEST 2005
-# Whom:					lofi@freebsd.org
-#
+# Created by: lofi@freebsd.org
 # $FreeBSD$
-#
 
 PORTNAME=	sql
 DISTVERSION=	${QT4_VERSION}
diff --git a/databases/qt4-sqlite-plugin/Makefile b/databases/qt4-sqlite-plugin/Makefile
index 72a342fb8ff7..2b70ffa04366 100644
--- a/databases/qt4-sqlite-plugin/Makefile
+++ b/databases/qt4-sqlite-plugin/Makefile
@@ -1,10 +1,5 @@
-# -*-mode: makefile-*-
-# New ports collection makefile for:		qt-sqlite-plugin
-# Date created:                         	27 February 2004
-# Whom:                                        	Michael Nottebrock <lofi@freebsd.org>
-#
+# Created by: Michael Nottebrock <lofi@freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	qt4-${DB}-plugin
 DISTVERSION=	${QT4_VERSION}
diff --git a/databases/qt4-sqlite3-plugin/Makefile b/databases/qt4-sqlite3-plugin/Makefile
index befcb225d775..c0e5aa98ce6a 100644
--- a/databases/qt4-sqlite3-plugin/Makefile
+++ b/databases/qt4-sqlite3-plugin/Makefile
@@ -1,10 +1,5 @@
-# -*-mode: makefile-*-
-# New ports collection makefile for:		qt-sqlite-plugin
-# Date created:                         	27 February 2004
-# Whom:                                        	Michael Nottebrock <lofi@freebsd.org>
-#
+# Created by: Michael Nottebrock <lofi@freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	qt4-${DB}-plugin
 DISTVERSION=	${QT4_VERSION}