Hi,

Crimson seems to need few casts and spaces to fix compilation.
Quickly tested few turns and port seems ok.

timo

Index: patches/patch-src_cf_main_cpp
===================================================================
RCS file: patches/patch-src_cf_main_cpp
diff -N patches/patch-src_cf_main_cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_cf_main_cpp       10 Apr 2018 15:50:29 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/cf/main.cpp
+--- src/cf/main.cpp.orig
++++ src/cf/main.cpp
+@@ -173,7 +173,7 @@ static void parse_options( int argc, char **argv, GUIO
+       else opts.sfx = opts.music = false;
+     } else {
+       if (strcmp(argv[argc], "--version") == 0)
+-        cout << PROGRAMNAME" "VERSION << endl;
++        cout << PROGRAMNAME " " VERSION << endl;
+       else print_usage( argv[0] );
+       exit ( 0 );
+     }
Index: patches/patch-src_comet_main_cpp
===================================================================
RCS file: patches/patch-src_comet_main_cpp
diff -N patches/patch-src_comet_main_cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_comet_main_cpp    10 Apr 2018 15:50:29 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/comet/main.cpp
+--- src/comet/main.cpp.orig
++++ src/comet/main.cpp
+@@ -118,7 +118,7 @@ void parse_options( int argc, char **argv, EdOptions &
+       else opts.sound = false;
+     } else {
+       if (strcmp(argv[argc], "--version") == 0)
+-        fprintf( stdout, PROGRAMNAME" "VERSION"\n" );
++        fprintf( stdout, PROGRAMNAME " " VERSION "\n" );
+       else print_usage( argv[0] );
+       exit ( 0 );
+     }
Index: patches/patch-src_common_font_cpp
===================================================================
RCS file: patches/patch-src_common_font_cpp
diff -N patches/patch-src_common_font_cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_common_font_cpp   10 Apr 2018 15:50:29 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Index: src/common/font.cpp
+--- src/common/font.cpp.orig
++++ src/common/font.cpp
+@@ -200,8 +200,8 @@ int Font::Write( const char *str, Surface *dest, short
+   SDL_Color scol = { col.r, col.g, col.b };
+   SDL_Surface *s = TTF_RenderUTF8_Blended( f, str, scol );
+   if ( s ) {
+-    SDL_Rect src = { 0, 0, s->w, s->h };
+-    SDL_Rect dst = { x, y, s->w, s->h };
++    SDL_Rect src = { 0, 0, static_cast<Uint16>(s->w), 
static_cast<Uint16>(s->h) };
++    SDL_Rect dst = { x, y, static_cast<Uint16>(s->w), 
static_cast<Uint16>(s->h) };
+     SDL_BlitSurface( s, &src, dest->s_surface, &dst );
+     SDL_FreeSurface( s );
+     return src.w;
Index: patches/patch-tools_cfed_cpp
===================================================================
RCS file: patches/patch-tools_cfed_cpp
diff -N patches/patch-tools_cfed_cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-tools_cfed_cpp        10 Apr 2018 15:50:29 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: tools/cfed.cpp
+--- tools/cfed.cpp.orig
++++ tools/cfed.cpp
+@@ -970,7 +970,7 @@ int main( int argc, char **argv ) {
+     for ( i = argc - 1; i > 1; --i ) {
+       if (strcmp(argv[i], "--help") == 0) show_help = 1;
+       else if (strcmp(argv[i], "--version") == 0) {
+-        cout << "cfed "VERSION << endl;
++        cout << "cfed " VERSION << endl;
+         return 0;
+       }
+       else if (strcmp(argv[i-1], "--units") == 0) uset = argv[i];

Reply via email to