7 files changed, 106 insertions, 21 deletions
diff --git a/games/colem/README b/games/colem/README
index 08d1919f5f..756c751512 100644
--- a/games/colem/README
+++ b/games/colem/README
@@ -20,10 +20,11 @@ to provide the ROM image for the emulator to use:
 1. Buld the package with the ROM image:
 
   Place either "coleco.rom" or "coleco.zip" (containing "coleco.rom")
-  in the directory with the SlackBuild script. The resulting package will
-  include the ROM image in "usr/share/colem/coleco.rom". If you do this,
-  DO NOT give anyone a copy of the package! Using the ROM might possibly
-  be legal, but bundling it with ColEm is against the ColEm license.
+  in the directory with the SlackBuild script. The resulting package
+  will include the ROM image in "usr/share/colem/coleco.rom". If you
+  do this, DO NOT give anyone a copy of the package! Using the ROM
+  might possibly be legal, but bundling it with ColEm is against the
+  ColEm license.
 
 2. Build the package without the ROM image:
 
diff --git a/games/colem/colem.6 b/games/colem/colem.6
index 41a3f95ffb..7352943a9e 100644
--- a/games/colem/colem.6
+++ b/games/colem/colem.6
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "COLEM 6"
-.TH COLEM 6 "2017-06-27" "4.0" "SlackBuilds.org"
+.TH COLEM 6 "2020-10-26" "5.4" "SlackBuilds.org"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -173,6 +173,15 @@ Illegal Z80 ops
 .IP "16" 4
 .IX Item "16"
 Sound
+.IP "32" 4
+.IX Item "32"
+Disks
+.IP "64" 4
+.IX Item "64"
+Tapes
+.IP "128" 4
+.IX Item "128"
+AdamNet
 .RE
 .RS 4
 .RE
@@ -242,6 +251,9 @@ Sync screen updates to <frequency> [default: 60]
 .IP "\-nosync" 4
 .IX Item "-nosync"
 Do not sync screen updates [default: \-nosync]
+.IP "\-linear" 4
+.IX Item "-linear"
+Scale display with linear interpolation [default: off]
 .IP "\-soft" 4
 .IX Item "-soft"
 Scale display with 2xSaI [default: off]
@@ -284,6 +296,27 @@ Scale window by <factor> [default: 2]
 .IP "\-4x3" 4
 .IX Item "-4x3"
 Force 4:3 television screen ratio [default: off]
+.IP "\-sgm, \-nosgm" 4
+.IX Item "-sgm, -nosgm"
+Enable Super Game Module extension [default: off]
+.IP "\-24c08, \-24c256" 4
+.IX Item "-24c08, -24c256"
+Enable serial \s-1EEPROM\s0 emulation [default: off]
+.IP "\-sram" 4
+.IX Item "-sram"
+Enable battery-backed \s-1SRAM\s0 emulation [default: off]
+.IP "\-tv, \-lcd, \-raster" 4
+.IX Item "-tv, -lcd, -raster"
+Simulate \s-1TV\s0 scanlines or \s-1LCD\s0 raster [default: off]
+.IP "\-printer" 4
+.IX Item "-printer"
+Redirect Adam printer output to file [default: stdout]
+.IP "\-diska, \-diskb, \-diskc, \-diskd" 4
+.IX Item "-diska, -diskb, -diskc, -diskd"
+Set disk images used for Adam drives A: \- D: [default: none]
+.IP "\-tapea, \-tapeb, \-tapec, \-taped" 4
+.IX Item "-tapea, -tapeb, -tapec, -taped"
+Set tape images used for Adam drives A: \- D: [default: none]
 .SH "KEYBOARD BINDINGS"
 .IX Header "KEYBOARD BINDINGS"
 [\s-1ALT\s0] Hold to switch to the second controller
