ports/59751: Update port: games/rubix to 1.0.3
KATO Tsuguru
tkato at prontomail.com
Fri Nov 28 13:40:39 UTC 2003
>Number: 59751
>Category: ports
>Synopsis: Update port: games/rubix to 1.0.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Nov 28 05:40:15 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.9-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.0.3
Remove file:
files/patch-aa
files/patch-ab
files/patch-ac
files/patch-ad
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/games/rubix/Makefile games/rubix/Makefile
--- /usr/ports/games/rubix/Makefile Sat Apr 12 22:47:22 2003
+++ games/rubix/Makefile Thu Nov 27 02:45:25 2003
@@ -6,24 +6,28 @@
#
PORTNAME= rubix
-PORTVERSION= 1.0.2
+PORTVERSION= 1.0.3
CATEGORIES= games
MASTER_SITES= http://sed.free.fr/rubix/
MAINTAINER= ports at 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 NOISE README TODO
- @${MKDIR} ${PREFIX}/share/doc/rubix
- ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/rubix
+.for file in AUTHORS BUGS INSTALL README TODO
+ @${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
.endif
diff -urN /usr/ports/games/rubix/distinfo games/rubix/distinfo
--- /usr/ports/games/rubix/distinfo Wed Dec 27 00:14:30 2000
+++ games/rubix/distinfo Thu Nov 27 02:34:37 2003
@@ -1 +1 @@
-MD5 (rubix-1.0.2.tar.gz) = c59d6e4ad830aa37f6c559c587c15cd8
+MD5 (rubix-1.0.3.tar.bz2) = 05a8721e409f7b7d18c994a6a86b2f25
diff -urN /usr/ports/games/rubix/files/patch-aa games/rubix/files/patch-aa
--- /usr/ports/games/rubix/files/patch-aa Wed Dec 27 00:14:32 2000
+++ games/rubix/files/patch-aa Thu Jan 1 09:00:00 1970
@@ -1,50 +0,0 @@
---- 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 $@ $<
diff -urN /usr/ports/games/rubix/files/patch-ab games/rubix/files/patch-ab
--- /usr/ports/games/rubix/files/patch-ab Tue Jan 4 05:17:36 2000
+++ games/rubix/files/patch-ab Thu Jan 1 09:00:00 1970
@@ -1,10 +0,0 @@
---- 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 -urN /usr/ports/games/rubix/files/patch-ac games/rubix/files/patch-ac
--- /usr/ports/games/rubix/files/patch-ac Wed Dec 27 00:14:32 2000
+++ games/rubix/files/patch-ac Thu Jan 1 09:00:00 1970
@@ -1,17 +0,0 @@
---- 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
-
diff -urN /usr/ports/games/rubix/files/patch-ad games/rubix/files/patch-ad
--- /usr/ports/games/rubix/files/patch-ad Wed Dec 27 00:14:32 2000
+++ games/rubix/files/patch-ad Thu Jan 1 09:00:00 1970
@@ -1,22 +0,0 @@
---- 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;
diff -urN /usr/ports/games/rubix/pkg-plist games/rubix/pkg-plist
--- /usr/ports/games/rubix/pkg-plist Mon Dec 24 11:15:05 2001
+++ games/rubix/pkg-plist Thu Nov 27 02:45:29 2003
@@ -1,10 +1,7 @@
bin/rubix
-%%PORTDOCS%%share/doc/rubix/AUTHORS
-%%PORTDOCS%%share/doc/rubix/BUGS
-%%PORTDOCS%%share/doc/rubix/INSTALL
-%%PORTDOCS%%share/doc/rubix/NOISE
-%%PORTDOCS%%share/doc/rubix/README
-%%PORTDOCS%%share/doc/rubix/TODO
-share/rubix/module.xm
- at dirrm share/rubix
-%%PORTDOCS%%@dirrm share/doc/rubix
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list