PR: ports/6155

Submitted by:	dchapes@ddm.on.ca
Import of new port emulators/vice, the Versatile Commodore Emulator (VICE),
an emulator for Commodore's PET/Vic-20/64.

5 files changed, 187 insertions, 0 deletions

diff --git a/emulators/vice/files/patch-ab b/emulators/vice/files/patch-ab
new file mode 100644
index 000000000000..d464178bdfa2
--- /dev/null
+++ b/emulators/vice/files/patch-ab
@@ -0,0 +1,71 @@
+--- ./arch/unix/joystick.c.orig	Sat Mar  7 09:01:51 1998
++++ ./arch/unix/joystick.c	Sat Mar 28 09:19:42 1998
+@@ -1,5 +1,5 @@
+ /*
+- * joystick.c - Joystick support for Linux.
++ * joystick.c - Joystick support for Linux and *BSD
+  *
+  * Written by
+  *  Bernhard Kuhn    (kuhn@eikon.e-technik.tu-muenchen.de)
+@@ -7,6 +7,7 @@
+  *
+  * Patches by
+  *  Daniel Sladic    (sladic@eecg.toronto.edu)
++ *  Dave Chapeskie   <dchapes@ddm.on.ca>
+  *
+  * This file is part of VICE, the Versatile Commodore Emulator.
+  * See README for copyright notice.
+@@ -32,7 +33,13 @@
+ 
+ #ifdef HAS_JOYSTICK
+ 
++#ifdef __linux__
+ #include <linux/joystick.h>
++#else
++#include <machine/joystick.h>
++#define JS_DATA_TYPE	joystick
++#define JS_RETURN	(sizeof(struct joystick))
++#endif
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -89,7 +96,11 @@
+   for(i=0;i<2;i++) {
+     
+     char* dev;
++#ifdef __linux__
+     dev=(i==0)?"/dev/js0":"/dev/js1";
++#else
++    dev=(i==0)?"/dev/joy0":"/dev/joy1";
++#endif
+     
+     ajoyfd[i]=open(dev,O_RDONLY);
+     if (ajoyfd[i] < 0) {
+@@ -132,6 +143,7 @@
+     }
+   }
+     
++#ifdef __linux__
+   /* open device files for digital joystick */
+   for(i=0;i<2;i++) {
+     char* dev;
+@@ -142,6 +154,7 @@
+       fprintf(stderr, "Warning: couldn't open the joystick device %s!\n",dev);
+     }
+   }
++#endif
+ }
+ 
+ void joyclose(void)
+@@ -195,7 +208,11 @@
+ 	  else joy[i] &= ~4;
+ 	  if (js.x>joyxmax[ajoyport]) joy[i] |= 8;
+ 	  else joy[i] &= ~8;
++#ifdef __linux__
+ 	  if(js.buttons) joy[i] |= 16;
++#else
++	  if(js.b1 | js.b2) joy[i] |= 16;
++#endif
+ 	  else joy[i] &= ~16;
+ 	}
+       }
diff --git a/emulators/vice/files/patch-ac b/emulators/vice/files/patch-ac
new file mode 100644
index 000000000000..ea8cac86d4f8
--- /dev/null
+++ b/emulators/vice/files/patch-ac
@@ -0,0 +1,54 @@
+--- ./configure.orig	Wed Mar 11 15:59:28 1998
++++ ./configure	Sat Mar 28 09:19:42 1998
+@@ -2362,7 +2362,41 @@
+ fi
+ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-   LINUXJOYSTICK=-DHAS_JOYSTICK ;
++   JOYSTICK=-DHAS_JOYSTICK ;
++		    JOY_OBJS='$(ARCHDIR)/joystick.o' 
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++  ac_safe=`echo "machine/joystick.h" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for machine/joystick.h""... $ac_c" 1>&6
++echo "configure:2374: checking for machine/joystick.h" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 2379 "configure"
++#include "confdefs.h"
++#include <machine/joystick.h>
++EOF
++ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++{ (eval echo configure:2384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++   JOYSTICK=-DHAS_JOYSTICK ;
+ 		    JOY_OBJS='$(ARCHDIR)/joystick.o' 
+ else
+   echo "$ac_t""no" 1>&6
+@@ -4705,7 +4739,7 @@
+ s%@MAKE2@%$MAKE2%g
+ s%@PERL@%$PERL%g
+ s%@MKDEP@%$MKDEP%g
+-s%@LINUXJOYSTICK@%$LINUXJOYSTICK%g
++s%@JOYSTICK@%$JOYSTICK%g
+ s%@JOY_OBJS@%$JOY_OBJS%g
+ s%@LIBOBJS@%$LIBOBJS%g
+ s%@SUBDIRS@%$SUBDIRS%g
diff --git a/emulators/vice/files/patch-ad b/emulators/vice/files/patch-ad
new file mode 100644
index 000000000000..3e236caad584
--- /dev/null
+++ b/emulators/vice/files/patch-ad
@@ -0,0 +1,23 @@
+--- ./configure.in.orig	Wed Mar 11 15:59:28 1998
++++ ./configure.in	Sat Mar 28 09:19:42 1998
+@@ -195,7 +195,10 @@
+ 
+ if test "$host_vendor" != "go32" -a "$host_vendor" != "msdos"; then
+   AC_CHECK_HEADER(linux/joystick.h,
+-                  [ LINUXJOYSTICK=-DHAS_JOYSTICK ;
++                  [ JOYSTICK=-DHAS_JOYSTICK ;
++		    JOY_OBJS='$(ARCHDIR)/joystick.o' ], )
++  AC_CHECK_HEADER(machine/joystick.h,
++                  [ JOYSTICK=-DHAS_JOYSTICK ;
+ 		    JOY_OBJS='$(ARCHDIR)/joystick.o' ], )
+   if test "$ac_cv_header_linux_joystick_h" = "yes" ; then
+     AC_MSG_CHECKING(whether linux/joystick.h supports digital joysticks)
+@@ -204,7 +207,7 @@
+ 		   [ LINUXJOYSTICK="$LINUXJOYSTICK -DHAS_DIGITAL_JOYSTICK"
+ 		     AC_MSG_RESULT(yes) ], AC_MSG_RESULT(no))
+   fi
+-  AC_SUBST(LINUXJOYSTICK)
++  AC_SUBST(JOYSTICK)
+   AC_SUBST(JOY_OBJS)
+   AC_CHECK_HEADERS(linux/soundcard.h machine/soundcard.h dmedia/audio.h)
+   AC_CHECK_HEADERS(SDL_audio.h SDL_sleep.h)
diff --git a/emulators/vice/files/patch-ae b/emulators/vice/files/patch-ae
new file mode 100644
index 000000000000..f8897c140705
--- /dev/null
+++ b/emulators/vice/files/patch-ae
@@ -0,0 +1,28 @@
+--- ./Makefile.in.orig	Sat Mar 21 08:53:32 1998
++++ ./Makefile.in	Sat Mar 28 09:28:52 1998
+@@ -59,7 +59,7 @@
+ ARCH		= @host@
+ 
+ LDFLAGS         = @X_LIBS@ @LDFLAGS@
+-DEFS 	        = @DEFS@ @LINUXJOYSTICK@ -DPREFIX=\"@prefix@\"
++DEFS 	        = @DEFS@ @JOYSTICK@ -DPREFIX=\"@prefix@\"
+ MKDEP 	        = @MKDEP@
+ CFLAGS          = @X_CFLAGS@ @CFLAGS@
+ INCLUDES	= -I$(SRCDIR) -I./include -I$(ARCHDIR) -I$(INCLUDEDIR)
+@@ -67,6 +67,7 @@
+ 
+ LN_S 	        = @LN_S@
+ 
++RM		= rm
+ INSTALL		= @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA	= @INSTALL_DATA@
+@@ -510,7 +511,7 @@
+ 	           $(INSTALL_BINDIR)/$$a;				      \
+ 	   done;							      \
+            $(RM) -f $(INSTALL_BINDIR)/recomment;			      \
+-	   $(INSTALL_PROGRAM) $(UTILDIR)/recomment			      \
++	   $(INSTALL) -m 555 $(UTILDIR)/recomment			      \
+ 	       $(INSTALL_LIBDIR)/$(ARCH)/recomment-$$VERSION;		      \
+ 	   $(LN_S) $(INSTALL_LIBDIR)/$(ARCH)/recomment-$$VERSION	      \
+ 	       $(INSTALL_BINDIR)/recomment )
diff --git a/emulators/vice/files/patch-af b/emulators/vice/files/patch-af
new file mode 100644
index 000000000000..c19cb23a4ae4
--- /dev/null
+++ b/emulators/vice/files/patch-af
@@ -0,0 +1,11 @@
+--- ../man/vice.man.orig	Sat Mar 28 14:42:29 1998
++++ ../man/vice.man	Sat Mar 28 14:43:01 1998
+@@ -32,7 +32,7 @@
+ .PP
+ The whole documentation for these programs is available in HTML
+ format; the main file should be installed on your system as
+-/usr/local/lib/VICE/doc/MANUAL.html.
++/usr/local/lib/vice/doc/MANUAL.html.
+ .P
+ For up to date news about VICE, have a look at the official home page
+ at