games/xroar: Updated for version 0.31.1.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 498 insertions, 127 deletions

diff --git a/games/xroar/README b/games/xroar/README
index 91b8697649..4968d69380 100644
--- a/games/xroar/README
+++ b/games/xroar/README
@@ -4,14 +4,21 @@ XRoar is a Dragon emulator for Linux, Unix, Mac OS X, GP32, Nintendo
 DS and Windows. Due to hardware similarities, XRoar also emulates the
 Tandy Colour Computer (CoCo) models 1 & 2.
 
-Optional dependency: if you want a full GTK+ user interface, install
-gtkglext before building xroar.
+Optional dependenies:
+
+gtkglext - if you want a full GTK+ user interface, install gtkglext
+   before building xroar.
+
+jack-audio-connection-kit - if you want to use JACK for audio output,
+   install jack-audio-connection-kit and set JACK=yes in the
+   environment before building xroar. If JACK audio has x-runs,
+   try 'setcap cap_ipc_lock,cap_sys_nice=ep /usr/bin/xroar'.
 
 To usefully emulate the Dragon or CoCo, you will need the images of
 the system ROMs for the target system. The ROM images must be copied to
 /usr/share/xroar/roms, and must be given the filenames xroar expects. See
-the xroar info page or /usr/doc/xroar-$VERSION/xroar.html for details on
-ROM files.
+the xroar info page or /usr/doc/xroar-$VERSION/xroar.html for details
+on ROM files.
 
 If you want to include ROM images in the package, get the files
 "coco.zip", "coco2.zip", "cocoe.zip", "dragon32.zip", and/or
diff --git a/games/xroar/alsa_first.diff b/games/xroar/alsa_first.diff
index ea726927d2..5511dd4a1e 100644
--- a/games/xroar/alsa_first.diff
+++ b/games/xroar/alsa_first.diff
@@ -1,7 +1,7 @@
-diff -Naur xroar-0.28.1/module.c xroar-0.28.1.patched/module.c
---- xroar-0.28.1/module.c	2012-06-11 12:45:20.000000000 -0400
-+++ xroar-0.28.1.patched/module.c	2012-12-18 17:05:59.000000000 -0500
-@@ -94,6 +94,9 @@
+diff -Naur xroar-0.31.1/src/module.c xroar-0.31.1.patched/src/module.c
+--- xroar-0.31.1/src/module.c	2013-12-04 02:38:24.000000000 -0500
++++ xroar-0.31.1.patched/src/module.c	2014-03-14 01:03:20.000000000 -0400
+@@ -90,6 +90,9 @@
  #ifdef HAVE_SUN_AUDIO
  	&sound_sun_module,
  #endif
@@ -11,7 +11,7 @@ diff -Naur xroar-0.28.1/module.c xroar-0.28.1.patched/module.c
  #ifdef HAVE_OSS_AUDIO
  	&sound_oss_module,
  #endif
-@@ -108,9 +111,6 @@
+@@ -104,9 +107,6 @@
  #ifdef HAVE_SDL
  	&sound_sdl_module,
  #endif
