diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2009-11-26 23:24:38 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2009-11-26 23:24:38 +0000 |
| commit | e9424863a57ba6633122293097864bd70fd4bfef (patch) | |
| tree | 870d23e38408b34c3022d27680e38dda9be68473 | |
| parent | 343f679bb8c577cd5b45c3064847f82b163f489c (diff) | |
| download | ports-e9424863a57ba6633122293097864bd70fd4bfef.tar.gz ports-e9424863a57ba6633122293097864bd70fd4bfef.zip | |
Notes
137 files changed, 375 insertions, 600 deletions
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk index 9db97828d33a..90462c7a4e5d 100644 --- a/Mk/bsd.qt.mk +++ b/Mk/bsd.qt.mk @@ -1,8 +1,11 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 - +# # QT_NONSTANDARD - Suppress modification of configure and make environment. # QT_DIST - Package being built is part of the Qt distribution. +# +# $FreeBSD$ +# .if !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include) Qt_Include_MAINTAINER= kde@freebsd.org @@ -19,6 +22,10 @@ MAKE_ENV+= QMAKESPEC="${QMAKESPEC}" .endif # !defined(QT_NONSTANDARD) .if defined(QT_DIST) +MD5_FILE= ${PORTSDIR}/devel/qt4/distinfo +MASTER_SITES= ${MASTER_SITE_QT} +DISTNAME= qt-x11-opensource-src-${QT4_VERSION} +DIST_SUBDIR= KDE #CONFLICTS+= Currently there are no conflicts \o/ CONFIGURE_ARGS+=-fast -platform ${QMAKESPEC} \ @@ -39,6 +46,9 @@ CONFIGURE_ARGS+=-fast -platform ${QMAKESPEC} \ -examplesdir ${PREFIX}/share/examples/qt4/examples \ -demosdir ${PREFIX}/share/examples/qt4/demos +PLIST_SUB+= SHLIB_VER=${QT4_VERSION} \ + SHLIB_SHVER=${QT4_VERSION:C/.[0-9]+$//} + .if defined(PACKAGE_BUILDING) CONFIGURE_ARGS+=-no-mmx -no-3dnow -no-sse -no-sse2 .endif #defined(PACKAGE_BUILDING) @@ -95,7 +105,7 @@ QTCGFLIBS?= # QT4 version # Don't forget to update ${PORTSDIR}/devel/qt4/files/configure ! # -QT4_VERSION?= 4.5.2 +QT4_VERSION?= 4.5.3 _QT_COMPONENTS_ALL= accessible assistant assistant-adp assistantclient \ clucene codecs-cn codecs-jp codecs-kr codecs-tw corelib \ diff --git a/accessibility/qt4-accessible/Makefile b/accessibility/qt4-accessible/Makefile index 8609ba541dd3..4197cff2c9e4 100644 --- a/accessibility/qt4-accessible/Makefile +++ b/accessibility/qt4-accessible/Makefile @@ -10,10 +10,7 @@ PORTNAME= accessible PORTVERSION= ${QT4_VERSION} PORTREVISION=0 CATEGORIES?= accessibility -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt accessibility widgets diff --git a/accessibility/qt4-accessible/distinfo b/accessibility/qt4-accessible/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/accessibility/qt4-accessible/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/chinese/qt4-codecs-cn/Makefile b/chinese/qt4-codecs-cn/Makefile index e447323ef1a2..70f49cd7da18 100644 --- a/chinese/qt4-codecs-cn/Makefile +++ b/chinese/qt4-codecs-cn/Makefile @@ -9,11 +9,8 @@ PORTNAME= codecs PORTVERSION= ${QT4_VERSION} CATEGORIES?= chinese -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -cn -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt GB 18030 codec plugin diff --git a/chinese/qt4-codecs-cn/distinfo b/chinese/qt4-codecs-cn/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/chinese/qt4-codecs-cn/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/chinese/qt4-codecs-tw/Makefile b/chinese/qt4-codecs-tw/Makefile index c6f7d2679551..85b696a3ca39 100644 --- a/chinese/qt4-codecs-tw/Makefile +++ b/chinese/qt4-codecs-tw/Makefile @@ -9,11 +9,8 @@ PORTNAME= codecs PORTVERSION= ${QT4_VERSION} CATEGORIES?= chinese -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -tw -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt Big-5 codec plugin diff --git a/chinese/qt4-codecs-tw/distinfo b/chinese/qt4-codecs-tw/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/chinese/qt4-codecs-tw/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/databases/qt4-ibase-plugin/Makefile b/databases/qt4-ibase-plugin/Makefile index 269f3f2786cc..351d22c9b0c7 100644 --- a/databases/qt4-ibase-plugin/Makefile +++ b/databases/qt4-ibase-plugin/Makefile @@ -9,9 +9,6 @@ PORTNAME= qt4-${DB}-plugin PORTVERSION= ${QT4_VERSION} CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_QT} -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt IBase/Firebird database plugin diff --git a/databases/qt4-ibase-plugin/distinfo b/databases/qt4-ibase-plugin/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/databases/qt4-ibase-plugin/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/databases/qt4-mysql-plugin/Makefile b/databases/qt4-mysql-plugin/Makefile index 3ed443b2d405..7bafc4a92756 100644 --- a/databases/qt4-mysql-plugin/Makefile +++ b/databases/qt4-mysql-plugin/Makefile @@ -22,6 +22,7 @@ USE_QT_VER= 4 QT_COMPONENTS= moc_build sql QT_NONSTANDARD= yes MAKE_JOBS_SAFE= yes +MD5_FILE= ${PORTSDIR}/devel/qt4/distinfo USE_MYSQL= yes DRIVER= src/sql/drivers/${DB} diff --git a/databases/qt4-mysql-plugin/distinfo b/databases/qt4-mysql-plugin/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/databases/qt4-mysql-plugin/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/databases/qt4-odbc-plugin/Makefile b/databases/qt4-odbc-plugin/Makefile index 9d36ac6fc363..a8cb627ba918 100644 --- a/databases/qt4-odbc-plugin/Makefile +++ b/databases/qt4-odbc-plugin/Makefile @@ -24,6 +24,7 @@ USE_QT_VER= 4 QT_COMPONENTS= moc_build sql QT_NONSTANDARD= yes MAKE_JOBS_SAFE= yes +MD5_FILE= ${PORTSDIR}/devel/qt4/distinfo DRIVER= src/sql/drivers/${DB} PLUGIN= src/plugins/sqldrivers/${DB} diff --git a/databases/qt4-odbc-plugin/distinfo b/databases/qt4-odbc-plugin/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/databases/qt4-odbc-plugin/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/databases/qt4-pgsql-plugin/Makefile b/databases/qt4-pgsql-plugin/Makefile index 3126f98522c2..a0136b6ce952 100644 --- a/databases/qt4-pgsql-plugin/Makefile +++ b/databases/qt4-pgsql-plugin/Makefile @@ -22,6 +22,7 @@ USE_QT_VER= 4 QT_COMPONENTS= moc_build sql QT_NONSTANDARD= yes MAKE_JOBS_SAFE= yes +MD5_FILE= ${PORTSDIR}/devel/qt4/distinfo USE_PGSQL= yes DRIVER= src/sql/drivers/${DB} diff --git a/databases/qt4-pgsql-plugin/distinfo b/databases/qt4-pgsql-plugin/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/databases/qt4-pgsql-plugin/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/databases/qt4-sql/Makefile b/databases/qt4-sql/Makefile index e8d15ea1f09b..f16da4ea5549 100644 --- a/databases/qt4-sql/Makefile +++ b/databases/qt4-sql/Makefile @@ -8,12 +8,9 @@ PORTNAME= sql PORTVERSION= ${QT4_VERSION} -PORTREVISION=0 +PORTREVISION= 0 CATEGORIES?= databases -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt SQL library diff --git a/databases/qt4-sql/distinfo b/databases/qt4-sql/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/databases/qt4-sql/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/databases/qt4-sql/pkg-plist b/databases/qt4-sql/pkg-plist index 910d43aecc41..dd0cd29bcd9c 100644 --- a/databases/qt4-sql/pkg-plist +++ b/databases/qt4-sql/pkg-plist @@ -85,9 +85,9 @@ lib/qt4/libQtSql.la lib/qt4/libQtSql.prl lib/qt4/libQtSql.so lib/qt4/libQtSql.so.4 -lib/qt4/libQtSql.so.4.5 -lib/qt4/libQtSql.so.4.5.2 -%%DEBUG%%lib/qt4/libQtSql.so.4.5.2.debug +lib/qt4/libQtSql.so.%%SHLIB_SHVER%% +lib/qt4/libQtSql.so.%%SHLIB_VER%% +%%DEBUG%%lib/qt4/libQtSql.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtSql.pc @dirrm include/qt4/QtSql @dirrmtry include/qt4/Qt diff --git a/databases/qt4-sqlite-plugin/Makefile b/databases/qt4-sqlite-plugin/Makefile index 7dda02b71008..3b02cb98dbdd 100644 --- a/databases/qt4-sqlite-plugin/Makefile +++ b/databases/qt4-sqlite-plugin/Makefile @@ -24,6 +24,7 @@ USE_QT_VER= 4 QT_COMPONENTS= moc_build sql QT_NONSTANDARD= yes MAKE_JOBS_SAFE= yes +MD5_FILE= ${PORTSDIR}/devel/qt4/distinfo DRIVER= src/sql/drivers/${DB} PLUGIN= src/plugins/sqldrivers/${DB} diff --git a/databases/qt4-sqlite-plugin/distinfo b/databases/qt4-sqlite-plugin/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/databases/qt4-sqlite-plugin/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/databases/qt4-sqlite3-plugin/Makefile b/databases/qt4-sqlite3-plugin/Makefile index 0a0389442dde..6b97509e3893 100644 --- a/databases/qt4-sqlite3-plugin/Makefile +++ b/databases/qt4-sqlite3-plugin/Makefile @@ -17,6 +17,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt SQLite 3.x database plugin DB= sqlite +MD5_FILE= ${PORTSDIR}/devel/qt4/distinfo LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3 diff --git a/databases/qt4-sqlite3-plugin/distinfo b/databases/qt4-sqlite3-plugin/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/databases/qt4-sqlite3-plugin/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/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile index e222c6073c78..e863c816651f 100644 --- a/devel/dbus-qt4/Makefile +++ b/devel/dbus-qt4/Makefile @@ -10,10 +10,7 @@ PORTNAME= dbus PORTVERSION= ${QT4_VERSION} PORTREVISION= 0 CATEGORIES?= devel -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt4 bindings for the D-BUS messaging system diff --git a/devel/dbus-qt4/distinfo b/devel/dbus-qt4/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/devel/dbus-qt4/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/devel/dbus-qt4/pkg-plist b/devel/dbus-qt4/pkg-plist index d989979ee813..e2d6b09d304e 100644 --- a/devel/dbus-qt4/pkg-plist +++ b/devel/dbus-qt4/pkg-plist @@ -61,9 +61,9 @@ lib/qt4/libQtDBus.la lib/qt4/libQtDBus.prl lib/qt4/libQtDBus.so lib/qt4/libQtDBus.so.4 -lib/qt4/libQtDBus.so.4.5 -lib/qt4/libQtDBus.so.4.5.2 -%%DEBUG%%lib/qt4/libQtDBus.so.4.5.2.debug +lib/qt4/libQtDBus.so.%%SHLIB_SHVER%% +lib/qt4/libQtDBus.so.%%SHLIB_VER%% +%%DEBUG%%lib/qt4/libQtDBus.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtDBus.pc @dirrm include/qt4/QtDBus @dirrmtry include/qt4/Qt diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile index da3046f89877..f92f4d4592b2 100644 --- a/devel/qmake4/Makefile +++ b/devel/qmake4/Makefile @@ -9,20 +9,17 @@ PORTNAME= qmake PORTVERSION= ${QT4_VERSION} PORTREVISION= 0 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= The build utility of the Qt project QT_NONSTANDARD= yes +QT_DIST= yes REINPLACE_ARGS= -i "" WRKSRC= ${WRKDIR}/${DISTNAME}/qmake MAKEFILE= ${FILESDIR}/Makefile.bsd MAKE_ENV+= FILESDIR="${FILESDIR}" -#USE_BZIP2= yes MAKE_JOBS_SAFE= yes EXTRACT_AFTER_ARGS=| ${TAR} -xf - \ diff --git a/devel/qmake4/distinfo b/devel/qmake4/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/devel/qmake4/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/devel/qt4-assistant-adp/Makefile b/devel/qt4-assistant-adp/Makefile index cad3d9efc982..332e4bdfe561 100644 --- a/devel/qt4-assistant-adp/Makefile +++ b/devel/qt4-assistant-adp/Makefile @@ -8,11 +8,8 @@ PORTNAME= assistant PORTVERSION= ${QT4_VERSION} CATEGORIES?= devel -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -PKGNAMESUFFIX= -adp -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE +PKGNAMESUFFIX= -adp MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation browser, adp compat version diff --git a/devel/qt4-assistant-adp/distinfo b/devel/qt4-assistant-adp/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/devel/qt4-assistant-adp/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/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile index 93e6a1a77475..5d86a782616e 100644 --- a/devel/qt4-assistant/Makefile +++ b/devel/qt4-assistant/Makefile @@ -10,10 +10,7 @@ PORTNAME= assistant PORTVERSION= ${QT4_VERSION} PORTREVISION= 0 CATEGORIES?= devel -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation browser diff --git a/devel/qt4-assistant/distinfo b/devel/qt4-assistant/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/devel/qt4-assistant/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/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile index 4d1b4c6f1246..dc8b22d682e9 100644 --- a/devel/qt4-corelib/Makefile +++ b/devel/qt4-corelib/Makefile @@ -10,10 +10,7 @@ PORTNAME= corelib PORTVERSION= ${QT4_VERSION} PORTREVISION= 0 CATEGORIES?= devel -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt core library diff --git a/devel/qt4-corelib/distinfo b/devel/qt4-corelib/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/devel/qt4-corelib/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/devel/qt4-corelib/files/patch-src__corelib__codecs__qiconvcodec.cpp b/devel/qt4-corelib/files/patch-src__corelib__codecs__qiconvcodec.cpp deleted file mode 100644 index 31c291b6928f..000000000000 --- a/devel/qt4-corelib/files/patch-src__corelib__codecs__qiconvcodec.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/corelib/codecs/qiconvcodec.cpp.orig 2009-06-20 08:57:57.000000000 +0400 -+++ ./src/corelib/codecs/qiconvcodec.cpp 2009-07-01 23:12:06.000000000 +0400 -@@ -62,7 +62,7 @@ - #elif defined(Q_OS_AIX) - # define NO_BOM - # define UTF16 "UCS-2" --#elif defined(Q_OS_MAC) -+#elif defined(Q_OS_MAC) || defined(Q_OS_FREEBSD) - # define NO_BOM - # if Q_BYTE_ORDER == Q_BIG_ENDIAN - # define UTF16 "UTF-16BE" diff --git a/devel/qt4-corelib/pkg-plist b/devel/qt4-corelib/pkg-plist index 60ae94ef4c3b..e3da1a095c91 100644 --- a/devel/qt4-corelib/pkg-plist +++ b/devel/qt4-corelib/pkg-plist @@ -520,9 +520,9 @@ lib/qt4/libQtCore.la lib/qt4/libQtCore.prl lib/qt4/libQtCore.so lib/qt4/libQtCore.so.4 -lib/qt4/libQtCore.so.4.5 -lib/qt4/libQtCore.so.4.5.2 -%%DEBUG%%lib/qt4/libQtCore.so.4.5.2.debug +lib/qt4/libQtCore.so.%%SHLIB_SHVER%% +lib/qt4/libQtCore.so.%%SHLIB_VER%% +%%DEBUG%%lib/qt4/libQtCore.so.%%SHLIB_VER%%.debug lib/qt4/plugins/.keep_me libdata/pkgconfig/QtCore.pc share/qt4/mkspecs/qconfig.pri diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile index 7cff683f867b..3dfe8ec9f152 100644 --- a/devel/qt4-designer/Makefile +++ b/devel/qt4-designer/Makefile @@ -10,10 +10,7 @@ PORTNAME= designer PORTVERSION= ${QT4_VERSION} PORTREVISION= 0 CATEGORIES?= devel -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt ui editor diff --git a/devel/qt4-designer/distinfo b/devel/qt4-designer/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/devel/qt4-designer/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/devel/qt4-designer/pkg-plist b/devel/qt4-designer/pkg-plist index dd780a44e740..43d99f49c582 100644 --- a/devel/qt4-designer/pkg-plist +++ b/devel/qt4-designer/pkg-plist @@ -85,15 +85,15 @@ include/qt4/QtUiTools/quiloader.h lib/qt4/libQtDesigner.prl lib/qt4/libQtDesigner.so lib/qt4/libQtDesigner.so.4 -lib/qt4/libQtDesigner.so.4.5 -lib/qt4/libQtDesigner.so.4.5.2 -%%DEBUG%%lib/qt4/libQtDesigner.so.4.5.2.debug +lib/qt4/libQtDesigner.so.%%SHLIB_SHVER%% +lib/qt4/libQtDesigner.so.%%SHLIB_VER%% +%%DEBUG%%lib/qt4/libQtDesigner.so.%%SHLIB_VER%%.debug lib/qt4/libQtDesignerComponents.prl lib/qt4/libQtDesignerComponents.so lib/qt4/libQtDesignerComponents.so.4 -lib/qt4/libQtDesignerComponents.so.4.5 -lib/qt4/libQtDesignerComponents.so.4.5.2 -%%DEBUG%%lib/qt4/libQtDesignerComponents.so.4.5.2.debug +lib/qt4/libQtDesignerComponents.so.%%SHLIB_SHVER%% +lib/qt4/libQtDesignerComponents.so.%%SHLIB_VER%% +%%DEBUG%%lib/qt4/libQtDesignerComponents.so.%%SHLIB_VER%%.debug lib/qt4/libQtUiTools.a lib/qt4/libQtUiTools.prl lib/qt4/plugins/designer/libphononwidgets.so diff --git a/devel/qt4-help-tools/Makefile b/devel/qt4-help-tools/Makefile index 0670c45d26ed..974cf050328d 100644 --- a/devel/qt4-help-tools/Makefile +++ b/devel/qt4-help-tools/Makefile @@ -11,8 +11,6 @@ CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -tools -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= QtHelp tools to generate and convert documentation diff --git a/devel/qt4-help-tools/distinfo b/devel/qt4-help-tools/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/devel/qt4-help-tools/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/devel/qt4-help/Makefile b/devel/qt4-help/Makefile index 9ab4e6d2e54b..5434bdec1aab 100644 --- a/devel/qt4-help/Makefile +++ b/devel/qt4-help/Makefile @@ -8,10 +8,7 @@ PORTNAME= help PORTVERSION= ${QT4_VERSION} CATEGORIES?= devel -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= QtHelp module provides QHelpEngine API and is used by Assistant diff --git a/devel/qt4-help/distinfo b/devel/qt4-help/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/devel/qt4-help/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/devel/qt4-help/pkg-plist b/devel/qt4-help/pkg-plist index b99df3fe03b9..99d0afd3e555 100644 --- a/devel/qt4-help/pkg-plist +++ b/devel/qt4-help/pkg-plist @@ -32,9 +32,9 @@ lib/qt4/libQtHelp.la lib/qt4/libQtHelp.prl lib/qt4/libQtHelp.so lib/qt4/libQtHelp.so.4 -lib/qt4/libQtHelp.so.4.5 -lib/qt4/libQtHelp.so.4.5.2 -%%DEBUG%%lib/qt4/libQtHelp.so.4.5.2.debug +lib/qt4/libQtHelp.so.%%SHLIB_SHVER%% +lib/qt4/libQtHelp.so.%%SHLIB_VER%% +%%DEBUG%%lib/qt4/libQtHelp.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtHelp.pc @dirrm include/qt4/QtHelp @dirrmtry include/qt4/Qt diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile index a8af9a0ae92d..1bfa3ba92915 100644 --- a/devel/qt4-libqtassistantclient/Makefile +++ b/devel/qt4-libqtassistantclient/Makefile @@ -8,12 +8,9 @@ PORTNAME= libQtAssistantClient PORTVERSION= ${QT4_VERSION} -PORTREVISION=0 +PORTREVISION= 0 CATEGORIES?= devel -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation browser integration library diff --git a/devel/qt4-libqtassistantclient/distinfo b/devel/qt4-libqtassistantclient/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/devel/qt4-libqtassistantclient/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/devel/qt4-libqtassistantclient/pkg-plist b/devel/qt4-libqtassistantclient/pkg-plist index eaeab429c967..d3a0fad7bdeb 100644 --- a/devel/qt4-libqtassistantclient/pkg-plist +++ b/devel/qt4-libqtassistantclient/pkg-plist @@ -5,8 +5,8 @@ include/qt4/QtAssistant/qassistantclient_global.h lib/qt4/libQtAssistantClient.prl lib/qt4/libQtAssistantClient.so lib/qt4/libQtAssistantClient.so.4 -lib/qt4/libQtAssistantClient.so.4.5 -lib/qt4/libQtAssistantClient.so.4.5.2 -%%DEBUG%%lib/qt4/libQtAssistantClient.so.4.5.2.debug +lib/qt4/libQtAssistantClient.so.%%SHLIB_SHVER%% +lib/qt4/libQtAssistantClient.so.%%SHLIB_VER%% +%%DEBUG%%lib/qt4/libQtAssistantClient.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtAssistantClient.pc @dirrm include/qt4/QtAssistant diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile index 014d954be5d4..4a8836df4519 100644 --- a/devel/qt4-linguist/Makefile +++ b/devel/qt4-linguist/Makefile @@ -10,10 +10,7 @@ PORTNAME= linguist PORTVERSION= ${QT4_VERSION} PORTREVISION= 0 CATEGORIES?= devel -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt localisation tool diff --git a/devel/qt4-linguist/distinfo b/devel/qt4-linguist/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/devel/qt4-linguist/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/devel/qt4-makeqpf/Makefile b/devel/qt4-makeqpf/Makefile index f4c8af520910..71cb3b551999 100644 --- a/devel/qt4-makeqpf/Makefile +++ b/devel/qt4-makeqpf/Makefile @@ -8,12 +8,9 @@ PORTNAME= makeqpf PORTVERSION= ${QT4_VERSION} -PORTREVISION=0 +PORTREVISION= 0 CATEGORIES?= devel -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt qtopia font creator diff --git a/devel/qt4-makeqpf/distinfo b/devel/qt4-makeqpf/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/devel/qt4-makeqpf/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/devel/qt4-moc/Makefile b/devel/qt4-moc/Makefile index 233166c11165..81844215a8e3 100644 --- a/devel/qt4-moc/Makefile +++ b/devel/qt4-moc/Makefile @@ -8,12 +8,9 @@ PORTNAME= moc PORTVERSION= ${QT4_VERSION} -PORTREVISION=0 +PORTREVISION= 0 CATEGORIES?= devel -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt meta object compiler diff --git a/devel/qt4-moc/distinfo b/devel/qt4-moc/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/devel/qt4-moc/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/devel/qt4-porting/Makefile b/devel/qt4-porting/Makefile index 43cbc4669a61..8f36ce038f36 100644 --- a/devel/qt4-porting/Makefile +++ b/devel/qt4-porting/Makefile @@ -9,10 +9,7 @@ PORTNAME= porting PORTVERSION= ${QT4_VERSION} CATEGORIES?= devel -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt utility to assist with porting Qt3 applications to Qt4 diff --git a/devel/qt4-porting/distinfo b/devel/qt4-porting/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/devel/qt4-porting/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/devel/qt4-qdbusviewer/Makefile b/devel/qt4-qdbusviewer/Makefile index 2b3222ddccb2..1b1fdc996b18 100644 --- a/devel/qt4-qdbusviewer/Makefile +++ b/devel/qt4-qdbusviewer/Makefile @@ -8,12 +8,9 @@ PORTNAME= qdbusviewer PORTVERSION= ${QT4_VERSION} -PORTREVISION=0 +PORTREVISION= 0 CATEGORIES?= devel -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt4 D-BUS viewer diff --git a/devel/qt4-qdbusviewer/distinfo b/devel/qt4-qdbusviewer/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/devel/qt4-qdbusviewer/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/devel/qt4-qdoc3/Makefile b/devel/qt4-qdoc3/Makefile index 857d98fb58c4..7c11aee0cabd 100644 --- a/devel/qt4-qdoc3/Makefile +++ b/devel/qt4-qdoc3/Makefile @@ -8,10 +8,7 @@ PORTNAME= qdoc3 PORTVERSION= ${QT4_VERSION} CATEGORIES= devel textproc -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt documentation generator diff --git a/devel/qt4-qdoc3/distinfo b/devel/qt4-qdoc3/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/devel/qt4-qdoc3/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/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile index aacd34bb7def..a4e41f4662f5 100644 --- a/devel/qt4-qt3support/Makefile +++ b/devel/qt4-qt3support/Makefile @@ -10,10 +10,7 @@ PORTNAME= qt3support PORTVERSION= ${QT4_VERSION} PORTREVISION= 0 CATEGORIES?= devel x11-toolkits -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt3 compatibility library diff --git a/devel/qt4-qt3support/distinfo b/devel/qt4-qt3support/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/devel/qt4-qt3support/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/devel/qt4-qt3support/pkg-plist b/devel/qt4-qt3support/pkg-plist index 9aa5b8446ca2..67c5d4fd0a99 100644 --- a/devel/qt4-qt3support/pkg-plist +++ b/devel/qt4-qt3support/pkg-plist @@ -405,9 +405,9 @@ lib/qt4/libQt3Support.la lib/qt4/libQt3Support.prl lib/qt4/libQt3Support.so lib/qt4/libQt3Support.so.4 -lib/qt4/libQt3Support.so.4.5 -lib/qt4/libQt3Support.so.4.5.2 -@comment %%DEBUG%%lib/qt4/libQt3Support.so.4.5.2.debug +lib/qt4/libQt3Support.so.%%SHLIB_SHVER%% +lib/qt4/libQt3Support.so.%%SHLIB_VER%% +@comment %%DEBUG%%lib/qt4/libQt3Support.so.%%SHLIB_VER%%.debug libdata/pkgconfig/Qt3Support.pc @dirrm include/qt4/Qt3Support @dirrmtry include/qt4/Qt diff --git a/devel/qt4-qtestlib/Makefile b/devel/qt4-qtestlib/Makefile index 62069134b386..c4d5e2398f12 100644 --- a/devel/qt4-qtestlib/Makefile +++ b/devel/qt4-qtestlib/Makefile @@ -10,10 +10,7 @@ PORTNAME= qtestlib PORTVERSION= ${QT4_VERSION} PORTREVISION= 0 CATEGORIES?= devel -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt unit testing library diff --git a/devel/qt4-qtestlib/distinfo b/devel/qt4-qtestlib/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/devel/qt4-qtestlib/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/devel/qt4-qtestlib/pkg-plist b/devel/qt4-qtestlib/pkg-plist index e2ae50f136fe..d667651a89c1 100644 --- a/devel/qt4-qtestlib/pkg-plist +++ b/devel/qt4-qtestlib/pkg-plist @@ -48,9 +48,9 @@ lib/qt4/libQtTest.la lib/qt4/libQtTest.prl lib/qt4/libQtTest.so lib/qt4/libQtTest.so.4 -lib/qt4/libQtTest.so.4.5 -lib/qt4/libQtTest.so.4.5.2 -%%DEBUG%%lib/qt4/libQtTest.so.4.5.2.debug +lib/qt4/libQtTest.so.%%SHLIB_SHVER%% +lib/qt4/libQtTest.so.%%SHLIB_VER%% +%%DEBUG%%lib/qt4/libQtTest.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtTest.pc @dirrm include/qt4/QtTest @dirrmtry include/qt4/Qt diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile index 28b7512599df..acac45dcf470 100644 --- a/devel/qt4-qvfb/Makefile +++ b/devel/qt4-qvfb/Makefile @@ -8,12 +8,9 @@ PORTNAME= qvfb PORTVERSION= ${QT4_VERSION} -PORTREVISION=0 +PORTREVISION= 0 CATEGORIES?= devel -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt virtual framebuffer utility diff --git a/devel/qt4-qvfb/distinfo b/devel/qt4-qvfb/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/devel/qt4-qvfb/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/devel/qt4-rcc/Makefile b/devel/qt4-rcc/Makefile index 3978b22d547c..4a4e2b45025a 100644 --- a/devel/qt4-rcc/Makefile +++ b/devel/qt4-rcc/Makefile @@ -9,10 +9,7 @@ PORTNAME= rcc PORTVERSION= ${QT4_VERSION} CATEGORIES?= devel -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt resource compiler diff --git a/devel/qt4-rcc/distinfo b/devel/qt4-rcc/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/devel/qt4-rcc/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/devel/qt4-script/Makefile b/devel/qt4-script/Makefile index 971f0c7096fb..344db0549ee9 100644 --- a/devel/qt4-script/Makefile +++ b/devel/qt4-script/Makefile @@ -8,12 +8,9 @@ PORTNAME= script PORTVERSION= ${QT4_VERSION} -PORTREVISION=0 +PORTREVISION= 0 CATEGORIES?= devel -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt script diff --git a/devel/qt4-script/distinfo b/devel/qt4-script/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/devel/qt4-script/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/devel/qt4-script/pkg-plist b/devel/qt4-script/pkg-plist index d1fa8f361aae..6efc6c64f0b7 100644 --- a/devel/qt4-script/pkg-plist +++ b/devel/qt4-script/pkg-plist @@ -43,9 +43,9 @@ lib/qt4/libQtScript.la lib/qt4/libQtScript.prl lib/qt4/libQtScript.so lib/qt4/libQtScript.so.4 -lib/qt4/libQtScript.so.4.5 -lib/qt4/libQtScript.so.4.5.2 -%%DEBUG%%lib/qt4/libQtScript.so.4.5.2.debug +lib/qt4/libQtScript.so.%%SHLIB_SHVER%% +lib/qt4/libQtScript.so.%%SHLIB_VER%% +%%DEBUG%%lib/qt4/libQtScript.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtScript.pc @dirrm include/qt4/QtScript @dirrmtry include/qt4/Qt diff --git a/devel/qt4-scripttools/Makefile b/devel/qt4-scripttools/Makefile index 19d2bf4fdd2a..3b605676635b 100644 --- a/devel/qt4-scripttools/Makefile +++ b/devel/qt4-scripttools/Makefile @@ -7,12 +7,9 @@ PORTNAME= scripttools PORTVERSION= ${QT4_VERSION} -PORTREVISION=0 +PORTREVISION= 0 CATEGORIES?= devel -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt script diff --git a/devel/qt4-scripttools/distinfo b/devel/qt4-scripttools/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/devel/qt4-scripttools/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/devel/qt4-scripttools/pkg-plist b/devel/qt4-scripttools/pkg-plist index f1516693d4d5..af0e5c7c5463 100644 --- a/devel/qt4-scripttools/pkg-plist +++ b/devel/qt4-scripttools/pkg-plist @@ -7,8 +7,8 @@ lib/qt4/libQtScriptTools.la lib/qt4/libQtScriptTools.prl lib/qt4/libQtScriptTools.so lib/qt4/libQtScriptTools.so.4 -lib/qt4/libQtScriptTools.so.4.5 -lib/qt4/libQtScriptTools.so.4.5.2 -%%DEBUG%%lib/qt4/libQtScriptTools.so.4.5.2.debug +lib/qt4/libQtScriptTools.so.%%SHLIB_SHVER%% +lib/qt4/libQtScriptTools.so.%%SHLIB_VER%% +%%DEBUG%%lib/qt4/libQtScriptTools.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtScriptTools.pc @dirrm include/qt4/QtScriptTools diff --git a/devel/qt4-uic/Makefile b/devel/qt4-uic/Makefile index f806fc6c344c..971adc47fcc2 100644 --- a/devel/qt4-uic/Makefile +++ b/devel/qt4-uic/Makefile @@ -8,12 +8,9 @@ PORTNAME= uic PORTVERSION= ${QT4_VERSION} -PORTREVISION=0 +PORTREVISION= 0 CATEGORIES?= devel -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt user interface compiler diff --git a/devel/qt4-uic/distinfo b/devel/qt4-uic/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/devel/qt4-uic/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/devel/qt4-uic3/Makefile b/devel/qt4-uic3/Makefile index c6e14de4be4f..2b6ca57b3b43 100644 --- a/devel/qt4-uic3/Makefile +++ b/devel/qt4-uic3/Makefile @@ -8,12 +8,9 @@ PORTNAME= uic3 PORTVERSION= ${QT4_VERSION} -PORTREVISION=0 +PORTREVISION= 0 CATEGORIES?= devel -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt backwards-compatible user interface compiler diff --git a/devel/qt4-uic3/distinfo b/devel/qt4-uic3/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/devel/qt4-uic3/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/devel/qt4/Makefile b/devel/qt4/Makefile index 66dbad4d6ad6..4ca0b5277b35 100644 --- a/devel/qt4/Makefile +++ b/devel/qt4/Makefile @@ -7,11 +7,11 @@ PORTNAME= qt4 PORTVERSION= ${QT4_VERSION} -PORTREVISION=0 +PORTREVISION= 0 CATEGORIES= devel -MASTER_SITES= # empty -DISTFILES= # none -EXTRACT_ONLY= # empty +MASTER_SITES= ${MASTER_SITE_QT} +DISTNAME= qt-x11-opensource-src-${PORTVERSION} +DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Multiplatform C++ application framework (metaport) @@ -55,8 +55,7 @@ QT_COMPONENTS+= codecs-cn codecs-jp codecs-kr codecs-tw .endif .if defined(WITH_SQL_PLUGINS) -RUN_DEPENDS+= ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlibase.so:${PORTSDIR}/databases/qt4-ibase-plugin \ - ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin \ +RUN_DEPENDS+= ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin \ ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlodbc.so:${PORTSDIR}/databases/qt4-odbc-plugin \ ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlpsql.so:${PORTSDIR}/databases/qt4-pgsql-plugin \ ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlite2.so:${PORTSDIR}/databases/qt4-sqlite-plugin \ diff --git a/devel/qt4/distinfo b/devel/qt4/distinfo new file mode 100644 index 000000000000..5d04b269780e --- /dev/null +++ b/devel/qt4/distinfo @@ -0,0 +1,3 @@ +MD5 (KDE/qt-x11-opensource-src-4.5.3.tar.gz) = 3988cf9af68be2df8a8000ede231de9b +SHA256 (KDE/qt-x11-opensource-src-4.5.3.tar.gz) = 0c87fc42825d3556970db4412257c6874e716ac3bc45e6f273924d5d6a089aa6 +SIZE (KDE/qt-x11-opensource-src-4.5.3.tar.gz) = 125384668 diff --git a/devel/qt4/files/Makefile.options b/devel/qt4/files/Makefile.options index 732d16072bba..836f5fe83cd6 100644 --- a/devel/qt4/files/Makefile.options +++ b/devel/qt4/files/Makefile.options @@ -6,10 +6,10 @@ QT4_OPTIONS+= CUPS .endif .for opt in ${QT4_OPTIONS_ALL} -${opt}_REPLACE=\# +${opt}_REPLACE= QT4_OPTIONS_REPLACE+= s,%%${opt}%%,${${opt}_REPLACE},g; .endfor .for opt in ${QT4_OPTIONS} -${opt}_REPLACE= +${opt}_REPLACE=\# .endfor diff --git a/devel/qt4/files/configure b/devel/qt4/files/configure index 71197f82cac3..412ba46d35dd 100644 --- a/devel/qt4/files/configure +++ b/devel/qt4/files/configure @@ -1,13 +1,44 @@ #!/bin/sh -# -# Configures to build the Qt library -# -# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -# Contact: Nokia Corporation (qt-info@nokia.com) -# -# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -# +############################################################################# +## +## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +## All rights reserved. +## Contact: Nokia Corporation (qt-info@nokia.com) +## +## This file is the build configuration utility of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## Commercial Usage +## Licensees holding valid Qt Commercial licenses may use this file in +## accordance with the Qt Commercial License Agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and Nokia. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 2.1 requirements +## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## In addition, as a special exception, Nokia gives you certain additional +## rights. These rights are described in the Nokia Qt LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 3.0 as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL included in the +## packaging of this file. Please review the following information to +## ensure the GNU General Public License version 3.0 requirements will be +## met: http://www.gnu.org/copyleft/gpl.html. +## +## If you have questions regarding the use of this file, please contact +## Nokia at qt-info@nokia.com. +## $QT_END_LICENSE$ +## +############################################################################# #------------------------------------------------------------------------------- # script initialization @@ -162,7 +193,7 @@ fi #------------------------------------------------------------------------------- # check the license #------------------------------------------------------------------------------- -COMMERCIAL_USER=no +COMMERCIAL_USER=ask CFG_DEV=no CFG_NOKIA=no CFG_EMBEDDED=no @@ -400,7 +431,7 @@ elif [ $COMMERCIAL_USER = "yes" ]; then echo echo "You are not licensed for Qt for Embedded Linux." echo - echo "Please contact sales@trolltech.com to upgrade your license" + echo "Please contact qt-info@nokia.com to upgrade your license" echo "to include Qt for Embedded Linux, or install the" echo "Qt Open Source Edition if you intend to develop free software." exit 1 @@ -420,7 +451,7 @@ elif [ $COMMERCIAL_USER = "yes" ]; then echo echo "You are not licensed for the Qt/Mac platform." echo - echo "Please contact sales@trolltech.com to upgrade your license" + echo "Please contact qt-info@nokia.com to upgrade your license" echo "to include the Qt/Mac platform." exit 1 ;; @@ -439,7 +470,7 @@ elif [ $COMMERCIAL_USER = "yes" ]; then echo echo "You are not licensed for the Qt/X11 platform." echo - echo "Please contact sales@trolltech.com to upgrade your license to" + echo "Please contact qt-info@nokia.com to upgrade your license to" echo "include the Qt/X11 platform, or install the Qt Open Source Edition" echo "if you intend to develop free software." exit 1 @@ -570,6 +601,7 @@ CFG_DEBUG_RELEASE=no CFG_SHARED=yes CFG_SM=auto CFG_XSHAPE=auto +CFG_XSYNC=auto CFG_XINERAMA=runtime CFG_XFIXES=runtime CFG_ZLIB=auto @@ -831,7 +863,7 @@ while [ "$#" -gt 0 ]; do VAL=no ;; #Qt style yes options - -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xinput|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-svg|-webkit|-scripttools|-rpath|-force-pkg-config) + -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xshape|-xinput|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-universal|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-svg|-webkit|-scripttools|-rpath|-force-pkg-config) VAR=`echo $1 | sed "s,^-\(.*\),\1,"` VAL=yes ;; @@ -1419,6 +1451,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + xsync) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_XSYNC="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; xinput) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ] || [ "$VAL" = "runtime" ]; then CFG_XINPUT="$VAL" @@ -2876,7 +2915,7 @@ fi #prefix if [ -z "$QT_INSTALL_PREFIX" ]; then if [ "$CFG_DEV" = "yes" ]; then - QT_INSTALL_PREFIX="$outpath" # At Trolltech, we use sandboxed builds by default + QT_INSTALL_PREFIX="$outpath" # In Qt Development, we use sandboxed builds by default elif [ "$PLATFORM_QWS" = "yes" ]; then QT_INSTALL_PREFIX="/usr/local/Trolltech/QtEmbedded-${QT_VERSION}" if [ "$PLATFORM" != "$XPLATFORM" ]; then @@ -3474,6 +3513,10 @@ Qt/X11 only: $SHY -xshape ............ Compile XShape support. Requires X11/extensions/shape.h. + $SHN -no-xsync .......... Do not compile XSync support. + $SHY -xsync ............. Compile XSync support. + Requires X11/extensions/sync.h. + $XAN -no-xinerama ....... Do not compile Xinerama (multihead) support. $XAY -xinerama .......... Compile Xinerama support. Requires X11/extensions/Xinerama.h and libXinerama. @@ -3692,16 +3735,22 @@ if [ "$Edition" = "NokiaInternalBuild" ]; then elif [ "$Edition" = "OpenSource" ]; then while true; do echo "You are licensed to use this software under the terms of" - echo "the GNU General Public License (GPL) versions 3." - echo "You are also licensed to use this software under the terms of" echo "the Lesser GNU General Public License (LGPL) versions 2.1." + if [ -f "$relpath/LICENSE.GPL3" ]; then + echo "You are also licensed to use this software under the terms of" + echo "the GNU General Public License (GPL) versions 3." + affix="either" + else + affix="the" + fi echo - affix="either" if [ "$OPT_CONFIRM_LICENSE" = "yes" ]; then - echo "You have already accepted the terms of the $LicenseType license." + echo "You have already accepted the terms of the $LicenseType license." acceptance=yes else - echo "Type '3' to view the GNU General Public License version 3." + if [ -f "$relpath/LICENSE.GPL3" ]; then + echo "Type '3' to view the GNU General Public License version 3." + fi echo "Type 'L' to view the Lesser GNU General Public License version 2.1." echo "Type 'yes' to accept this license offer." echo "Type 'no' to decline this license offer." @@ -3774,7 +3823,7 @@ elif [ "$Edition" != "OpenSource" ]; then echo " Your support and upgrade period has expired." echo echo " You are no longer licensed to use this version of Qt." - echo " Please contact sales@trolltech.com to renew your support" + echo " Please contact qt-info@nokia.com to renew your support" echo " and upgrades for this license." echo echo "NOTICE NOTICE NOTICE NOTICE" @@ -3792,7 +3841,7 @@ elif [ "$Edition" != "OpenSource" ]; then echo " support, nor are you entitled to use any more recent" echo " Qt releases." echo - echo " Please contact sales@trolltech.com to renew your" + echo " Please contact qt-info@nokia.com to renew your" echo " support and upgrades for this license." echo echo "WARNING WARNING WARNING WARNING" @@ -3807,7 +3856,7 @@ elif [ "$Edition" != "OpenSource" ]; then echo " Your Evaluation license has expired." echo echo " You are no longer licensed to use this software. Please" - echo " contact sales@trolltech.com to purchase license, or install" + echo " contact qt-info@nokia.com to purchase license, or install" echo " the Qt Open Source Edition if you intend to develop free" echo " software." echo @@ -4988,6 +5037,23 @@ if [ "$PLATFORM_X11" = "yes" ]; then fi fi + # auto-detect XSync support + if [ "$CFG_XSYNC" != "no" ]; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xsync "XSync" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then + CFG_XSYNC=yes + else + if [ "$CFG_XSYNC" = "yes" ] && [ "$CFG_CONFIGURE_EXIT_ON_ERROR" = "yes" ]; then + echo "XSync support cannot be enabled due to functionality tests!" + echo " Turn on verbose messaging (-v) to $0 to see the final report." + echo " If you believe this message is in error you may use the continue" + echo " switch (-continue) to $0 to continue." + exit 101 + else + CFG_XSYNC=no + fi + fi + fi + # auto-detect Xinerama support if [ "$CFG_XINERAMA" != "no" ]; then if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/x11/xinerama "Xinerama" $L_FLAGS $I_FLAGS $l_FLAGS $X11TESTS_FLAGS; then @@ -5581,7 +5647,7 @@ if [ "$CFG_PHONON" = "yes" ]; then QT_CONFIG="$QT_CONFIG phonon-backend" fi else - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_PHONON" +# QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_PHONON" fi # disable accessibility @@ -5593,7 +5659,7 @@ fi # enable opengl if [ "$CFG_OPENGL" = "no" ]; then - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENGL" +# QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_OPENGL" else QT_CONFIG="$QT_CONFIG opengl" fi @@ -5701,7 +5767,9 @@ fi if [ "$CFG_INOTIFY" = "yes" ]; then QT_CONFIG="$QT_CONFIG inotify" fi -if [ "$CFG_LIBJPEG" = "system" ]; then +if [ "$CFG_LIBJPEG" = "no" ]; then + CFG_JPEG="no" +elif [ "$CFG_LIBJPEG" = "system" ]; then QT_CONFIG="$QT_CONFIG system-jpeg" fi if [ "$CFG_JPEG" = "no" ]; then @@ -5709,7 +5777,9 @@ if [ "$CFG_JPEG" = "no" ]; then elif [ "$CFG_JPEG" = "yes" ]; then QT_CONFIG="$QT_CONFIG jpeg" fi -if [ "$CFG_LIBMNG" = "system" ]; then +if [ "$CFG_LIBMNG" = "no" ]; then + CFG_MNG="no" +elif [ "$CFG_LIBMNG" = "system" ]; then QT_CONFIG="$QT_CONFIG system-mng" fi if [ "$CFG_MNG" = "no" ]; then @@ -5733,7 +5803,9 @@ if [ "$CFG_GIF" = "no" ]; then elif [ "$CFG_GIF" = "yes" ]; then QT_CONFIG="$QT_CONFIG gif" fi -if [ "$CFG_LIBTIFF" = "system" ]; then +if [ "$CFG_LIBTIFF" = "no" ]; then + CFG_TIFF="no" +elif [ "$CFG_LIBTIFF" = "system" ]; then QT_CONFIG="$QT_CONFIG system-tiff" fi if [ "$CFG_TIFF" = "no" ]; then @@ -5780,6 +5852,9 @@ if [ "$PLATFORM_X11" = "yes" ]; then if [ "$CFG_XSHAPE" = "yes" ]; then QT_CONFIG="$QT_CONFIG xshape" fi + if [ "$CFG_XSYNC" = "yes" ]; then + QT_CONFIG="$QT_CONFIG xsync" + fi if [ "$CFG_XINERAMA" = "yes" ]; then QT_CONFIG="$QT_CONFIG xinerama" QMakeVar set QMAKE_LIBS_X11 '-lXinerama $$QMAKE_LIBS_X11' @@ -5958,7 +6033,7 @@ fi if [ "$CFG_XMLPATTERNS" = "yes" ]; then QT_CONFIG="$QT_CONFIG xmlpatterns" else - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XMLPATTERNS" +# QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XMLPATTERNS" fi if [ "$CFG_SVG" = "yes" ]; then @@ -6455,10 +6530,10 @@ QMakeVar set sql-plugins "$SQL_PLUGINS" [ "$CFG_JPEG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_JPEG" [ "$CFG_MNG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_MNG" [ "$CFG_ZLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ZLIB" -[ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS" +# [ "$CFG_EXCEPTIONS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_EXCEPTIONS" [ "$CFG_IPV6" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6" [ "$CFG_SXE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SXE" -[ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" +# [ "$CFG_DBUS" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_DBUS" if [ "$PLATFORM_QWS" != "yes" ]; then [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" @@ -6492,6 +6567,7 @@ fi [ "$CFG_XRENDER" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XRENDER" [ "$CFG_MITSHM" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MITSHM" [ "$CFG_XSHAPE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SHAPE" +[ "$CFG_XSYNC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XSYNC" [ "$CFG_XINPUT" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XINPUT QT_NO_TABLET" [ "$CFG_XCURSOR" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XCURSOR" @@ -6933,6 +7009,7 @@ fi if [ "$PLATFORM_X11" = "yes" ]; then echo "NAS sound support ... $CFG_NAS" echo "XShape support ...... $CFG_XSHAPE" + echo "XSync support ....... $CFG_XSYNC" echo "Xinerama support .... $CFG_XINERAMA" echo "Xcursor support ..... $CFG_XCURSOR" echo "Xfixes support ...... $CFG_XFIXES" @@ -7030,9 +7107,9 @@ BEGIN { FNR == 1 { if ( input_file ) { - if ( ! target_file ) - target_file = third - print input_file >target_file + if ( ! target_file ) + target_file = third + print input_file >target_file } matched_target = 0 @@ -7043,32 +7120,32 @@ FNR == 1 { /^(TARGET.*=)/ { if ( \$3 == "moc" || \$3 ~ /^Qt/ ) { - target_file = first + target_file = first matched_target = 1 } } matched_target == 0 && /^(TEMPLATE.*=)/ { if ( \$3 == "subdirs" ) - target_file = second + target_file = second else if ( \$3 == "lib" ) - template_lib = 1 + template_lib = 1 else - target_file = third + target_file = third } matched_target == 0 && template_lib == 1 && /^(CONFIG.*=)/ { if ( \$0 ~ /plugin/ ) target_file = third else - target_file = second + target_file = second } END { if ( input_file ) { - if ( ! target_file ) - target_file = third - print input_file >>target_file + if ( ! target_file ) + target_file = third + print input_file >>target_file } } diff --git a/devel/qt4/files/extrapatch-configure b/devel/qt4/files/extrapatch-configure index 5d8e9a1806a4..8fff01cdb1ea 100644 --- a/devel/qt4/files/extrapatch-configure +++ b/devel/qt4/files/extrapatch-configure @@ -1,6 +1,6 @@ ---- ./configure.orig 2009-04-22 03:57:35.000000000 +0400 -+++ ./configure 2009-05-21 02:46:31.000000000 +0400 -@@ -2084,12 +2084,6 @@ +--- ./configure.orig 2009-09-29 15:01:31.000000000 +0400 ++++ ./configure 2009-10-04 01:56:41.000000000 +0400 +@@ -2124,12 +2124,6 @@ chmod 755 "$outpath/bin/syncqt" fi @@ -13,7 +13,7 @@ # symlink the doc directory rm -rf "$outpath/doc" ln -s "$relpath/doc" "$outpath/doc" -@@ -2128,7 +2122,7 @@ +@@ -2168,7 +2162,7 @@ # find a make command if [ -z "$MAKE" ]; then MAKE= @@ -22,7 +22,7 @@ if "$WHICH" $mk >/dev/null 2>&1; then MAKE=`$WHICH $mk` break -@@ -4006,7 +4000,7 @@ +@@ -4069,7 +4063,7 @@ } # build qmake @@ -31,7 +31,7 @@ echo "Creating qmake. Please wait..." OLD_QCONFIG_H= -@@ -4734,12 +4728,13 @@ +@@ -4797,12 +4791,13 @@ fi # Check we actually have X11 :-) @@ -51,7 +51,7 @@ # auto-detect OpenGL support (es1 = OpenGL ES 1.x Common, es1cl = ES 1.x common lite, es2 = OpenGL ES 2.x) if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then -@@ -5569,7 +5564,7 @@ +@@ -5652,7 +5647,7 @@ QT_CONFIG="$QT_CONFIG phonon-backend" fi else @@ -60,7 +60,7 @@ fi # disable accessibility -@@ -5581,7 +5576,7 @@ +@@ -5664,7 +5659,7 @@ # enable opengl if [ "$CFG_OPENGL" = "no" ]; then @@ -69,7 +69,7 @@ else QT_CONFIG="$QT_CONFIG opengl" fi -@@ -5946,7 +5941,7 @@ +@@ -6038,7 +6033,7 @@ if [ "$CFG_XMLPATTERNS" = "yes" ]; then QT_CONFIG="$QT_CONFIG xmlpatterns" else @@ -78,7 +78,7 @@ fi if [ "$CFG_SVG" = "yes" ]; then -@@ -6442,10 +6437,10 @@ +@@ -6535,10 +6530,10 @@ [ "$CFG_JPEG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_JPEG" [ "$CFG_MNG" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IMAGEFORMAT_MNG" [ "$CFG_ZLIB" != "yes" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_ZLIB" @@ -91,7 +91,7 @@ if [ "$PLATFORM_QWS" != "yes" ]; then [ "$CFG_GRAPHICS_SYSTEM" = "raster" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_GRAPHICSSYSTEM_RASTER" -@@ -6453,33 +6448,33 @@ +@@ -6546,34 +6541,34 @@ fi # X11/Unix/Mac only configs @@ -125,6 +125,7 @@ -[ "$CFG_XRENDER" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XRENDER" -[ "$CFG_MITSHM" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MITSHM" -[ "$CFG_XSHAPE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SHAPE" +-[ "$CFG_XSYNC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XSYNC" -[ "$CFG_XINPUT" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XINPUT QT_NO_TABLET" +# [ "$CFG_SM" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SESSIONMANAGER" +# [ "$CFG_XCURSOR" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XCURSOR" @@ -136,11 +137,12 @@ +# [ "$CFG_XRENDER" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XRENDER" +# [ "$CFG_MITSHM" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_MITSHM" +# [ "$CFG_XSHAPE" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_SHAPE" ++# [ "$CFG_XSYNC" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XSYNC" +# [ "$CFG_XINPUT" = "no" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_XINPUT QT_NO_TABLET" [ "$CFG_XCURSOR" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XCURSOR" [ "$CFG_XINERAMA" = "runtime" ] && QCONFIG_FLAGS="$QCONFIG_FLAGS QT_RUNTIME_XINERAMA" -@@ -6989,7 +6984,7 @@ +@@ -7084,7 +7079,7 @@ if [ -f "${relpath}/projects.pro" ]; then mkfile="${outpath}/Makefile" [ -f "$mkfile" ] && chmod +w "$mkfile" @@ -149,7 +151,7 @@ fi # .projects -> projects to process -@@ -7162,7 +7157,7 @@ +@@ -7257,7 +7252,7 @@ echo " for $a\c" fi diff --git a/graphics/qt4-iconengines/Makefile b/graphics/qt4-iconengines/Makefile index 130c8c895744..77ade58473e7 100644 --- a/graphics/qt4-iconengines/Makefile +++ b/graphics/qt4-iconengines/Makefile @@ -8,12 +8,9 @@ PORTNAME= iconengines PORTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES?= graphics -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt SVG icon engine plugin diff --git a/graphics/qt4-iconengines/distinfo b/graphics/qt4-iconengines/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/graphics/qt4-iconengines/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/graphics/qt4-imageformats/Makefile b/graphics/qt4-imageformats/Makefile index 6c160ac672f7..4fdfb4e9eaf1 100644 --- a/graphics/qt4-imageformats/Makefile +++ b/graphics/qt4-imageformats/Makefile @@ -8,12 +8,9 @@ PORTNAME= imageformats PORTVERSION= ${QT4_VERSION} -PORTREVISION=0 +PORTREVISION= 0 CATEGORIES?= graphics -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt imageformat plugins for GIF, JPEG, MNG and SVG diff --git a/graphics/qt4-imageformats/distinfo b/graphics/qt4-imageformats/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/graphics/qt4-imageformats/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/graphics/qt4-pixeltool/Makefile b/graphics/qt4-pixeltool/Makefile index ebdb35f2f840..ff8411bc8d4e 100644 --- a/graphics/qt4-pixeltool/Makefile +++ b/graphics/qt4-pixeltool/Makefile @@ -8,12 +8,9 @@ PORTNAME= pixeltool PORTVERSION= ${QT4_VERSION} -PORTREVISION=0 +PORTREVISION= 0 CATEGORIES?= graphics -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt screen magnification utility diff --git a/graphics/qt4-pixeltool/distinfo b/graphics/qt4-pixeltool/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/graphics/qt4-pixeltool/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/graphics/qt4-svg/Makefile b/graphics/qt4-svg/Makefile index 2ac35bc34817..b63d06513b28 100644 --- a/graphics/qt4-svg/Makefile +++ b/graphics/qt4-svg/Makefile @@ -9,10 +9,7 @@ PORTNAME= svg PORTVERSION= ${QT4_VERSION} CATEGORIES?= graphics -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt SVG library diff --git a/graphics/qt4-svg/distinfo b/graphics/qt4-svg/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/graphics/qt4-svg/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/graphics/qt4-svg/pkg-plist b/graphics/qt4-svg/pkg-plist index f2bd42e1b9e3..3480db18360a 100644 --- a/graphics/qt4-svg/pkg-plist +++ b/graphics/qt4-svg/pkg-plist @@ -16,9 +16,9 @@ lib/qt4/libQtSvg.la lib/qt4/libQtSvg.prl lib/qt4/libQtSvg.so lib/qt4/libQtSvg.so.4 -lib/qt4/libQtSvg.so.4.5 -lib/qt4/libQtSvg.so.4.5.2 -%%DEBUG%%lib/qt4/libQtSvg.so.4.5.2.debug +lib/qt4/libQtSvg.so.%%SHLIB_SHVER%% +lib/qt4/libQtSvg.so.%%SHLIB_VER%% +%%DEBUG%%lib/qt4/libQtSvg.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtSvg.pc @dirrm include/qt4/QtSvg @dirrmtry include/qt4/Qt diff --git a/japanese/qt4-codecs-jp/Makefile b/japanese/qt4-codecs-jp/Makefile index d9647ffc9537..a5f5978d08e0 100644 --- a/japanese/qt4-codecs-jp/Makefile +++ b/japanese/qt4-codecs-jp/Makefile @@ -9,11 +9,8 @@ PORTNAME= codecs PORTVERSION= ${QT4_VERSION} CATEGORIES?= japanese -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -jp -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt EUC-JP/JIS codec plugins diff --git a/japanese/qt4-codecs-jp/distinfo b/japanese/qt4-codecs-jp/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/japanese/qt4-codecs-jp/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/korean/qt4-codecs-kr/Makefile b/korean/qt4-codecs-kr/Makefile index c1aa8ae01b97..147cde777c3b 100644 --- a/korean/qt4-codecs-kr/Makefile +++ b/korean/qt4-codecs-kr/Makefile @@ -9,11 +9,8 @@ PORTNAME= codecs PORTVERSION= ${QT4_VERSION} CATEGORIES?= korean -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -kr -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt EUC-KR codec plugin @@ -23,7 +20,6 @@ QT_COMPONENTS= qmake_build corelib QT_NONSTANDARD= yes QT_DIST= yes -#USE_BZIP2= yes HAS_CONFIGURE= yes ALL_TARGET= first diff --git a/korean/qt4-codecs-kr/distinfo b/korean/qt4-codecs-kr/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/korean/qt4-codecs-kr/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/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 diff --git a/multimedia/qt4-phonon-gst/Makefile b/multimedia/qt4-phonon-gst/Makefile index b12a9dd53c2f..51f977dd6e5f 100644 --- a/multimedia/qt4-phonon-gst/Makefile +++ b/multimedia/qt4-phonon-gst/Makefile @@ -8,11 +8,8 @@ PORTNAME= phonon PORTVERSION= ${QT4_VERSION} CATEGORIES?= multimedia -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -gst -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt4 multimedia framework, gstreamer backend diff --git a/multimedia/qt4-phonon-gst/distinfo b/multimedia/qt4-phonon-gst/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/multimedia/qt4-phonon-gst/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/multimedia/qt4-phonon/Makefile b/multimedia/qt4-phonon/Makefile index 1687fbd1817e..56de6baaae64 100644 --- a/multimedia/qt4-phonon/Makefile +++ b/multimedia/qt4-phonon/Makefile @@ -8,10 +8,7 @@ PORTNAME= phonon PORTVERSION= ${QT4_VERSION} CATEGORIES?= multimedia -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt4 multimedia framework diff --git a/multimedia/qt4-phonon/distinfo b/multimedia/qt4-phonon/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/multimedia/qt4-phonon/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/multimedia/qt4-phonon/pkg-plist b/multimedia/qt4-phonon/pkg-plist index 6f138fe7c417..98b55a71a329 100644 --- a/multimedia/qt4-phonon/pkg-plist +++ b/multimedia/qt4-phonon/pkg-plist @@ -1,80 +1,49 @@ -include/qt4/Qt/abstractaudiooutput.h -include/qt4/Qt/abstractmediastream.h -include/qt4/Qt/abstractvideooutput.h -include/qt4/Qt/addoninterface.h -include/qt4/Qt/audiooutput.h -include/qt4/Qt/audiooutputinterface.h -include/qt4/Qt/backendcapabilities.h -include/qt4/Qt/backendinterface.h -include/qt4/Qt/effect.h -include/qt4/Qt/effectinterface.h -include/qt4/Qt/effectparameter.h -include/qt4/Qt/effectwidget.h -include/qt4/Qt/mediacontroller.h -include/qt4/Qt/medianode.h -include/qt4/Qt/mediaobject.h -include/qt4/Qt/mediaobjectinterface.h -include/qt4/Qt/mediasource.h -include/qt4/Qt/objectdescription.h -include/qt4/Qt/objectdescriptionmodel.h -include/qt4/Qt/path.h -include/qt4/Qt/phonon -include/qt4/Qt/phonon_export.h -include/qt4/Qt/phonondefs.h -include/qt4/Qt/phononnamespace.h -include/qt4/Qt/platformplugin.h -include/qt4/Qt/seekslider.h -include/qt4/Qt/streaminterface.h -include/qt4/Qt/videoplayer.h -include/qt4/Qt/videowidget.h -include/qt4/Qt/videowidgetinterface.h -include/qt4/Qt/volumefadereffect.h -include/qt4/Qt/volumefaderinterface.h -include/qt4/Qt/volumeslider.h -include/qt4/phonon/AbstractAudioOutput -include/qt4/phonon/AbstractMediaStream -include/qt4/phonon/AbstractVideoOutput -include/qt4/phonon/AddonInterface -include/qt4/phonon/AudioCaptureDevice -include/qt4/phonon/AudioCaptureDeviceModel -include/qt4/phonon/AudioChannelDescription -include/qt4/phonon/AudioChannelDescriptionModel -include/qt4/phonon/AudioOutput -include/qt4/phonon/AudioOutputDevice -include/qt4/phonon/AudioOutputDeviceModel -include/qt4/phonon/AudioOutputInterface -include/qt4/phonon/AudioOutputInterface40 -include/qt4/phonon/AudioOutputInterface42 -include/qt4/phonon/BackendCapabilities -include/qt4/phonon/BackendInterface -include/qt4/phonon/Effect -include/qt4/phonon/EffectDescription -include/qt4/phonon/EffectDescriptionModel -include/qt4/phonon/EffectInterface -include/qt4/phonon/EffectParameter -include/qt4/phonon/EffectWidget +include/qt4/Phonon include/qt4/phonon/Global -include/qt4/phonon/MediaController -include/qt4/phonon/MediaNode -include/qt4/phonon/MediaObject -include/qt4/phonon/MediaObjectInterface -include/qt4/phonon/MediaSource -include/qt4/phonon/ObjectDescription -include/qt4/phonon/ObjectDescriptionData -include/qt4/phonon/ObjectDescriptionModel -include/qt4/phonon/ObjectDescriptionModelData -include/qt4/phonon/Path -include/qt4/phonon/PlatformPlugin -include/qt4/phonon/SeekSlider -include/qt4/phonon/StreamInterface -include/qt4/phonon/SubtitleDescription -include/qt4/phonon/SubtitleDescriptionModel -include/qt4/phonon/VideoPlayer -include/qt4/phonon/VideoWidget -include/qt4/phonon/VideoWidgetInterface -include/qt4/phonon/VolumeFaderEffect -include/qt4/phonon/VolumeFaderInterface -include/qt4/phonon/VolumeSlider +include/qt4/phonon/Phonon/AbstractAudioOutput +include/qt4/phonon/Phonon/AbstractMediaStream +include/qt4/phonon/Phonon/AbstractVideoOutput +include/qt4/phonon/Phonon/AddonInterface +include/qt4/phonon/Phonon/AudioCaptureDevice +include/qt4/phonon/Phonon/AudioCaptureDeviceModel +include/qt4/phonon/Phonon/AudioChannelDescription +include/qt4/phonon/Phonon/AudioChannelDescriptionModel +include/qt4/phonon/Phonon/AudioOutput +include/qt4/phonon/Phonon/AudioOutputDevice +include/qt4/phonon/Phonon/AudioOutputDeviceModel +include/qt4/phonon/Phonon/AudioOutputInterface +include/qt4/phonon/Phonon/AudioOutputInterface40 +include/qt4/phonon/Phonon/AudioOutputInterface42 +include/qt4/phonon/Phonon/BackendCapabilities +include/qt4/phonon/Phonon/BackendInterface +include/qt4/phonon/Phonon/Effect +include/qt4/phonon/Phonon/EffectDescription +include/qt4/phonon/Phonon/EffectDescriptionModel +include/qt4/phonon/Phonon/EffectInterface +include/qt4/phonon/Phonon/EffectParameter +include/qt4/phonon/Phonon/EffectWidget +include/qt4/phonon/Phonon/Global +include/qt4/phonon/Phonon/MediaController +include/qt4/phonon/Phonon/MediaNode +include/qt4/phonon/Phonon/MediaObject +include/qt4/phonon/Phonon/MediaObjectInterface +include/qt4/phonon/Phonon/MediaSource +include/qt4/phonon/Phonon/ObjectDescription +include/qt4/phonon/Phonon/ObjectDescriptionData +include/qt4/phonon/Phonon/ObjectDescriptionModel +include/qt4/phonon/Phonon/ObjectDescriptionModelData +include/qt4/phonon/Phonon/Path +include/qt4/phonon/Phonon/PlatformPlugin +include/qt4/phonon/Phonon/SeekSlider +include/qt4/phonon/Phonon/StreamInterface +include/qt4/phonon/Phonon/SubtitleDescription +include/qt4/phonon/Phonon/SubtitleDescriptionModel +include/qt4/phonon/Phonon/VideoPlayer +include/qt4/phonon/Phonon/VideoWidget +include/qt4/phonon/Phonon/VideoWidgetInterface +include/qt4/phonon/Phonon/VolumeFaderEffect +include/qt4/phonon/Phonon/VolumeFaderInterface +include/qt4/phonon/Phonon/VolumeSlider include/qt4/phonon/abstractaudiooutput.h include/qt4/phonon/abstractmediastream.h include/qt4/phonon/abstractvideooutput.h @@ -108,7 +77,6 @@ include/qt4/phonon/videowidgetinterface.h include/qt4/phonon/volumefadereffect.h include/qt4/phonon/volumefaderinterface.h include/qt4/phonon/volumeslider.h -include/qt4/Phonon lib/qt4/libphonon.la lib/qt4/libphonon.prl lib/qt4/libphonon.so @@ -117,7 +85,10 @@ lib/qt4/libphonon.so.4.3 lib/qt4/libphonon.so.4.3.1 %%DEBUG%%lib/qt4/libphonon.so.4.3.1.debug libdata/pkgconfig/phonon.pc +@dirrm lib/qt4/plugins/phonon_backend +@dirrm lib/qt4/plugins +@dirrm lib/qt4 +@dirrmtry include/qt4/phonon/Phonon @dirrm include/qt4/phonon -@dirrmtry include/qt4/Qt -@dirrmtry include/qt4 -@dirrmtry %%QT_PLUGINDIR_REL%%/phonon_backend +@dirrmtry %%QT_PLUGINDIR_REL%%//phonon_backend +@dirrm include/qt4 diff --git a/net/qt4-network/Makefile b/net/qt4-network/Makefile index cc441c55c574..76084b845d39 100644 --- a/net/qt4-network/Makefile +++ b/net/qt4-network/Makefile @@ -8,12 +8,9 @@ PORTNAME= network PORTVERSION= ${QT4_VERSION} -PORTREVISION=0 +PORTREVISION= 0 CATEGORIES?= net ipv6 -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt network library diff --git a/net/qt4-network/distinfo b/net/qt4-network/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/net/qt4-network/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/net/qt4-network/pkg-plist b/net/qt4-network/pkg-plist index 322d9b827b46..c24b20bb9480 100644 --- a/net/qt4-network/pkg-plist +++ b/net/qt4-network/pkg-plist @@ -94,10 +94,10 @@ include/qt4/QtNetwork/qurlinfo.h lib/qt4/libQtNetwork.la lib/qt4/libQtNetwork.prl lib/qt4/libQtNetwork.so -%%DEBUG%%lib/qt4/libQtNetwork.so.4.5.2.debug +%%DEBUG%%lib/qt4/libQtNetwork.so.%%SHLIB_VER%%.debug lib/qt4/libQtNetwork.so.4 -lib/qt4/libQtNetwork.so.4.5 -lib/qt4/libQtNetwork.so.4.5.2 +lib/qt4/libQtNetwork.so.%%SHLIB_SHVER%% +lib/qt4/libQtNetwork.so.%%SHLIB_VER%% libdata/pkgconfig/QtNetwork.pc @dirrm include/qt4/QtNetwork @dirrmtry include/qt4/Qt 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 diff --git a/www/qt4-webkit/Makefile b/www/qt4-webkit/Makefile index 830d67c6e34e..d4790bc40336 100644 --- a/www/qt4-webkit/Makefile +++ b/www/qt4-webkit/Makefile @@ -8,10 +8,7 @@ PORTNAME= webkit PORTVERSION= ${QT4_VERSION} CATEGORIES?= www -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt4 webkit engine diff --git a/www/qt4-webkit/distinfo b/www/qt4-webkit/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/www/qt4-webkit/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/www/qt4-webkit/pkg-plist b/www/qt4-webkit/pkg-plist index f0e7548003bf..748148fc5324 100644 --- a/www/qt4-webkit/pkg-plist +++ b/www/qt4-webkit/pkg-plist @@ -35,9 +35,9 @@ lib/qt4/libQtWebKit.la lib/qt4/libQtWebKit.prl lib/qt4/libQtWebKit.so lib/qt4/libQtWebKit.so.4 -lib/qt4/libQtWebKit.so.4.5 -lib/qt4/libQtWebKit.so.4.5.2 -@comment %%DEBUG%%lib/qt4/libQtWebKit.so.4.5.2.debug +lib/qt4/libQtWebKit.so.%%SHLIB_SHVER%% +lib/qt4/libQtWebKit.so.%%SHLIB_VER%% +@comment %%DEBUG%%lib/qt4/libQtWebKit.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtWebKit.pc @dirrm include/qt4/QtWebKit @dirrmtry include/qt4/Qt diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile index 78f92a9091c3..f2ef6a434633 100644 --- a/x11-toolkits/qt4-gui/Makefile +++ b/x11-toolkits/qt4-gui/Makefile @@ -8,12 +8,9 @@ PORTNAME= gui PORTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES?= x11-toolkits -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt graphical user interface library diff --git a/x11-toolkits/qt4-gui/distinfo b/x11-toolkits/qt4-gui/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/x11-toolkits/qt4-gui/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/x11-toolkits/qt4-gui/pkg-plist b/x11-toolkits/qt4-gui/pkg-plist index d74d4279062f..613cdd5ca955 100644 --- a/x11-toolkits/qt4-gui/pkg-plist +++ b/x11-toolkits/qt4-gui/pkg-plist @@ -802,9 +802,9 @@ lib/qt4/libQtGui.la lib/qt4/libQtGui.prl lib/qt4/libQtGui.so lib/qt4/libQtGui.so.4 -lib/qt4/libQtGui.so.4.5 -lib/qt4/libQtGui.so.4.5.2 -%%DEBUG%%lib/qt4/libQtGui.so.4.5.2.debug +lib/qt4/libQtGui.so.%%SHLIB_SHVER%% +lib/qt4/libQtGui.so.%%SHLIB_VER%% +%%DEBUG%%lib/qt4/libQtGui.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtGui.pc @dirrm include/qt4/QtGui @dirrmtry include/qt4/Qt diff --git a/x11/qt4-inputmethods/Makefile b/x11/qt4-inputmethods/Makefile index 8d1e80aaffbb..46f5fc3b75bb 100644 --- a/x11/qt4-inputmethods/Makefile +++ b/x11/qt4-inputmethods/Makefile @@ -8,12 +8,9 @@ PORTNAME= inputmethods PORTVERSION= ${QT4_VERSION} -PORTREVISION=0 +PORTREVISION= 0 CATEGORIES?= x11 -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt input method plugins diff --git a/x11/qt4-inputmethods/distinfo b/x11/qt4-inputmethods/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/x11/qt4-inputmethods/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/x11/qt4-opengl/Makefile b/x11/qt4-opengl/Makefile index 0e5fd03abf36..577538c13646 100644 --- a/x11/qt4-opengl/Makefile +++ b/x11/qt4-opengl/Makefile @@ -8,12 +8,9 @@ PORTNAME= opengl PORTVERSION= ${QT4_VERSION} -PORTREVISION=0 +PORTREVISION= 0 CATEGORIES?= x11 -MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- -DISTNAME= qt-x11-opensource-src-${PORTVERSION} -DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Qt OpenGL library diff --git a/x11/qt4-opengl/distinfo b/x11/qt4-opengl/distinfo deleted file mode 100644 index 27b0949354e8..000000000000 --- a/x11/qt4-opengl/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/x11/qt4-opengl/pkg-plist b/x11/qt4-opengl/pkg-plist index 90b1da42fde6..ca0a00ab3f6d 100644 --- a/x11/qt4-opengl/pkg-plist +++ b/x11/qt4-opengl/pkg-plist @@ -24,9 +24,9 @@ lib/qt4/libQtOpenGL.la lib/qt4/libQtOpenGL.prl lib/qt4/libQtOpenGL.so lib/qt4/libQtOpenGL.so.4 -lib/qt4/libQtOpenGL.so.4.5 -lib/qt4/libQtOpenGL.so.4.5.2 -%%DEBUG%%lib/qt4/libQtOpenGL.so.4.5.2.debug +lib/qt4/libQtOpenGL.so.%%SHLIB_SHVER%% +lib/qt4/libQtOpenGL.so.%%SHLIB_VER%% +%%DEBUG%%lib/qt4/libQtOpenGL.so.%%SHLIB_VER%%.debug libdata/pkgconfig/QtOpenGL.pc @dirrm include/qt4/QtOpenGL @dirrmtry include/qt4/Qt |