Attachment #37564 for bug #59751

View | Details | Raw Unified | Return to bug 59751
Collapse All | Expand All




#

PORTNAME=	rubix
PORTVERSION=	1.0.3
CATEGORIES=	games
MASTER_SITES=	http://sed.free.fr/rubix/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Another Rubik's cube game with a rather interesting interface

WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}

USE_BZIP2=	yes
USE_X_PREFIX=	yes
USE_GMAKE=	yes
ALL_TARGET=	${PORTNAME}
MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" XINC="-I${X11BASE}/include" \
		XLIB="-L${X11BASE}/lib -lX11"

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/rubix ${PREFIX}/bin
	@${MKDIR} ${PREFIX}/share/rubix
	${INSTALL_DATA} ${WRKSRC}/module.xm ${PREFIX}/share/rubix
.if !defined(NOPORTDOCS)
.for file in AUTHORS BUGS INSTALL README TODO
	@${MKDIR} ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
.endif


Line 1 Link Here

(-)games/rubix/distinfo (-1 / +1 lines)
1	MD5 (rubix-1.0.2.tar.gz) = c59d6e4ad830aa37f6c559c587c15cd8	1	MD5 (rubix-1.0.3.tar.bz2) = 05a8721e409f7b7d18c994a6a86b2f25




--- Makefile.orig	Tue Dec  7 00:19:16 1999
+++ Makefile	Sat Dec 23 13:31:45 2000
@@ -11,35 +11,38 @@
 #
 
 #customize to fit your needs (it does not work for now).
-architecture=-DPC_ARCHI
+#architecture=-DPC_ARCHI
+module_path=-DMODULE_PATH=\"${PREFIX}/share/rubix\"
 
 #SOLARIS=-lsocket
 
-CC=gcc
-CFLAGS=-Wall -O3 -fomit-frame-pointer -ffast-math -Iplayer \
-	$(architecture)
+CC?=gcc
+CFLAGS+=-Iplayer \
+	$(architecture) $(module_path)
 #CFLAGS=-Wall -g -ffast-math -Iplayer \
 #	$(architecture)
-XINC=-I/usr/X11R6/include
-XLIB=-L/usr/X11R6/lib -lX11
+XINC=-I${X11BASE}/include
+XLIB=-L${X11BASE}/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; $(MAKE) clean)
 
 dep :
