summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--databases/qt-ibase-plugin/Makefile2
-rw-r--r--databases/qt-ibase-plugin/distinfo4
-rw-r--r--databases/qt-mysql-plugin/Makefile2
-rw-r--r--databases/qt-mysql-plugin/distinfo4
-rw-r--r--databases/qt-odbc-plugin/Makefile2
-rw-r--r--databases/qt-odbc-plugin/distinfo4
-rw-r--r--databases/qt-pgsql-plugin/Makefile2
-rw-r--r--databases/qt-pgsql-plugin/distinfo4
-rw-r--r--databases/qt-sqlite-plugin/Makefile2
-rw-r--r--databases/qt-sqlite-plugin/distinfo4
-rw-r--r--devel/qmake/Makefile2
-rw-r--r--devel/qmake/distinfo4
-rw-r--r--devel/qmake/pkg-plist11
-rw-r--r--x11-toolkits/qt33/Makefile7
-rw-r--r--x11-toolkits/qt33/distinfo4
-rw-r--r--x11-toolkits/qt33/files/patch-tools_makeqpf_main.cpp20
-rw-r--r--x11-toolkits/qt33/pkg-plist2
17 files changed, 52 insertions, 28 deletions
diff --git a/databases/qt-ibase-plugin/Makefile b/databases/qt-ibase-plugin/Makefile
index ff171f62f049..220313e03d23 100644
--- a/databases/qt-ibase-plugin/Makefile
+++ b/databases/qt-ibase-plugin/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= qt-${DB}-plugin
-PORTVERSION= 3.3.2
+PORTVERSION= 3.3.3
CATEGORIES= databases
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
ftp://ftp.silug.org/pub/qt/ \
diff --git a/databases/qt-ibase-plugin/distinfo b/databases/qt-ibase-plugin/distinfo
index b90abcca2a8d..f04333a7557c 100644
--- a/databases/qt-ibase-plugin/distinfo
+++ b/databases/qt-ibase-plugin/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/qt-x11-free-3.3.2.tar.bz2) = 903cad618274ad84d7d13fd0027a6c3c
-SIZE (KDE/qt-x11-free-3.3.2.tar.bz2) = 14434821
+MD5 (KDE/qt-x11-free-3.3.3.tar.bz2) = 3e0a0c8429b0a974b39b5f535ddff01c
+SIZE (KDE/qt-x11-free-3.3.3.tar.bz2) = 14424812
diff --git a/databases/qt-mysql-plugin/Makefile b/databases/qt-mysql-plugin/Makefile
index 6f68f5d27004..32eac3aa6898 100644
--- a/databases/qt-mysql-plugin/Makefile
+++ b/databases/qt-mysql-plugin/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= qt-${DB}-plugin
-PORTVERSION= 3.3.2
+PORTVERSION= 3.3.3
CATEGORIES= databases
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
ftp://ftp.silug.org/pub/qt/ \
diff --git a/databases/qt-mysql-plugin/distinfo b/databases/qt-mysql-plugin/distinfo
index b90abcca2a8d..f04333a7557c 100644
--- a/databases/qt-mysql-plugin/distinfo
+++ b/databases/qt-mysql-plugin/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/qt-x11-free-3.3.2.tar.bz2) = 903cad618274ad84d7d13fd0027a6c3c
-SIZE (KDE/qt-x11-free-3.3.2.tar.bz2) = 14434821
+MD5 (KDE/qt-x11-free-3.3.3.tar.bz2) = 3e0a0c8429b0a974b39b5f535ddff01c
+SIZE (KDE/qt-x11-free-3.3.3.tar.bz2) = 14424812
diff --git a/databases/qt-odbc-plugin/Makefile b/databases/qt-odbc-plugin/Makefile
index 081ebf5a6de7..66fcab25c591 100644
--- a/databases/qt-odbc-plugin/Makefile
+++ b/databases/qt-odbc-plugin/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= qt-${DB}-plugin
-PORTVERSION= 3.3.2
+PORTVERSION= 3.3.3
CATEGORIES= databases
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
ftp://ftp.silug.org/pub/qt/ \
diff --git a/databases/qt-odbc-plugin/distinfo b/databases/qt-odbc-plugin/distinfo
index b90abcca2a8d..f04333a7557c 100644
--- a/databases/qt-odbc-plugin/distinfo
+++ b/databases/qt-odbc-plugin/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/qt-x11-free-3.3.2.tar.bz2) = 903cad618274ad84d7d13fd0027a6c3c
-SIZE (KDE/qt-x11-free-3.3.2.tar.bz2) = 14434821
+MD5 (KDE/qt-x11-free-3.3.3.tar.bz2) = 3e0a0c8429b0a974b39b5f535ddff01c
+SIZE (KDE/qt-x11-free-3.3.3.tar.bz2) = 14424812
diff --git a/databases/qt-pgsql-plugin/Makefile b/databases/qt-pgsql-plugin/Makefile
index fbed0b435e44..6ab09ad7fae9 100644
--- a/databases/qt-pgsql-plugin/Makefile
+++ b/databases/qt-pgsql-plugin/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= qt-${DB}-plugin
-PORTVERSION= 3.3.2
+PORTVERSION= 3.3.3
CATEGORIES= databases
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
ftp://ftp.silug.org/pub/qt/ \
diff --git a/databases/qt-pgsql-plugin/distinfo b/databases/qt-pgsql-plugin/distinfo
index b90abcca2a8d..f04333a7557c 100644
--- a/databases/qt-pgsql-plugin/distinfo
+++ b/databases/qt-pgsql-plugin/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/qt-x11-free-3.3.2.tar.bz2) = 903cad618274ad84d7d13fd0027a6c3c
-SIZE (KDE/qt-x11-free-3.3.2.tar.bz2) = 14434821
+MD5 (KDE/qt-x11-free-3.3.3.tar.bz2) = 3e0a0c8429b0a974b39b5f535ddff01c
+SIZE (KDE/qt-x11-free-3.3.3.tar.bz2) = 14424812
diff --git a/databases/qt-sqlite-plugin/Makefile b/databases/qt-sqlite-plugin/Makefile
index 516d27a00437..2acddef94975 100644
--- a/databases/qt-sqlite-plugin/Makefile
+++ b/databases/qt-sqlite-plugin/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= qt-${DB}-plugin
-PORTVERSION= 3.3.2
+PORTVERSION= 3.3.3
CATEGORIES= databases
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
ftp://ftp.silug.org/pub/qt/ \
diff --git a/databases/qt-sqlite-plugin/distinfo b/databases/qt-sqlite-plugin/distinfo
index b90abcca2a8d..f04333a7557c 100644
--- a/databases/qt-sqlite-plugin/distinfo
+++ b/databases/qt-sqlite-plugin/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/qt-x11-free-3.3.2.tar.bz2) = 903cad618274ad84d7d13fd0027a6c3c
-SIZE (KDE/qt-x11-free-3.3.2.tar.bz2) = 14434821
+MD5 (KDE/qt-x11-free-3.3.3.tar.bz2) = 3e0a0c8429b0a974b39b5f535ddff01c
+SIZE (KDE/qt-x11-free-3.3.3.tar.bz2) = 14424812
diff --git a/devel/qmake/Makefile b/devel/qmake/Makefile
index 884d2b5906db..3e223f450d72 100644
--- a/devel/qmake/Makefile
+++ b/devel/qmake/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= qmake
-PORTVERSION= 3.3.2
+PORTVERSION= 3.3.3
CATEGORIES= devel
MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
ftp://ftp.silug.org/pub/qt/ \
diff --git a/devel/qmake/distinfo b/devel/qmake/distinfo
index b90abcca2a8d..f04333a7557c 100644
--- a/devel/qmake/distinfo
+++ b/devel/qmake/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/qt-x11-free-3.3.2.tar.bz2) = 903cad618274ad84d7d13fd0027a6c3c
-SIZE (KDE/qt-x11-free-3.3.2.tar.bz2) = 14434821
+MD5 (KDE/qt-x11-free-3.3.3.tar.bz2) = 3e0a0c8429b0a974b39b5f535ddff01c
+SIZE (KDE/qt-x11-free-3.3.3.tar.bz2) = 14424812
diff --git a/devel/qmake/pkg-plist b/devel/qmake/pkg-plist
index b5f8048c501d..4f4e498d24e4 100644
--- a/devel/qmake/pkg-plist
+++ b/devel/qmake/pkg-plist
@@ -1,10 +1,10 @@
bin/qmake
@comment A bug in pkg_* prevents us from using %D below
@cwd %%_PREFIX%%/share/qt/mkspecs
-aix-g++/qmake.conf
-aix-g++/qplatformdefs.h
aix-g++-64/qmake.conf
aix-g++-64/qplatformdefs.h
+aix-g++/qmake.conf
+aix-g++/qplatformdefs.h
aix-xlc-64/qmake.conf
aix-xlc-64/qplatformdefs.h
aix-xlc/qmake.conf
@@ -51,10 +51,10 @@ linux-cxx/qmake.conf
linux-cxx/qplatformdefs.h
linux-ecc-64/qmake.conf
linux-ecc-64/qplatformdefs.h
-linux-g++/qmake.conf
-linux-g++/qplatformdefs.h
linux-g++-64/qmake.conf
linux-g++-64/qplatformdefs.h
+linux-g++/qmake.conf
+linux-g++/qplatformdefs.h
linux-icc/qmake.conf
linux-icc/qplatformdefs.h
linux-kcc/qmake.conf
@@ -74,6 +74,8 @@ macx-mwerks/qplatformdefs.h
macx-pbuilder/Info.plist.app
macx-pbuilder/qmake.conf
macx-pbuilder/qplatformdefs.h
+macx-xlc/qmake.conf
+macx-xlc/qplatformdefs.h
netbsd-g++/qmake.conf
netbsd-g++/qplatformdefs.h
openbsd-g++/qmake.conf
@@ -157,6 +159,7 @@ win32-watcom/qmake.conf
@dirrm macx-g++
@dirrm macx-mwerks
@dirrm macx-pbuilder
+@dirrm macx-xlc
@dirrm netbsd-g++
@dirrm openbsd-g++
@dirrm qnx-g++
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 0537a7d4ff2d..8fd819f08d36 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= qt
-PORTVERSION= 3.3.2
-PORTREVISION= 2
+PORTVERSION= 3.3.3
CATEGORIES?= x11-toolkits ipv6
MASTER_SITES= ftp://sunsite.rediris.es/mirror/Qt/source/ \
ftp://ftp.iasi.roedu.net/mirrors/ftp.trolltech.com/qt/sources/ \
@@ -110,7 +109,7 @@ CUPS=
.if !defined(WITHOUT_NAS)
LIB_DEPENDS+= audio:${PORTSDIR}/audio/nas
-CONFIGURE_ARGS+=-system-nas-sound
+CONFIGURE_ARGS+=-system-nas-sound -no-pch
.elseif defined(WITHOUT_NAS)
CONFIGURE_ARGS+=-no-nas-sound
.endif
@@ -141,6 +140,8 @@ post-patch:
${WRKSRC}/config.tests/unix/ptrsize.test
.endif
@${REINPLACE_CMD} -e 's|^ cd qmake.*||' ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -e 's|^CFG_PRECOMPILE=no|CFG_PRECOMPILE=auto|g' \
+ ${WRKSRC}/configure
post-configure:
@${REINPLACE_CMD} -e \
diff --git a/x11-toolkits/qt33/distinfo b/x11-toolkits/qt33/distinfo
index b90abcca2a8d..f04333a7557c 100644
--- a/x11-toolkits/qt33/distinfo
+++ b/x11-toolkits/qt33/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/qt-x11-free-3.3.2.tar.bz2) = 903cad618274ad84d7d13fd0027a6c3c
-SIZE (KDE/qt-x11-free-3.3.2.tar.bz2) = 14434821
+MD5 (KDE/qt-x11-free-3.3.3.tar.bz2) = 3e0a0c8429b0a974b39b5f535ddff01c
+SIZE (KDE/qt-x11-free-3.3.3.tar.bz2) = 14424812
diff --git a/x11-toolkits/qt33/files/patch-tools_makeqpf_main.cpp b/x11-toolkits/qt33/files/patch-tools_makeqpf_main.cpp
new file mode 100644
index 000000000000..7a2df67c8551
--- /dev/null
+++ b/x11-toolkits/qt33/files/patch-tools_makeqpf_main.cpp
@@ -0,0 +1,20 @@
+--- tools/makeqpf/main.cpp.orig Wed Jun 23 14:13:52 2004
++++ tools/makeqpf/main.cpp Wed Aug 11 21:32:48 2004
+@@ -124,8 +124,6 @@
+ }
+ };
+
+-extern QString qws_topdir();
+-
+ class MakeQPF : public QMainWindow
+ {
+ Q_OBJECT
+@@ -139,7 +137,7 @@
+ view->addColumn("Weight");
+ view->addColumn("Style");
+ setCentralWidget(view);
+- QString fontdir = qws_topdir() + "/lib/fonts";
++ QString fontdir = QString(getenv("QTDIR")) + "/lib/fonts";
+ readFontDir(fontdir);
+
+ connect(view,SIGNAL(selectionChanged(QListViewItem*)),
diff --git a/x11-toolkits/qt33/pkg-plist b/x11-toolkits/qt33/pkg-plist
index 11baa4b2f0b1..3349196acff9 100644
--- a/x11-toolkits/qt33/pkg-plist
+++ b/x11-toolkits/qt33/pkg-plist
@@ -415,7 +415,7 @@ lib/libqt-mt.prl
lib/libqt-mt.so
lib/libqt-mt.so.3
lib/libqt-mt.so.3.3
-lib/libqt-mt.so.3.3.2
+lib/libqt-mt.so.3.3.3
lib/libqui.prl
lib/libqui.so
lib/libqui.so.1