update to qt-2.2.2

"Bugfixes and minor extensions."

13 files changed, 46 insertions, 43 deletions

diff --git a/x11/qt2-designer/Makefile b/x11/qt2-designer/Makefile
index 7769ae926e9..af2ab8a0e20 100644
--- a/x11/qt2-designer/Makefile
+++ b/x11/qt2-designer/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2000/11/03 08:37:05 skrll Exp $
+# $NetBSD: Makefile,v 1.4 2000/12/05 18:32:03 drochner Exp $
 #
 
-PKGNAME=	qt2-designer-2.2.1
+PKGNAME=	qt2-designer-2.2.2
 
 .include "../qt2-libs/Makefile.common"
 
diff --git a/x11/qt2-designer/files/md5 b/x11/qt2-designer/files/md5
index 2febff35ee0..9f0c836f0f8 100644
--- a/x11/qt2-designer/files/md5
+++ b/x11/qt2-designer/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/10/19 07:45:12 skrll Exp $
+$NetBSD: md5,v 1.2 2000/12/05 18:32:04 drochner Exp $
 
-MD5 (qt-x11-2.2.1.tar.gz) = c5a65c4ded0330fa6b44c24fd93b938e
+MD5 (qt-x11-2.2.2.tar.gz) = 682e8f62af48770aea52036eb6329792
diff --git a/x11/qt2-docs/Makefile b/x11/qt2-docs/Makefile
index ffe1fd1fdb8..a3946c99116 100644
--- a/x11/qt2-docs/Makefile
+++ b/x11/qt2-docs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2000/11/03 08:37:05 skrll Exp $
+# $NetBSD: Makefile,v 1.4 2000/12/05 18:32:04 drochner Exp $
 #
 
-PKGNAME=	qt2-docs-2.2.1
+PKGNAME=	qt2-docs-2.2.2
 
 .include "../qt2-libs/Makefile.common"
 
diff --git a/x11/qt2-docs/files/md5 b/x11/qt2-docs/files/md5
index 3f6a6220de8..9f0c836f0f8 100644
--- a/x11/qt2-docs/files/md5
+++ b/x11/qt2-docs/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/10/19 07:42:40 skrll Exp $
+$NetBSD: md5,v 1.2 2000/12/05 18:32:04 drochner Exp $
 
-MD5 (qt-x11-2.2.1.tar.gz) = c5a65c4ded0330fa6b44c24fd93b938e
+MD5 (qt-x11-2.2.2.tar.gz) = 682e8f62af48770aea52036eb6329792
diff --git a/x11/qt2-docs/pkg/PLIST b/x11/qt2-docs/pkg/PLIST
index 1f70d2a5416..0f29f76ccc2 100644
--- a/x11/qt2-docs/pkg/PLIST
+++ b/x11/qt2-docs/pkg/PLIST
@@ -1,8 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/10/19 07:42:40 skrll Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/12/05 18:32:04 drochner Exp $
 
 qt2/doc/README
 qt2/doc/README.QT
-qt2/doc/man/man3/PCOPChannel.3
 qt2/doc/man/man3/QAccel.3
 qt2/doc/man/man3/QAction.3
 qt2/doc/man/man3/QActionGroup.3
@@ -53,6 +52,7 @@ qt2/doc/man/man3/QColorGroup.3
 qt2/doc/man/man3/QComboBox.3
 qt2/doc/man/man3/QCommonStyle.3
 qt2/doc/man/man3/QConstString.3
+qt2/doc/man/man3/QCopChannel.3
 qt2/doc/man/man3/QCursor.3
 qt2/doc/man/man3/QCustomEvent.3
 qt2/doc/man/man3/QCustomMenuItem.3
@@ -332,7 +332,6 @@ qt2/doc/man/man3/QXmlSimpleReader.3
 qt2/doc/man/man3/QXtApplication.3
 qt2/doc/man/man3/QXtWidget.3
 qt2/doc/man/man3/Qt.3
-qt2/doc/man/man3/pcopchannel.3
 qt2/doc/man/man3/qaccel.3
 qt2/doc/man/man3/qaction.3
 qt2/doc/man/man3/qactiongroup.3
@@ -382,6 +381,7 @@ qt2/doc/man/man3/qcolorgroup.3
 qt2/doc/man/man3/qcombobox.3
 qt2/doc/man/man3/qcommonstyle.3
 qt2/doc/man/man3/qconststring.3
+qt2/doc/man/man3/qcopchannel.3
 qt2/doc/man/man3/qcstring.3
 qt2/doc/man/man3/qcursor.3
 qt2/doc/man/man3/qcustomevent.3
diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile
index 667aa985e3b..cc5bdd82ec4 100644
--- a/x11/qt2-libs/Makefile
+++ b/x11/qt2-libs/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2000/10/22 05:52:24 rh Exp $
+# $NetBSD: Makefile,v 1.3 2000/12/05 18:32:04 drochner Exp $
 #
 USE_MESA=	yes
 
 .include "../qt2-libs/Makefile.common"
 