@@ -385,7 +418,7 @@ The coleco.rom file will occasionally be found on websites with the names \*(L"o
 ColEm works with any of the above \s-1ROM\s0 images.
 .SH "AUTHOR"
 .IX Header "AUTHOR"
-ColEm is by Marat Fayzullin, (C)FMS 1994\-2016
+ColEm is by Marat Fayzullin, (C)FMS 1994\-2020
 .PP
 This man page is by B. Watson, for the SlackBuilds.org project (but may be used by anyone for any
 purpose).
diff --git a/games/colem/colem.SlackBuild b/games/colem/colem.SlackBuild
index e6d89d3554..9f3f0d6776 100644
--- a/games/colem/colem.SlackBuild
+++ b/games/colem/colem.SlackBuild
@@ -6,6 +6,13 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210220 bkw: updated for 5.5.
+# 20201026 bkw:
+# - updated for 5.4.
+# - make the slack-desc say whether or not the ROM is included.
+# - update the man page with new options in 5.4.
+
+# 20191202 bkw: updated for 4.8.
 # 20180619 bkw: updated for 4.6.
 
 # 20171218 bkw: updated for 4.2.
@@ -57,7 +64,7 @@
 #     with OSS modules disabled by default.
 
 PRGNAM=colem
-VERSION=${VERSION:-4.6}
+VERSION=${VERSION:-5.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -110,11 +117,8 @@ mkdir $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 unzip -aa $CWD/$ZIPNAME$ZIPVER-Source.zip
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 sed -i "s/-O2/$SLKCFLAGS/" EMULib/Rules.gcc
 
@@ -202,7 +206,10 @@ for i in coleco.rom COLECO.ROM os7.rom OS7.ROM; do
 done
 
 # If we found a ROM image, include it in the package.
-[ -n "$ROM" ] && cat $ROM > $PKG/usr/share/$PRGNAM/coleco.rom
+INCLUDES="does NOT include"
+[ -n "$ROM" ] && \
+  cat $ROM > $PKG/usr/share/$PRGNAM/coleco.rom && \
+  INCLUDES="includes"
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -212,7 +219,7 @@ cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
 cat ../$ZIPNAME.html > $PKG/usr/doc/$PRGNAM-$VERSION/$ZIPNAME.html
 
 mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,@INCLUDES@,$INCLUDES," $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
diff --git a/games/colem/colem.desktop b/games/colem/colem.desktop
index 2a2f9632c9..8c80b46dbc 100644
--- a/games/colem/colem.desktop
+++ b/games/colem/colem.desktop
@@ -12,4 +12,4 @@ MimeType=application/x-cvrom;
 
 [Desktop Action Play]
 Name=Play
-Exec=colem %f
+Exec=aoss colem %f
diff --git a/games/colem/colem.info b/games/colem/colem.info
index 84e6876d0f..7583471b60 100644
--- a/games/colem/colem.info
+++ b/games/colem/colem.info
@@ -1,8 +1,8 @@
 PRGNAM="colem"
-VERSION="4.6"
+VERSION="5.5"
 HOMEPAGE="http://fms.komkon.org/ColEm/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/ColEm46-Source.zip"
-MD5SUM="ef991440e17ce46483ea3152acd3c98f"
+DOWNLOAD="https://slackware.uk/~urchlay/src/ColEm55-Source.zip"
+MD5SUM="1c643fb1ed3f1f7514b04ff9e61b2bbd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/colem/colem.pod b/games/colem/colem.pod
index 0f678b10be..6e1ef5bd87 100644
--- a/games/colem/colem.pod
+++ b/games/colem/colem.pod
@@ -1,5 +1,5 @@
 # pod source for colem man page. convert with:
-# pod2man --stderr -s6 -r4.0 -cSlackBuilds.org colem.pod > colem.6
+# pod2man --stderr -s6 -r5.4 -cSlackBuilds.org colem.pod > colem.6
 
 =pod
 
@@ -53,6 +53,18 @@ Illegal Z80 ops
 
 Sound
 
+=item Z<>32
+
+Disks
+
+=item Z<>64
+
+Tapes
+
+=item Z<>128
+
+AdamNet
+
 =back
 
 =item -pal, -ntsc
@@ -143,6 +155,10 @@ Sync screen updates to <frequency> [default: 60]
 
 Do not sync screen updates [default: -nosync]
 
+=item -linear
+
+Scale display with linear interpolation [default: off]
+
 =item -soft
 
 Scale display with 2xSaI [default: off]
@@ -199,6 +215,34 @@ Scale window by <factor> [default: 2]
 
 Force 4:3 television screen ratio [default: off]
 
+=item -sgm, -nosgm
+
+Enable Super Game Module extension [default: off]
+
+=item -24c08, -24c256
+
+Enable serial EEPROM emulation [default: off]
+
+=item -sram
+
+Enable battery-backed SRAM emulation [default: off]
+
+=item -tv, -lcd, -raster
+
+Simulate TV scanlines or LCD raster [default: off]
+
+=item -printer
+
+Redirect Adam printer output to file [default: stdout]
+
+=item -diska, -diskb, -diskc, -diskd
+
+Set disk images used for Adam drives A: - D: [default: none]
+
+=item -tapea, -tapeb, -tapec, -taped
+
+Set tape images used for Adam drives A: - D: [default: none]
+
 =back
 
 =head1 KEYBOARD BINDINGS
@@ -337,7 +381,7 @@ ColEm works with any of the above ROM images.
 
 =head1 AUTHOR
 
-ColEm is by Marat Fayzullin, (C)FMS 1994-2016
+ColEm is by Marat Fayzullin, (C)FMS 1994-2020
 
 This man page is by B. Watson, for the SlackBuilds.org project (but may be used by anyone for any
 purpose).
diff --git a/games/colem/slack-desc b/games/colem/slack-desc
index be7a345606..801c9c1228 100644
--- a/games/colem/slack-desc
+++ b/games/colem/slack-desc
@@ -12,7 +12,7 @@ colem: ColEm is a portable emulator of the old ColecoVision videogame
 colem: console. It should run most ColecoVision games and supports Coleco's
 colem: SuperAction controllers with spin wheels.
 colem:
-colem:
+colem: This package @INCLUDES@ the Coleco ROM image.
 colem:
 colem:
 colem: