Update to 1.0, clean up, remove xpm dependency and check (...only used for

window icon when iconified), and add third party configs for 4064, SX-64,
and C64 Game System.

10 files changed, 89 insertions, 114 deletions

diff --git a/emulators/vice/patches/patch-aa b/emulators/vice/patches/patch-aa
index 08f95b7a532..3cf4a667924 100644
--- a/emulators/vice/patches/patch-aa
+++ b/emulators/vice/patches/patch-aa
@@ -1,12 +1,13 @@
-$NetBSD: patch-aa,v 1.1 1998/09/06 23:47:27 garbled Exp $
---- src/sounddrv/soundsun.c.orig	Sun Sep  6 11:01:10 1998
-+++ src/sounddrv/soundsun.c	Sun Sep  6 11:05:09 1998
-@@ -32,7 +32,7 @@
- #include <fcntl.h>
- #include <sys/uio.h>
- #include <unistd.h>
--
-+#include <sys/ioctl.h>
- #include <sys/audioio.h>
+$NetBSD: patch-aa,v 1.2 1999/05/18 08:45:48 tv Exp $
+
+--- src/resid/Makefile.in.orig	Mon May 17 17:51:36 1999
++++ src/resid/Makefile.in	Mon May 17 17:51:46 1999
+@@ -290,7 +290,7 @@
+ install-data: install-pkgincludeHEADERS
+ 	@$(NORMAL_INSTALL)
  
- #include "vice.h"
+-install: install-exec install-data all
++install: all
+ 	@:
+ 
+ uninstall: uninstall-libLIBRARIES uninstall-pkgincludeHEADERS
diff --git a/emulators/vice/patches/patch-ab b/emulators/vice/patches/patch-ab
index 4171f0613ae..86f87672574 100644
--- a/emulators/vice/patches/patch-ab
+++ b/emulators/vice/patches/patch-ab
@@ -1,14 +1,15 @@
-$NetBSD: patch-ab,v 1.1 1998/09/06 23:47:28 garbled Exp $
---- src/vice.h.orig	Sun Sep  6 11:29:44 1998
-+++ src/vice.h	Sun Sep  6 11:30:14 1998
-@@ -48,8 +48,8 @@
+$NetBSD: patch-ab,v 1.2 1999/05/18 08:45:48 tv Exp $
+
+--- src/arch/unix/archdep.h.orig	Sun Mar 14 09:19:29 1999
++++ src/arch/unix/archdep.h	Tue May 18 02:28:26 1999
+@@ -43,8 +43,8 @@
+ #define MODE_APPEND "w+"
  
- /* Define the default system directory (where the ROMs are). */
- 
--#define LIBDIR		PREFIX "/lib/vice"
+ /* Define the default system directory (where the ROMs are).  */
+-#define LIBDIR          PREFIX "/lib/vice"
 -#define DOCDIR          LIBDIR "/doc"
-+#define LIBDIR		PREFIX "/share/vice"
++#define LIBDIR          PREFIX "/share/vice"
 +#define DOCDIR          PREFIX "/share/doc/vice"
+ #define VICEUSERDIR     ".vice"
  
