- Update to Qt-4.5

The KDE FreeBSD team would like to say thanks to all the helpers
and submitters.

Tested by:	pointyhat-exp-run (myself)

11 files changed, 86 insertions, 82 deletions

diff --git a/misc/qt4-doc/Makefile b/misc/qt4-doc/Makefile
index 51bf9617d58a..65a4f0203456 100644
--- a/misc/qt4-doc/Makefile
+++ b/misc/qt4-doc/Makefile
@@ -9,11 +9,7 @@
 PORTNAME=	doc
 PORTVERSION=	${QT4_VERSION}
 CATEGORIES?=	misc
-MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
-DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
-DIST_SUBDIR=	KDE
-
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Multiplatform C++ application framework
 
diff --git a/misc/qt4-doc/distinfo b/misc/qt4-doc/distinfo
deleted file mode 100644
index 27b0949354e8..000000000000
--- a/misc/qt4-doc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550
-SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2
-SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421
diff --git a/misc/qt4-doc/pkg-plist b/misc/qt4-doc/pkg-plist
index 640bbee30c12..9eced06a0686 100644
--- a/misc/qt4-doc/pkg-plist
+++ b/misc/qt4-doc/pkg-plist
@@ -920,6 +920,8 @@
 %%DOCSDIR%%/html/images/framebufferobject2-example.png
 %%DOCSDIR%%/html/images/frames.png
 %%DOCSDIR%%/html/images/fridgemagnets-example.png
+%%DOCSDIR%%/html/images/frozencolumn-example.png
+%%DOCSDIR%%/html/images/frozencolumn-tableview.png
 %%DOCSDIR%%/html/images/ftp-example.png
 %%DOCSDIR%%/html/images/geometry.png
 %%DOCSDIR%%/html/images/googlechat-example.png
@@ -1836,6 +1838,12 @@
 %%DOCSDIR%%/html/itemviews-fetchmore-window-cpp.html
 %%DOCSDIR%%/html/itemviews-fetchmore-window-h.html
 %%DOCSDIR%%/html/itemviews-fetchmore.html
+%%DOCSDIR%%/html/itemviews-frozencolumn-freezetablewidget-cpp.html
+%%DOCSDIR%%/html/itemviews-frozencolumn-freezetablewidget-h.html
+%%DOCSDIR%%/html/itemviews-frozencolumn-frozencolumn-pro.html
+%%DOCSDIR%%/html/itemviews-frozencolumn-grades-qrc.html
+%%DOCSDIR%%/html/itemviews-frozencolumn-main-cpp.html
+%%DOCSDIR%%/html/itemviews-frozencolumn.html
 %%DOCSDIR%%/html/itemviews-pixelator-imagemodel-cpp.html
 %%DOCSDIR%%/html/itemviews-pixelator-imagemodel-h.html
 %%DOCSDIR%%/html/itemviews-pixelator-images-qrc.html
@@ -3745,6 +3753,7 @@
 %%DOCSDIR%%/html/qsqldatabase-members.html
 %%DOCSDIR%%/html/qsqldatabase-qt3.html
 %%DOCSDIR%%/html/qsqldatabase.html
+%%DOCSDIR%%/html/qsqldatatype-table.html
 %%DOCSDIR%%/html/qsqldriver-members.html
 %%DOCSDIR%%/html/qsqldriver-qt3.html
 %%DOCSDIR%%/html/qsqldriver.html
diff --git a/misc/qt4-l10n/Makefile b/misc/qt4-l10n/Makefile
index 735329be7916..3a1c3b76cd9f 100644
--- a/misc/qt4-l10n/Makefile
+++ b/misc/qt4-l10n/Makefile
@@ -20,11 +20,12 @@ COMMENT=	Qt translations messages
 USE_QT_VER=	4
 QT_COMPONENTS=	#dummy
 NO_BUILD=	yes
+MD5_FILE=	${PORTSDIR}/devel/qt4/distinfo
 
 EXTRACT_AFTER_ARGS+=	| ${TAR} -xf - --include '${DISTNAME}/translations'
 
 do-install:
 	${MKDIR} ${PREFIX}/share/qt4/translations
