Use the new qt-2.2.1 libraries.

Update to version 2.1. Changes are

XML File Formats

	XML is used for all files formats. The previous file format is still
	loaded. However, only XML is saved. The previous format may be dropped
	in a latter release.

Code Generation

	The following code generation changes were made:
		* Special character values, like new lines and tabs, are
		  escaped in the generated code.

Widgets

	The following widgets were added:
		* QHGroupBox
		* QIconView
		* QVGroupBox

	As usual the properties for all the widgets were updated. Properties
	which were marked as obsolete were removed. In a future release,
	qtarch will support compiling with the QT_NO_COMPAT flag.

5 files changed, 54 insertions, 45 deletions

diff --git a/x11/qtarch/Makefile b/x11/qtarch/Makefile
index 257a8ee0328..c064e295eba 100644
--- a/x11/qtarch/Makefile
+++ b/x11/qtarch/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2000/07/20 14:33:25 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2000/10/19 08:04:57 skrll Exp $
 #
 
-DISTNAME=	qtarch-2.0-1
-PKGNAME=	qtarch-2.0
+DISTNAME=	qtarch-2.1-1
+PKGNAME=	qtarch-2.1
 WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	x11 devel
 MASTER_SITES=	ftp://qtarch.sourceforge.net/pub/qtarch/
@@ -10,7 +10,7 @@ MASTER_SITES=	ftp://qtarch.sourceforge.net/pub/qtarch/
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://qtarch.sourceforge.net/
 
-DEPENDS+=	qt2-*:../../x11/qt
+DEPENDS+=	qt2-libs-*:../../x11/qt2-libs
 DEPENDS+=	png-*:../../graphics/png
 
 USE_X11=	yes
diff --git a/x11/qtarch/files/md5 b/x11/qtarch/files/md5
index af0ca1263fd..645078c919c 100644
--- a/x11/qtarch/files/md5
+++ b/x11/qtarch/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/04/28 20:31:44 drochner Exp $
+$NetBSD: md5,v 1.2 2000/10/19 08:04:57 skrll Exp $
 
-MD5 (qtarch-2.0-1.tar.gz) = 66119089c63517f5f9fc355b48cdf52e
+MD5 (qtarch-2.1-1.tar.gz) = 2b2e8035660836548e65b65415b9b2d2
diff --git a/x11/qtarch/files/patch-sum b/x11/qtarch/files/patch-sum
index 930a149e9e4..e485a01fbc2 100644
--- a/x11/qtarch/files/patch-sum
+++ b/x11/qtarch/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.1.1.1 2000/04/28 20:31:44 drochner Exp $
+$NetBSD: patch-sum,v 1.2 2000/10/19 08:04:57 skrll Exp $
 
-MD5 (patch-aa) = ddcf28b06d28de0f13936a2c292d8844
-MD5 (patch-ab) = 5fee973c039091f5b24c654f6b8f2c7e
+MD5 (patch-aa) = b93f109e5a6e289d933f3982ede46bf9
+MD5 (patch-ab) = fb3e8f9461669a8d12918a39a1cde2b3
diff --git a/x11/qtarch/patches/patch-aa b/x11/qtarch/patches/patch-aa
index 259671b110a..9810da002e1 100644
--- a/x11/qtarch/patches/patch-aa
+++ b/x11/qtarch/patches/patch-aa
@@ -1,15 +1,33 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/04/28 20:31:44 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2000/10/19 08:04:58 skrll Exp $
 
---- bmp/Makefile.orig	Fri Apr 28 20:52:20 2000
-+++ bmp/Makefile	Fri Apr 28 20:56:08 2000
-@@ -93,7 +93,9 @@
- include ../Makefile.common
- 
- qembed: qembed.o
--	$(CC) qembed.o -o qembed -Wall -L$(QTDIR)/lib -lqt 
-+	$(CC) qembed.o -o qembed -Wall -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib -lqt \
-+		-L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -lX11 -lXext -lSM \
-+		-L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -lpng -lz
- 
- $(BMPSOURCE): $(BMPS) qembed
- 	./qembed $(BMPHEADER) $(BMPSOURCE) $(BMPS)
+--- Makefile.common.orig	Tue May 16 04:13:20 2000
++++ Makefile.common
+@@ -15,22 +15,24 @@
+ #	-Wconversion -Wno-overloaded-virtual
+ 
+ ifdef BUILD_RELEASE
+-CFLAGS	= -O2 -fno-strength-reduce -W -Wall -pipe
++CFLAGS	= -O2 -fno-strength-reduce -W -Wall -pipe -D__unix__
+ else
+-CFLAGS	= -g -Wall -W -pipe #-DQT_NO_COMPAT
++CFLAGS	= -g -Wall -W -pipe -D__unix__ #-DQT_NO_COMPAT
+ endif
+ 
+ # Flags used by the C Compiler (not the c++ compiler)
+ C_FLAGS = -O2 -Ixmltok -Ixmlparse -DXML_NS
+ 
+-LFLAGS  = -g -L$(QTDIR)/lib \
++LFLAGS  = -g -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib \
+ 	widget/libwidget.a \
+ 	prop/libprop.a \
+ 	bmp/libbmp.a \
+ 	layout/liblayout.a \
+ 	pixmap/libpixmap.a \
+ 	xml/libqtarchxml.a \
+-	-lfl -lqt -ldl
++	-lfl -lqt \
++	-L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -lX11 -lXext -lSM \
++	-L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -lpng -lz -lstdc++                                                                                                 	
+ #	-lfl -lqt -rdynamic $(HOME)/tmp/ccmalloc-0.2.3/src/libccmalloc.a -ldl
+ 
+ ARFLAGS	= -crs
diff --git a/x11/qtarch/patches/patch-ab b/x11/qtarch/patches/patch-ab
index 830df3e0ffc..9bf2d60d337 100644
--- a/x11/qtarch/patches/patch-ab
+++ b/x11/qtarch/patches/patch-ab
@@ -1,24 +1,15 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/04/28 20:31:44 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2000/10/19 08:04:58 skrll Exp $
 
---- Makefile.common.orig	Mon Oct  4 03:24:17 1999
-+++ Makefile.common	Fri Apr 28 21:41:31 2000
-@@ -19,14 +19,17 @@
- else
- CFLAGS	= -g -Wall -W -pipe
- endif
-+CFLAGS+= -D__unix__
+--- bmp/Makefile.orig	Fri Apr 28 02:41:56 2000
++++ bmp/Makefile
+@@ -95,7 +95,9 @@
+ include ../Makefile.common
  
--LFLAGS  = -rdynamic -g -L$(QTDIR)/lib \
-+LFLAGS  = -g -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib \
- 	widget/libwidget.a \
- 	prop/libprop.a \
- 	bmp/libbmp.a \
- 	layout/liblayout.a \
- 	pixmap/libpixmap.a \
--	-lfl -lqt -lstdc++ -ldl -rdynamic
-+	-lfl -lqt \
-+	-L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -lX11 -lXext -lSM \
-+	-L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -lpng -lz -lstdc++
- ARFLAGS	= -crs
- CC	= g++
- AR	= ar
+ qembed: qembed.o
+-	$(CC) qembed.o -o qembed -Wall -L$(QTDIR)/lib -lqt 
++	$(CC) qembed.o -o qembed -Wall -L$(QTDIR)/lib -Wl,-R$(QTDIR)/lib -lqt \
++		-L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -lX11 -lXext -lSM \
++		-L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -lpng -lz
+ 
+ $(BMPSOURCE): $(BMPS) qembed
+ 	./qembed $(BMPHEADER) $(BMPSOURCE) $(BMPS)