From ff6a438c6962b388018f739b325570b68c38f419 Mon Sep 17 00:00:00 2001 From: lofi Date: Sun, 2 Sep 2007 06:23:28 +0000 Subject: Update to Qt 4.3.1. --- Mk/bsd.qt.mk | 4 +- accessibility/qt4-accessible/Makefile | 2 - accessibility/qt4-accessible/distinfo | 6 +- accessibility/qt4-accessible/pkg-plist | 10 +- chinese/qt4-codecs-cn/Makefile | 2 - chinese/qt4-codecs-cn/distinfo | 6 +- chinese/qt4-codecs-cn/pkg-plist | 8 +- chinese/qt4-codecs-tw/Makefile | 2 - chinese/qt4-codecs-tw/distinfo | 6 +- chinese/qt4-codecs-tw/pkg-plist | 8 +- databases/qt-ibase-plugin/Makefile | 4 +- databases/qt-mysql-plugin/Makefile | 4 +- databases/qt-odbc-plugin/Makefile | 4 +- databases/qt-pgsql-plugin/Makefile | 4 +- databases/qt-sqlite-plugin/Makefile | 4 +- databases/qt4-ibase-plugin/distinfo | 6 +- databases/qt4-ibase-plugin/files/Makefile.bsd | 2 +- databases/qt4-ibase-plugin/pkg-plist | 4 +- databases/qt4-mysql-plugin/distinfo | 6 +- databases/qt4-mysql-plugin/files/Makefile.bsd | 2 +- databases/qt4-mysql-plugin/pkg-plist | 4 +- databases/qt4-odbc-plugin/distinfo | 6 +- databases/qt4-odbc-plugin/files/Makefile.bsd | 2 +- databases/qt4-odbc-plugin/pkg-plist | 4 +- databases/qt4-pgsql-plugin/distinfo | 6 +- databases/qt4-pgsql-plugin/files/Makefile.bsd | 2 +- databases/qt4-pgsql-plugin/pkg-plist | 4 +- databases/qt4-sql/distinfo | 6 +- databases/qt4-sql/pkg-plist | 4 +- databases/qt4-sqlite-plugin/distinfo | 6 +- databases/qt4-sqlite-plugin/files/Makefile.bsd | 2 +- databases/qt4-sqlite-plugin/pkg-plist | 4 +- databases/qt4-sqlite3-plugin/distinfo | 6 +- databases/qt4-sqlite3-plugin/files/Makefile.bsd | 2 +- databases/qt4-sqlite3-plugin/pkg-plist | 4 +- devel/dbus-qt4/distinfo | 6 +- devel/dbus-qt4/pkg-plist | 4 +- devel/qmake4/Makefile | 2 +- devel/qmake4/distinfo | 6 +- devel/qmake4/files/qconfig.cpp | 2 +- devel/qmake4/pkg-plist | 3 + devel/qt4-assistant/Makefile | 2 +- devel/qt4-assistant/distinfo | 6 +- devel/qt4-corelib/Makefile | 6 +- devel/qt4-corelib/distinfo | 6 +- .../files/patch-src_corelib_arch_arm_arch.pri | 9 - devel/qt4-corelib/pkg-plist | 9 +- devel/qt4-designer/Makefile | 11 +- devel/qt4-designer/distinfo | 6 +- devel/qt4-designer/pkg-plist | 13 +- devel/qt4-libqtassistantclient/distinfo | 6 +- devel/qt4-libqtassistantclient/pkg-plist | 4 +- devel/qt4-linguist/Makefile | 2 +- devel/qt4-linguist/distinfo | 6 +- devel/qt4-linguist/pkg-plist | 1 + devel/qt4-makeqpf/distinfo | 6 +- devel/qt4-moc/distinfo | 6 +- devel/qt4-moc/pkg-plist | 2 + devel/qt4-porting/distinfo | 6 +- devel/qt4-qdbusviewer/distinfo | 6 +- devel/qt4-qt3support/Makefile | 2 +- devel/qt4-qt3support/distinfo | 6 +- devel/qt4-qt3support/pkg-plist | 4 +- devel/qt4-qtestlib/Makefile | 2 +- devel/qt4-qtestlib/distinfo | 6 +- devel/qt4-qtestlib/pkg-plist | 4 +- devel/qt4-qvfb/distinfo | 6 +- devel/qt4-qvfb/pkg-plist | 118 +- devel/qt4-rcc/distinfo | 6 +- devel/qt4-rcc/pkg-plist | 2 + devel/qt4-script/distinfo | 6 +- devel/qt4-script/pkg-plist | 4 +- devel/qt4-uic/distinfo | 6 +- devel/qt4-uic/pkg-plist | 2 + devel/qt4-uic3/distinfo | 6 +- devel/qt4-uic3/pkg-plist | 2 + devel/qt4/Makefile | 28 +- devel/qt4/files/configure | 36 +- graphics/qt4-iconengines/Makefile | 2 - graphics/qt4-iconengines/distinfo | 6 +- graphics/qt4-iconengines/pkg-plist | 6 +- graphics/qt4-imageformats/Makefile | 3 - graphics/qt4-imageformats/distinfo | 6 +- graphics/qt4-imageformats/pkg-plist | 22 +- graphics/qt4-pixeltool/distinfo | 6 +- graphics/qt4-svg/distinfo | 6 +- graphics/qt4-svg/pkg-plist | 4 +- japanese/qt4-codecs-jp/Makefile | 2 - japanese/qt4-codecs-jp/distinfo | 6 +- japanese/qt4-codecs-jp/pkg-plist | 8 +- korean/qt4-codecs-kr/Makefile | 2 - korean/qt4-codecs-kr/distinfo | 6 +- korean/qt4-codecs-kr/pkg-plist | 8 +- misc/qt4-doc/distinfo | 6 +- misc/qt4-doc/pkg-plist | 8077 ++++++++++---------- misc/qt4-qtconfig/distinfo | 6 +- misc/qt4-qtdemo/distinfo | 6 +- misc/qt4-qtdemo/pkg-plist | 57 +- net/qt4-network/distinfo | 6 +- net/qt4-network/pkg-plist | 4 +- textproc/qt4-xml/distinfo | 6 +- textproc/qt4-xml/pkg-plist | 4 +- x11-toolkits/qt4-gui/Makefile | 5 +- x11-toolkits/qt4-gui/distinfo | 6 +- x11-toolkits/qt4-gui/pkg-plist | 4 +- x11/qt4-inputmethods/Makefile | 2 - x11/qt4-inputmethods/distinfo | 6 +- x11/qt4-inputmethods/pkg-plist | 6 +- x11/qt4-opengl/distinfo | 6 +- x11/qt4-opengl/pkg-plist | 4 +- 110 files changed, 4482 insertions(+), 4360 deletions(-) delete mode 100644 devel/qt4-corelib/files/patch-src_corelib_arch_arm_arch.pri diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk index c538e6476ddf..ce0687032aa3 100644 --- a/Mk/bsd.qt.mk +++ b/Mk/bsd.qt.mk @@ -22,7 +22,7 @@ CONFIGURE_ARGS+=-fast -no-exceptions ${CUPS} \ -prefix ${PREFIX} \ -docdir ${PREFIX}/share/doc/qt4 \ -headerdir ${PREFIX}/include \ - -plugindir ${PREFIX}/lib/plugins \ + -plugindir ${PREFIX}/lib/qt4/plugins \ -datadir ${PREFIX}/share/qt4 \ -libdir ${PREFIX}/lib \ -translationdir ${PREFIX}/share/qt4/translations \ @@ -66,7 +66,7 @@ QTCGFLIBS?= .endif # !defined(_POSTMKINCLUDED) && !defined(Qt_Pre_Include) -QT4_VERSION?= 4.3.0 +QT4_VERSION?= 4.3.1 _QT_COMPONENTS_ALL= accessible assistant assistantclient codecs-cn \ codecs-jp codecs-kr codecs-tw corelib dbus designer \ diff --git a/accessibility/qt4-accessible/Makefile b/accessibility/qt4-accessible/Makefile index 2e812511a2cb..fb23f1893c99 100644 --- a/accessibility/qt4-accessible/Makefile +++ b/accessibility/qt4-accessible/Makefile @@ -44,8 +44,6 @@ CONFIGURE_WRKSRC=${WRKSRC}/../../.. pre-configure: ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} - ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib/plugins/accessible|g' \ - ${WRKSRC}/qaccessiblebase.pri ${MKDIR} ${WRKSRC}/../../../mkspecs ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../bin/qmake ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../../bin/moc diff --git a/accessibility/qt4-accessible/distinfo b/accessibility/qt4-accessible/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/accessibility/qt4-accessible/distinfo +++ b/accessibility/qt4-accessible/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/accessibility/qt4-accessible/pkg-plist b/accessibility/qt4-accessible/pkg-plist index 5115727c69d3..b8588dd81f60 100644 --- a/accessibility/qt4-accessible/pkg-plist +++ b/accessibility/qt4-accessible/pkg-plist @@ -1,5 +1,5 @@ -lib/plugins/accessible/libqtaccessiblecompatwidgets.so -%%DEBUG%%lib/plugins/accessible/libqtaccessiblecompatwidgets.so.debug -lib/plugins/accessible/libqtaccessiblewidgets.so -%%DEBUG%%lib/plugins/accessible/libqtaccessiblewidgets.so.debug -@dirrm lib/plugins/accessible +lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so +%%DEBUG%%lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so.debug +lib/qt4/plugins/accessible/libqtaccessiblewidgets.so +%%DEBUG%%lib/qt4/plugins/accessible/libqtaccessiblewidgets.so.debug +@dirrm lib/qt4/plugins/accessible diff --git a/chinese/qt4-codecs-cn/Makefile b/chinese/qt4-codecs-cn/Makefile index 81457b0803a3..93e97947aee3 100644 --- a/chinese/qt4-codecs-cn/Makefile +++ b/chinese/qt4-codecs-cn/Makefile @@ -45,8 +45,6 @@ CONFIGURE_WRKSRC=${WRKSRC}/../../../.. pre-configure: ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} - ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib/plugins/codecs|g' \ - ${WRKSRC}/cn.pro ${MKDIR} ${WRKSRC}/../../../mkspecs ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../../bin/qmake ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../../../bin/moc diff --git a/chinese/qt4-codecs-cn/distinfo b/chinese/qt4-codecs-cn/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/chinese/qt4-codecs-cn/distinfo +++ b/chinese/qt4-codecs-cn/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/chinese/qt4-codecs-cn/pkg-plist b/chinese/qt4-codecs-cn/pkg-plist index c1469343d723..2f3e3af9bc28 100644 --- a/chinese/qt4-codecs-cn/pkg-plist +++ b/chinese/qt4-codecs-cn/pkg-plist @@ -1,3 +1,5 @@ -lib/plugins/codecs/libqcncodecs.so -%%DEBUG%%lib/plugins/codecs/libqcncodecs.so.debug -@dirrm lib/plugins/codecs +lib/qt4/plugins/codecs/libqcncodecs.so +%%DEBUG%%lib/qt4/plugins/codecs/libqcncodecs.so.debug +share/nls/POSIX +share/nls/en_US.US-ASCII +@dirrm lib/qt4/plugins/codecs diff --git a/chinese/qt4-codecs-tw/Makefile b/chinese/qt4-codecs-tw/Makefile index 2e8cb17f26e0..3c3dc0dfb7ec 100644 --- a/chinese/qt4-codecs-tw/Makefile +++ b/chinese/qt4-codecs-tw/Makefile @@ -45,8 +45,6 @@ CONFIGURE_WRKSRC=${WRKSRC}/../../../.. pre-configure: ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} - ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib/plugins/codecs|g' \ - ${WRKSRC}/tw.pro ${MKDIR} ${WRKSRC}/../../../mkspecs ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../../../bin/qmake ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../../../bin/moc diff --git a/chinese/qt4-codecs-tw/distinfo b/chinese/qt4-codecs-tw/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/chinese/qt4-codecs-tw/distinfo +++ b/chinese/qt4-codecs-tw/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/chinese/qt4-codecs-tw/pkg-plist b/chinese/qt4-codecs-tw/pkg-plist index ee41cd9ed325..abdadc67e0b5 100644 --- a/chinese/qt4-codecs-tw/pkg-plist +++ b/chinese/qt4-codecs-tw/pkg-plist @@ -1,3 +1,5 @@ -lib/plugins/codecs/libqtwcodecs.so -%%DEBUG%%lib/plugins/codecs/libqtwcodecs.so.debug -@dirrm lib/plugins/codecs +lib/qt4/plugins/codecs/libqtwcodecs.so +%%DEBUG%%lib/qt4/plugins/codecs/libqtwcodecs.so.debug +share/nls/POSIX +share/nls/en_US.US-ASCII +@dirrm lib/qt4/plugins/codecs diff --git a/databases/qt-ibase-plugin/Makefile b/databases/qt-ibase-plugin/Makefile index f83277683ea5..8a2ed2fbfe42 100644 --- a/databases/qt-ibase-plugin/Makefile +++ b/databases/qt-ibase-plugin/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-free-${PORTVERSION} @@ -17,6 +17,8 @@ DIST_SUBDIR= KDE MAINTAINER= kde@freebsd.org COMMENT= A plugin for QT to connect to IBase/Firebird-Databases +CONFLICTS= qt4-ibase-plugin-4.2.* qt4-ibase-plugin-4.3.0 + DB= ibase LIB_DEPENDS+= qt-mt:${PORTSDIR}/x11-toolkits/qt33 diff --git a/databases/qt-mysql-plugin/Makefile b/databases/qt-mysql-plugin/Makefile index 2c2aa921e36f..1853a2b22b77 100644 --- a/databases/qt-mysql-plugin/Makefile +++ b/databases/qt-mysql-plugin/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-free-${PORTVERSION} @@ -17,6 +17,8 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= A plugin for QT to connect to MySQL-Databases +CONFLICTS= qt4-mysql-plugin-4.2.* qt4-mysql-plugin-4.3.0 + DB= mysql LIB_DEPENDS+= qt-mt:${PORTSDIR}/x11-toolkits/qt33 diff --git a/databases/qt-odbc-plugin/Makefile b/databases/qt-odbc-plugin/Makefile index cd380d0d07da..b817d06440c9 100644 --- a/databases/qt-odbc-plugin/Makefile +++ b/databases/qt-odbc-plugin/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-free-${PORTVERSION} @@ -17,6 +17,8 @@ DIST_SUBDIR= KDE MAINTAINER= kde@freebsd.org COMMENT= A plugin for QT to connect to ODBC-compatible databases +CONFLICTS= qt4-odbc-plugin-4.2.* qt4-odbc-plugin-4.3.0 + DB= odbc LIB_DEPENDS+= odbc:${PORTSDIR}/databases/unixODBC \ diff --git a/databases/qt-pgsql-plugin/Makefile b/databases/qt-pgsql-plugin/Makefile index 768ae4904a4f..bc7c7162d8c3 100644 --- a/databases/qt-pgsql-plugin/Makefile +++ b/databases/qt-pgsql-plugin/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-free-${PORTVERSION} @@ -17,6 +17,8 @@ DIST_SUBDIR= KDE MAINTAINER= kde@freebsd.org COMMENT= A plugin for QT to connect to PostgreSQL-Databases +CONFLICTS= qt4-psql-plugin-4.2.* qt4-psql-plugin-4.3.0 + DB= psql LIB_DEPENDS+= qt-mt:${PORTSDIR}/x11-toolkits/qt33 diff --git a/databases/qt-sqlite-plugin/Makefile b/databases/qt-sqlite-plugin/Makefile index 1f8fd3641926..d61bf2ba7082 100644 --- a/databases/qt-sqlite-plugin/Makefile +++ b/databases/qt-sqlite-plugin/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt-${DB}-plugin PORTVERSION= 3.3.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-free-${PORTVERSION} @@ -17,6 +17,8 @@ DIST_SUBDIR= KDE MAINTAINER= kde@freebsd.org COMMENT= A plugin for QT to connect to SQLite-Databases +CONFLICTS= qt4-sqlite-plugin-4.2.* qt4-sqlite-plugin-4.3.0 + DB= sqlite LIB_DEPENDS+= qt-mt:${PORTSDIR}/x11-toolkits/qt33 \ diff --git a/databases/qt4-ibase-plugin/distinfo b/databases/qt4-ibase-plugin/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/databases/qt4-ibase-plugin/distinfo +++ b/databases/qt4-ibase-plugin/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/databases/qt4-ibase-plugin/files/Makefile.bsd b/databases/qt4-ibase-plugin/files/Makefile.bsd index 3c890f0ef7ef..bf13e47c6331 100644 --- a/databases/qt4-ibase-plugin/files/Makefile.bsd +++ b/databases/qt4-ibase-plugin/files/Makefile.bsd @@ -11,7 +11,7 @@ MOC?= ${LOCALBASE}/bin/moc-qt4 LDADD= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lgds SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp -LIBDIR= ${PREFIX}/lib/plugins/sqldrivers +LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers ${LIBDIR}: mkdir -p ${LIBDIR} diff --git a/databases/qt4-ibase-plugin/pkg-plist b/databases/qt4-ibase-plugin/pkg-plist index 482facca168e..50edd8ee885a 100644 --- a/databases/qt4-ibase-plugin/pkg-plist +++ b/databases/qt4-ibase-plugin/pkg-plist @@ -1,2 +1,2 @@ -lib/plugins/sqldrivers/libqsql%%DB%%.so -@dirrm lib/plugins/sqldrivers +lib/qt4/plugins/sqldrivers/libqsql%%DB%%.so +@dirrm lib/qt4/plugins/sqldrivers diff --git a/databases/qt4-mysql-plugin/distinfo b/databases/qt4-mysql-plugin/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/databases/qt4-mysql-plugin/distinfo +++ b/databases/qt4-mysql-plugin/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/databases/qt4-mysql-plugin/files/Makefile.bsd b/databases/qt4-mysql-plugin/files/Makefile.bsd index 4774f995d1fa..8ffbde77575e 100644 --- a/databases/qt4-mysql-plugin/files/Makefile.bsd +++ b/databases/qt4-mysql-plugin/files/Makefile.bsd @@ -11,7 +11,7 @@ LDADD= -L${LOCALBASE}/lib -L${LOCALBASE}/lib/mysql ${PTHREAD_LIBS} -lQtSql -lmy MOC?= ${LOCALBASE}/bin/moc-qt4 SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp -LIBDIR= ${PREFIX}/lib/plugins/sqldrivers +LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers ${LIBDIR}: mkdir -p ${LIBDIR} diff --git a/databases/qt4-mysql-plugin/pkg-plist b/databases/qt4-mysql-plugin/pkg-plist index 482facca168e..50edd8ee885a 100644 --- a/databases/qt4-mysql-plugin/pkg-plist +++ b/databases/qt4-mysql-plugin/pkg-plist @@ -1,2 +1,2 @@ -lib/plugins/sqldrivers/libqsql%%DB%%.so -@dirrm lib/plugins/sqldrivers +lib/qt4/plugins/sqldrivers/libqsql%%DB%%.so +@dirrm lib/qt4/plugins/sqldrivers diff --git a/databases/qt4-odbc-plugin/distinfo b/databases/qt4-odbc-plugin/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/databases/qt4-odbc-plugin/distinfo +++ b/databases/qt4-odbc-plugin/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/databases/qt4-odbc-plugin/files/Makefile.bsd b/databases/qt4-odbc-plugin/files/Makefile.bsd index 178007369e45..8ce23e09de2b 100644 --- a/databases/qt4-odbc-plugin/files/Makefile.bsd +++ b/databases/qt4-odbc-plugin/files/Makefile.bsd @@ -11,7 +11,7 @@ LDADD= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lodbc MOC?= ${LOCALBASE}/bin/moc-qt4 SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp -LIBDIR= ${PREFIX}/lib/plugins/sqldrivers +LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers ${LIBDIR}: mkdir -p ${LIBDIR} diff --git a/databases/qt4-odbc-plugin/pkg-plist b/databases/qt4-odbc-plugin/pkg-plist index 482facca168e..50edd8ee885a 100644 --- a/databases/qt4-odbc-plugin/pkg-plist +++ b/databases/qt4-odbc-plugin/pkg-plist @@ -1,2 +1,2 @@ -lib/plugins/sqldrivers/libqsql%%DB%%.so -@dirrm lib/plugins/sqldrivers +lib/qt4/plugins/sqldrivers/libqsql%%DB%%.so +@dirrm lib/qt4/plugins/sqldrivers diff --git a/databases/qt4-pgsql-plugin/distinfo b/databases/qt4-pgsql-plugin/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/databases/qt4-pgsql-plugin/distinfo +++ b/databases/qt4-pgsql-plugin/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/databases/qt4-pgsql-plugin/files/Makefile.bsd b/databases/qt4-pgsql-plugin/files/Makefile.bsd index 6caf331a909d..1363014e4995 100644 --- a/databases/qt4-pgsql-plugin/files/Makefile.bsd +++ b/databases/qt4-pgsql-plugin/files/Makefile.bsd @@ -12,7 +12,7 @@ MOC?= ${LOCALBASE}/bin/moc-qt4 LDADD= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lpq SRCS= main.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp -LIBDIR= ${PREFIX}/lib/plugins/sqldrivers +LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers ${LIBDIR}: mkdir -p ${LIBDIR} diff --git a/databases/qt4-pgsql-plugin/pkg-plist b/databases/qt4-pgsql-plugin/pkg-plist index 482facca168e..50edd8ee885a 100644 --- a/databases/qt4-pgsql-plugin/pkg-plist +++ b/databases/qt4-pgsql-plugin/pkg-plist @@ -1,2 +1,2 @@ -lib/plugins/sqldrivers/libqsql%%DB%%.so -@dirrm lib/plugins/sqldrivers +lib/qt4/plugins/sqldrivers/libqsql%%DB%%.so +@dirrm lib/qt4/plugins/sqldrivers diff --git a/databases/qt4-sql/distinfo b/databases/qt4-sql/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/databases/qt4-sql/distinfo +++ b/databases/qt4-sql/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/databases/qt4-sql/pkg-plist b/databases/qt4-sql/pkg-plist index 8c219e9760dc..6209f8de587e 100644 --- a/databases/qt4-sql/pkg-plist +++ b/databases/qt4-sql/pkg-plist @@ -74,7 +74,7 @@ lib/libQtSql.prl lib/libQtSql.so lib/libQtSql.so.4 lib/libQtSql.so.4.3 -lib/libQtSql.so.4.3.0 -%%DEBUG%%lib/libQtSql.so.4.3.0.debug +lib/libQtSql.so.4.3.1 +%%DEBUG%%lib/libQtSql.so.4.3.1.debug libdata/pkgconfig/QtSql.pc @dirrm include/QtSql diff --git a/databases/qt4-sqlite-plugin/distinfo b/databases/qt4-sqlite-plugin/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/databases/qt4-sqlite-plugin/distinfo +++ b/databases/qt4-sqlite-plugin/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/databases/qt4-sqlite-plugin/files/Makefile.bsd b/databases/qt4-sqlite-plugin/files/Makefile.bsd index 87ab42fe9799..263b1ef34f01 100644 --- a/databases/qt4-sqlite-plugin/files/Makefile.bsd +++ b/databases/qt4-sqlite-plugin/files/Makefile.bsd @@ -11,7 +11,7 @@ MOC?= ${LOCALBASE}/bin/moc-qt4 LDADD= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lsqlite SRCS= smain.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp -LIBDIR= ${PREFIX}/lib/plugins/sqldrivers +LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers ${LIBDIR}: mkdir -p ${LIBDIR} diff --git a/databases/qt4-sqlite-plugin/pkg-plist b/databases/qt4-sqlite-plugin/pkg-plist index 482facca168e..50edd8ee885a 100644 --- a/databases/qt4-sqlite-plugin/pkg-plist +++ b/databases/qt4-sqlite-plugin/pkg-plist @@ -1,2 +1,2 @@ -lib/plugins/sqldrivers/libqsql%%DB%%.so -@dirrm lib/plugins/sqldrivers +lib/qt4/plugins/sqldrivers/libqsql%%DB%%.so +@dirrm lib/qt4/plugins/sqldrivers diff --git a/databases/qt4-sqlite3-plugin/distinfo b/databases/qt4-sqlite3-plugin/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/databases/qt4-sqlite3-plugin/distinfo +++ b/databases/qt4-sqlite3-plugin/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/databases/qt4-sqlite3-plugin/files/Makefile.bsd b/databases/qt4-sqlite3-plugin/files/Makefile.bsd index 3fcb0b193e03..e3d4e2cf7879 100644 --- a/databases/qt4-sqlite3-plugin/files/Makefile.bsd +++ b/databases/qt4-sqlite3-plugin/files/Makefile.bsd @@ -11,7 +11,7 @@ MOC?= ${LOCALBASE}/bin/moc-qt4 LDADD= -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lQtSql -lsqlite3 SRCS= smain.cpp qsql_${DB}.cpp moc_qsql_${DB}.cpp -LIBDIR= ${PREFIX}/lib/plugins/sqldrivers +LIBDIR= ${PREFIX}/lib/qt4/plugins/sqldrivers ${LIBDIR}: mkdir -p ${LIBDIR} diff --git a/databases/qt4-sqlite3-plugin/pkg-plist b/databases/qt4-sqlite3-plugin/pkg-plist index 482facca168e..50edd8ee885a 100644 --- a/databases/qt4-sqlite3-plugin/pkg-plist +++ b/databases/qt4-sqlite3-plugin/pkg-plist @@ -1,2 +1,2 @@ -lib/plugins/sqldrivers/libqsql%%DB%%.so -@dirrm lib/plugins/sqldrivers +lib/qt4/plugins/sqldrivers/libqsql%%DB%%.so +@dirrm lib/qt4/plugins/sqldrivers diff --git a/devel/dbus-qt4/distinfo b/devel/dbus-qt4/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/devel/dbus-qt4/distinfo +++ b/devel/dbus-qt4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/devel/dbus-qt4/pkg-plist b/devel/dbus-qt4/pkg-plist index 0efee4443d78..cf277d8dc50a 100644 --- a/devel/dbus-qt4/pkg-plist +++ b/devel/dbus-qt4/pkg-plist @@ -39,7 +39,7 @@ lib/libQtDBus.prl lib/libQtDBus.so lib/libQtDBus.so.4 lib/libQtDBus.so.4.3 -lib/libQtDBus.so.4.3.0 -%%DEBUG%%lib/libQtDBus.so.4.3.0.debug +lib/libQtDBus.so.4.3.1 +%%DEBUG%%lib/libQtDBus.so.4.3.1.debug libdata/pkgconfig/QtDBus.pc @dirrm include/QtDBus diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile index 63b444de1bdb..b92c33122d96 100644 --- a/devel/qmake4/Makefile +++ b/devel/qmake4/Makefile @@ -7,7 +7,7 @@ PORTNAME= qmake PORTVERSION= ${QT4_VERSION} -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- diff --git a/devel/qmake4/distinfo b/devel/qmake4/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/devel/qmake4/distinfo +++ b/devel/qmake4/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/devel/qmake4/files/qconfig.cpp b/devel/qmake4/files/qconfig.cpp index 3bf44c9a3582..f7bc2b7e9d45 100644 --- a/devel/qmake4/files/qconfig.cpp +++ b/devel/qmake4/files/qconfig.cpp @@ -11,7 +11,7 @@ #define QT_CONFIGURE_HEADERS_PATH "/usr/local/include"; #define QT_CONFIGURE_LIBRARIES_PATH "/usr/local/lib"; #define QT_CONFIGURE_BINARIES_PATH "/usr/local/bin"; -#define QT_CONFIGURE_PLUGINS_PATH "/usr/local/lib/plugins"; +#define QT_CONFIGURE_PLUGINS_PATH "/usr/local/lib/qt4/plugins"; #define QT_CONFIGURE_DATA_PATH "/usr/local/share/qt4"; #define QT_CONFIGURE_TRANSLATIONS_PATH "/usr/local/share/qt4/translations"; #define QT_CONFIGURE_SETTINGS_PATH "/usr/local/etc/xdg"; diff --git a/devel/qmake4/pkg-plist b/devel/qmake4/pkg-plist index d282c1df166d..cb091277603d 100644 --- a/devel/qmake4/pkg-plist +++ b/devel/qmake4/pkg-plist @@ -144,6 +144,8 @@ share/qt4/mkspecs/linux-g++/qmake.conf share/qt4/mkspecs/linux-g++/qplatformdefs.h share/qt4/mkspecs/linux-icc/qmake.conf share/qt4/mkspecs/linux-icc/qplatformdefs.h +share/qt4/mkspecs/linux-icc-32/qmake.conf +share/qt4/mkspecs/linux-icc-32/qplatformdefs.h share/qt4/mkspecs/linux-icc-64/qmake.conf share/qt4/mkspecs/linux-icc-64/qplatformdefs.h share/qt4/mkspecs/linux-kcc/qmake.conf @@ -261,6 +263,7 @@ share/qt4/mkspecs/win32-g++/qplatformdefs.h @dirrm share/qt4/mkspecs/linux-lsb-g++ @dirrm share/qt4/mkspecs/linux-kcc @dirrm share/qt4/mkspecs/linux-icc-64 +@dirrm share/qt4/mkspecs/linux-icc-32 @dirrm share/qt4/mkspecs/linux-icc @dirrm share/qt4/mkspecs/linux-g++-64 @dirrm share/qt4/mkspecs/linux-g++-32 diff --git a/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile index 949164b2cbe0..b05bb67c85d8 100644 --- a/devel/qt4-assistant/Makefile +++ b/devel/qt4-assistant/Makefile @@ -8,7 +8,7 @@ PORTNAME= assistant PORTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-assistant/distinfo b/devel/qt4-assistant/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/devel/qt4-assistant/distinfo +++ b/devel/qt4-assistant/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile index 600ffd7198f2..c98fe7b206ef 100644 --- a/devel/qt4-corelib/Makefile +++ b/devel/qt4-corelib/Makefile @@ -8,7 +8,7 @@ PORTNAME= corelib PORTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -65,7 +65,7 @@ post-configure: ${WRKSRC}/../../lib/pkgconfig/*Qt* post-install: - ${MKDIR} ${PREFIX}/lib/plugins - ${TOUCH} ${PREFIX}/lib/plugins/.keep_me + ${MKDIR} ${PREFIX}/lib/qt4/plugins + ${TOUCH} ${PREFIX}/lib/qt4/plugins/.keep_me .include diff --git a/devel/qt4-corelib/distinfo b/devel/qt4-corelib/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/devel/qt4-corelib/distinfo +++ b/devel/qt4-corelib/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/devel/qt4-corelib/files/patch-src_corelib_arch_arm_arch.pri b/devel/qt4-corelib/files/patch-src_corelib_arch_arm_arch.pri deleted file mode 100644 index 0cc60cd18225..000000000000 --- a/devel/qt4-corelib/files/patch-src_corelib_arch_arm_arch.pri +++ /dev/null @@ -1,9 +0,0 @@ ---- src/corelib/arch/arm/arch.pri.orig 2007-05-25 15:24:41.000000000 +0200 -+++ src/corelib/arch/arm/arch.pri 2007-07-25 20:23:32.000000000 +0200 -@@ -1,5 +1,4 @@ - # - # ARM architecture - # --SOURCES += $$QT_ARCH_CPP/qatomic.cpp \ -- $$QT_ARCH_CPP/malloc.c -+SOURCES += $$QT_ARCH_CPP/qatomic.cpp diff --git a/devel/qt4-corelib/pkg-plist b/devel/qt4-corelib/pkg-plist index 00c303d47d93..9e66e37256fe 100644 --- a/devel/qt4-corelib/pkg-plist +++ b/devel/qt4-corelib/pkg-plist @@ -418,11 +418,12 @@ lib/libQtCore.prl lib/libQtCore.so lib/libQtCore.so.4 lib/libQtCore.so.4.3 -lib/libQtCore.so.4.3.0 -%%DEBUG%%lib/libQtCore.so.4.3.0.debug -lib/plugins/.keep_me +lib/libQtCore.so.4.3.1 +%%DEBUG%%lib/libQtCore.so.4.3.1.debug +lib/qt4/plugins/.keep_me libdata/pkgconfig/QtCore.pc @dirrmtry share/qt4 -@dirrm lib/plugins +@dirrm lib/qt4/plugins +@dirrm lib/qt4 @dirrm include/QtCore @dirrm include/Qt diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile index bfa83eefeb33..e9810123b3fa 100644 --- a/devel/qt4-designer/Makefile +++ b/devel/qt4-designer/Makefile @@ -8,7 +8,7 @@ PORTNAME= designer PORTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -45,15 +45,8 @@ PATCH_WRKSRC=${CONFIGURE_WRKSRC} pre-configure: ${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC} - ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/bin|g' \ - -e 's|^TARGET.*|TARGET=designer-qt4|g' \ + ${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=designer-qt4|g' \ ${WRKSRC}/src/designer/${PORTNAME}.pro - ${REINPLACE_CMD} -e 's|target.path.*|target.path=${PREFIX}/lib/plugins|g' \ - ${WRKSRC}/src/plugins/plugins.pri - ${REINPLACE_CMD} -e \ - 's|designer_headers.path.*|designer_headers.path=${PREFIX}/include/QtDesigner|g' \ - -e 's|target.path.*|target.path=${PREFIX}/lib|g' \ - ${WRKSRC}/src/lib/lib.pro ${WRKSRC}/src/components/lib/lib.pro ${MKDIR} ${WRKSRC}/../../mkspecs ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake ${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc diff --git a/devel/qt4-designer/distinfo b/devel/qt4-designer/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/devel/qt4-designer/distinfo +++ b/devel/qt4-designer/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/devel/qt4-designer/pkg-plist b/devel/qt4-designer/pkg-plist index 42629782fa43..e96b50de47e9 100644 --- a/devel/qt4-designer/pkg-plist +++ b/devel/qt4-designer/pkg-plist @@ -86,18 +86,19 @@ lib/libQtDesigner.prl lib/libQtDesigner.so lib/libQtDesigner.so.4 lib/libQtDesigner.so.4.3 -lib/libQtDesigner.so.4.3.0 -%%DEBUG%%lib/libQtDesigner.so.4.3.0.debug +lib/libQtDesigner.so.4.3.1 +%%DEBUG%%lib/libQtDesigner.so.4.3.1.debug lib/libQtDesignerComponents.prl lib/libQtDesignerComponents.so lib/libQtDesignerComponents.so.4 lib/libQtDesignerComponents.so.4.3 -lib/libQtDesignerComponents.so.4.3.0 -%%DEBUG%%lib/libQtDesignerComponents.so.4.3.0.debug +lib/libQtDesignerComponents.so.4.3.1 +%%DEBUG%%lib/libQtDesignerComponents.so.4.3.1.debug lib/libQtUiTools.a lib/libQtUiTools.prl -lib/plugins/libqt3supportwidgets.so -%%DEBUG%%lib/plugins/libqt3supportwidgets.so.debug +lib/qt4/plugins/designer/libqt3supportwidgets.so +%%DEBUG%%lib/qt4/plugins/designer/libqt3supportwidgets.so.debug libdata/pkgconfig/QtUiTools.pc +@dirrm lib/qt4/plugins/designer @dirrm include/QtUiTools @dirrm include/QtDesigner diff --git a/devel/qt4-libqtassistantclient/distinfo b/devel/qt4-libqtassistantclient/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/devel/qt4-libqtassistantclient/distinfo +++ b/devel/qt4-libqtassistantclient/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/devel/qt4-libqtassistantclient/pkg-plist b/devel/qt4-libqtassistantclient/pkg-plist index a371174cd079..4d47cd362582 100644 --- a/devel/qt4-libqtassistantclient/pkg-plist +++ b/devel/qt4-libqtassistantclient/pkg-plist @@ -6,7 +6,7 @@ lib/libQtAssistantClient.prl lib/libQtAssistantClient.so lib/libQtAssistantClient.so.4 lib/libQtAssistantClient.so.4.3 -lib/libQtAssistantClient.so.4.3.0 -%%DEBUG%%lib/libQtAssistantClient.so.4.3.0.debug +lib/libQtAssistantClient.so.4.3.1 +%%DEBUG%%lib/libQtAssistantClient.so.4.3.1.debug libdata/pkgconfig/QtAssistantClient.pc @dirrm include/QtAssistant diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile index 0ae577b10cef..43c66245c500 100644 --- a/devel/qt4-linguist/Makefile +++ b/devel/qt4-linguist/Makefile @@ -8,7 +8,7 @@ PORTNAME= linguist PORTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-linguist/distinfo b/devel/qt4-linguist/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/devel/qt4-linguist/distinfo +++ b/devel/qt4-linguist/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/devel/qt4-linguist/pkg-plist b/devel/qt4-linguist/pkg-plist index 6c2d4046abce..f638e7cc76d4 100644 --- a/devel/qt4-linguist/pkg-plist +++ b/devel/qt4-linguist/pkg-plist @@ -12,6 +12,7 @@ share/qt4/phrasebooks/german.qph share/qt4/phrasebooks/italian.qph share/qt4/phrasebooks/japanese.qph share/qt4/phrasebooks/norwegian.qph +share/qt4/phrasebooks/polish.qph share/qt4/phrasebooks/russian.qph share/qt4/phrasebooks/spanish.qph share/qt4/phrasebooks/swedish.qph diff --git a/devel/qt4-makeqpf/distinfo b/devel/qt4-makeqpf/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/devel/qt4-makeqpf/distinfo +++ b/devel/qt4-makeqpf/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/devel/qt4-moc/distinfo b/devel/qt4-moc/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/devel/qt4-moc/distinfo +++ b/devel/qt4-moc/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/devel/qt4-moc/pkg-plist b/devel/qt4-moc/pkg-plist index 690446be106a..8616c3e199fe 100644 --- a/devel/qt4-moc/pkg-plist +++ b/devel/qt4-moc/pkg-plist @@ -1,2 +1,4 @@ bin/moc-qt4 %%DEBUG%%bin/moc-qt4.debug +share/nls/POSIX +share/nls/en_US.US-ASCII diff --git a/devel/qt4-porting/distinfo b/devel/qt4-porting/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/devel/qt4-porting/distinfo +++ b/devel/qt4-porting/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/devel/qt4-qdbusviewer/distinfo b/devel/qt4-qdbusviewer/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/devel/qt4-qdbusviewer/distinfo +++ b/devel/qt4-qdbusviewer/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile index a931e8221b1c..8f97d711b9ea 100644 --- a/devel/qt4-qt3support/Makefile +++ b/devel/qt4-qt3support/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt3support PORTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES?= devel x11-toolkits MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-qt3support/distinfo b/devel/qt4-qt3support/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/devel/qt4-qt3support/distinfo +++ b/devel/qt4-qt3support/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/devel/qt4-qt3support/pkg-plist b/devel/qt4-qt3support/pkg-plist index 107f8ab1edca..7cc317e99397 100644 --- a/devel/qt4-qt3support/pkg-plist +++ b/devel/qt4-qt3support/pkg-plist @@ -406,7 +406,7 @@ lib/libQt3Support.prl lib/libQt3Support.so lib/libQt3Support.so.4 lib/libQt3Support.so.4.3 -lib/libQt3Support.so.4.3.0 -%%DEBUG%%lib/libQt3Support.so.4.3.0.debug +lib/libQt3Support.so.4.3.1 +%%DEBUG%%lib/libQt3Support.so.4.3.1.debug libdata/pkgconfig/Qt3Support.pc @dirrm include/Qt3Support diff --git a/devel/qt4-qtestlib/Makefile b/devel/qt4-qtestlib/Makefile index b784f4c1443a..8310ab6651f9 100644 --- a/devel/qt4-qtestlib/Makefile +++ b/devel/qt4-qtestlib/Makefile @@ -8,7 +8,7 @@ PORTNAME= qtestlib PORTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- diff --git a/devel/qt4-qtestlib/distinfo b/devel/qt4-qtestlib/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/devel/qt4-qtestlib/distinfo +++ b/devel/qt4-qtestlib/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/devel/qt4-qtestlib/pkg-plist b/devel/qt4-qtestlib/pkg-plist index ce45c94cdeac..37f5b4c53fc2 100644 --- a/devel/qt4-qtestlib/pkg-plist +++ b/devel/qt4-qtestlib/pkg-plist @@ -32,7 +32,7 @@ lib/libQtTest.prl lib/libQtTest.so lib/libQtTest.so.4 lib/libQtTest.so.4.3 -lib/libQtTest.so.4.3.0 -%%DEBUG%%lib/libQtTest.so.4.3.0.debug +lib/libQtTest.so.4.3.1 +%%DEBUG%%lib/libQtTest.so.4.3.1.debug libdata/pkgconfig/QtTest.pc @dirrm include/QtTest diff --git a/devel/qt4-qvfb/distinfo b/devel/qt4-qvfb/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/devel/qt4-qvfb/distinfo +++ b/devel/qt4-qvfb/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/devel/qt4-qvfb/pkg-plist b/devel/qt4-qvfb/pkg-plist index f31b576acbed..49b49c2c6ecb 100644 --- a/devel/qt4-qvfb/pkg-plist +++ b/devel/qt4-qvfb/pkg-plist @@ -1,61 +1,61 @@ bin/qvfb-qt4 %%DEBUG%%bin/qvfb-qt4.debug -%%DATADIR%%/ClamshellPhone.skin/ClamshellPhone.skin -%%DATADIR%%/ClamshellPhone.skin/ClamshellPhone1-5-closed.png -%%DATADIR%%/ClamshellPhone.skin/ClamshellPhone1-5-pressed.png -%%DATADIR%%/ClamshellPhone.skin/ClamshellPhone1-5.png -%%DATADIR%%/ClamshellPhone.skin/defaultbuttons.conf -%%DATADIR%%/DualScreenPhone.skin/DualScreen-pressed.png -%%DATADIR%%/DualScreenPhone.skin/DualScreen.png -%%DATADIR%%/DualScreenPhone.skin/DualScreenPhone.skin -%%DATADIR%%/DualScreenPhone.skin/defaultbuttons.conf -%%DATADIR%%/PDAPhone.skin/PDAPhone.skin -%%DATADIR%%/PDAPhone.skin/defaultbuttons.conf -%%DATADIR%%/PDAPhone.skin/finger.png -%%DATADIR%%/PDAPhone.skin/pda_down.png -%%DATADIR%%/PDAPhone.skin/pda_up.png -%%DATADIR%%/PortableMedia.skin/PortableMedia.skin -%%DATADIR%%/PortableMedia.skin/defaultbuttons.conf -%%DATADIR%%/PortableMedia.skin/portablemedia-pressed.png -%%DATADIR%%/PortableMedia.skin/portablemedia.png -%%DATADIR%%/PortableMedia.skin/portablemedia.xcf -%%DATADIR%%/SmartPhone.skin/SmartPhone-pressed.png -%%DATADIR%%/SmartPhone.skin/SmartPhone.png -%%DATADIR%%/SmartPhone.skin/SmartPhone.skin -%%DATADIR%%/SmartPhone.skin/defaultbuttons.conf -%%DATADIR%%/SmartPhone2.skin/SmartPhone2-pressed.png -%%DATADIR%%/SmartPhone2.skin/SmartPhone2.png -%%DATADIR%%/SmartPhone2.skin/SmartPhone2.skin -%%DATADIR%%/SmartPhone2.skin/defaultbuttons.conf -%%DATADIR%%/SmartPhoneWithButtons.skin/SmartPhoneWithButtons-pressed.png -%%DATADIR%%/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.png -%%DATADIR%%/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.skin -%%DATADIR%%/SmartPhoneWithButtons.skin/defaultbuttons.conf -%%DATADIR%%/TouchscreenPhone.skin/TouchscreenPhone-pressed.png -%%DATADIR%%/TouchscreenPhone.skin/TouchscreenPhone.png -%%DATADIR%%/TouchscreenPhone.skin/TouchscreenPhone.skin -%%DATADIR%%/TouchscreenPhone.skin/defaultbuttons.conf -%%DATADIR%%/Trolltech-Keypad.skin/Trolltech-Keypad-closed.png -%%DATADIR%%/Trolltech-Keypad.skin/Trolltech-Keypad-down.png -%%DATADIR%%/Trolltech-Keypad.skin/Trolltech-Keypad.png -%%DATADIR%%/Trolltech-Keypad.skin/Trolltech-Keypad.skin -%%DATADIR%%/Trolltech-Keypad.skin/defaultbuttons.conf -%%DATADIR%%/Trolltech-Touchscreen.skin/Trolltech-Touchscreen-down.png -%%DATADIR%%/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.png -%%DATADIR%%/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.skin -%%DATADIR%%/Trolltech-Touchscreen.skin/defaultbuttons.conf -%%DATADIR%%/pda.qrc -%%DATADIR%%/pda.skin -%%DATADIR%%/pda_down.png -%%DATADIR%%/pda_up.png -@dirrm %%DATADIR%%/Trolltech-Touchscreen.skin -@dirrm %%DATADIR%%/Trolltech-Keypad.skin -@dirrm %%DATADIR%%/TouchscreenPhone.skin -@dirrm %%DATADIR%%/SmartPhoneWithButtons.skin -@dirrm %%DATADIR%%/SmartPhone2.skin -@dirrm %%DATADIR%%/SmartPhone.skin -@dirrm %%DATADIR%%/PortableMedia.skin -@dirrm %%DATADIR%%/PDAPhone.skin -@dirrm %%DATADIR%%/DualScreenPhone.skin -@dirrm %%DATADIR%%/ClamshellPhone.skin -@dirrm %%DATADIR%% +share/qvfb/ClamshellPhone.skin/ClamshellPhone.skin +share/qvfb/ClamshellPhone.skin/ClamshellPhone1-5-closed.png +share/qvfb/ClamshellPhone.skin/ClamshellPhone1-5-pressed.png +share/qvfb/ClamshellPhone.skin/ClamshellPhone1-5.png +share/qvfb/ClamshellPhone.skin/defaultbuttons.conf +share/qvfb/DualScreenPhone.skin/DualScreen-pressed.png +share/qvfb/DualScreenPhone.skin/DualScreen.png +share/qvfb/DualScreenPhone.skin/DualScreenPhone.skin +share/qvfb/DualScreenPhone.skin/defaultbuttons.conf +share/qvfb/PDAPhone.skin/PDAPhone.skin +share/qvfb/PDAPhone.skin/defaultbuttons.conf +share/qvfb/PDAPhone.skin/finger.png +share/qvfb/PDAPhone.skin/pda_down.png +share/qvfb/PDAPhone.skin/pda_up.png +share/qvfb/PortableMedia.skin/PortableMedia.skin +share/qvfb/PortableMedia.skin/defaultbuttons.conf +share/qvfb/PortableMedia.skin/portablemedia-pressed.png +share/qvfb/PortableMedia.skin/portablemedia.png +share/qvfb/PortableMedia.skin/portablemedia.xcf +share/qvfb/SmartPhone.skin/SmartPhone-pressed.png +share/qvfb/SmartPhone.skin/SmartPhone.png +share/qvfb/SmartPhone.skin/SmartPhone.skin +share/qvfb/SmartPhone.skin/defaultbuttons.conf +share/qvfb/SmartPhone2.skin/SmartPhone2-pressed.png +share/qvfb/SmartPhone2.skin/SmartPhone2.png +share/qvfb/SmartPhone2.skin/SmartPhone2.skin +share/qvfb/SmartPhone2.skin/defaultbuttons.conf +share/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons-pressed.png +share/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.png +share/qvfb/SmartPhoneWithButtons.skin/SmartPhoneWithButtons.skin +share/qvfb/SmartPhoneWithButtons.skin/defaultbuttons.conf +share/qvfb/TouchscreenPhone.skin/TouchscreenPhone-pressed.png +share/qvfb/TouchscreenPhone.skin/TouchscreenPhone.png +share/qvfb/TouchscreenPhone.skin/TouchscreenPhone.skin +share/qvfb/TouchscreenPhone.skin/defaultbuttons.conf +share/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad-closed.png +share/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad-down.png +share/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad.png +share/qvfb/Trolltech-Keypad.skin/Trolltech-Keypad.skin +share/qvfb/Trolltech-Keypad.skin/defaultbuttons.conf +share/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen-down.png +share/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.png +share/qvfb/Trolltech-Touchscreen.skin/Trolltech-Touchscreen.skin +share/qvfb/Trolltech-Touchscreen.skin/defaultbuttons.conf +share/qvfb/pda.qrc +share/qvfb/pda.skin +share/qvfb/pda_down.png +share/qvfb/pda_up.png +@dirrm share/qvfb/Trolltech-Touchscreen.skin +@dirrm share/qvfb/Trolltech-Keypad.skin +@dirrm share/qvfb/TouchscreenPhone.skin +@dirrm share/qvfb/SmartPhoneWithButtons.skin +@dirrm share/qvfb/SmartPhone2.skin +@dirrm share/qvfb/SmartPhone.skin +@dirrm share/qvfb/PortableMedia.skin +@dirrm share/qvfb/PDAPhone.skin +@dirrm share/qvfb/DualScreenPhone.skin +@dirrm share/qvfb/ClamshellPhone.skin +@dirrm share/qvfb diff --git a/devel/qt4-rcc/distinfo b/devel/qt4-rcc/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/devel/qt4-rcc/distinfo +++ b/devel/qt4-rcc/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/devel/qt4-rcc/pkg-plist b/devel/qt4-rcc/pkg-plist index f17a054adcb1..8787e83f66f2 100644 --- a/devel/qt4-rcc/pkg-plist +++ b/devel/qt4-rcc/pkg-plist @@ -1,2 +1,4 @@ bin/rcc %%DEBUG%%bin/rcc.debug +share/nls/POSIX +share/nls/en_US.US-ASCII diff --git a/devel/qt4-script/distinfo b/devel/qt4-script/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/devel/qt4-script/distinfo +++ b/devel/qt4-script/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/devel/qt4-script/pkg-plist b/devel/qt4-script/pkg-plist index 142a03be8da1..d0755529cf2d 100644 --- a/devel/qt4-script/pkg-plist +++ b/devel/qt4-script/pkg-plist @@ -27,7 +27,7 @@ lib/libQtScript.prl lib/libQtScript.so lib/libQtScript.so.4 lib/libQtScript.so.4.3 -lib/libQtScript.so.4.3.0 -%%DEBUG%%lib/libQtScript.so.4.3.0.debug +lib/libQtScript.so.4.3.1 +%%DEBUG%%lib/libQtScript.so.4.3.1.debug libdata/pkgconfig/QtScript.pc @dirrm include/QtScript diff --git a/devel/qt4-uic/distinfo b/devel/qt4-uic/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/devel/qt4-uic/distinfo +++ b/devel/qt4-uic/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/devel/qt4-uic/pkg-plist b/devel/qt4-uic/pkg-plist index b5060a2e10a1..3f47b2dec0fc 100644 --- a/devel/qt4-uic/pkg-plist +++ b/devel/qt4-uic/pkg-plist @@ -1,2 +1,4 @@ bin/uic-qt4 %%DEBUG%%bin/uic-qt4.debug +share/nls/POSIX +share/nls/en_US.US-ASCII diff --git a/devel/qt4-uic3/distinfo b/devel/qt4-uic3/distinfo index 8fb631a2787d..8fbd772f627d 100644 --- a/devel/qt4-uic3/distinfo +++ b/devel/qt4-uic3/distinfo @@ -1,3 +1,3 @@ -MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d -SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440 -SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515 +MD5 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = ec255dcc2b30f5efe0ded85ae8a75e13 +SHA256 (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 4d59d0c74e4358ed59f11542403248687b04aa0c1bc06ea35b4b9e2cfc55e661 +SIZE (KDE/qt-x11-opensource-src-4.3.1.tar.gz) = 43118858 diff --git a/devel/qt4-uic3/pkg-plist b/devel/qt4-uic3/pkg-plist index 9d3131c9d188..9a743f9e4c42 100644 --- a/devel/qt4-uic3/pkg-plist +++ b/devel/qt4-uic3/pkg-plist @@ -1,2 +1,4 @@ bin/uic3 %%DEBUG%%bin/uic3.debug +share/nls/POSIX +share/nls/en_US.US-ASCII diff --git a/devel/qt4/Makefile b/devel/qt4/Makefile index 72d48c915582..0c2f55e1a9b9 100644 --- a/devel/qt4/Makefile +++ b/devel/qt4/Makefile @@ -18,9 +18,9 @@ COMMENT= Multiplatform C++ application framework (metaport) OPTIONS= SQL_PLUGINS "Database connectivity plugins for QtSql" off -RUN_DEPENDS= ${LOCALBASE}/lib/plugins/accessible/libqtaccessiblecompatwidgets.so:${PORTSDIR}/accessibility/qt4-accessible \ - ${LOCALBASE}/lib/plugins/codecs/libqcncodecs.so:${PORTSDIR}/chinese/qt4-codecs-cn \ - ${LOCALBASE}/lib/plugins/codecs/libqtwcodecs.so:${PORTSDIR}/chinese/qt4-codecs-tw \ +RUN_DEPENDS= ${LOCALBASE}/lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so:${PORTSDIR}/accessibility/qt4-accessible \ + ${LOCALBASE}/lib/qt4/plugins/codecs/libqcncodecs.so:${PORTSDIR}/chinese/qt4-codecs-cn \ + ${LOCALBASE}/lib/qt4/plugins/codecs/libqtwcodecs.so:${PORTSDIR}/chinese/qt4-codecs-tw \ ${LOCALBASE}/lib/libQtSql.so:${PORTSDIR}/databases/qt4-sql \ qdbus:${PORTSDIR}/devel/dbus-qt4 \ qdbusviewer:${PORTSDIR}/devel/qt4-qdbusviewer \ @@ -40,17 +40,17 @@ RUN_DEPENDS= ${LOCALBASE}/lib/plugins/accessible/libqtaccessiblecompatwidgets.so uic-qt4:${PORTSDIR}/devel/qt4-uic \ uic3:${PORTSDIR}/devel/qt4-uic3 \ ${LOCALBASE}/lib/libQtTest.so:${PORTSDIR}/devel/qt4-qtestlib \ - ${LOCALBASE}/lib/plugins/imageformats/libqgif.so:${PORTSDIR}/graphics/qt4-imageformats \ + ${LOCALBASE}/lib/qt4/plugins/imageformats/libqgif.so:${PORTSDIR}/graphics/qt4-imageformats \ ${LOCALBASE}/lib/libQtSvg.so:${PORTSDIR}/graphics/qt4-svg \ - ${LOCALBASE}/lib/plugins/iconengines/libqsvg.so:${PORTSDIR}/graphics/qt4-iconengines \ + ${LOCALBASE}/lib/qt4/plugins/iconengines/libqsvg.so:${PORTSDIR}/graphics/qt4-iconengines \ pixeltool:${PORTSDIR}/graphics/qt4-pixeltool \ - ${LOCALBASE}/lib/plugins/codecs/libqjpcodecs.so:${PORTSDIR}/japanese/qt4-codecs-jp \ - ${LOCALBASE}/lib/plugins/codecs/libqkrcodecs.so:${PORTSDIR}/korean/qt4-codecs-kr \ + ${LOCALBASE}/lib/qt4/plugins/codecs/libqjpcodecs.so:${PORTSDIR}/japanese/qt4-codecs-jp \ + ${LOCALBASE}/lib/qt4/plugins/codecs/libqkrcodecs.so:${PORTSDIR}/korean/qt4-codecs-kr \ qtconfig-qt4:${PORTSDIR}/misc/qt4-qtconfig \ ${LOCALBASE}/lib/libQtNetwork.so:${PORTSDIR}/net/qt4-network \ ${LOCALBASE}/lib/libQtXml.so:${PORTSDIR}/textproc/qt4-xml \ ${LOCALBASE}/lib/libQtOpenGL.so:${PORTSDIR}/x11/qt4-opengl \ - ${LOCALBASE}/lib/plugins/inputmethods/libqimsw-multi.so:${PORTSDIR}/x11/qt4-inputmethods \ + ${LOCALBASE}/lib/qt4/plugins/inputmethods/libqimsw-multi.so:${PORTSDIR}/x11/qt4-inputmethods \ ${LOCALBASE}/lib/libQtGui.so:${PORTSDIR}/x11-toolkits/qt4-gui NO_BUILD= yes @@ -59,12 +59,12 @@ NO_BUILD= yes .include "${.CURDIR}/../../Mk/bsd.qt.mk" .if defined(WITH_SQL_PLUGINS) -RUN_DEPENDS+= ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlibase.so:${PORTSDIR}/databases/qt4-ibase-plugin \ - ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin \ - ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlodbc.so:${PORTSDIR}/databases/qt4-odbc-plugin \ - ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlpgsql.so:${PORTSDIR}/databases/qt4-pgsql-plugin \ - ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlsqlite.so:${PORTSDIR}/databases/qt4-sqlite-plugin \ - ${LOCALBASE}/lib/plugins/sqldrivers/libqsqlsqlite3.so:${PORTSDIR}/databases/qt4-sqlite3-plugin +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 \ + ${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/libqsqlsqlite2.so:${PORTSDIR}/databases/qt4-sqlite-plugin \ + ${LOCALBASE}/lib/qt4/plugins/sqldrivers/libqsqlsqlite.so:${PORTSDIR}/databases/qt4-sqlite3-plugin .endif do-install: #empty diff --git a/devel/qt4/files/configure b/devel/qt4/files/configure index 702882753b01..b59d302adc5f 100644 --- a/devel/qt4/files/configure +++ b/devel/qt4/files/configure @@ -589,6 +589,7 @@ l_FLAGS= QCONFIG_FLAGS= XPLATFORM= PLATFORM=$QMAKESPEC +QT_CROSS_COMPILE=no OPT_CONFIRM_LICENSE=no OPT_SHADOW=maybe OPT_FAST=auto @@ -2013,6 +2014,7 @@ else XQMAKESPEC="$relpath/mkspecs/${XPLATFORM}" fi if [ "$PLATFORM" != "$XPLATFORM" ]; then + QT_CROSS_COMPILE=yes QMAKE_CONFIG="$QMAKE_CONFIG cross_compile" fi @@ -2161,7 +2163,7 @@ else ARCH=i386 ;; *:*:x86_64|*:*:amd64) - if [ "$PLATFORM" = "linux-g++-32" ]; then + if [ "$PLATFORM" = "linux-g++-32" -o "$PLATFORM" = "linux-icc-32" ]; then if [ "$OPT_VERBOSE" = "yes" ]; then echo " 32 bit on 64-bit AMD 80x86 (i386)" fi @@ -2191,6 +2193,18 @@ else fi ARCH=s390 ;; + *:*:arm*) + if [ "$OPT_VERBOSE" = "yes" ]; then + echo " ARM (arm)" + fi + ARCH=arm + ;; + Linux:*:sparc*) + if [ "$OPT_VERBOSE" = "yes" ]; then + echo " Linux on SPARC" + fi + ARCH=sparc + ;; *:*:*) if [ "$OPT_VERBOSE" = "yes" ]; then echo " Trying '$UNAME_MACHINE'..." @@ -2696,8 +2710,8 @@ Third Party Libraries: + -system-zlib ....... Use zlib from the operating system. See http://www.gzip.org/zlib - * -no-gif ............ Do not compile the plugin for GIF reading support. - -qt-gif ............ Compile the plugin for GIF reading support. + -no-gif ............ Do not compile the plugin for GIF reading support. + * -qt-gif ............ Compile the plugin for GIF reading support. See also src/plugins/imageformats/gif/qgifhandler.h -no-libtiff ........ Do not compile the plugin for TIFF support. @@ -2971,7 +2985,7 @@ Qtopia Core only: default ($CFG_QCONFIG). -depths ...... Comma-separated list of supported bit-per-pixel - depths, from: 4, 8, 16, 18, 24, and 32. + depths, from: 1, 4, 8, 16, 18, 24, and 32. -qt-decoration-