-	${INSTALL_DATA} ${WRKSRC}/translations/*.qm ${PREFIX}/share/qt4/translations
+	${INSTALL_DATA} ${WRKSRC}/translations/*.ts ${PREFIX}/share/qt4/translations
 
 .include <bsd.port.mk>
diff --git a/misc/qt4-l10n/distinfo b/misc/qt4-l10n/distinfo
deleted file mode 100644
index 27b0949354e8..000000000000
--- a/misc/qt4-l10n/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550
-SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2
-SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421
diff --git a/misc/qt4-l10n/pkg-plist b/misc/qt4-l10n/pkg-plist
index 22f8f7ec65bb..69f266b8431f 100644
--- a/misc/qt4-l10n/pkg-plist
+++ b/misc/qt4-l10n/pkg-plist
@@ -1,56 +1,66 @@
-share/qt4/translations/assistant_adp_de.qm
-share/qt4/translations/assistant_adp_ja.qm
-share/qt4/translations/assistant_adp_pl.qm
-share/qt4/translations/assistant_adp_untranslated.qm
-share/qt4/translations/assistant_adp_zh_CN.qm
-share/qt4/translations/assistant_adp_zh_TW.qm
-share/qt4/translations/assistant_de.qm
-share/qt4/translations/assistant_ja.qm
-share/qt4/translations/assistant_pl.qm
-share/qt4/translations/assistant_untranslated.qm
-share/qt4/translations/assistant_zh_CN.qm
-share/qt4/translations/assistant_zh_TW.qm
-share/qt4/translations/designer_de.qm
-share/qt4/translations/designer_ja.qm
-share/qt4/translations/designer_pl.qm
-share/qt4/translations/designer_untranslated.qm
-share/qt4/translations/designer_zh_CN.qm
-share/qt4/translations/designer_zh_TW.qm
-share/qt4/translations/linguist_de.qm
-share/qt4/translations/linguist_fr.qm
-share/qt4/translations/linguist_ja.qm
-share/qt4/translations/linguist_pl.qm
-share/qt4/translations/linguist_untranslated.qm
-share/qt4/translations/linguist_zh_CN.qm
-share/qt4/translations/linguist_zh_TW.qm
-share/qt4/translations/qt_ar.qm
-share/qt4/translations/qt_de.qm
-share/qt4/translations/qt_es.qm
-share/qt4/translations/qt_fr.qm
-share/qt4/translations/qt_help_de.qm
-share/qt4/translations/qt_help_ja.qm
-share/qt4/translations/qt_help_pl.qm
-share/qt4/translations/qt_help_untranslated.qm
-share/qt4/translations/qt_help_zh_CN.qm
-share/qt4/translations/qt_help_zh_TW.qm
-share/qt4/translations/qt_iw.qm
-share/qt4/translations/qt_ja_JP.qm
-share/qt4/translations/qt_pl.qm
-share/qt4/translations/qt_pt.qm
-share/qt4/translations/qt_ru.qm
-share/qt4/translations/qt_sk.qm
-share/qt4/translations/qt_sv.qm
-share/qt4/translations/qt_uk.qm
-share/qt4/translations/qt_untranslated.qm
-share/qt4/translations/qt_zh_CN.qm
-share/qt4/translations/qt_zh_TW.qm
-share/qt4/translations/qtconfig_pl.qm
-share/qt4/translations/qtconfig_untranslated.qm
-share/qt4/translations/qtconfig_zh_CN.qm
-share/qt4/translations/qtconfig_zh_TW.qm
-share/qt4/translations/qvfb_pl.qm
-share/qt4/translations/qvfb_untranslated.qm
-share/qt4/translations/qvfb_zh_CN.qm
-share/qt4/translations/qvfb_zh_TW.qm
-@dirrmtry share/qt4/translations
-@dirrmtry share/qt4
+share/qt4/translations/assistant_adp_de.ts
+share/qt4/translations/assistant_adp_ja.ts
+share/qt4/translations/assistant_adp_pl.ts
+share/qt4/translations/assistant_adp_ru.ts
+share/qt4/translations/assistant_adp_untranslated.ts
+share/qt4/translations/assistant_adp_zh_CN.ts
+share/qt4/translations/assistant_adp_zh_TW.ts
+share/qt4/translations/assistant_da.ts
+share/qt4/translations/assistant_de.ts
+share/qt4/translations/assistant_ja.ts
+share/qt4/translations/assistant_pl.ts
+share/qt4/translations/assistant_ru.ts
+share/qt4/translations/assistant_untranslated.ts
+share/qt4/translations/assistant_zh_CN.ts
+share/qt4/translations/assistant_zh_TW.ts
+share/qt4/translations/designer_de.ts
+share/qt4/translations/designer_ja.ts
+share/qt4/translations/designer_pl.ts
+share/qt4/translations/designer_ru.ts
+share/qt4/translations/designer_untranslated.ts
+share/qt4/translations/designer_zh_CN.ts
+share/qt4/translations/designer_zh_TW.ts
+share/qt4/translations/linguist_de.ts
+share/qt4/translations/linguist_fr.ts
+share/qt4/translations/linguist_ja.ts
+share/qt4/translations/linguist_pl.ts
+share/qt4/translations/linguist_ru.ts
+share/qt4/translations/linguist_untranslated.ts
+share/qt4/translations/linguist_zh_CN.ts
+share/qt4/translations/linguist_zh_TW.ts
+share/qt4/translations/qt_ar.ts
+share/qt4/translations/qt_da.ts
+share/qt4/translations/qt_de.ts
+share/qt4/translations/qt_es.ts
+share/qt4/translations/qt_fr.ts
+share/qt4/translations/qt_help_da.ts
+share/qt4/translations/qt_help_de.ts
+share/qt4/translations/qt_help_ja.ts
+share/qt4/translations/qt_help_pl.ts
+share/qt4/translations/qt_help_ru.ts
+share/qt4/translations/qt_help_untranslated.ts
+share/qt4/translations/qt_help_zh_CN.ts
+share/qt4/translations/qt_help_zh_TW.ts
+share/qt4/translations/qt_iw.ts
+share/qt4/translations/qt_ja_JP.ts
+share/qt4/translations/qt_pl.ts
+share/qt4/translations/qt_pt.ts
+share/qt4/translations/qt_ru.ts
+share/qt4/translations/qt_sk.ts
+share/qt4/translations/qt_sv.ts
+share/qt4/translations/qt_uk.ts
+share/qt4/translations/qt_untranslated.ts
+share/qt4/translations/qt_zh_CN.ts
+share/qt4/translations/qt_zh_TW.ts
+share/qt4/translations/qtconfig_pl.ts
+share/qt4/translations/qtconfig_ru.ts
+share/qt4/translations/qtconfig_untranslated.ts
+share/qt4/translations/qtconfig_zh_CN.ts
+share/qt4/translations/qtconfig_zh_TW.ts
+share/qt4/translations/qvfb_pl.ts
+share/qt4/translations/qvfb_ru.ts
+share/qt4/translations/qvfb_untranslated.ts
+share/qt4/translations/qvfb_zh_CN.ts
+share/qt4/translations/qvfb_zh_TW.ts
+@dirrm share/qt4/translations
+@dirrm share/qt4
diff --git a/misc/qt4-qtconfig/Makefile b/misc/qt4-qtconfig/Makefile
index 56c6a8b64ce8..b0d8391d8073 100644
--- a/misc/qt4-qtconfig/Makefile
+++ b/misc/qt4-qtconfig/Makefile
@@ -8,10 +8,7 @@
 PORTNAME=	qtconfig
 PORTVERSION=	${QT4_VERSION}
 CATEGORIES?=	misc
-MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
-DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
-DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt graphical configuration utility
diff --git a/misc/qt4-qtconfig/distinfo b/misc/qt4-qtconfig/distinfo
deleted file mode 100644
index 27b0949354e8..000000000000
--- a/misc/qt4-qtconfig/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550
-SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2
-SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421
diff --git a/misc/qt4-qtdemo/Makefile b/misc/qt4-qtdemo/Makefile
index 628f7e365f16..f1d79cb2a174 100644
--- a/misc/qt4-qtdemo/Makefile
+++ b/misc/qt4-qtdemo/Makefile
@@ -8,12 +8,9 @@
 
 PORTNAME=	qtdemo
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=0
+PORTREVISION=	0
 CATEGORIES?=	misc
-MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
-DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
-DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt demonstration and example programs
diff --git a/misc/qt4-qtdemo/distinfo b/misc/qt4-qtdemo/distinfo
deleted file mode 100644
index 27b0949354e8..000000000000
--- a/misc/qt4-qtdemo/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = d8bcc070a58db25c228b7729ffad4550
-SHA256 (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 4e4c8619335cac14ba0c52d1555fab549a562fb774c1c08dcbd2be9de38120a2
-SIZE (KDE/qt-x11-opensource-src-4.5.2.tar.gz) = 125803421
diff --git a/misc/qt4-qtdemo/pkg-plist b/misc/qt4-qtdemo/pkg-plist
index e3fcf8beb7dc..288e662e9a43 100644
--- a/misc/qt4-qtdemo/pkg-plist
+++ b/misc/qt4-qtdemo/pkg-plist
@@ -429,7 +429,6 @@ share/examples/qt4/demos/textedit/main.cpp
 share/examples/qt4/demos/textedit/textedit
 share/examples/qt4/demos/textedit/textedit.cpp
 %%DEBUG%%share/examples/qt4/demos/textedit/textedit.debug
-share/examples/qt4/demos/textedit/textedit.doc
 share/examples/qt4/demos/textedit/textedit.h
 share/examples/qt4/demos/textedit/textedit.pro
 share/examples/qt4/demos/textedit/textedit.qrc
@@ -486,6 +485,12 @@ share/examples/qt4/examples/assistant/simpletextviewer/main.cpp
 share/examples/qt4/examples/assistant/simpletextviewer/mainwindow.cpp
 share/examples/qt4/examples/assistant/simpletextviewer/mainwindow.h
 share/examples/qt4/examples/assistant/simpletextviewer/simpletextviewer
+share/examples/qt4/examples/itemviews/frozencolumn/freezetablewidget.cpp
+share/examples/qt4/examples/itemviews/frozencolumn/freezetablewidget.h
+share/examples/qt4/examples/itemviews/frozencolumn/frozencolumn
+share/examples/qt4/examples/itemviews/frozencolumn/frozencolumn.pro
+share/examples/qt4/examples/itemviews/frozencolumn/grades.qrc
+share/examples/qt4/examples/itemviews/frozencolumn/main.cpp
 %%DEBUG%%share/examples/qt4/examples/assistant/simpletextviewer/simpletextviewer.debug
 share/examples/qt4/examples/assistant/simpletextviewer/simpletextviewer.pro
 share/examples/qt4/examples/dbus/chat/chat.cpp
@@ -2202,7 +2207,7 @@ share/examples/qt4/examples/webkit/fancybrowser/main.cpp
 share/examples/qt4/examples/webkit/fancybrowser/mainwindow.cpp
 share/examples/qt4/examples/webkit/fancybrowser/mainwindow.h
 share/examples/qt4/examples/webkit/formextractor/form.html
-share/examples/qt4/examples/webkit/formextractor/formExtractor
+share/examples/qt4/examples/webkit/formextractor/formextractor
 %%DEBUG%%share/examples/qt4/examples/webkit/formextractor/formExtractor.debug
 share/examples/qt4/examples/webkit/formextractor/formextractor.cpp
 share/examples/qt4/examples/webkit/formextractor/formextractor.h
@@ -2779,6 +2784,7 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro
 @dirrm share/examples/qt4/examples/itemviews/puzzle
 @dirrm share/examples/qt4/examples/itemviews/pixelator/images
 @dirrm share/examples/qt4/examples/itemviews/pixelator
+@dirrm share/examples/qt4/examples/itemviews/frozencolumn
 @dirrm share/examples/qt4/examples/itemviews/fetchmore
 @dirrm share/examples/qt4/examples/itemviews/editabletreemodel
 @dirrm share/examples/qt4/examples/itemviews/dirview