Work around broken qt test in configure script, and add some patches

to make this compile with gcc3.

13 files changed, 175 insertions, 8 deletions

diff --git a/games/xarchon/distinfo b/games/xarchon/distinfo
index d9997daade0..3a1a2a2135d 100644
--- a/games/xarchon/distinfo
+++ b/games/xarchon/distinfo
@@ -1,6 +1,16 @@
-$NetBSD: distinfo,v 1.6 2003/12/20 01:51:34 hubertf Exp $
+$NetBSD: distinfo,v 1.7 2005/02/22 16:35:55 wiz Exp $
 
 SHA1 (xarchon-0.60.tar.gz) = e68f79a712a8bff5ca18e5011d1582f7e5196f49
 Size (xarchon-0.60.tar.gz) = 435088 bytes
-SHA1 (patch-aa) = 03d8cdc6a8ba77a8b28fb7b4464823f6066f3993
-SHA1 (patch-ab) = 2f35eb718bd47089ee545abbdb10ed8adba7807f
+SHA1 (patch-aa) = f6049d4298cd1363d10bbea35957334fa496e2c0
+SHA1 (patch-ab) = d6ce4b8b5d9053debff34cc7d6ec396e8d8f2306
+SHA1 (patch-ac) = 0021cba328bbfc4da5a3093d5a338495ee3681f4
+SHA1 (patch-ad) = 28dea7e4fd285791d42df7ee43ff6623b15dad55
+SHA1 (patch-ae) = b80aa4bd8ee51d9798aac15da917235b7ae2b106
+SHA1 (patch-af) = bd789fa299cea2d8ed9d89bddbfda642c0744e55
+SHA1 (patch-ag) = d87bae0c62787165eda3384ebaff8fa4b85c3b41
+SHA1 (patch-ah) = 63c7c2bbb9767072ac5804e8ae0686fff6d43d8c
+SHA1 (patch-ai) = ebb7809f3c2bef22ccc73afe507826d46347a14d
+SHA1 (patch-aj) = feeca49101109695a09a2e5a526e306659cc7089
+SHA1 (patch-ak) = bff38380e7b40161c8135a1d04ee0468a1135991
+SHA1 (patch-al) = 55693517ab21d4393b724844f091fc3e6833d764
diff --git a/games/xarchon/patches/patch-aa b/games/xarchon/patches/patch-aa
index 7b4b5c26964..9ca9bf02a9a 100644
--- a/games/xarchon/patches/patch-aa
+++ b/games/xarchon/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2003/12/20 01:51:34 hubertf Exp $
+$NetBSD: patch-aa,v 1.4 2005/02/22 16:35:55 wiz Exp $
 
---- src/gtk/gtk-callbacks.h.orig	Wed Jan  9 20:07:27 2002
+--- src/gtk/gtk-callbacks.h.orig	2002-01-09 20:07:27.000000000 +0100
 +++ src/gtk/gtk-callbacks.h
 @@ -1,3 +1,4 @@
 +#include "main.h"
diff --git a/games/xarchon/patches/patch-ab b/games/xarchon/patches/patch-ab
index b84f03edbef..f849b5b8bd9 100644
--- a/games/xarchon/patches/patch-ab
+++ b/games/xarchon/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2003/12/20 01:51:34 hubertf Exp $
+$NetBSD: patch-ab,v 1.7 2005/02/22 16:35:55 wiz Exp $
 
---- configure.orig	Wed Jan  9 19:34:33 2002
+--- configure.orig	2002-01-09 19:34:33.000000000 +0100
 +++ configure
 @@ -4458,13 +4458,13 @@ QT_INCLUDES="-I $qtdir/include"
  QT_LDFLAGS="-L $qtdir/lib"
@@ -19,7 +19,15 @@ $NetBSD: patch-ab,v 1.6 2003/12/20 01:51:34 hubertf Exp $
  cat >conftest.$ac_ext <<_ACEOF
  #line 4469 "configure"
  #include "confdefs.h"
-@@ -4552,7 +4552,7 @@ fi
+@@ -4507,6 +4507,7 @@ LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:4508: result: $ac_cv_lib_qt_qVersion__Fv" >&5
+ echo "${ECHO_T}$ac_cv_lib_qt_qVersion__Fv" >&6
++ac_cv_lib_qt_qVersion__Fv=yes
+ if test $ac_cv_lib_qt_qVersion__Fv = yes; then
+ 
+   # Extract the first word of "moc", so it can be a program name with args.
+@@ -4552,7 +4553,7 @@ fi
  echo "$as_me: WARNING: Moc is missing;  the Qt interface will not be built" >&2;}
  
    else