- /* Sound defaults.  */
- #define SOUND_SAMPLE_RATE 22050
+ int archdep_startup(int *argc, char **argv);
diff --git a/emulators/vice/patches/patch-ac b/emulators/vice/patches/patch-ac
index 5c0b4e88b1c..71b6598c2fe 100644
--- a/emulators/vice/patches/patch-ac
+++ b/emulators/vice/patches/patch-ac
@@ -1,12 +1,49 @@
-$NetBSD: patch-ac,v 1.1 1998/09/06 23:47:29 garbled Exp $
---- Makefile.in.orig	Sun Sep  6 11:36:17 1998
-+++ Makefile.in	Sun Sep  6 11:37:05 1998
-@@ -37,7 +37,7 @@
- DISTDIR =
+$NetBSD: patch-ac,v 1.2 1999/05/18 08:45:49 tv Exp $
+
+--- configure.orig	Sat Apr 24 14:11:32 1999
++++ configure	Tue May 18 01:55:08 1999
+@@ -4841,14 +4841,14 @@
+   if test x"$with_readline" != "xno" ; then
+     READLINE=""
+     unset ac_cv_lib_readline_readline
+-    echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
+-echo "configure:4846: checking for readline in -lreadline" >&5
++    echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6
++echo "configure:4846: checking for readline in -ledit" >&5
+ ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lreadline  $LIBS"
++LIBS="-ledit -ltermcap $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 4854 "configure"
+ #include "confdefs.h"
+@@ -4876,7 +4876,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-   READLINE="" LIBS="-lreadline $LIBS"
++   READLINE="" LIBS="-ledit -ltermcap $LIBS"
+ else
+   echo "$ac_t""no" 1>&6
+  
+@@ -6295,7 +6295,7 @@
  
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
-+pkglibdir = $(datadir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
+   fi
  
- top_builddir = .
+-
++if false; then
+   echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6
+ echo "configure:6301: checking for XpmCreatePixmapFromData in -lXpm" >&5
+ ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'`
+@@ -6340,7 +6340,7 @@
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+-
++fi
+ 
+   if test x"$MISSING_X_LIBS" != "x"; then
+     echo
diff --git a/emulators/vice/patches/patch-ad b/emulators/vice/patches/patch-ad
index 80a65e9df8a..0200b6671a0 100644
--- a/emulators/vice/patches/patch-ad
+++ b/emulators/vice/patches/patch-ad
@@ -1,12 +1,20 @@
-$NetBSD: patch-ad,v 1.1 1998/09/06 23:47:30 garbled Exp $
---- src/Makefile.in.orig	Sun Sep  6 11:37:38 1998
-+++ src/Makefile.in	Sun Sep  6 11:38:26 1998
-@@ -35,7 +35,7 @@
- DISTDIR =
+$NetBSD: patch-ad,v 1.2 1999/05/18 08:45:49 tv Exp $
+
+--- src/arch/unix/xaw/c64ui.c.orig	Tue May 18 04:31:52 1999
++++ src/arch/unix/xaw/c64ui.c	Tue May 18 04:33:17 1999
+@@ -342,8 +342,14 @@
+ /* ------------------------------------------------------------------------- */
  
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
-+pkglibdir = $(datadir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- 
- top_builddir = ..
+ static ui_menu_entry_t c64_romset_submenu[] = {
+-    { "default ROMs",
++    { "Default ROMs",
+       (ui_callback_t) ui_set_romset, (ui_callback_data_t)"default.vrs", NULL },
++    { "C64 Game System (GS)",
++      (ui_callback_t) ui_set_romset, (ui_callback_data_t)"64gs.vrs", NULL },
++    { "Educator 64 (4064)",
++      (ui_callback_t) ui_set_romset, (ui_callback_data_t)"4064.vrs", NULL },
++    { "SX-64",
++      (ui_callback_t) ui_set_romset, (ui_callback_data_t)"sx64.vrs", NULL },
+     { "--" },
+     { "Load new kernal ROM",
+       (ui_callback_t) ui_load_rom_file, (ui_callback_data_t)"KernalName", NULL },
diff --git a/emulators/vice/patches/patch-ae b/emulators/vice/patches/patch-ae
deleted file mode 100644
index 2a450d952ca..00000000000
--- a/emulators/vice/patches/patch-ae
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1998/09/06 23:47:30 garbled Exp $
---- doc/Makefile.in.orig	Sun Sep  6 11:39:08 1998
-+++ doc/Makefile.in	Sun Sep  6 11:39:20 1998
-@@ -93,7 +93,7 @@
- VERSION = @VERSION@
- YACC = @YACC@
- 
--docdir = $(prefix)/lib/vice/doc
-+docdir = $(prefix)/share/doc/vice/
- 
- doc_DATA = \
- 	64doc.txt \
diff --git a/emulators/vice/patches/patch-af b/emulators/vice/patches/patch-af
deleted file mode 100644
index e9017d63e78..00000000000
--- a/emulators/vice/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1 1998/09/06 23:47:31 garbled Exp $
---- data/C128/Makefile.in.orig	Sun Sep  6 11:56:23 1998
-+++ data/C128/Makefile.in	Sun Sep  6 11:56:37 1998
-@@ -94,7 +94,7 @@
- VERSION = @VERSION@
- YACC = @YACC@
- 
--c128dir = $(prefix)/lib/vice/C128
-+c128dir = $(prefix)/share/vice/C128
- 
- c128_DATA = \
- 	basic \
diff --git a/emulators/vice/patches/patch-ag b/emulators/vice/patches/patch-ag
deleted file mode 100644
index 44f5b119972..00000000000
--- a/emulators/vice/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 1998/09/06 23:47:32 garbled Exp $
---- data/C64/Makefile.in.orig	Sun Sep  6 11:56:49 1998
-+++ data/C64/Makefile.in	Sun Sep  6 11:57:02 1998
-@@ -94,7 +94,7 @@
- VERSION = @VERSION@
- YACC = @YACC@
- 
--c64dir = $(prefix)/lib/vice/C64
-+c64dir = $(prefix)/share/vice/C64
- 
- c64_DATA = \
- 	basic \
diff --git a/emulators/vice/patches/patch-ah b/emulators/vice/patches/patch-ah
deleted file mode 100644
index b557ffff40c..00000000000
--- a/emulators/vice/patches/patch-ah
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ah,v 1.1 1998/09/06 23:47:33 garbled Exp $
---- data/PET/Makefile.in.orig	Sun Sep  6 11:57:11 1998
-+++ data/PET/Makefile.in	Sun Sep  6 11:57:23 1998
-@@ -113,7 +113,7 @@
- 	graphics.vkm \
- 	posg_de.vkm
- 
--petdir = $(prefix)/lib/vice/PET
-+petdir = $(prefix)/share/vice/PET
- 
- pet_DATA = $(keymaps) $(roms) $(palettes)
- 
diff --git a/emulators/vice/patches/patch-ai b/emulators/vice/patches/patch-ai
deleted file mode 100644
index 9a8aeecdf74..00000000000
--- a/emulators/vice/patches/patch-ai
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ai,v 1.1 1998/09/06 23:47:34 garbled Exp $
---- data/VIC20/Makefile.in.orig	Sun Sep  6 11:57:34 1998
-+++ data/VIC20/Makefile.in	Sun Sep  6 11:57:44 1998
-@@ -94,7 +94,7 @@
- VERSION = @VERSION@
- YACC = @YACC@
- 
--vic20dir = $(prefix)/lib/vice/VIC20
-+vic20dir = $(prefix)/share/vice/VIC20
- 
- vic20_DATA = \
- 	basic \
diff --git a/emulators/vice/patches/patch-aj b/emulators/vice/patches/patch-aj
deleted file mode 100644
index 7ab9e3d1e2d..00000000000
--- a/emulators/vice/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.1 1998/09/06 23:47:35 garbled Exp $
---- doc/html/Makefile.in.orig	Sun Sep  6 12:09:45 1998
-+++ doc/html/Makefile.in	Sun Sep  6 12:10:03 1998
-@@ -94,7 +94,7 @@
- VERSION = @VERSION@
- YACC = @YACC@
- 
--docdir = $(prefix)/lib/vice/doc
-+docdir = $(prefix)/share/doc/vice
- 
- doc_DATA = \
- 	vice_1.html \