uae_reset takes an argument, fixing compilation. Drop the pthread

conditionalisation of GUI support -- it doesn't compile without.

4 files changed, 35 insertions, 9 deletions

diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index 6fa12d83274..4ab2ce2d6e2 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2007/03/24 02:26:21 joerg Exp $
+# $NetBSD: Makefile,v 1.46 2007/04/04 17:36:17 joerg Exp $
 
 DISTNAME=	uae-0.8.25
 PKGREVISION=	3
@@ -17,13 +17,6 @@ GNU_CONFIGURE=	yes
 
 CONFIGURE_ARGS+=	--enable-dga --enable-vidmode
 
-.include "../../mk/pthread.buildlink3.mk"
-.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "native"
-.include "../../x11/gtk2/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--disable-ui
-.endif
-
 .if ${OPSYS} == NetBSD && exists(/usr/include/sys/statvfs.h)
 CONFIGURE_ENV+=	cv_func_getmntinfo=yes fu_cv_sys_mounted_getmntinfo=yes
 .endif
@@ -36,9 +29,14 @@ do-install:
 	cd ${WRKSRC}/docs && ${INSTALL_DATA} FAQ README \
 		${PREFIX}/share/doc/uae
 
+BUILDLINK_DEPMETHOD.libXt?=	build
+
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXxf86dga/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/uae/distinfo b/emulators/uae/distinfo
index 327fb15cefb..2c947f90682 100644
--- a/emulators/uae/distinfo
+++ b/emulators/uae/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2006/10/18 23:38:59 wiz Exp $
+$NetBSD: distinfo,v 1.17 2007/04/04 17:36:17 joerg Exp $
 
 SHA1 (uae-0.8.25.tar.gz) = 41b7a70cf672d3cc516bd3856a051459a95a6517
 RMD160 (uae-0.8.25.tar.gz) = 6990dc7aaf43c8bda0d7b86e6d0ae164209d1eb1
@@ -11,3 +11,5 @@ SHA1 (patch-ae) = 9235c20d2a60b3c48e87eb23463a14f558e0de4e
 SHA1 (patch-af) = ca05a7ec786d48e488d3b29e0650da1ef4f67d37
 SHA1 (patch-ag) = f62849869131a4ce3c87c4f3596fe2479ca3df8e
 SHA1 (patch-ah) = 3c467cd0e1de340733b9feb9e9e9c9365f9205ea
+SHA1 (patch-ai) = 25cf481cf7139088b7248835c48242364a586cd9
+SHA1 (patch-aj) = 7d1a48d40b35594c2ed5673b9b2a737d8ba25ac8
diff --git a/emulators/uae/patches/patch-ai b/emulators/uae/patches/patch-ai
new file mode 100644
index 00000000000..03fe620ced8
--- /dev/null
+++ b/emulators/uae/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2007/04/04 17:36:17 joerg Exp $
+
+--- src/tui.c.orig	2007-04-04 16:43:34.000000000 +0000
++++ src/tui.c
+@@ -684,7 +684,7 @@ static int do_gui (int mode)
+ 	     case 0: DiskOptions (); break;
+ 	     case 1: OtherOptions (); break;
+ 	     case 2: save_settings (); break;
+-	     case 3: uae_reset (); break;
++	     case 3: uae_reset (1); break;
+ 	     case 4: uae_quit (); break;
+ 	    }
+ 	}
diff --git a/emulators/uae/patches/patch-aj b/emulators/uae/patches/patch-aj
new file mode 100644
index 00000000000..c0af91f5cf3
--- /dev/null
+++ b/emulators/uae/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2007/04/04 17:36:17 joerg Exp $
+
+--- src/ncurses.c.orig	2007-04-04 16:37:10.000000000 +0000
++++ src/ncurses.c
+@@ -596,7 +596,7 @@ void handle_events(void)
+ 	if (ch == 16) --lastmy; /* ^P */
+ 	if (ch == 11) {buttonstate[0] = keydelay;ch = 0;} /* ^K */
+ 	if (ch == 25) {buttonstate[2] = keydelay;ch = 0;} /* ^Y */
+-	if (ch == 15) uae_reset (); /* ^O */
++	if (ch == 15) uae_reset (1); /* ^O */
+ 	if (ch == 17) uae_quit (); /* ^Q */
+ 	if (ch == KEY_F(1)) {
+ 	  curses_insert_disk();