diff --git a/games/xroar/xroar.6 b/games/xroar/xroar.6
index fa008367e0..1be7136496 100644
--- a/games/xroar/xroar.6
+++ b/games/xroar/xroar.6
@@ -1,129 +1,478 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH XROAR "6" "April 2010" "XRoar 0.23" "Games"
-.SH NAME
+.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
+.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+.    ds C`
+.    ds C'
+'br\}
+.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.\"
+.\" Avoid warning from groff about undefined register 'F'.
+.de IX
+..
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{
+.    if \nF \{
+.        de IX
+.        tm Index:\\$1\t\\n%\t"\\$2"
+..
+.        if !\nF==2 \{
+.            nr % 0
+.            nr F 2
+.        \}
+.    \}
+.\}
+.rr rF
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "XROAR 6"
+.TH XROAR 6 "2014-03-14" "0.31.1" "SlackBuilds.org"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
+.SH "NAME"
 xroar \- Dragon and CoCo 1/2 emulator.
-.SH SYNOPSIS
-.B xroar
-[\fIOPTION\fR]...
-.SH DESCRIPTION
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBxroar\fR [\-c \s-1CONFFILE\s0] [\s-1OPTION\s0]...
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
 XRoar is a Dragon emulator.  Due to hardware similarities, XRoar also
 emulates the Tandy Colour Computer (CoCo) models 1 & 2.
 .PP
-This man page just documents the command\-line options to xroar. For full
-documentation, see the info page for xroar, or the HTML documentation
-in /usr/doc/xroar-@VERSION@/xroar.html.
-.SH OPTIONS
-The first non\-option argument is taken as a filename, and treated as though
-it were given as the argument to \-run.
-.SS
-Emulator interface:
-.TP
-\fB\-ui\fR MODULE
-user\-interface module (\fB\-ui\fR help for list)
-.TP
-\fB\-vo\fR MODULE
-video module (\fB\-vo\fR help for list)
-.TP
-\fB\-gl\-filter\fR FILTER
-OpenGL texture filter (auto, linear, nearest)
-.TP
-\fB\-ao\fR MODULE
-audio module (\fB\-ao\fR help for list)
-.TP
-\fB\-fast\-sound\fR
-faster but less accurate sound
-.TP
-\fB\-fs\fR
-start emulator full\-screen if possible
-.TP
-\fB\-ccr\fR RENDERER
-cross\-colour renderer (\fB\-ccr\fR help for list)
-.TP
-\fB\-fskip\fR FRAMES
+This man page just documents the command-line options to xroar. For full
+documentation,  see the info page for xroar, or the \s-1HTML\s0 documentation
+in /usr/doc/xroar\-_VERSION_/xroar.html.
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+.IP "\-c \fI\s-1CONFFILE\s0\fR" 4
+.IX Item "-c CONFFILE"
+specify a configuration file
+.SS "Machines"
+.IX Subsection "Machines"
+.IP "\-default\-machine \fI\s-1NAME\s0\fR" 4
+.IX Item "-default-machine NAME"
+default machine on startup
+.IP "\-machine \fI\s-1NAME\s0\fR" 4
+.IX Item "-machine NAME"
+configure named machine (\-machine help for list)
+.IP "\-machine\-desc \fI\s-1TEXT\s0\fR" 4
+.IX Item "-machine-desc TEXT"
+machine description
+.IP "\-machine\-arch \fI\s-1ARCH\s0\fR" 4
+.IX Item "-machine-arch ARCH"
+machine architecture (\-machine\-arch help for list)
+.IP "\-machine\-keyboard \fI\s-1LAYOUT\s0\fR" 4
+.IX Item "-machine-keyboard LAYOUT"
+keyboard layout (\-machine\-keyboard help for list)
+.IP "\-machine\-cpu \fI\s-1CPU\s0\fR" 4
+.IX Item "-machine-cpu CPU"
+machine \s-1CPU \s0(\-machine\-cpu help for list)
+.IP "\-bas \fI\s-1NAME\s0\fR" 4
+.IX Item "-bas NAME"
+\&\s-1BASIC ROM\s0 to use (CoCo only)
+.IP "\-extbas \fI\s-1NAME\s0\fR" 4
+.IX Item "-extbas NAME"
+Extended \s-1BASIC ROM\s0 to use
+.IP "\-altbas \fI\s-1NAME\s0\fR" 4
+.IX Item "-altbas NAME"
+64K mode Extended \s-1BASIC ROM \s0(Dragon 64)
+.IP "\-nobas" 4
+.IX Item "-nobas"
+disable \s-1BASIC\s0
+.IP "\-noextbas" 4
+.IX Item "-noextbas"
+disable Extended \s-1BASIC\s0
+.IP "\-noaltbas" 4
+.IX Item "-noaltbas"
+disable 64K mode Extended \s-1BASIC\s0
+.IP "\-ext\-charset \fI\s-1NAME\s0\fR" 4
+.IX Item "-ext-charset NAME"
+external character generator \s-1ROM\s0 to use
+.IP "\-tv\-type \fI\s-1TYPE\s0\fR" 4
+.IX Item "-tv-type TYPE"
+\&\s-1TV\s0 type (\-tv\-type help for list)
+.IP "\-vdg\-type \fI\s-1TYPE\s0\fR" 4
+.IX Item "-vdg-type TYPE"
+\&\s-1VDG\s0 type (6847 or 6847t1)
+.IP "\-ram \fI\s-1KBYTES\s0\fR" 4
+.IX Item "-ram KBYTES"
+amount of \s-1RAM\s0 in K
+.IP "\-machine\-cart \fI\s-1NAME\s0\fR" 4
+.IX Item "-machine-cart NAME"
+default cartridge for selected machine
+.IP "\-nodos" 4
+.IX Item "-nodos"
+don't automatically pick a \s-1DOS\s0 cartridge
+.SS "Cartridges"
+.IX Subsection "Cartridges"
+.IP "\-cart \fI\s-1NAME\s0\fR" 4
+.IX Item "-cart NAME"
+configure named cartridge (\-cart help for list)
+.IP "\-cart\-desc \fI\s-1TEXT\s0\fR" 4
+.IX Item "-cart-desc TEXT"
+cartridge description
+.IP "\-cart\-type \fI\s-1TYPE\s0\fR" 4
+.IX Item "-cart-type TYPE"
+cartridge base type (\-cart\-type help for list)
+.IP "\-cart\-rom \fI\s-1NAME\s0\fR" 4
+.IX Item "-cart-rom NAME"
+\&\s-1ROM\s0 image to load ($C000\-)
+.IP "\-cart\-rom2 \fI\s-1NAME\s0\fR" 4
+.IX Item "-cart-rom2 NAME"
+second \s-1ROM\s0 image to load ($E000\-)
+.IP "\-cart\-autorun" 4
+.IX Item "-cart-autorun"
+autorun cartridge
+.IP "\-cart\-becker" 4
+.IX Item "-cart-becker"
+enable becker port where supported
+.SS "Becker port"
+.IX Subsection "Becker port"
+.IP "\-becker" 4
+.IX Item "-becker"
+prefer becker-enabled \s-1DOS \s0(when picked automatically)
+.IP "\-becker\-ip \fI\s-1ADDRESS\s0\fR" 4
+.IX Item "-becker-ip ADDRESS"
+address or hostname of DriveWire server [127.0.0.1]
+.IP "\-becker\-port \fI\s-1PORT\s0\fR" 4
+.IX Item "-becker-port PORT"
+port of DriveWire server [65504]
+.SS "Files"
+.IX Subsection "Files"
+.IP "\-load \fI\s-1FILENAME\s0\fR" 4
+.IX Item "-load FILENAME"
+load or attach \s-1FILENAME\s0
+.IP "\-run \fI\s-1FILENAME\s0\fR" 4
+.IX Item "-run FILENAME"
+load or attach \s-1FILENAME\s0 and attempt autorun
+.SS "Cassettes"
+.IX Subsection "Cassettes"
+.IP "\-tape\-write \fI\s-1FILENAME\s0\fR" 4
+.IX Item "-tape-write FILENAME"
+open \s-1FILENAME\s0 for tape writing
+.IP "\-no\-tape\-fast" 4
+.IX Item "-no-tape-fast"
+disable fast tape loading
+.IP "\-tape\-pad" 4
+.IX Item "-tape-pad"
+force tape leader padding
+.IP "\-no\-tape\-pad\-auto" 4
+.IX Item "-no-tape-pad-auto"
+disable automatic leader padding
+.IP "\-tape\-rewrite" 4
+.IX Item "-tape-rewrite"
+enable tape rewriting
+.SS "Disks"
+.IX Subsection "Disks"
+.IP "\-disk\-write\-back" 4
+.IX Item "-disk-write-back"
+default to enabling write-back for disk images
+.IP "\-disk\-jvc\-hack" 4
+.IX Item "-disk-jvc-hack"
+autodetect headerless double-sided \s-1JVC\s0 images
+.SS "Firmware \s-1ROM\s0 images"
+.IX Subsection "Firmware ROM images"
+.IP "\-rompath \fI\s-1PATH\s0\fR" 4
+.IX Item "-rompath PATH"
+\&\s-1ROM\s0 search path (colon-separated list)
+.IP "\-romlist \fINAME=LIST\fR" 4
+.IX Item "-romlist NAME=LIST"
+define a \s-1ROM\s0 list
+.IP "\-romlist\-print" 4
+.IX Item "-romlist-print"
+print defined \s-1ROM\s0 lists
+.IP "\-crclist \fINAME=LIST\fR" 4
+.IX Item "-crclist NAME=LIST"
+define a \s-1ROM CRC\s0 list
+.IP "\-crclist\-print" 4
+.IX Item "-crclist-print"
+print defined \s-1ROM CRC\s0 lists
+.IP "\-force\-crc\-match" 4
+.IX Item "-force-crc-match"
+force per-architecture \s-1CRC\s0 matches
+.SS "User interface"
+.IX Subsection "User interface"
+.IP "\-ui \fI\s-1MODULE\s0\fR" 4
+.IX Item "-ui MODULE"
+user-interface module (\-ui help for list)
+.SS "Video"
+.IX Subsection "Video"
+.IP "\-vo \fI\s-1MODULE\s0\fR" 4
+.IX Item "-vo MODULE"
+video module (\-vo help for list)
+.IP "\-fs" 4
+.IX Item "-fs"
+start emulator full-screen if possible
+.IP "\-fskip \fI\s-1FRAMES\s0\fR" 4
+.IX Item "-fskip FRAMES"
 frameskip (default: 0)
-.TP
-\fB\-keymap\fR CODE
-host keyboard type (uk, us, fr, de)
-.TP
-\fB\-joy\-left\fR JOYSPEC
-map left joystick
-.TP
-\fB\-joy\-right\fR JOYSPEC
+.IP "\-ccr \fI\s-1RENDERER\s0\fR" 4
+.IX Item "-ccr RENDERER"
+cross-colour renderer (\-ccr help for list)
+.IP "\-geometry \fIWxH+X+Y\fR" 4
+.IX Item "-geometry WxH+X+Y"
+initial emulator geometry
+.IP "\-invert\-text" 4
+.IX Item "-invert-text"
+start with text mode inverted
+.SS "Audio"
+.IX Subsection "Audio"
+.IP "\-ao \fI\s-1MODULE\s0\fR" 4
+.IX Item "-ao MODULE"
+audio module (\-ao help for list)
+.IP "\-ao\-device \fI\s-1STRING\s0\fR" 4
+.IX Item "-ao-device STRING"
+device to use for audio module
+.IP "\-ao\-rate \fI\s-1HZ\s0\fR" 4
+.IX Item "-ao-rate HZ"
+set audio frame rate (if supported by module)
+.IP "\-ao\-channels \fIN\fR" 4
+.IX Item "-ao-channels N"
+set number of audio channels, 1 or 2
+.IP "\-ao\-fragments \fIN\fR" 4
+.IX Item "-ao-fragments N"
+set number of audio fragments
+.IP "\-ao\-fragment\-ms \fI\s-1MS\s0\fR" 4
+.IX Item "-ao-fragment-ms MS"
+set audio fragment size in ms (if supported)
+.Sp
+\&\-ao\-fragment\-frames N set audio fragment size in samples (if supported)
+=item \-ao\-buffer\-ms \fI\s-1MS\s0\fR
+.Sp
+set total audio buffer size in ms (if supported)
+.IP "\-ao\-buffer\-frames \fIN\fR" 4
+.IX Item "-ao-buffer-frames N"
+set total audio buffer size in samples (if supported)
+.IP "\-volume \fI\s-1VOLUME\s0\fR" 4
+.IX Item "-volume VOLUME"
+audio volume (0 \- 100)
+.IP "\-fast\-sound" 4
+.IX Item "-fast-sound"
+faster but less accurate sound
+.SS "Keyboard"
+.IX Subsection "Keyboard"
+.IP "\-keymap \fI\s-1CODE\s0\fR" 4
+.IX Item "-keymap CODE"
+host keyboard type (\-keymap help for list)
+.IP "\-kbd\-translate" 4
+.IX Item "-kbd-translate"
+enable keyboard translation
+.IP "\-type \fI\s-1STRING\s0\fR" 4
+.IX Item "-type STRING"
+intercept \s-1ROM\s0 calls to type \s-1STRING\s0 into \s-1BASIC\s0
+.SS "Joysticks"
+.IX Subsection "Joysticks"
+See \fB\s-1JOYSTICK SPECS\s0\fR below for the description of the \fB\s-1SPEC\s0\fR
+arguments.
+.IP "\-joy \fI\s-1NAME\s0\fR" 4
+.IX Item "-joy NAME"
+configure named joystick (\-joy help for list)
+.IP "\-joy\-desc \fI\s-1TEXT\s0\fR" 4
+.IX Item "-joy-desc TEXT"
+joystick description
+.IP "\-joy\-axis \fIAXIS=SPEC\fR" 4
+.IX Item "-joy-axis AXIS=SPEC"
+configure joystick axis
+.IP "\-joy\-button \fIBTN=SPEC\fR" 4
+.IX Item "-joy-button BTN=SPEC"
+configure joystick button
+.IP "\-joy\-right \fI\s-1NAME\s0\fR" 4
+.IX Item "-joy-right NAME"
 map right joystick
-.TP
-\fB\-trace\fR
+.IP "\-joy\-left \fI\s-1NAME\s0\fR" 4
+.IX Item "-joy-left NAME"
+map left joystick
+.IP "\-joy\-virtual \fI\s-1NAME\s0\fR" 4
+.IX Item "-joy-virtual NAME"
+specify the 'virtual' joystick to cycle [kjoy0]
+.SS "Printing"
+.IX Subsection "Printing"
+.IP "\-lp\-file \fI\s-1FILENAME\s0\fR" 4
+.IX Item "-lp-file FILENAME"
+append Dragon printer output to \s-1FILENAME\s0
+.IP "\-lp\-pipe \fI\s-1COMMAND\s0\fR" 4
+.IX Item "-lp-pipe COMMAND"
+pipe Dragon printer output to \s-1COMMAND\s0
+.SS "Debugging"
+.IX Subsection "Debugging"
+.IP "\-gdb" 4
+.IX Item "-gdb"
+disable \s-1GDB\s0 target
+.IP "\-gdb\-ip" 4
+.IX Item "-gdb-ip"
+address of interface for \s-1GDB\s0 target [localhost]
+.IP "\-gdb\-port" 4
+.IX Item "-gdb-port"
+port for \s-1GDB\s0 target to listen on [65520]
+.IP "\-trace" 4
+.IX Item "-trace"
 start with trace mode on
-.SS
-Emulated machine:
-.TP
-\fB\-machine\fR MACHINE
-emulated machine (\fB\-machine\fR help for list)
-.TP
-\fB\-bas\fR FILENAME
-BASIC ROM to use (CoCo only)
-.TP
-\fB\-extbas\fR FILENAME
-Extended BASIC ROM to use
-.TP
-\fB\-altbas\fR FILENAME
-alternate BASIC ROM (Dragon 64)
-.TP
-\fB\-noextbas\fR
-disable Extended BASIC
-.TP
-\fB\-dostype\fR DOS
-type of DOS cartridge (\fB\-dostype\fR help for list)
-.TP
-\fB\-dos\fR FILENAME
-DOS ROM (or CoCo Disk BASIC)
-.TP
-\fB\-nodos\fR
-disable DOS (ROM and hardware emulation)
-.TP
-\fB\-pal\fR
-emulate PAL (50Hz) video
-.TP
-\fB\-ntsc\fR
-emulate NTSC (60Hz) video
-.TP
-\fB\-ram\fR KBYTES
-specify amount of RAM in K
-.SS
-Automatically load or run files:
-.TP
-\fB\-load\fR FILENAME
-load or attach FILENAME
-.TP
-\fB\-run\fR FILENAME
-load or attach FILENAME and attempt autorun
-.SS
-Other options:
-.TP
-\fB\-h\fR, \fB\-\-help\fR
+.IP "\-debug\-ui \fI\s-1FLAGS\s0\fR" 4
+.IX Item "-debug-ui FLAGS"
+\&\s-1UI\s0 debugging (see manual, or \-1 for all)
+.IP "\-debug\-file \fI\s-1FLAGS\s0\fR" 4
+.IX Item "-debug-file FLAGS"
+file debugging (see manual, or \-1 for all)
+.IP "\-debug\-fdc \fI\s-1FLAGS\s0\fR" 4
+.IX Item "-debug-fdc FLAGS"
+\&\s-1FDC\s0 debugging (see manual, or \-1 for all)
+.IP "\-debug\-gdb \fI\s-1FLAGS\s0\fR" 4
+.IX Item "-debug-gdb FLAGS"
+\&\s-1GDB\s0 target debugging (see manual, or \-1 for all)
+.IP "\-timeout \fI\s-1SECONDS\s0\fR" 4
+.IX Item "-timeout SECONDS"
+run for \s-1SECONDS\s0 then quit
+.SS "Other options"
+.IX Subsection "Other options"
+.IP "\-config\-print" 4
+.IX Item "-config-print"
+print full configuration to standard output
+.IP "\-h, \-\-help" 4
+.IX Item "-h, --help"
 display this help and exit
-.TP
-\fB\-\-version\fR
+.IP "\-\-version" 4
+.IX Item "--version"
 output version information and exit
+.SH "JOYSTICK SPECS"
+.IX Header "JOYSTICK SPECS"
+Joystick SPECs are of the form [\s-1INTERFACE:\s0][ARG[,ARG]...], from:
 .PP
-A JOYSPEC maps physical joystick axes and buttons to one of the emulated
-machine's joysticks.  JOYSPEC is of the form 'DEV,AXIS:DEV,AXIS:DEV,BUTTON',
-mapping two axes and a button to the X, Y and firebutton on the emulated
-joystick respectively.
-.SH COPYRIGHT
-xroar is Copyright \(co 2009 Ciaran Anscomb
+.Vb 4
+\&        INTERFACE       Axis ARGs                       Button ARGs
+\&        physical        joystick\-index,[\-]axis\-index    joystick\-index,button\-index
+\&        keyboard        key\-name0,key\-name1             key\-name
+\&        mouse           screen\-offset0,screen\-offset1   button\-number
+.Ve
+.PP
+For physical joysticks a '\-' before the axis index inverts the axis.
+\&\s-1AXIS 0\s0 is the X\-axis, and \s-1AXIS 1\s0 the Y\-axis.  \s-1BTN 0\s0 is the only one used
+so far, but in the future \s-1BTN 1\s0 will be the second button on certain
+CoCo joysticks.
+.SH "COPYRIGHT"
+.IX Header "COPYRIGHT"
+xroar is Copyright (c) 2009 Ciaran Anscomb
 .PP
 This man page written by B. Watson for the SlackBuilds.org project (but it
 may be used by anyone).
 .PP
 This is free software.  You may redistribute copies of it under the terms of
-the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
-There is NO WARRANTY, to the extent permitted by law.
-.SH SEE ALSO
-The info page for \fBxroar\fR (includes much information not found in this
-man page).
-.br
-http://en.wikipedia.org/wiki/TRS-80_Color_Computer
-.br
+the \s-1GNU\s0 General Public License <http://www.gnu.org/licenses/gpl.html>.
+There is \s-1NO WARRANTY,\s0 to the extent permitted by law.
+.SH "SEE ALSO"
+.IX Header "SEE ALSO"
+The info page for \fBxroar\fR (includes much information not found in this man page).
+.PP
+http://en.wikipedia.org/wiki/TRS\-80_Color_Computer
+.PP
 http://archive.worldofdragon.org/index.php?title=Main_Page
-.br
+.PP
 http://archive.worldofdragon.org/archive/index.php
diff --git a/games/xroar/xroar.SlackBuild b/games/xroar/xroar.SlackBuild
index 9bedcb9de5..d3a37f586c 100644
--- a/games/xroar/xroar.SlackBuild
+++ b/games/xroar/xroar.SlackBuild
@@ -4,7 +4,14 @@
 
 # Written by B. Watson (yalhcru@gmail.com)
 
-# Licensed under the WTFPL. See http://sam.zoy.org/wtfpl/ for details.
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20140313 bkw:
+# - update for 0.31.1
+# - change download link to upstream's, looks OK now
+# - update alsa_first.diff (module.c -> src/module.c)
+# - update man page (new options, convert to POD)
+# - add jack support
 
 # 20130617 bkw:
 # - update for 0.29.5
@@ -19,7 +26,7 @@
 # - mention gtkglext in README as an optional dep
 
 PRGNAM=xroar
-VERSION=${VERSION:-0.29.5}
+VERSION=${VERSION:-0.31.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -70,12 +77,17 @@ find -L . \
 # apps from making any sound at all!)
 patch -p1 < $CWD/alsa_first.diff
 
+# Not sure why anyone would need this, but it's easy to support.
+JACKOPT="--disable-jack"
+[ "${JACK:-no}" = "yes" ] && JACKOPT="--enable-jack"
+
 # fix underlinking via LDFLAGS instead of a .diff
 
 LDFLAGS="-lm" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
+  $JACKOPT \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
@@ -117,10 +129,13 @@ fi
 
 # Man page written for this SlackBuild
 mkdir -p $PKG/usr/man/man6
-sed "s,@VERSION@,$VERSION,g" < $CWD/$PRGNAM.6 | gzip -9c > $PKG/usr/man/man6/$PRGNAM.6.gz
+sed "s,_VERSION_,$VERSION,g" < $CWD/$PRGNAM.6 | gzip -9c > $PKG/usr/man/man6/$PRGNAM.6.gz
 
 # Icon taken from Fedora package here:
 # ftp://mirror.switch.ch/pool/3/mirror/rpmfusion/free/fedora/updates/8/i386/xroar-0.21-2.fc8.i386.rpm
+# Current versions of xroar include windows and mac icons that are larger,
+# but they don't include the word 'xroar' (just the X-shaped graphic), so
+# I'm sticking with the old Fedora icon.
 mkdir $PKG/usr/share/pixmaps
 cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
 
diff --git a/games/xroar/xroar.info b/games/xroar/xroar.info
index cc89e0c46f..5fc7b6ce09 100644
--- a/games/xroar/xroar.info
+++ b/games/xroar/xroar.info
@@ -1,8 +1,8 @@
 PRGNAM="xroar"
-VERSION="0.29.5"
+VERSION="0.31.1"
 HOMEPAGE="http://www.6809.org.uk/dragon/xroar.shtml"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/xroar-0.29.5.tar.gz"
-MD5SUM="92401d6c360f502e3acbd5ef33761de2"
+DOWNLOAD="http://www.6809.org.uk/xroar/download/0.31/xroar-0.31.1.tar.gz"
+MD5SUM="d5e1a730be225547e216c218789e1019"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""