diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2007-09-02 06:23:28 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2007-09-02 06:23:28 +0000 |
| commit | deaff822455109805aceab16654cff1ee1f6e86d (patch) | |
| tree | bb5983d2ff70c6770c2a7587454c5f884d8d054c /databases | |
| parent | . Mark this as BROKEN for gcc 4.2. The HotSpot C++ code needs some work (diff) | |
Update to Qt 4.3.1.
Notes
Notes:
svn path=/head/; revision=198629
Diffstat (limited to 'databases')
25 files changed, 56 insertions, 46 deletions
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 |