This is a multi-part message in MIME format.
--------------6E8A3F7804BBA7E76216CCCA
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Does anyone mind if I commit the attached patches to the qt21 package.
What they do is make sure that the libqt.la has the correct install
directory in it.

It would seem as though qt1 has a similar problem which I can fix as
well as soon as I get the OK.

Nick
--------------6E8A3F7804BBA7E76216CCCA
Content-Type: text/plain; charset=us-ascii;
 name="qt21-patches"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="qt21-patches"

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt21/Makefile,v
retrieving revision 1.4
diff -r1.4 Makefile
23c23
< USE_PKGLIBTOOL=		yes
---
> USE_LIBTOOL=		yes
29c29,31
< MAKE_ENV+=	QTDIR=${WRKSRC}
---
> QTPREFIX=	${PREFIX}/qt21
> 
> MAKE_ENV+=	QTDIR=${WRKSRC} QTPREFIX=${QTPREFIX}
42,43d43
< 
< QTPREFIX=	${PREFIX}/qt21
Index: files/patch-sum
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt21/files/patch-sum,v
retrieving revision 1.2
diff -r1.2 patch-sum
3c3
< MD5 (patch-aa) = e5f74faca4ba8334410e036e60dfb424
---
> MD5 (patch-aa) = e8bac3f02db341e891f07e013f65fa9c
5c5
< MD5 (patch-ac) = d33d498a09eec7fd2f8769efc90a2827
---
> MD5 (patch-ac) = c0be2950a4b292dbfe6546dc74d3e381
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt21/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 patch-aa
1,4c1,2
< $NetBSD: patch-aa,v 1.1.1.1 2000/04/28 17:18:22 drochner Exp $
< 
< --- configs/netbsd-g++-static.orig	Tue Jul 20 04:45:11 1999
< +++ configs/netbsd-g++-static	Thu Oct 21 14:15:45 1999
---
> --- ./configs/netbsd-g++-static.orig	Wed Apr 12 14:26:47 2000
> +++ ./configs/netbsd-g++-static	Wed Jun 14 22:39:32 2000
9c7
< +SYSCONF_CXX_LIB		= $(LIBTOOL) --cplusplus --mode=compile g++
---
> +SYSCONF_CXX_LIB		= $(LIBTOOL) --mode=compile g++
33c31
< +SYSCONF_LINK		= $(LIBTOOL) --cplusplus --mode=link g++
---
> +SYSCONF_LINK		= $(LIBTOOL) --mode=link g++
63c61
< +	$(SYSCONF_LINK) -rpath $(PREFIX)/lib -version-info $(VER_MAJ):$(VER_MIN) \
---
> +	$(SYSCONF_LINK) -rpath $(QTPREFIX)/lib -version-info $(VER_MAJ):$(VER_MIN) \
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt21/patches/patch-ac,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 patch-ac
1,4c1,2
< $NetBSD: patch-ac,v 1.1.1.1 2000/04/28 17:18:23 drochner Exp $
< 
< --- configs/solaris-g++-static.orig	Wed Apr 12 15:26:52 2000
< +++ configs/solaris-g++-static	Fri Apr 28 16:12:03 2000
---
> --- ./configs/solaris-g++-static.orig	Wed Apr 12 14:26:52 2000
> +++ ./configs/solaris-g++-static	Wed Jun 14 22:39:39 2000
9c7
< +SYSCONF_CXX_LIB	= $(LIBTOOL) --cplusplus --mode=compile ${SYSCONF_CXX}
---
> +SYSCONF_CXX_LIB	= $(LIBTOOL) --mode=compile ${SYSCONF_CXX}
60c58
< +SYSCONF_AR		= $(LIBTOOL) --cplusplus --mode=link $(SYSCONF_CXX) -rpath $(PREFIX)/lib -version-info $(VER_MAJ):$(VER_MIN) -o
---
> +SYSCONF_AR		= $(LIBTOOL) --mode=link $(SYSCONF_CXX) -rpath $(QTPREFIX)/lib -version-info $(VER_MAJ):$(VER_MIN) -o



--------------6E8A3F7804BBA7E76216CCCA--