Add rubix port.

Rubix is another X11-based incarnation of the world-famous
"Rubik's Cube" game. It has the capability of saving games,
which, according to the author, can't be found in any other
Rubik's Cube games.

PR:		15807
Submitted by:	Will Andrews <andrews@technologist.com>

4 files changed, 109 insertions, 0 deletions

diff --git a/games/rubix/files/patch-aa b/games/rubix/files/patch-aa
new file mode 100644
index 0000000..44e8de7
--- /dev/null
+++ b/games/rubix/files/patch-aa
@@ -0,0 +1,49 @@
+--- Makefile.orig	Mon Dec  6 07:19:16 1999
++++ Makefile	Sun Jan  2 13:07:30 2000
+@@ -11,35 +11,38 @@
+ #
+ 
+ #customize to fit your needs (it does not work for now).
+-architecture=-DPC_ARCHI
++#architecture=-DPC_ARCHI
++module_file=-DMODULE_FILE_PREFIX=\"$(PREFIX)/share/rubix/\"
+ 
+ #SOLARIS=-lsocket
+ 
+-CC=gcc
+-CFLAGS=-Wall -O3 -fomit-frame-pointer -ffast-math -Iplayer \
+-	$(architecture)
++CC?=gcc
++CFLAGS+=-Wall -fomit-frame-pointer -ffast-math -Iplayer \
++	$(architecture) $(module_file)
+ #CFLAGS=-Wall -g -ffast-math -Iplayer \
+ #	$(architecture)
+-XINC=-I/usr/X11R6/include
+-XLIB=-L/usr/X11R6/lib -lX11
++XINC=-I$(PREFIX)/include
++XLIB=-L$(PREFIX)/lib -lX11
+ 
+ #the following should not be changed.
+ 
+ OBJ=cube.o event.o fillpoly.o line.o main.o screen.o sound.o player/player.a
+ 
++all: rubix
++
+ rubix : $(OBJ)
+ 	$(CC) $(CFLAGS) -o $@ $^ -lm $(XLIB) $(SOLARIS)
+ #	strip rubix
+ 
+ clean :
+ 	rm -f *.o *~ core *.bak *.dat gmon.out
+-	(cd player; make clean)
++	(cd player; $(GMAKE) clean)
+ 
+ dep :
+ 	makedepend -Y *.c -s"#I like the GNU tools" -Iplayer
+ 
+ player/player.a : player/*.c player/*.h
+-	(cd player; make)
++	(cd player; $(GMAKE))
+ 
+ %.o : %.c
+ 	$(CC) $(CFLAGS) $(XINC) -c -o $@ $<
diff --git a/games/rubix/files/patch-ab b/games/rubix/files/patch-ab
new file mode 100644
index 0000000..2606e58
--- /dev/null
+++ b/games/rubix/files/patch-ab
@@ -0,0 +1,10 @@
+--- event.c	Thu Dec  2 12:50:06 1999
++++ event.c.new	Mon Dec  6 16:44:01 1999
+@@ -18,6 +18,7 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <X11/Xlib.h>
++#include <string.h>
+ 
+ #include "sound.h"
+ #include "screen.h"
diff --git a/games/rubix/files/patch-ac b/games/rubix/files/patch-ac
new file mode 100644
index 0000000..b070bdd
--- /dev/null
+++ b/games/rubix/files/patch-ac
@@ -0,0 +1,17 @@
+--- player/Makefile.orig	Thu Dec  2 09:35:44 1999
++++ player/Makefile	Sun Jan  2 13:08:58 2000
+@@ -4,10 +4,11 @@
+ # * This is total free software.
+ # */
+ 
+-WITH_ASM=1
++#WITH_ASM=1
+ 
+-CC=gcc
+-CFLAGS=-Wall -O3 -fomit-frame-pointer -ffast-math
++CC?=gcc
++INCS=-I$(PREFIX)/include
++CFLAGS+=-Wall -fomit-frame-pointer -ffast-math $(INCS)
+ 
+ OBJ=card.o mixer.o xm.o live_player.o wav.o
+ 
diff --git a/games/rubix/files/patch-ad b/games/rubix/files/patch-ad
new file mode 100644
index 0000000..c720dba
--- /dev/null
+++ b/games/rubix/files/patch-ad
@@ -0,0 +1,33 @@
+--- main.c	Thu Dec  2 19:00:49 1999
++++ main.c.new	Wed Dec 22 21:13:11 1999
+@@ -22,6 +22,10 @@
+ #include "event.h"
+ #include "device.h"
+ 
++#ifndef MODULE_FILE_PREFIX
++#define MODULE_FILE_PREFIX "\"/usr/X11R6/share/rubix/\""
++#endif
++
+ char *the_screen;
+ device d;
+ 
+@@ -32,6 +36,10 @@
+   CUBE cube;
+   int i;
+   int rand=1;
++  char full_module_file[4096];
++  char *module_file = "module.xm";
++  strcpy(full_module_file, MODULE_FILE_PREFIX);
++  strcat(full_module_file, module_file);
+ 
+   the_screen=&screen.buffer[0];
+   d.buffer=screen.buffer;
+@@ -68,7 +76,7 @@
+     return -1;
+   }
+ 
+-  if (rubick_init_sound(&sound, "module.xm")==-1) {
++  if (rubick_init_sound(&sound, full_module_file)==1) {
+     fprintf(stderr, "Error with initing the sound, sorry pal, no sound no game.\n(I fucked my head with"
+ 	    " an xm player, this is not for nothing !)\n");
+     return 0;