Upgrade to 1.0.2

PR: 23829
Submitted by: Ports Fury

6 files changed, 37 insertions, 49 deletions

diff --git a/games/rubix/Makefile b/games/rubix/Makefile
index 7862079a6ad5..e829d3acd767 100644
--- a/games/rubix/Makefile
+++ b/games/rubix/Makefile
@@ -6,27 +6,24 @@
 #
 
 PORTNAME=	rubix
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 CATEGORIES=	games
 MASTER_SITES=	http://sed.free.fr/rubix/
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_GMAKE=	yes
-MAKE_ENV=	GMAKE=${GMAKE}
 USE_X_PREFIX=	yes
+USE_GMAKE=	yes
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/rubix ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/rubix ${PREFIX}/bin
 	@${MKDIR} ${PREFIX}/share/rubix
-	@${INSTALL_DATA} ${WRKSRC}/module.xm ${PREFIX}/share/rubix
+	${INSTALL_DATA} ${WRKSRC}/module.xm ${PREFIX}/share/rubix
 .if !defined(NOPORTDOCS)
-.for DOC in AUTHORS BUGS INSTALL NOISE README TODO
-	@${INSTALL_DATA} ${WRKSRC}/${DOC} ${PREFIX}/share/rubix
+.for file in AUTHORS BUGS INSTALL NOISE README TODO
+	@${MKDIR} ${PREFIX}/share/doc/rubix
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/rubix
 .endfor
-	@${ECHO}
-	@${ECHO} "Docs are installed in ${PREFIX}/share/rubix."
-	@${ECHO}
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/rubix/distinfo b/games/rubix/distinfo
index 7324bc368dd5..def5c9c4f230 100644
--- a/games/rubix/distinfo
+++ b/games/rubix/distinfo
@@ -1 +1 @@
-MD5 (rubix-1.0.1.tar.gz) = 665aec4bfaddbc98732c2963dc4d4a56
+MD5 (rubix-1.0.2.tar.gz) = c59d6e4ad830aa37f6c559c587c15cd8
diff --git a/games/rubix/files/patch-aa b/games/rubix/files/patch-aa
index 44e8de756d0a..3322265f3228 100644
--- a/games/rubix/files/patch-aa
+++ b/games/rubix/files/patch-aa
@@ -1,12 +1,12 @@
---- Makefile.orig	Mon Dec  6 07:19:16 1999
-+++ Makefile	Sun Jan  2 13:07:30 2000
+--- 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_file=-DMODULE_FILE_PREFIX=\"$(PREFIX)/share/rubix/\"
++module_path=-DMODULE_PATH=\"${PREFIX}/share/rubix\"
  
  #SOLARIS=-lsocket
  
@@ -14,14 +14,14 @@
 -CFLAGS=-Wall -O3 -fomit-frame-pointer -ffast-math -Iplayer \
 -	$(architecture)
 +CC?=gcc
-+CFLAGS+=-Wall -fomit-frame-pointer -ffast-math -Iplayer \
-+	$(architecture) $(module_file)
++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$(PREFIX)/include
-+XLIB=-L$(PREFIX)/lib -lX11
++XINC=-I${X11BASE}/include
++XLIB=-L${X11BASE}/lib -lX11
  
  #the following should not be changed.
  
@@ -36,14 +36,15 @@
  clean :
  	rm -f *.o *~ core *.bak *.dat gmon.out
 -	(cd player; make clean)
-+	(cd player; $(GMAKE) 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
++#	makedepend -Y *.c -s"#I like the GNU tools" -Iplayer
  
  player/player.a : player/*.c player/*.h
 -	(cd player; make)
-+	(cd player; $(GMAKE))
++	(cd player; $(MAKE))
  
  %.o : %.c
  	$(CC) $(CFLAGS) $(XINC) -c -o $@ $<
diff --git a/games/rubix/files/patch-ac b/games/rubix/files/patch-ac
index b070bdd7fbba..08c596e3482b 100644
--- a/games/rubix/files/patch-ac
+++ b/games/rubix/files/patch-ac
@@ -1,5 +1,5 @@
---- player/Makefile.orig	Thu Dec  2 09:35:44 1999
-+++ player/Makefile	Sun Jan  2 13:08:58 2000
+--- 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.
  # */
@@ -10,8 +10,8 @@
 -CC=gcc
 -CFLAGS=-Wall -O3 -fomit-frame-pointer -ffast-math
 +CC?=gcc
-+INCS=-I$(PREFIX)/include
-+CFLAGS+=-Wall -fomit-frame-pointer -ffast-math $(INCS)
++INCS=-I${X11BASE}/include
++CFLAGS+=$(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
index c720dba1c94a..18024606705b 100644
--- a/games/rubix/files/patch-ad
+++ b/games/rubix/files/patch-ad
@@ -1,33 +1,22 @@
---- 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 @@
+--- 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_FILE_PREFIX);
++  strcpy(full_module_file, MODULE_PATH "/");
 +  strcat(full_module_file, module_file);
  
    the_screen=&screen.buffer[0];
    d.buffer=screen.buffer;
-@@ -68,7 +76,7 @@
-     return -1;
+@@ -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) {
++  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 --git a/games/rubix/pkg-plist b/games/rubix/pkg-plist
index 64c518d1e4b6..0fa9a753be95 100644
--- a/games/rubix/pkg-plist
+++ b/games/rubix/pkg-plist
@@ -1,9 +1,10 @@
 bin/rubix
+share/doc/rubix/AUTHORS
+share/doc/rubix/BUGS
+share/doc/rubix/INSTALL
+share/doc/rubix/NOISE
+share/doc/rubix/README
+share/doc/rubix/TODO
 share/rubix/module.xm
-share/rubix/AUTHORS
-share/rubix/BUGS
-share/rubix/INSTALL
-share/rubix/NOISE
-share/rubix/README
-share/rubix/TODO
 @dirrm share/rubix
+@dirrm share/doc/rubix