games/colem: Updated for version 4.0.

Signed-off-by: B. Watson <yalhcru@gmail.com>

5 files changed, 32 insertions, 20 deletions

diff --git a/games/colem/colem.6 b/games/colem/colem.6
index 9d4a1c4664..41a3f95ffb 100644
--- a/games/colem/colem.6
+++ b/games/colem/colem.6
@@ -133,7 +133,7 @@
 .\" ========================================================================
 .\"
 .IX Title "COLEM 6"
-.TH COLEM 6 "2016-10-17" "3.8" "SlackBuilds.org"
+.TH COLEM 6 "2017-06-27" "4.0" "SlackBuilds.org"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -281,6 +281,9 @@ Use/don't use \s-1MIT SHM\s0 extensions for X [default: \-shm]
 .IP "\-scale <factor>" 4
 .IX Item "-scale <factor>"
 Scale window by <factor> [default: 2]
+.IP "\-4x3" 4
+.IX Item "-4x3"
+Force 4:3 television screen ratio [default: off]
 .SH "KEYBOARD BINDINGS"
 .IX Header "KEYBOARD BINDINGS"
 [\s-1ALT\s0] Hold to switch to the second controller
diff --git a/games/colem/colem.SlackBuild b/games/colem/colem.SlackBuild
index 62a52fd03f..0c0b037ec8 100644
--- a/games/colem/colem.SlackBuild
+++ b/games/colem/colem.SlackBuild
@@ -6,6 +6,11 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20170627 bkw:
+# - updated for 4.0
+# - rework rom_path.diff, so this script can't build 3.8 any more
+# - update man page, add new -4x3 option
+
 # 20161017 bkw:
 # - updated for 3.8
 # - updated man page with new 3.8 options
@@ -42,7 +47,7 @@
 #     with OSS modules disabled by default.
 
 PRGNAM=colem
-VERSION=${VERSION:-3.8}
+VERSION=${VERSION:-4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/colem/colem.info b/games/colem/colem.info
index b1ce0aa9ca..d8fce5d84a 100644
--- a/games/colem/colem.info
+++ b/games/colem/colem.info
@@ -1,8 +1,8 @@
 PRGNAM="colem"
-VERSION="3.8"
+VERSION="4.0"
 HOMEPAGE="http://fms.komkon.org/ColEm/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/ColEm38-Source.zip"
-MD5SUM="e637a0ed82960387f1cc34a73eb9cc35"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/ColEm40-Source.zip"
+MD5SUM="62dbdf61903c9a5072f288c74d0a7805"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/colem/colem.pod b/games/colem/colem.pod
index b2c0fb43c8..0f678b10be 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 -r3.8 -cSlackBuilds.org colem.pod > colem.6
+# pod2man --stderr -s6 -r4.0 -cSlackBuilds.org colem.pod > colem.6
 
 =pod
 
@@ -195,6 +195,10 @@ Use/don't use MIT SHM extensions for X [default: -shm]
 
 Scale window by <factor> [default: 2]
 
+=item -4x3
+
+Force 4:3 television screen ratio [default: off]
+
 =back
 
 =head1 KEYBOARD BINDINGS
diff --git a/games/colem/rom_path.diff b/games/colem/rom_path.diff
index e01edbf43d..c3c05cce28 100644
--- a/games/colem/rom_path.diff
+++ b/games/colem/rom_path.diff
@@ -1,6 +1,6 @@
 diff -Naur a/ColEm/Coleco.c b/ColEm/Coleco.c
---- a/ColEm/Coleco.c	2008-03-30 12:53:24.000000000 -0400
-+++ b/ColEm/Coleco.c	2009-09-29 17:49:32.000000000 -0400
+--- a/ColEm/Coleco.c	2017-01-15 13:10:40.000000000 -0500
++++ b/ColEm/Coleco.c	2017-06-27 15:30:39.448547570 -0400
 @@ -19,6 +19,9 @@
  #include <stdlib.h>
  #include <ctype.h>
@@ -11,8 +11,8 @@ diff -Naur a/ColEm/Coleco.c b/ColEm/Coleco.c
  
  #ifdef __WATCOMC__
  #include <direct.h>
-@@ -69,6 +72,46 @@
- #define fwrite(B,N,L,F) gzwrite(F,B,(L)*(N))
+@@ -111,6 +114,46 @@
+ #define feof(F)         gzeof((gzFile)(F))
  #endif
  
 +/* 20090929 bkw: smart_fopen() searches for ROMs in various places
@@ -55,10 +55,10 @@ diff -Naur a/ColEm/Coleco.c b/ColEm/Coleco.c
 +	return NULL;
 +}
 +
- /** StartColeco() ********************************************/
- /** Allocate memory, load ROM image, initialize hardware,   **/
- /** CPU and start the emulation. This function returns 0 in **/
-@@ -134,7 +177,7 @@
+ /** gethex() *************************************************/
+ /** Parse hexadecimal byte.                                 **/
+ /*************************************************************/
+@@ -212,7 +255,7 @@
  
    /* COLECO.ROM: OS7 (ColecoVision BIOS) */
    if(Verbose) printf("  Opening COLECO.ROM...");
@@ -67,21 +67,21 @@ diff -Naur a/ColEm/Coleco.c b/ColEm/Coleco.c
    else
    {
      if(fread(ROM_BIOS,1,0x2000,F)!=0x2000) P="SHORT FILE";
-@@ -145,7 +188,7 @@
+@@ -223,7 +266,7 @@
    if(!P)
    {
      if(Verbose) printf("OK\n  Opening WRITER.ROM...");
--    if(F=fopen("WRITER.ROM","rb"))
-+    if(F=smart_fopen("WRITER.ROM","rb"))
+-    if((F=fopen("WRITER.ROM","rb")))
++    if((F=smart_fopen("WRITER.ROM","rb")))
      {
        if(fread(ROM_WRITER,1,0x8000,F)==0x8000) ++AdamROMs;
        fclose(F);
-@@ -157,7 +200,7 @@
+@@ -235,7 +278,7 @@
    if(!P&&AdamROMs)
    {
      if(Verbose) printf("  Opening EOS.ROM...");
--    if(F=fopen("EOS.ROM","rb"))
-+    if(F=smart_fopen("EOS.ROM","rb"))
+-    if((F=fopen("EOS.ROM","rb")))
++    if((F=smart_fopen("EOS.ROM","rb")))
      {
        if(fread(ROM_EOS,1,0x2000,F)==0x2000) ++AdamROMs;
        fclose(F);