-PKGNAME=	qt2-libs-2.2.1
+PKGNAME=	qt2-libs-2.2.2
 
 DEPENDS+=	png-*:../../graphics/png
 DEPENDS+=	jpeg-*:../../graphics/jpeg
diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common
index 9de271f47cf..ed046df31de 100644
--- a/x11/qt2-libs/Makefile.common
+++ b/x11/qt2-libs/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2000/10/19 07:41:12 skrll Exp $
+# $NetBSD: Makefile.common,v 1.2 2000/12/05 18:32:04 drochner Exp $
 #
 
-DISTNAME=		qt-x11-2.2.1
-WRKSRC=			${WRKDIR}/qt-2.2.1
+DISTNAME=		qt-x11-2.2.2
+WRKSRC=			${WRKDIR}/qt-2.2.2
 CATEGORIES=		x11
 MASTER_SITES=	\
 	ftp://ftp.trolltech.com/qt/source/ \
diff --git a/x11/qt2-libs/files/md5 b/x11/qt2-libs/files/md5
index 5312767de20..9f0c836f0f8 100644
--- a/x11/qt2-libs/files/md5
+++ b/x11/qt2-libs/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/10/19 07:41:12 skrll Exp $
+$NetBSD: md5,v 1.2 2000/12/05 18:32:04 drochner Exp $
 
-MD5 (qt-x11-2.2.1.tar.gz) = c5a65c4ded0330fa6b44c24fd93b938e
+MD5 (qt-x11-2.2.2.tar.gz) = 682e8f62af48770aea52036eb6329792
diff --git a/x11/qt2-libs/files/patch-sum b/x11/qt2-libs/files/patch-sum
index 081ae087d26..e3f278f3ae0 100644
--- a/x11/qt2-libs/files/patch-sum
+++ b/x11/qt2-libs/files/patch-sum
@@ -1,10 +1,10 @@
-$NetBSD: patch-sum,v 1.2 2000/11/03 08:40:24 skrll Exp $
+$NetBSD: patch-sum,v 1.3 2000/12/05 18:32:04 drochner Exp $
 
 MD5 (patch-aa) = 8065c4af83fe8ce8713510f6e32a7811
-MD5 (patch-ab) = 07572df0bf296c725b733884fbc5fcac
-MD5 (patch-ac) = 677291030a425e5792bd242338c9ddc1
+MD5 (patch-ab) = f50a6c9d50b9817003b216fa6eff5729
+MD5 (patch-ac) = 04de629d6d27a0030c190b175940d9ef
 MD5 (patch-ad) = 6bb4068dfa73008cefd6a860391caaf9
-MD5 (patch-ae) = 2c72e9e3658293f9476d4a0415f12899
+MD5 (patch-ae) = bda1074af956f165e6fe827babc9105e
 MD5 (patch-af) = eabc3b9b2a37d3b278ef9781305d4c93
 MD5 (patch-ag) = e37a1c2177d634a10cd13e3831317be6
 MD5 (patch-ah) = 17097e2d1020179a52b1df16bf69fdd1
diff --git a/x11/qt2-libs/patches/patch-ab b/x11/qt2-libs/patches/patch-ab
index ad9931a3e29..a27d5ecb678 100644
--- a/x11/qt2-libs/patches/patch-ab
+++ b/x11/qt2-libs/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2000/11/03 08:40:24 skrll Exp $
+$NetBSD: patch-ab,v 1.3 2000/12/05 18:32:04 drochner Exp $
 
---- configs/netbsd-g++-static.orig	Wed Oct  4 10:55:23 2000
-+++ configs/netbsd-g++-static
-@@ -1,20 +1,21 @@
+--- configs/netbsd-g++-static.orig	Wed Nov  8 18:06:36 2000
++++ configs/netbsd-g++-static	Thu Nov 30 13:01:14 2000
+@@ -1,21 +1,22 @@
  # Compiling
  INTERFACE_DECL_PATH 	= .
 -SYSCONF_CXX		= g++
@@ -10,6 +10,7 @@ $NetBSD: patch-ab,v 1.2 2000/11/03 08:40:24 skrll Exp $
 +SYSCONF_CXX		= c++
 +SYSCONF_CC		= cc
 +SYSCONF_CXX_LIB		= ${LIBTOOL} --mode=compile c++
+ DASHCROSS		= 
  
  # Compiling with support libraries
  SYSCONF_CXXFLAGS_X11	= -I/usr/X11R6/include
@@ -30,7 +31,7 @@ $NetBSD: patch-ab,v 1.2 2000/11/03 08:40:24 skrll Exp $
  
  # Linking with support libraries
  # X11
