Bug 56085

Summary: games/fuhquake port updated
Product: Ports & Packages Reporter: Alexey Dokuchaev <danfe>
Component: Individual Port(s)Assignee: freebsd-ports-bugs (Nobody) <ports-bugs>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff
none
file.diff
none
file.diff none

Description Alexey Dokuchaev 2003-08-28 16:40:23 UTC 
This update of games/fuhquake does the following (`-' means bug fixed, `+'
means feature/knob added):

	+ Allows fuhquake to be run from any directory per kris' suggestion;

	+ Adds WITH_SHAREWARE_DATA knob.  Coupled with provious `+', this
	  makes fuhquake playable right after install, yet allows it to be
	  distributed on CDROM (since shareware data cannot be included,
	  one must explicitly define this knob);

	- Properly utilizes EXTRACT_ONLY in Makefile;

	- Removes EXTRACT_BEFORE_ARGS from Makefile since it's no longer
	  needed (kris made a commit regarding this to bsd.port.mk four
	  weeks ago);

	+ Tells user about WITHOUT_XMMS knob, when XMMS bits are found;

	- Fixes palette problems on 24-bit depth with x11-renderer;

	- Fixes DGA mouse behavior on higher mouse rates when GLX-rendered.

Fix: Two new patch files (patch-common.c and patch-vid_x11.c):

=== start of patch-common.c ===
* * *

=== start of patch-common.c ===
* * *

And this is the main diff:

%%%
How-To-Repeat: N/A
Comment 1 danfe 2003-09-01 09:42:08 UTC 
Forgot to fix building on 5.x with XMMS.
This is a patch against already-there ``files/patch-mp3_player.c''

%%%
--- files/patch-mp3_player.c.orig	Tue Jun  3 01:29:57 2003
+++ files/patch-mp3_player.c	Mon Sep  1 15:40:29 2003
 @@ -48,6 +48,7 @@
  
  #ifdef __XMMS__
@@ -8,6 +8,15 @@
  #include <sys/wait.h>
  
  cvar_t mp3_dir = {"mp3_xmms_dir", "/usr/local/bin"};
+@@ -288,7 +289,7 @@
+ #define XMMS_COMMAND(Name, Param)						\
+     void MP3_##Name##_f(void) {							\
+ 	   if (MP3_IsPlayerRunning()) {						\
+-		   xmms_remote_##Param##(XMMS_SESSION);			\
++		   xmms_remote_##Param(XMMS_SESSION);			\
+ 	   } else {											\
+ 		   Com_Printf("%s\n", mp3_notrunning_msg);		\
+ 	   }												\
 @@ -769,7 +770,7 @@
  
  #endif
Comment 2 danfe 2003-09-01 09:48:06 UTC 
On Mon, Sep 01, 2003 at 03:42:08PM +0700, Alexey Dokuchaev wrote:
> Forgot to fix building on 5.x with XMMS.
> This is a patch against already-there ``files/patch-mp3_player.c''
> 
> %%%
> --- files/patch-mp3_player.c.orig	Tue Jun  3 01:29:57 2003
> +++ files/patch-mp3_player.c	Mon Sep  1 15:40:29 2003
>  @@ -48,6 +48,7 @@
>   
>   #ifdef __XMMS__
> @@ -8,6 +8,15 @@
>   #include <sys/wait.h>
>   
>   cvar_t mp3_dir = {"mp3_xmms_dir", "/usr/local/bin"};
					    ^^^^^

Could anyone *please* substitute 'local' to 'X11R6' since that is really
a place where FreeBSD ports install XMMS.

Thanks!
Comment 3 Sergey A. Osokin freebsd_committer freebsd_triage 2003-09-01 12:52:23 UTC 
State Changed
From-To: open->closed

Committed, thanks!