update to qt-2.2.2

"Bugfixes and minor extensions."

3 files changed, 19 insertions, 18 deletions

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)