Update qt3 to 3.1.2. This update fixes a large number of bugs.

9 files changed, 42 insertions, 24 deletions

diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile
index 058ee91bc52..7084ceb08d8 100644
--- a/x11/qt3-libs/Makefile
+++ b/x11/qt3-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/03/09 19:28:18 jschauma Exp $
+# $NetBSD: Makefile,v 1.16 2003/03/18 08:36:24 skrll Exp $
 #
 
 LIBQT=			${WRKSRC}/lib/libqt-mt.la
@@ -17,7 +17,10 @@ PTHREAD_OPTS+=		require
 UNLIMIT_RESOURCES=	datasize
 
 post-extract:
-	${RM} -f ${WRKSRC}/include/qt_windows.h
+	${RM} -f ${WRKSRC}/include/qmotif.h
+	${RM} -f ${WRKSRC}/include/qmotifdialog.h
+	${RM} -f ${WRKSRC}/include/qmotifwidget.h
+	${RM} -f ${WRKSRC}/include/qxtwidget.h
 
 do-install:
 	${INSTALL_DATA_DIR} ${QTPREFIX}
@@ -35,6 +38,7 @@ do-install:
 	${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/imageformats/libqmng.la ${QTPREFIX}/plugins/imageformats
 
 .include "../../devel/zlib/buildlink2.mk"
+.include "../../fonts/Xft2/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/MesaLib/buildlink2.mk"
 .include "../../graphics/glu/buildlink2.mk"
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index e84c9e465e2..54bb44e31b6 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2003/03/11 13:02:07 markd Exp $
+# $NetBSD: Makefile.common,v 1.14 2003/03/18 08:36:24 skrll Exp $
 #
 DISTNAME=		qt-x11-free-${QTVERSION}
 CATEGORIES=		x11
@@ -29,10 +29,8 @@ CONFIGURE_ARGS+=	-no-g++-exceptions
 
 CONFIGURE_ARGS+=	< ${FILESDIR}/license-acceptance
 
-QTPREFIX=		${PREFIX}/qt3
 LIBQT?=			-lqt-mt
 
-CONFIGURE_ENV+=         QTDIR="${WRKSRC}"
 MAKE_ENV+=		QTPREFIX=${QTPREFIX}
 MAKE_ENV+=              QTDIR="${WRKSRC}"
 
@@ -78,6 +76,7 @@ post-patch:
 		-e 's:@SYS_LIBS@:${SYS_LIBS}:g' \
 		-e 's:@LEX@:${LEX}:g' \
 		-e 's:@YACC@:${YACC}:g' \
+		-e 's:@AR@:${AR}:g' \
 		-e 's:@LIBQT@:${LIBQT}:g' \
 		${FILESDIR}/qmake.conf > ${WRKSRC}/qmake.conf
 	for dir in ${WRKSRC}/mkspecs/*; do \
diff --git a/x11/qt3-libs/PLIST b/x11/qt3-libs/PLIST
index 4d7bcaef9f5..6c4a6106a93 100644
--- a/x11/qt3-libs/PLIST
+++ b/x11/qt3-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2003/03/11 13:02:07 markd Exp $
+@comment $NetBSD: PLIST,v 1.10 2003/03/18 08:36:24 skrll Exp $
 qt3/bin/moc
 qt3/include/private/qapplication_p.h
 qt3/include/private/qcolor_p.h
@@ -373,11 +373,11 @@ qt3/include/qwindow.h
 qt3/include/qwindowdefs.h
 qt3/include/qwindowsstyle.h
 qt3/include/qwindowsxpstyle.h
+qt3/include/qwinexport.h
 qt3/include/qwizard.h
 qt3/include/qwmatrix.h
 qt3/include/qworkspace.h
 qt3/include/qxml.h
-qt3/include/qxtwidget.h
 qt3/lib/libqt-mt.a
 qt3/lib/libqt-mt.la
 qt3/lib/libqt-mt.so
diff --git a/x11/qt3-libs/buildlink2.mk b/x11/qt3-libs/buildlink2.mk
index da670f528df..fe0ccbfc643 100644
--- a/x11/qt3-libs/buildlink2.mk
+++ b/x11/qt3-libs/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.12 2003/03/14 19:38:07 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.13 2003/03/18 08:36:24 skrll Exp $
 
 .if !defined(QT3_LIBS_BUILDLINK2_MK)
 QT3_LIBS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		qt3-libs
-BUILDLINK_DEPENDS.qt3-libs?=	qt3-libs>=3.1.1
+BUILDLINK_DEPENDS.qt3-libs?=	qt3-libs>=3.1.2
 BUILDLINK_PKGSRCDIR.qt3-libs?=	../../x11/qt3-libs
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.qt3-libs=qt3-libs
@@ -22,6 +22,7 @@ FIX_RPATH+=			BUILDLINK_LDFLAGS.qt3-libs
 PTHREAD_OPTS+=	require
 
 .include "../../devel/zlib/buildlink2.mk"
+.include "../../fonts/Xft2/buildlink2.mk"
 .include "../../graphics/MesaLib/buildlink2.mk"
 .include "../../graphics/freetype2/buildlink2.mk"
 .include "../../graphics/glu/buildlink2.mk"
diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo
index 6c51c8c7909..a7761e7f576 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.12 2003/03/11 13:02:08 markd Exp $
+$NetBSD: distinfo,v 1.13 2003/03/18 08:36:25 skrll Exp $
 
-SHA1 (qt-x11-free-3.1.1.tar.bz2) = c0175a264ee60fc65b062842bf4a6be9e1618da5
-Size (qt-x11-free-3.1.1.tar.bz2) = 12393902 bytes
+SHA1 (qt-x11-free-3.1.2.tar.bz2) = eddcf56d34c4ee98fd2b48be6b6aa32b66f302a5
+Size (qt-x11-free-3.1.2.tar.bz2) = 13358932 bytes
 SHA1 (patch-aa) = d230bbb56eac7f386c4610f3a7088902c95c9c4d
-SHA1 (patch-ab) = e8c2bbb84c241df34f493fd9cf44209069f2495e
-SHA1 (patch-ac) = ea4a7e3c5cef4e366a1cea4985f0fa34efa8f34f
+SHA1 (patch-ab) = 4dfee5c06bc322646465f43fe850126873d7bb75
+SHA1 (patch-ac) = 842ac48bd9d1f8a4d92bdaf0ccd8f14a1b7c4512
 SHA1 (patch-ad) = 5f3d133051a9894aa45df1b1a6e1d0b6d964c49c
+SHA1 (patch-ag) = 4b1d279a7ff1793eac7ca0c98df61f43a762d50a
 SHA1 (patch-ba) = 0f5baae5501a83ea53e5d4df846bb1f338e4d802
 SHA1 (patch-bb) = 5196eb7c63f33fc36fe3569273d6c7061aeb9dbb
diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf
index f05bd6f3da5..3753200b673 100644
--- a/x11/qt3-libs/files/qmake.conf
+++ b/x11/qt3-libs/files/qmake.conf
@@ -1,5 +1,5 @@
-# $NetBSD: qmake.conf,v 1.8 2003/03/11 13:02:08 markd Exp $
-# $Id: qmake.conf,v 1.8 2003/03/11 13:02:08 markd Exp $
+# $NetBSD: qmake.conf,v 1.9 2003/03/18 08:36:25 skrll Exp $
+# $Id: qmake.conf,v 1.9 2003/03/18 08:36:25 skrll Exp $
 #
 # qmake configuration for netbsd-g++
 #
@@ -83,7 +83,7 @@ QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
-QMAKE_AR		= libtool --mode=link c++ -o 
+QMAKE_AR		= @AR@ ru
 QMAKE_RANLIB		= true
 
 QMAKE_TAR		= tar -cf
diff --git a/x11/qt3-libs/patches/patch-ab b/x11/qt3-libs/patches/patch-ab
index 2d501980708..5c0174f5cbf 100644
--- a/x11/qt3-libs/patches/patch-ab
+++ b/x11/qt3-libs/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.5 2003/03/11 13:02:08 markd Exp $
+$NetBSD: patch-ab,v 1.6 2003/03/18 08:36:25 skrll Exp $
 
---- tools/designer/editor/editor.pro.orig	Wed Nov 20 11:07:43 2002
+--- tools/designer/editor/editor.pro.orig	Tue Nov 19 22:07:43 2002
 +++ tools/designer/editor/editor.pro
 @@ -1,6 +1,5 @@
  TEMPLATE	= lib
 -CONFIG		+= qt warn_on staticlib
 -CONFIG		-= dll
-+CONFIG		+= qt warn_on dll
++CONFIG		+= qt warn_on
  HEADERS		= editor.h  \
  		  parenmatcher.h  \
  		  completion.h \
diff --git a/x11/qt3-libs/patches/patch-ac b/x11/qt3-libs/patches/patch-ac
index 0a4598911e5..7f88f2277d2 100644
--- a/x11/qt3-libs/patches/patch-ac
+++ b/x11/qt3-libs/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2003/03/11 13:02:08 markd Exp $
+$NetBSD: patch-ac,v 1.4 2003/03/18 08:36:25 skrll Exp $
 
 --- src/tools/qdir_unix.cpp.orig	Mon Dec  9 22:40:32 2002
 +++ src/tools/qdir_unix.cpp
@@ -39,10 +39,10 @@ $NetBSD: patch-ac,v 1.3 2003/03/11 13:02:08 markd Exp $
 +	   name.truncate( pos );
 +       }
 +    }
-     return ::mkdir( QFile::encodeName(filePath(name,acceptAbsPath)), 0777 )
- 	== 0;
+     int status =
+ 	::mkdir( QFile::encodeName(filePath(name,acceptAbsPath)), 0777 );
  #else
-@@ -100,7 +119,24 @@
+@@ -101,7 +120,24 @@ bool QDir::mkdir( const QString &dirName
  
  bool QDir::rmdir( const QString &dirName, bool acceptAbsPath ) const
  {
diff --git a/x11/qt3-libs/patches/patch-ag b/x11/qt3-libs/patches/patch-ag
new file mode 100644
index 00000000000..725dd8e0043
--- /dev/null
+++ b/x11/qt3-libs/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2003/03/18 08:36:25 skrll Exp $
+
+--- tools/designer/plugins/cppeditor/cppeditor.pro.orig	2003-01-14 17:56:20.000000000 +0000
++++ tools/designer/plugins/cppeditor/cppeditor.pro
+@@ -13,7 +13,7 @@ INCLUDEPATH	+= ../../interfaces ../../ed
+ win32{
+     LIBS	+= $$QT_BUILD_TREE/lib/editor.lib
+ } else {
+-    LIBS	+= -L$$QT_BUILD_TREE/lib $$QT_BUILD_TREE/lib/libeditor.a
++    LIBS	+= -L$$QT_BUILD_TREE/lib $$QT_BUILD_TREE/lib/libeditor.la
+ }
+ 
+ target.path += $$plugins.path/designer