summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11/qt3-libs/Makefile4
-rw-r--r--x11/qt3-libs/distinfo10
-rw-r--r--x11/qt3-libs/patches/patch-ah8
-rw-r--r--x11/qt3-libs/patches/patch-bd6
-rw-r--r--x11/qt3-mysql/Makefile4
-rw-r--r--x11/qt3-psql/Makefile4
-rw-r--r--x11/qt3-tools/Makefile4
-rw-r--r--x11/qt3/Makefile3
-rw-r--r--x11/qt3/Makefile.common4
9 files changed, 19 insertions, 28 deletions
diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile
index 01c6c743ce0..b11cb630be7 100644
--- a/x11/qt3-libs/Makefile
+++ b/x11/qt3-libs/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.31 2004/12/03 15:15:13 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.32 2005/02/10 13:21:20 adam Exp $
LIBQT= ${WRKSRC}/lib/libqt-mt.la
.include "../qt3-libs/Makefile.common"
PKGNAME= qt3-libs-${QTVERSION}
-PKGREVISION= 5
COMMENT= C++ X GUI toolkit
GCC_REQD+= 2.95.3
diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo
index d0c3ddd8948..c89c4de321a 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.28 2004/10/28 10:28:49 gavan Exp $
+$NetBSD: distinfo,v 1.29 2005/02/10 13:21:20 adam Exp $
-SHA1 (qt-x11-free-3.3.3.tar.bz2) = b9737d8dc0c440a7d28f1f0a164e49f7bd242585
-Size (qt-x11-free-3.3.3.tar.bz2) = 14424812 bytes
+SHA1 (qt-x11-free-3.3.4.tar.bz2) = cb5f452bcdc9d2ed0201481f4b8f152edfda9523
+Size (qt-x11-free-3.3.4.tar.bz2) = 14439722 bytes
SHA1 (patch-aa) = 0247c3694db7bf29556e00809b5d7f26817f3055
SHA1 (patch-ab) = 4dfee5c06bc322646465f43fe850126873d7bb75
SHA1 (patch-ac) = 1914c348846ae2ab0358e554d29ba49a0be90d52
@@ -9,11 +9,11 @@ SHA1 (patch-ad) = 09afcc6c8a3a2f93131fdbf4be50d3e313792374
SHA1 (patch-ae) = 2ec0b408edd78daa03c02c654e0ce515933f36e7
SHA1 (patch-af) = 513b0419dcbe0d2e65d9912868effcf0681119ae
SHA1 (patch-ag) = a413055f8df258b0bb91e46d6f611e9ec511b913
-SHA1 (patch-ah) = aa34fde5c1ef71ebb35a00b376236acffb04fc16
+SHA1 (patch-ah) = f9e0a77ea62e06b3c037921094e0eb1d50a5ffce
SHA1 (patch-ai) = 582a02a1b697ef038cd5a8ead5dd3b0910e6297b
SHA1 (patch-ba) = 0f5baae5501a83ea53e5d4df846bb1f338e4d802
SHA1 (patch-bb) = df300b77d0adb653eaa16c97f995ed2def8e7d87
SHA1 (patch-bc) = d8a84e1b66bf1953b53df57ae81d2c98cce69c41
-SHA1 (patch-bd) = 0493bc7a0e9b9fa3c88f77b6fc89f77a3e4e3481
+SHA1 (patch-bd) = 9996f12ff24c01f0735f0a588c52771ce041de84
SHA1 (patch-ia) = 62c50fe48b9ff1ce9fb757b432c8b1db7693e112
SHA1 (patch-ib) = b15936b85b2b1946e8c9a92bf393c3d3a1fc6950
diff --git a/x11/qt3-libs/patches/patch-ah b/x11/qt3-libs/patches/patch-ah
index 110f51cb882..db4fa6a83bd 100644
--- a/x11/qt3-libs/patches/patch-ah
+++ b/x11/qt3-libs/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.5 2004/10/13 02:08:43 tv Exp $
+$NetBSD: patch-ah,v 1.6 2005/02/10 13:21:20 adam Exp $
---- src/tools/qdatastream.cpp.orig Thu Aug 5 10:41:57 2004
+--- src/tools/qdatastream.cpp.orig 2005-01-21 17:16:04.000000000 +0000
+++ src/tools/qdatastream.cpp
-@@ -484,6 +484,8 @@ void QDataStream::setByteOrder( int bo )
+@@ -486,6 +486,8 @@ void QDataStream::setByteOrder( int bo )
#if defined(Q_OS_HPUX) && !defined(__LP64__)
extern "C" long long __strtoll( const char *, char**, int );
@@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.5 2004/10/13 02:08:43 tv Exp $
#endif
static Q_INT64 read_int_ascii( QDataStream *s )
-@@ -508,7 +510,7 @@ static Q_INT64 read_int_ascii( QDataStre
+@@ -510,7 +512,7 @@ static Q_INT64 read_int_ascii( QDataStre
return _atoi64( buf );
# elif defined(Q_OS_HPUX)
return __strtoll( buf, (char**)0, 10 );
diff --git a/x11/qt3-libs/patches/patch-bd b/x11/qt3-libs/patches/patch-bd
index 97e136c8257..64864f0b127 100644
--- a/x11/qt3-libs/patches/patch-bd
+++ b/x11/qt3-libs/patches/patch-bd
@@ -1,8 +1,8 @@
-$NetBSD: patch-bd,v 1.3 2004/08/24 12:38:18 markd Exp $
+$NetBSD: patch-bd,v 1.4 2005/02/10 13:21:20 adam Exp $
---- src/network/qdns.cpp.orig 2004-08-24 23:37:54.000000000 +1200
+--- src/network/qdns.cpp.orig 2005-01-21 17:16:09.000000000 +0000
+++ src/network/qdns.cpp
-@@ -2515,6 +2515,8 @@ void QDns::doSynchronousLookup()
+@@ -2532,6 +2532,8 @@ void QDns::doSynchronousLookup()
#if defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3)))
#define Q_MODERN_RES_API
diff --git a/x11/qt3-mysql/Makefile b/x11/qt3-mysql/Makefile
index b2c0a436784..08216185597 100644
--- a/x11/qt3-mysql/Makefile
+++ b/x11/qt3-mysql/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2004/10/29 05:59:24 jdolecek Exp $
-#
+# $NetBSD: Makefile,v 1.12 2005/02/10 13:23:51 adam Exp $
.include "../qt3-libs/Makefile.common"
PKGNAME= qt3-mysql-${QTVERSION}
-PKGREVISION= 1
COMMENT= QT mysql driver
CONFIGURE_ARGS+= -I${QTDIR}/include \
diff --git a/x11/qt3-psql/Makefile b/x11/qt3-psql/Makefile
index 5ee1757c4bc..81b586b679b 100644
--- a/x11/qt3-psql/Makefile
+++ b/x11/qt3-psql/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.17 2004/10/28 10:32:23 gavan Exp $
-#
+# $NetBSD: Makefile,v 1.18 2005/02/10 13:22:46 adam Exp $
.include "../qt3-libs/Makefile.common"
PKGNAME= qt3-psql-${QTVERSION}
-PKGREVISION= 1
COMMENT= QT postgresql driver
CONFIGURE_ARGS+= -I${QTDIR}/include \
diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile
index b645f235775..09212d8d8f4 100644
--- a/x11/qt3-tools/Makefile
+++ b/x11/qt3-tools/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2004/12/03 15:15:13 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.32 2005/02/10 13:21:40 adam Exp $
.include "../qt3-libs/Makefile.common"
PKGNAME= qt3-tools-${QTVERSION}
-PKGREVISION= 3
COMMENT= QT GUI (WYSIWYG) builder and other tools
CONFIGURE_ARGS+= -I${QTDIR}/include \
diff --git a/x11/qt3/Makefile b/x11/qt3/Makefile
index 95d8f6dfd65..b67a4993f9f 100644
--- a/x11/qt3/Makefile
+++ b/x11/qt3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2004/10/07 16:28:18 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/02/10 13:24:12 adam Exp $
DISTNAME= qt3-${QTVERSION}
-PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/x11/qt3/Makefile.common b/x11/qt3/Makefile.common
index a2ac881dc15..dc4dd5d3814 100644
--- a/x11/qt3/Makefile.common
+++ b/x11/qt3/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.15 2004/08/12 11:52:21 adam Exp $
+# $NetBSD: Makefile.common,v 1.16 2005/02/10 13:24:12 adam Exp $
-QTVERSION= 3.3.3
+QTVERSION= 3.3.4
MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.trolltech.com/products/qt.html