Hi,

Adding few spaces to sources helps the maelstrom to compile.
Quickly tested playing the game and seems to work.

timo

Index: patches/patch-controls_cpp
===================================================================
RCS file: patches/patch-controls_cpp
diff -N patches/patch-controls_cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-controls_cpp  9 Apr 2018 12:09:34 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: controls.cpp
+--- controls.cpp.orig
++++ controls.cpp
+@@ -83,7 +83,7 @@ static FILE *OpenData(char *mode, char **fname)
+       if ( fname ) {
+               *fname = datafile;
+       }
+-      sprintf(datafile,  "%s"DIR_SEP"%s", home, MAELSTROM_DATA);
++      sprintf(datafile,  "%s" DIR_SEP "%s", home, MAELSTROM_DATA);
+       if ( (data=fopen(datafile, mode)) == NULL )
+               return(NULL);
+       return(data);
Index: patches/patch-load_cpp
===================================================================
RCS file: patches/patch-load_cpp
diff -N patches/patch-load_cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-load_cpp      9 Apr 2018 12:09:34 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: load.cpp
+--- load.cpp.orig
++++ load.cpp
+@@ -81,7 +81,7 @@ SDL_Surface *Load_Title(FrameBuf *screen, int title_id
+       SDL_Surface *bmp, *title;
+       
+       /* Open the title file -- we know its colormap is our global one */
+-      sprintf(file, "Images"DIR_SEP"Maelstrom_Titles#%d.bmp", title_id);
++      sprintf(file, "Images" DIR_SEP "Maelstrom_Titles#%d.bmp", title_id);
+       bmp = SDL_LoadBMP(path.Path(file));
+       if ( bmp == NULL ) {
+               return(NULL);
+@@ -103,7 +103,7 @@ SDL_Surface *GetCIcon(FrameBuf *screen, short cicn_id)
+       Uint16 w, h;
+       
+       /* Open the cicn sprite file.. */
+-      sprintf(file, "Images"DIR_SEP"Maelstrom_Icon#%hd.cicn", cicn_id);
++      sprintf(file, "Images" DIR_SEP "Maelstrom_Icon#%hd.cicn", cicn_id);
+       if ( (cicn_src=SDL_RWFromFile(path.Path(file), "r")) == NULL ) {
+               error("GetCIcon(%hd): Can't open CICN %s: ",
+                                       cicn_id, path.Path(file));
Index: patches/patch-load_h
===================================================================
RCS file: /cvs/ports/games/maelstrom/patches/patch-load_h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-load_h
--- patches/patch-load_h        4 Jun 2008 06:50:20 -0000       1.1.1.1
+++ patches/patch-load_h        9 Apr 2018 12:09:34 -0000
@@ -1,6 +1,7 @@
 $OpenBSD: patch-load_h,v 1.1.1.1 2008/06/04 06:50:20 phessler Exp $
---- load.h.orig        Sat Jul 21 13:46:17 2001
-+++ load.h     Tue Jun  3 19:05:51 2008
+Index: load.h
+--- load.h.orig
++++ load.h
 @@ -21,7 +21,7 @@ static inline char *strdup(const char *str)
        return(newstr);
  }
@@ -19,3 +20,12 @@ $OpenBSD: patch-load_h,v 1.1.1.1 2008/06
  #define DIR_SEP       "/"
  #define CUR_DIR       "."
  #elif defined(WIN32)
+@@ -106,7 +106,7 @@ class LibPath { (public)
+               if ( strcmp(directory, DIR_SEP) == 0 ) {
+                       sprintf(path, DIR_SEP"%s", filename);
+               } else {
+-                      sprintf(path, "%s"DIR_SEP"%s", directory, filename);
++                      sprintf(path, "%s" DIR_SEP "%s", directory, filename);
+               }
+               return(path);
+       }
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/maelstrom/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   4 Jun 2008 16:23:33 -0000       1.2
+++ pkg/PLIST   9 Apr 2018 12:09:34 -0000
@@ -1,6 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.2 2008/06/04 16:23:33 phessler Exp $
-bin/maelstrom
-bin/maelstrom-netd
+@bin bin/maelstrom
+@bin bin/maelstrom-netd
 share/doc/maelstrom/
 share/doc/maelstrom/COPYING
 share/doc/maelstrom/COPYING.GPL

Reply via email to