-	makedepend -Y *.c -s"#I like the GNU tools" -Iplayer
+#	makedepend -Y *.c -s"#I like the GNU tools" -Iplayer
 
 player/player.a : player/*.c player/*.h
-	(cd player; make)
+	(cd player; $(MAKE))
 
 %.o : %.c
 	$(CC) $(CFLAGS) $(XINC) -c -o $@ $<

Lines 1-10 Link Here

(-)games/rubix/files/patch-ab (-10 lines)
1	--- event.c Thu Dec 2 12:50:06 1999
2	+++ event.c.new Mon Dec 6 16:44:01 1999
3	@@ -18,6 +18,7 @@
4	#include <errno.h>
5	#include <stdio.h>
6	#include <X11/Xlib.h>
7	+#include <string.h>
8
9	#include "sound.h"
10	#include "screen.h"




--- player/Makefile.orig	Fri Dec  3 02:35:44 1999
+++ player/Makefile	Sat Dec 23 13:35:18 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${X11BASE}/include
+CFLAGS+=$(INCS)
 
 OBJ=card.o mixer.o xm.o live_player.o wav.o
 




--- main.c.orig	Fri Dec 10 01:59:09 1999
+++ main.c	Sat Dec 23 13:37:46 2000
@@ -54,6 +54,10 @@
   CUBE cube;
   int i;
   int rand=1;
+  char full_module_file[4096];
+  char *module_file = "module.xm";
+  strcpy(full_module_file, MODULE_PATH "/");
+  strcat(full_module_file, module_file);
 
   the_screen=&screen.buffer[0];
   d.buffer=screen.buffer;
@@ -81,7 +85,7 @@
   }
 
   if (do_init_sound)
-  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;

Lines 1-10 Link Here

(-)games/rubix/pkg-plist (-9 / +6 lines)
1	bin/rubix	1	bin/rubix
2	%%PORTDOCS%%share/doc/rubix/AUTHORS	2	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
3	%%PORTDOCS%%share/doc/rubix/BUGS	3	%%PORTDOCS%%%%DOCSDIR%%/BUGS
4	%%PORTDOCS%%share/doc/rubix/INSTALL	4	%%PORTDOCS%%%%DOCSDIR%%/INSTALL
5	%%PORTDOCS%%share/doc/rubix/NOISE	5	%%PORTDOCS%%%%DOCSDIR%%/README
6	%%PORTDOCS%%share/doc/rubix/README	6	%%PORTDOCS%%%%DOCSDIR%%/TODO
7	%%PORTDOCS%%share/doc/rubix/TODO	7	%%PORTDOCS%%@dirrm %%DOCSDIR%%
8	share/rubix/module.xm
9	@dirrm share/rubix
10	%%PORTDOCS%%@dirrm share/doc/rubix

Return to bug 59751

Lines 6-29 Link Here

(-)games/rubix/Makefile (-6 / +10 lines)
6	#	6	#
7		7
8	PORTNAME= rubix	8	PORTNAME= rubix
9	PORTVERSION= 1.0.2	9	PORTVERSION= 1.0.3
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= http://sed.free.fr/rubix/	11	MASTER_SITES= http://sed.free.fr/rubix/
12		12
13	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= ports@FreeBSD.org
14	COMMENT= Another Rubik's cube game with a rather interesting interface	14	COMMENT= Another Rubik's cube game with a rather interesting interface
15		15
		16	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
		17
		18	USE_BZIP2= yes
16	USE_X_PREFIX= yes	19	USE_X_PREFIX= yes
17	USE_GMAKE= yes	20	USE_GMAKE= yes
		21	ALL_TARGET= ${PORTNAME}
		22	MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" XINC="-I${X11BASE}/include" \
		23	XLIB="-L${X11BASE}/lib -lX11"
18		24
19	do-install:	25	do-install:
20	${INSTALL_PROGRAM} ${WRKSRC}/rubix ${PREFIX}/bin	26	${INSTALL_PROGRAM} ${WRKSRC}/rubix ${PREFIX}/bin
21	@${MKDIR} ${PREFIX}/share/rubix
22	${INSTALL_DATA} ${WRKSRC}/module.xm ${PREFIX}/share/rubix
23	.if !defined(NOPORTDOCS)	27	.if !defined(NOPORTDOCS)
24	.for file in AUTHORS BUGS INSTALL NOISE README TODO	28	.for file in AUTHORS BUGS INSTALL README TODO
25	@${MKDIR} ${PREFIX}/share/doc/rubix	29	@${MKDIR} ${DOCSDIR}
26	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/rubix	30	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
27	.endfor	31	.endfor
28	.endif	32	.endif
29		33

Lines 1-50 Link Here

(-)games/rubix/files/patch-aa (-50 lines)
1	--- Makefile.orig Tue Dec 7 00:19:16 1999
2	+++ Makefile Sat Dec 23 13:31:45 2000
3	@@ -11,35 +11,38 @@
4	#
5
6	#customize to fit your needs (it does not work for now).
7	-architecture=-DPC_ARCHI
8	+#architecture=-DPC_ARCHI
9	+module_path=-DMODULE_PATH=\"${PREFIX}/share/rubix\"
10
11	#SOLARIS=-lsocket
12
13	-CC=gcc
14	-CFLAGS=-Wall -O3 -fomit-frame-pointer -ffast-math -Iplayer \
15	- $(architecture)
16	+CC?=gcc
17	+CFLAGS+=-Iplayer \
18	+ $(architecture) $(module_path)
19	#CFLAGS=-Wall -g -ffast-math -Iplayer \
20	# $(architecture)
21	-XINC=-I/usr/X11R6/include
22	-XLIB=-L/usr/X11R6/lib -lX11
23	+XINC=-I${X11BASE}/include
24	+XLIB=-L${X11BASE}/lib -lX11
25
26	#the following should not be changed.
27
28	OBJ=cube.o event.o fillpoly.o line.o main.o screen.o sound.o player/player.a
29
30	+all: rubix
31	+
32	rubix : $(OBJ)
33	$(CC) $(CFLAGS) -o $@ $^ -lm $(XLIB) $(SOLARIS)
34	# strip rubix
35
36	clean :
37	rm -f .o ~ core .bak .dat gmon.out
38	- (cd player; make clean)
39	+ (cd player; $(MAKE) clean)
40
41	dep :
42	- makedepend -Y *.c -s"#I like the GNU tools" -Iplayer
43	+# makedepend -Y *.c -s"#I like the GNU tools" -Iplayer
44
45	player/player.a : player/.c player/.h
46	- (cd player; make)
47	+ (cd player; $(MAKE))
48
49	%.o : %.c
50	$(CC) $(CFLAGS) $(XINC) -c -o $@ $<

Lines 1-17 Link Here

(-)games/rubix/files/patch-ac (-17 lines)
1	--- player/Makefile.orig Fri Dec 3 02:35:44 1999
2	+++ player/Makefile Sat Dec 23 13:35:18 2000
3	@@ -4,10 +4,11 @@
4	# * This is total free software.
5	# */
6
7	-WITH_ASM=1
8	+#WITH_ASM=1
9
10	-CC=gcc
11	-CFLAGS=-Wall -O3 -fomit-frame-pointer -ffast-math
12	+CC?=gcc
13	+INCS=-I${X11BASE}/include
14	+CFLAGS+=$(INCS)
15
16	OBJ=card.o mixer.o xm.o live_player.o wav.o
17

Lines 1-22 Link Here

(-)games/rubix/files/patch-ad (-22 lines)
1	--- main.c.orig Fri Dec 10 01:59:09 1999
2	+++ main.c Sat Dec 23 13:37:46 2000
3	@@ -54,6 +54,10 @@
4	CUBE cube;
5	int i;
6	int rand=1;
7	+ char full_module_file[4096];
8	+ char *module_file = "module.xm";
9	+ strcpy(full_module_file, MODULE_PATH "/");
10	+ strcat(full_module_file, module_file);
11
12	the_screen=&screen.buffer[0];
13	d.buffer=screen.buffer;
14	@@ -81,7 +85,7 @@
15	}
16
17	if (do_init_sound)
18	- if (rubick_init_sound(&sound, "module.xm")==-1) {
19	+ if (rubick_init_sound(&sound, full_module_file)==-1) {
20	fprintf(stderr, "Error with initing the sound, sorry pal, no sound no game.\n(I fucked my head with"
21	" an xm player, this is not for nothing !)\n");
22	return 0;