Update to Qt 3.0.6, change PKGLIBTOOL to LIBTOOL in one place and do a bit of

PLIST sorting.

Qt 3.0.6 is a bugfix release. It maintains both forward and backward
compatibility (source and binary) with Qt 3.0.5

Binary compatibility warning: Qt 3.0.6 is backward and forward binary compatible
with Qt 3.0.5, and is planned to be binary compatible with Qt 3.1. Unfortunately
Qt 3.0.5 is not 100% backward binary compatible with Qt 3.0.3 (a class got a few
bytes smaller), meaning executables compiled with 3.0.5 may not run properly
when linked dynamically to 3.0.3. at runtime. Note that this is not a problem on
MS-Windows. Due to its wide distributed in various GNU/Linux distributions, we
have decided to stick with 3.0.5's ABI. If you ship dynamically linked
executables, we suggest putting a QT_REQUIRE_VERSION macro at the beginning of
your main function:

   ...
   #include <qmessagebox.h>
   ...
   int main( int argc, char**argv )
   {
       QT_REQUIRE_VERSION( argc, argv, "3.0.5" )
       ...
   }

The macro will show a message box with a warning message and then abort the
application gracefully with exit(1).

For a full buglist see the Trolltech web site.

4 files changed, 12 insertions, 13 deletions

diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile
index 52d9bc47813..dfd789f9b98 100644
--- a/x11/qt3-libs/Makefile
+++ b/x11/qt3-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2002/08/27 09:13:48 skrll Exp $
+# $NetBSD: Makefile,v 1.11 2002/10/28 08:46:44 skrll Exp $
 #
 
 .include "../qt3-libs/Makefile.common"
@@ -24,7 +24,7 @@ do-install:
 	${INSTALL_PROGRAM_DIR} ${QTPREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${QTPREFIX}/bin
 	${INSTALL_DATA_DIR} ${QTPREFIX}/lib
-	${PKGLIBTOOL} ${INSTALL_DATA} ${WRKSRC}/lib/libqt-mt.la ${QTPREFIX}/lib
+	${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/lib/libqt-mt.la ${QTPREFIX}/lib
 	${INSTALL_DATA_DIR} ${QTPREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${QTPREFIX}/include
 	${INSTALL_DATA_DIR} ${QTPREFIX}/include/private
diff --git a/x11/qt3-libs/PLIST b/x11/qt3-libs/PLIST
index 023a528bfa8..4fc2258fd2e 100644
--- a/x11/qt3-libs/PLIST
+++ b/x11/qt3-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2002/08/27 09:13:49 skrll Exp $
+@comment $NetBSD: PLIST,v 1.7 2002/10/28 08:46:44 skrll Exp $
 qt3/bin/moc
 qt3/include/jri.h
 qt3/include/jri_md.h
@@ -124,7 +124,6 @@ qt3/include/qfocusdata.h
 qt3/include/qfont.h
 qt3/include/qfontdatabase.h
 qt3/include/qfontdialog.h
-qt3/include/qfontdta.h
 qt3/include/qfontinf.h
 qt3/include/qfontinfo.h
 qt3/include/qfontmet.h
diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo
index 2fbbd3feaeb..3663b8bbfe9 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2002/08/27 09:13:49 skrll Exp $
+$NetBSD: distinfo,v 1.9 2002/10/28 08:46:44 skrll Exp $
 
-SHA1 (qt-x11-free-3.0.5.tar.gz) = 8d6c3c5b17da2a32f1b4ff60a61998d0822c3e41
-Size (qt-x11-free-3.0.5.tar.gz) = 16057928 bytes
+SHA1 (qt-x11-free-3.0.6.tar.gz) = 7fb6a9d17091d9a60dd18fb3235098a17f142542
+Size (qt-x11-free-3.0.6.tar.gz) = 16062069 bytes
 SHA1 (patch-aa) = d230bbb56eac7f386c4610f3a7088902c95c9c4d
 SHA1 (patch-ab) = 8842f4ef5d3464d3a588c20d0ef5b0bb40d48180
-SHA1 (patch-ac) = da32dd8596f36238fec30fb7b8a444d36e13ed92
+SHA1 (patch-ac) = e68231282b24674498de446f1dc4e4f052fe1196
 SHA1 (patch-ad) = 197ba1f217635ad0b25d4709d0be9786ade079cc
diff --git a/x11/qt3-libs/patches/patch-ac b/x11/qt3-libs/patches/patch-ac
index 1b3ea8d0fc7..8e9cd05fdfc 100644
--- a/x11/qt3-libs/patches/patch-ac
+++ b/x11/qt3-libs/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/01/07 08:07:59 skrll Exp $
+$NetBSD: patch-ac,v 1.2 2002/10/28 08:46:44 skrll Exp $
 
---- src/tools/qdir_unix.cpp.orig	Wed Dec 12 06:58:31 2001
+--- src/tools/qdir_unix.cpp.orig	Thu Oct 17 15:08:58 2002
 +++ src/tools/qdir_unix.cpp
-@@ -81,10 +81,19 @@
+@@ -82,10 +82,19 @@ QString QDir::canonicalPath() const
  
  bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const
  {
--#ifdef Q_OS_MACX  // Mac X doesn't support trailing /'s
+-#if defined(Q_OS_MACX)  // Mac X doesn't support trailing /'s
 +#ifdef Q_TRAILING_DIR_SEP  // Some OSes doesn't support trailing /'s
      QString name = dirName;
 -    if (dirName[dirName.length() - 1] == "/")
@@ -25,7 +25,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2002/01/07 08:07:59 skrll Exp $
      return QT_MKDIR( QFile::encodeName(filePath(name,acceptAbsPath)), 0777 )
  	== 0;
  #else
-@@ -95,7 +104,24 @@
+@@ -96,7 +105,24 @@ bool QDir::mkdir( const QString &dirName
  
  bool QDir::rmdir( const QString &dirName, bool acceptAbsPath ) const
  {