diff --git a/games/xarchon/patches/patch-ac b/games/xarchon/patches/patch-ac
new file mode 100644
index 00000000000..63350454c46
--- /dev/null
+++ b/games/xarchon/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.3 2005/02/22 16:35:55 wiz Exp $
+
+--- src/qt/qkeypushbutton.cpp.orig	2002-01-09 19:34:33.000000000 +0100
++++ src/qt/qkeypushbutton.cpp
+@@ -13,7 +13,7 @@
+ /*--------------------------------------------------------------------------*/
+ 
+ QKeyPushButton::QKeyPushButton(int _id, QString &_descr, unsigned long _key,
+-                               QWidget *parent = 0, const char *name = 0)
++                               QWidget *parent, const char *name)
+     : QPushButton(parent, name)
+ {
+     id = _id;
diff --git a/games/xarchon/patches/patch-ad b/games/xarchon/patches/patch-ad
new file mode 100644
index 00000000000..9fe74d12375
--- /dev/null
+++ b/games/xarchon/patches/patch-ad
@@ -0,0 +1,31 @@
+$NetBSD: patch-ad,v 1.1 2005/02/22 16:35:55 wiz Exp $
+
+--- src/qt/qmymenubar.cpp.orig	2002-01-09 19:34:33.000000000 +0100
++++ src/qt/qmymenubar.cpp
+@@ -35,7 +35,7 @@ private:
+ /* QMyMenuBar::QMyMenuBar                                                   */
+ /*--------------------------------------------------------------------------*/
+ 
+-QMyMenuBar::QMyMenuBar(QWidget *parent = 0, const char *name = 0)
++QMyMenuBar::QMyMenuBar(QWidget *parent, const char *name)
+     : QMenuBar(parent, name)
+ {
+     dict.setAutoDelete(TRUE);
+@@ -46,7 +46,7 @@ QMyMenuBar::QMyMenuBar(QWidget *parent =
+ /*--------------------------------------------------------------------------*/
+ 
+ int QMyMenuBar::insertItem(const QString &text, QPopupMenu *popup,
+-                           int id = -1, int index = -1)
++                           int id, int index)
+ {
+    QMenuBar::insertItem(text, popup, id, index);
+ }
+@@ -58,7 +58,7 @@ int QMyMenuBar::insertItem(const QString
+ int QMyMenuBar::insertItem(const char *name, QPopupMenu *popup,
+                            const QString &text,
+                            const QObject *receiver, const char *member,
+-                           int accel = 0, int id = -1, int index = -1)
++                           int accel, int id, int index)
+ {
+     int the_id = popup->insertItem(text, receiver, member, accel, id, index);
+     QMyMenuBarItem *item = new QMyMenuBarItem(popup, the_id);
diff --git a/games/xarchon/patches/patch-ae b/games/xarchon/patches/patch-ae
new file mode 100644
index 00000000000..8ffd0583502
--- /dev/null
+++ b/games/xarchon/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2005/02/22 16:35:55 wiz Exp $
+
+--- src/qt/qmyprogressbar.cpp.orig	2002-01-09 19:34:33.000000000 +0100
++++ src/qt/qmyprogressbar.cpp
+@@ -8,7 +8,7 @@
+ /* QMyProgressBar::QMyProgressBar                                           */
+ /*--------------------------------------------------------------------------*/
+ 
+-QMyProgressBar::QMyProgressBar(QWidget *parent = 0, const char *name = 0)
++QMyProgressBar::QMyProgressBar(QWidget *parent, const char *name)
+     : QProgressBar(parent, name)
+ {
+     setCenterIndicator(TRUE);
diff --git a/games/xarchon/patches/patch-af b/games/xarchon/patches/patch-af
new file mode 100644
index 00000000000..29df2f1bccf
--- /dev/null
+++ b/games/xarchon/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2005/02/22 16:35:55 wiz Exp $
+
+--- src/qt/qtcomputeriface.cpp.orig	2002-01-09 19:34:33.000000000 +0100
++++ src/qt/qtcomputeriface.cpp
+@@ -16,7 +16,7 @@
+ /*--------------------------------------------------------------------------*/
+ 
+ QtComputerIface::QtComputerIface(void *_config, int _side,
+-                                 QWidget *parent = 0, const char *name = 0)
++                                 QWidget *parent, const char *name)
+     : QtIface(_config, _side, parent, name)
+ {
+     buttonBox = new QButtonGroup(3, Qt::Vertical, this);
diff --git a/games/xarchon/patches/patch-ag b/games/xarchon/patches/patch-ag
new file mode 100644
index 00000000000..e8298bc47db
--- /dev/null
+++ b/games/xarchon/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2005/02/22 16:35:55 wiz Exp $
+
+--- src/qt/qtguiwidget.cpp.orig	2002-01-09 19:34:33.000000000 +0100
++++ src/qt/qtguiwidget.cpp
+@@ -65,7 +65,7 @@ void QtGuiWidget::createMenu()
+ /* QtGuiWidget::QtGuiWidget                                                 */
+ /*--------------------------------------------------------------------------*/
+ 
+-QtGuiWidget::QtGuiWidget(QWidget *parent = 0, const char *name = 0)
++QtGuiWidget::QtGuiWidget(QWidget *parent, const char *name)
+     : QMainWindow(parent, name)
+ {
+     setCaption("X ARCHON");
diff --git a/games/xarchon/patches/patch-ah b/games/xarchon/patches/patch-ah
new file mode 100644
index 00000000000..3213d6193db
--- /dev/null
+++ b/games/xarchon/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2005/02/22 16:35:55 wiz Exp $
+
+--- src/qt/qthumaniface.cpp.orig	2002-01-09 19:34:33.000000000 +0100
++++ src/qt/qthumaniface.cpp
+@@ -48,7 +48,7 @@ static int qt_buttons_order[] = {
+ /*--------------------------------------------------------------------------*/
+ 
+ QtHumanIface::QtHumanIface(void *_config, int _side,
+-                           QWidget *parent = 0, const char *name = 0)
++                           QWidget *parent, const char *name)
+     : QtIface(_config, _side, parent, name)
+ {
+     QGridLayout *grid = new QGridLayout(this, 5, 3, 5, 5);
diff --git a/games/xarchon/patches/patch-ai b/games/xarchon/patches/patch-ai
new file mode 100644
index 00000000000..000604f7661
--- /dev/null
+++ b/games/xarchon/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2005/02/22 16:35:55 wiz Exp $
+
+--- src/qt/qtnetworkiface.cpp.orig	2002-01-09 19:34:33.000000000 +0100
++++ src/qt/qtnetworkiface.cpp
+@@ -18,7 +18,7 @@
+ /*--------------------------------------------------------------------------*/
+ 
+ QtNetworkIface::QtNetworkIface(void *_config, int _side,
+-                               QWidget *parent = 0, const char *name = 0)
++                               QWidget *parent, const char *name)
+     : QtIface(_config, _side, parent, name)
+ {
+     QVBox *box = new QVBox(this);
diff --git a/games/xarchon/patches/patch-aj b/games/xarchon/patches/patch-aj
new file mode 100644
index 00000000000..b90f495ab0a
--- /dev/null
+++ b/games/xarchon/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2005/02/22 16:35:55 wiz Exp $
+
+--- src/qt/qtplayersdialog.cpp.orig	2002-01-09 19:34:33.000000000 +0100
++++ src/qt/qtplayersdialog.cpp
+@@ -58,7 +58,7 @@ IFACE_PLAYER *QtPlayersDialog::findPlaye
+ /* QtPlayersDialog::QtPlayersDialog                                         */
+ /*--------------------------------------------------------------------------*/
+ 
+-QtPlayersDialog::QtPlayersDialog(QWidget *parent = 0, const char *name = 0)
++QtPlayersDialog::QtPlayersDialog(QWidget *parent, const char *name)
+     : QDialog(parent, name, TRUE)
+ {
+     setCaption("X ARCHON Player Configuration");
diff --git a/games/xarchon/patches/patch-ak b/games/xarchon/patches/patch-ak
new file mode 100644
index 00000000000..e3667615a58
--- /dev/null
+++ b/games/xarchon/patches/patch-ak
@@ -0,0 +1,14 @@
+$NetBSD: patch-ak,v 1.1 2005/02/22 16:35:55 wiz Exp $
+
+--- src/qt/qtplayersdialog.h.orig	2002-01-09 19:34:33.000000000 +0100
++++ src/qt/qtplayersdialog.h
+@@ -6,8 +6,8 @@
+ #define __MY_QT_PLAYERS_DIALOG_H
+ 
+ #include <qdialog.h>
++#include "iface.h"
+ 
+-struct IFACE_PLAYER;
+ class QtPlayerWidget;
+ class QButtonGroup;
+ 
diff --git a/games/xarchon/patches/patch-al b/games/xarchon/patches/patch-al
new file mode 100644
index 00000000000..1f885a88cc0
--- /dev/null
+++ b/games/xarchon/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2005/02/22 16:35:55 wiz Exp $
+
+--- src/qt/qtplayerwidget.cpp.orig	2002-01-09 19:34:33.000000000 +0100
++++ src/qt/qtplayerwidget.cpp
+@@ -20,7 +20,7 @@
+ /*--------------------------------------------------------------------------*/
+ 
+ QtPlayerWidget::QtPlayerWidget(IFACE_PLAYER *data, int side,
+-                               QWidget *parent = 0, const char *name = 0)
++                               QWidget *parent, const char *name)
+     : QVBox(parent, name)
+ {
+     setFrameStyle(Box + Plain);