-@@ -25,19 +26,16 @@
+@@ -26,19 +27,16 @@
  SYSCONF_LIBS_QT		= -lqt$(QT_THREAD_SUFFIX)
  SYSCONF_LIBS_QT_OPENGL	= 
  # OpenGL
@@ -52,12 +53,12 @@ $NetBSD: patch-ab,v 1.2 2000/11/03 08:40:24 skrll Exp $
  # Flags for threading
  SYSCONF_CFLAGS_THREAD	= 
  SYSCONF_CXXFLAGS_THREAD	= 
-@@ -50,34 +48,23 @@
+@@ -51,34 +49,23 @@
  # UI compiler
  SYSCONF_UIC		= $(QTDIR)/bin/uic
  
 -# Linking shared libraries
--#   - Build the $(TARGET) library, eg. lib$(TARGET).so.2.0.1
+-#   - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2
 +# Linking libtool libraries
 +#   - Build the $(TARGET) library, eg. lib$(TARGET).la
  #   - Place target in $(DESTDIR) - which has a trailing /
diff --git a/x11/qt2-libs/patches/patch-ac b/x11/qt2-libs/patches/patch-ac
index a4752187512..25d59167f22 100644
--- a/x11/qt2-libs/patches/patch-ac
+++ b/x11/qt2-libs/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/10/19 07:41:15 skrll Exp $
+$NetBSD: patch-ac,v 1.2 2000/12/05 18:32:05 drochner Exp $
 
---- configs/solaris-g++-static.orig	Wed Oct  4 10:55:31 2000
-+++ configs/solaris-g++-static
+--- configs/solaris-g++-static.orig	Wed Nov  8 18:06:39 2000
++++ configs/solaris-g++-static	Thu Nov 30 13:09:00 2000
 @@ -2,6 +2,7 @@
  INTERFACE_DECL_PATH 	= .
  SYSCONF_CXX		= g++
  SYSCONF_CC		= gcc
 +SYSCONF_CXX_LIB		= $(LIBTOOL) --mode=compile g++
+ DASHCROSS		= 
  
  # Compiling with support libraries
- SYSCONF_CXXFLAGS_X11	= -I/usr/openwin/include
diff --git a/x11/qt2-libs/patches/patch-ae b/x11/qt2-libs/patches/patch-ae
index 82ffcc3673e..bc6cc180d36 100644
--- a/x11/qt2-libs/patches/patch-ae
+++ b/x11/qt2-libs/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/10/19 07:41:16 skrll Exp $
+$NetBSD: patch-ae,v 1.2 2000/12/05 18:32:05 drochner Exp $
 
---- src/Makefile.in.orig	Wed Oct  4 10:55:53 2000
-+++ src/Makefile.in
+--- src/Makefile.in.orig	Wed Nov  8 18:06:56 2000
++++ src/Makefile.in	Thu Nov 30 13:15:27 2000
 @@ -2,7 +2,7 @@
  
  ####### Compiler, tools and options
@@ -16,11 +16,11 @@ $NetBSD: patch-ae,v 1.1.1.1 2000/10/19 07:41:16 skrll Exp $
  ####### Target
  
 -DESTDIR = ../lib/
-+DESTDIR = 
++DESTDIR =
  VER_MAJ = 2
  VER_MIN = 2
- VER_PATCH = 1
-@@ -358,19 +358,7 @@
+ VER_PATCH = 2
+@@ -370,19 +370,7 @@
  .SUFFIXES: .cpp .cxx .cc .C .c
  
  .cpp.o:
@@ -41,7 +41,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2000/10/19 07:41:16 skrll Exp $
  
  ####### Build rules
  
-@@ -378,7 +366,7 @@
+@@ -390,7 +378,7 @@
  all: $(DESTDIR)$(SYSCONF_LINK_TARGET)
  
  $(DESTDIR)$(SYSCONF_LINK_TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC) $(SUBLIBS)
diff --git a/x11/qt2-libs/pkg/PLIST b/x11/qt2-libs/pkg/PLIST
index 1e6132c0799..3bd8e23ceb0 100644
--- a/x11/qt2-libs/pkg/PLIST
+++ b/x11/qt2-libs/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/10/19 07:41:14 skrll Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/12/05 18:32:05 drochner Exp $
 
 qt2/bin/moc
 qt2/include/jri.h
@@ -40,9 +40,11 @@ qt2/include/qcombo.h
 qt2/include/qcombobox.h
 qt2/include/qcommonstyle.h
 qt2/include/qconfig-dist.h
-qt2/include/qconfig-embedded.h
+qt2/include/qconfig-large.h
+qt2/include/qconfig-medium.h
 qt2/include/qconfig-minimal.h
-qt2/include/qconfig-qpim.h
+qt2/include/qconfig-qpe.h
+qt2/include/qconfig-small.h
 qt2/include/qconfig.h
 qt2/include/qconnect.h
 qt2/include/qconnection.h