From 51c48b3161b6ceb4e0ae3b8541c666e941f22b6f Mon Sep 17 00:00:00 2001
From: adam <adam@pkgsrc.org>
Date: Thu, 12 Aug 2004 11:52:21 +0000
Subject: Changes 3.3.3: * Bug-fix release

---
 x11/qt3-libs/distinfo         | 10 ++++------
 x11/qt3-libs/patches/patch-ae |  8 ++++----
 x11/qt3-libs/patches/patch-ag | 13 -------------
 x11/qt3-libs/patches/patch-ah | 13 -------------
 x11/qt3-tools/PLIST           |  4 +++-
 x11/qt3/Makefile.common       |  5 ++---
 6 files changed, 13 insertions(+), 40 deletions(-)
 delete mode 100644 x11/qt3-libs/patches/patch-ag
 delete mode 100644 x11/qt3-libs/patches/patch-ah

(limited to 'x11')

diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo
index 653e7fd9169..8da70e725eb 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.22 2004/07/06 16:59:04 wiz Exp $
+$NetBSD: distinfo,v 1.23 2004/08/12 11:52:39 adam Exp $
 
-SHA1 (qt-x11-free-3.3.2.tar.bz2) = 18b0a1dafbdbe446814949bc814a9c070419743e
-Size (qt-x11-free-3.3.2.tar.bz2) = 14434821 bytes
+SHA1 (qt-x11-free-3.3.3.tar.bz2) = b9737d8dc0c440a7d28f1f0a164e49f7bd242585
+Size (qt-x11-free-3.3.3.tar.bz2) = 14424812 bytes
 SHA1 (patch-aa) = 0247c3694db7bf29556e00809b5d7f26817f3055
 SHA1 (patch-ab) = 4dfee5c06bc322646465f43fe850126873d7bb75
 SHA1 (patch-ac) = 1914c348846ae2ab0358e554d29ba49a0be90d52
-SHA1 (patch-ae) = 16f35100cccc0b3e325fc8a2fd049bab5aca8056
+SHA1 (patch-ae) = 2ec0b408edd78daa03c02c654e0ce515933f36e7
 SHA1 (patch-af) = dde2d3cd4fa9eab0105ee097182a172756002347
-SHA1 (patch-ag) = d8185f4c98df1ba8db45b74ff06a204693a29da6
-SHA1 (patch-ah) = 6ef54bbed6e01144e4dc18e91d410845adbbfeba
 SHA1 (patch-ba) = 0f5baae5501a83ea53e5d4df846bb1f338e4d802
 SHA1 (patch-bb) = df300b77d0adb653eaa16c97f995ed2def8e7d87
 SHA1 (patch-bc) = d8a84e1b66bf1953b53df57ae81d2c98cce69c41
diff --git a/x11/qt3-libs/patches/patch-ae b/x11/qt3-libs/patches/patch-ae
index e6eb20c93aa..ecc51254974 100644
--- a/x11/qt3-libs/patches/patch-ae
+++ b/x11/qt3-libs/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2003/12/19 15:43:31 skrll Exp $
+$NetBSD: patch-ae,v 1.2 2004/08/12 11:52:39 adam Exp $
 
---- src/kernel/qinputcontext_x11.cpp.orig	2003-10-10 10:47:35.000000000 +0900
-+++ src/kernel/qinputcontext_x11.cpp	2003-12-15 23:15:04.000000000 +0900
-@@ -255,9 +255,8 @@
+--- src/kernel/qinputcontext_x11.cpp.orig	2004-08-05 14:42:10.000000000 +0000
++++ src/kernel/qinputcontext_x11.cpp
+@@ -265,9 +265,8 @@ extern "C" {
  		qDebug( "compose emptied" );
  #endif // QT_XIM_DEBUG
  
diff --git a/x11/qt3-libs/patches/patch-ag b/x11/qt3-libs/patches/patch-ag
deleted file mode 100644
index 5849a04b823..00000000000
--- a/x11/qt3-libs/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2004/05/10 06:47:10 adam Exp $
-
---- include/qglobal.h.orig	Sun May  9 11:23:48 2004
-+++ include/qglobal.h
-@@ -82,7 +82,7 @@
- #if defined(__DARWIN_X11__)
- #  define Q_OS_DARWIN
- #elif defined(__APPLE__) && defined(__GNUC__)
--#  define Q_OS_MACX
-+#  define Q_OS_DARWIN
- #elif defined(__MACOSX__)
- #  define Q_OS_MACX
- #elif defined(macintosh)
diff --git a/x11/qt3-libs/patches/patch-ah b/x11/qt3-libs/patches/patch-ah
deleted file mode 100644
index 2b014ed3bfe..00000000000
--- a/x11/qt3-libs/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2004/05/10 06:47:10 adam Exp $
-
---- src/tools/qglobal.h.orig	Sun May  9 11:23:48 2004
-+++ src/tools/qglobal.h
-@@ -82,7 +82,7 @@
- #if defined(__DARWIN_X11__)
- #  define Q_OS_DARWIN
- #elif defined(__APPLE__) && defined(__GNUC__)
--#  define Q_OS_MACX
-+#  define Q_OS_DARWIN
- #elif defined(__MACOSX__)
- #  define Q_OS_MACX
- #elif defined(macintosh)
diff --git a/x11/qt3-tools/PLIST b/x11/qt3-tools/PLIST
index dfb519eedd1..4b8bc9806d2 100644
--- a/x11/qt3-tools/PLIST
+++ b/x11/qt3-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2004/04/16 14:30:45 recht Exp $
+@comment $NetBSD: PLIST,v 1.14 2004/08/12 11:53:43 adam Exp $
 qt3/bin/assistant
 qt3/bin/designer
 qt3/bin/linguist
@@ -97,6 +97,8 @@ qt3/mkspecs/macx-mwerks/qplatformdefs.h
 qt3/mkspecs/macx-pbuilder/Info.plist.app
 qt3/mkspecs/macx-pbuilder/qmake.conf
 qt3/mkspecs/macx-pbuilder/qplatformdefs.h
+qt3/mkspecs/macx-xlc/qmake.conf
+qt3/mkspecs/macx-xlc/qplatformdefs.h
 qt3/mkspecs/netbsd-g++/qmake.conf
 qt3/mkspecs/netbsd-g++/qplatformdefs.h
 qt3/mkspecs/openbsd-g++/qmake.conf
diff --git a/x11/qt3/Makefile.common b/x11/qt3/Makefile.common
index c75b18703a3..a2ac881dc15 100644
--- a/x11/qt3/Makefile.common
+++ b/x11/qt3/Makefile.common
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.14 2004/04/29 12:53:05 markd Exp $
-#
+# $NetBSD: Makefile.common,v 1.15 2004/08/12 11:52:21 adam Exp $
 
-QTVERSION=	3.3.2
+QTVERSION=	3.3.3
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.trolltech.com/products/qt.html
-- 
cgit v1.2.3