- 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, 10 insertions, 34 deletions

diff --git a/textproc/qt4-clucene/Makefile b/textproc/qt4-clucene/Makefile
index 3d737748efe5..5c143705f46f 100644
--- a/textproc/qt4-clucene/Makefile
+++ b/textproc/qt4-clucene/Makefile
@@ -10,10 +10,7 @@ PORTNAME=	clucene
 PORTVERSION=	${QT4_VERSION}
 PORTREVISION=	0
 CATEGORIES?=	textproc
-MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
-DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
-DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	QtCLucene full text search library wrapper
diff --git a/textproc/qt4-clucene/distinfo b/textproc/qt4-clucene/distinfo
deleted file mode 100644
index 27b0949354e8..000000000000
--- a/textproc/qt4-clucene/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/textproc/qt4-clucene/pkg-plist b/textproc/qt4-clucene/pkg-plist
index faf7503b684e..06ca6436ba2f 100644
--- a/textproc/qt4-clucene/pkg-plist
+++ b/textproc/qt4-clucene/pkg-plist
@@ -2,7 +2,7 @@ lib/qt4/libQtCLucene.la
 lib/qt4/libQtCLucene.prl
 lib/qt4/libQtCLucene.so
 lib/qt4/libQtCLucene.so.4
-lib/qt4/libQtCLucene.so.4.5
-lib/qt4/libQtCLucene.so.4.5.2
-%%DEBUG%%lib/qt4/libQtCLucene.so.4.5.2.debug
+lib/qt4/libQtCLucene.so.%%SHLIB_SHVER%%
+lib/qt4/libQtCLucene.so.%%SHLIB_VER%%
+%%DEBUG%%lib/qt4/libQtCLucene.so.%%SHLIB_VER%%.debug
 libdata/pkgconfig/QtCLucene.pc
diff --git a/textproc/qt4-xml/Makefile b/textproc/qt4-xml/Makefile
index 6fee98944537..a7101944e51b 100644
--- a/textproc/qt4-xml/Makefile
+++ b/textproc/qt4-xml/Makefile
@@ -8,12 +8,9 @@
 
 PORTNAME=	xml
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=0
+PORTREVISION=	0
 CATEGORIES?=	textproc
-MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
-DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
-DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt XML library
diff --git a/textproc/qt4-xml/distinfo b/textproc/qt4-xml/distinfo
deleted file mode 100644
index 27b0949354e8..000000000000
--- a/textproc/qt4-xml/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/textproc/qt4-xml/pkg-plist b/textproc/qt4-xml/pkg-plist
index 98a4c52cc9a0..d6dbd7ec940f 100644
--- a/textproc/qt4-xml/pkg-plist
+++ b/textproc/qt4-xml/pkg-plist
@@ -52,9 +52,9 @@ lib/qt4/libQtXml.la
 lib/qt4/libQtXml.prl
 lib/qt4/libQtXml.so
 lib/qt4/libQtXml.so.4
-lib/qt4/libQtXml.so.4.5
-lib/qt4/libQtXml.so.4.5.2
-%%DEBUG%%lib/qt4/libQtXml.so.4.5.2.debug
+lib/qt4/libQtXml.so.%%SHLIB_SHVER%%
+lib/qt4/libQtXml.so.%%SHLIB_VER%%
+%%DEBUG%%lib/qt4/libQtXml.so.%%SHLIB_VER%%.debug
 libdata/pkgconfig/QtXml.pc
 @dirrm include/qt4/QtXml
 @dirrmtry include/qt4/Qt
diff --git a/textproc/qt4-xmlpatterns-tool/Makefile b/textproc/qt4-xmlpatterns-tool/Makefile
index 86c2e7a1e6d2..cb2c058a65a4 100644
--- a/textproc/qt4-xmlpatterns-tool/Makefile
+++ b/textproc/qt4-xmlpatterns-tool/Makefile
@@ -8,10 +8,7 @@
 PORTNAME=	xmlpatterns-tool
 PORTVERSION=	${QT4_VERSION}
 CATEGORIES?=	textproc
-MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
-DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
-DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt4 command line utility for running XQueries
diff --git a/textproc/qt4-xmlpatterns-tool/distinfo b/textproc/qt4-xmlpatterns-tool/distinfo
deleted file mode 100644
index 27b0949354e8..000000000000
--- a/textproc/qt4-xmlpatterns-tool/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/textproc/qt4-xmlpatterns/Makefile b/textproc/qt4-xmlpatterns/Makefile
index e9f6d2c6731f..417d81d0c5b3 100644
--- a/textproc/qt4-xmlpatterns/Makefile
+++ b/textproc/qt4-xmlpatterns/Makefile
@@ -8,10 +8,7 @@
 PORTNAME=	xmlpatterns
 PORTVERSION=	${QT4_VERSION}
 CATEGORIES?=	textproc
-MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
-DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
-DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	XQuery 1.0 and XPath 2.0 support for Qt4
diff --git a/textproc/qt4-xmlpatterns/distinfo b/textproc/qt4-xmlpatterns/distinfo
deleted file mode 100644
index 27b0949354e8..000000000000
--- a/textproc/qt4-xmlpatterns/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/textproc/qt4-xmlpatterns/pkg-plist b/textproc/qt4-xmlpatterns/pkg-plist
index e20ff2899eda..26009f8d845d 100644
--- a/textproc/qt4-xmlpatterns/pkg-plist
+++ b/textproc/qt4-xmlpatterns/pkg-plist
@@ -42,9 +42,9 @@ lib/qt4/libQtXmlPatterns.la
 lib/qt4/libQtXmlPatterns.prl
 lib/qt4/libQtXmlPatterns.so
 lib/qt4/libQtXmlPatterns.so.4
-lib/qt4/libQtXmlPatterns.so.4.5
-lib/qt4/libQtXmlPatterns.so.4.5.2
-%%DEBUG%%lib/qt4/libQtXmlPatterns.so.4.5.2.debug
+lib/qt4/libQtXmlPatterns.so.%%SHLIB_SHVER%%
+lib/qt4/libQtXmlPatterns.so.%%SHLIB_VER%%
+%%DEBUG%%lib/qt4/libQtXmlPatterns.so.%%SHLIB_VER%%.debug
 libdata/pkgconfig/QtXmlPatterns.pc
 @dirrm include/qt4/QtXmlPatterns
 @dirrmtry include/qt4/Qt