Attachment #42265 for bug #65929




#

PORTNAME=	fuhquake
PORTVERSION=	0.31
PORTREVISION=	1
CATEGORIES=	games
MASTER_SITES=	http://www.fuhquake.net/files/releases/v${PORTVERSION}/:src \
		http://www.fuhquake.net/files/releases/v${PORTVERSION}/:dat \
		http://freebsd.nsu.ru/distfiles/:pak
DISTNAME=	${PORTNAME}-source-v${PORTVERSION}

DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:src \
		${PORTNAME}-linux-v${PORTVERSION}${EXTRACT_SUFX}:dat
DIST_SUBDIR=	${PORTNAME}
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
		${PORTNAME}-linux-v${PORTVERSION}${EXTRACT_SUFX}

MAINTAINER=	danfe@regency.nsu.ru
COMMENT=	An excellent QuakeWorld client

BROKEN=		"Checksum mismatch"

.if defined(WITH_SHAREWARE_DATA)
DISTFILES+=	q1-shareware-pak0.pak:pak
PLIST_SUB+=	SHAREWARE=""

PLIST_SUB+=	SHAREWARE="@comment "
.endif

EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
		${PORTNAME}-linux-v${PORTVERSION}${EXTRACT_SUFX}

.if exists(${LOCALBASE}/lib/libvga.so.1)
WITH_SVGA=	yes
.endif

pre-everything::
.if ${MACHINE_ARCH} == "i386" && !defined(WITH_SVGA)
	@${ECHO_MSG} "Define WITH_SVGA to build SVGA client"
.elif !defined(WITHOUT_SVGA)
	@${ECHO_MSG} "Define WITHOUT_SVGA to disable building of SVGA client"
.endif
.if !defined(WITH_XMMS)
	@${ECHO_MSG} "Define WITH_XMMS to enable \`\`MP3 Player'' feature"
.elif !defined(WITHOUT_XMMS)
	@${ECHO_MSG} "Define WITHOUT_XMMS to build without \`\`MP3 Player'' feature"
.endif
.if !defined(WITHOUT_X11)
	@${ECHO_MSG} "Define WITHOUT_X11 to disable building of X11 client"

.if defined(WITH_SHAREWARE_DATA)
	@${ECHO_MSG} "Define WITH_SHAREWARE_DATA to install demo version game data"
.endif
.if !defined(WITHOUT_XMMS) && exists(${X11BASE}/lib/libxmms.so.4)
	@${ECHO_MSG} "Define WITHOUT_XMMS to build without \`\`MP3 Player'' feature"
.endif
.if !defined(WITH_OPTIMIZED_CFLAGS)
	@${ECHO_MSG} "Define WITH_OPTIMIZED_CFLAGS to enable extra optimization options"
.endif

USE_ZIP=	yes
WRKSRC=		${WRKDIR}/source

post-extract:
	@${FIND} -E ${WRKDIR} -type f -iregex ".*\.(c|h|s|txt)" -exec ${FILESDIR}/fix^m.sh '{}' \;
	@${CP} ${FILESDIR}/*.c ${WRKSRC}

post-patch:
	@${REINPLACE_CMD} -e 's|%%BASEDIR%%|${DATADIR}|' ${WRKSRC}/common.c
	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|' ${WRKSRC}/mp3_player.c
	@${CP} ${FILESDIR}/*.c ${WRKSRC}
	modules.h mp3_player.h r_local.h movie.c logging.c quotes.h zone.c \
	gl_local.h gl_image.h gl_warp_sin.h
	@${ECHO_CMD} "" >> ${WRKSRC}/${file}
.endfor

do-build:
.if !defined(WITHOUT_X11)

.for tgt in ${END_TARGETS}
	${INSTALL_PROGRAM} ${WRKSRC}/${tgt} ${PREFIX}/bin
.endfor
	@${MKDIR} ${DATADIR}/qw
	${INSTALL_DATA} ${WRKDIR}/qw/fragfile.dat ${DATADIR}/qw
	${INSTALL_DATA} ${WRKDIR}/qw/qwprogs.dat ${DATADIR}/qw
	${INSTALL_DATA} ${WRKDIR}/qw/spprogs.dat ${DATADIR}/qw
	${INSTALL_DATA} ${DISTDIR}/pak0.pak ${DATADIR}/${PORTNAME}
.if defined(WITH_SHAREWARE_DATA)
	@${MKDIR} ${DATADIR}/id1
	${INSTALL_DATA} ${_DISTDIR}/q1-shareware-pak0.pak \
		${DATADIR}/id1/pak0.pak
.endif
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
. for txt in FAQ-v0.30-b585 FuhQuake-v0.31-FAQ benchmark config_manager crosshairs \
	linux logitech match_tools mp3 particles pointing rulesets track
	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/${txt}.txt ${DOCSDIR}
. endfor
	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.txt ${DOCSDIR}
.endif

Lines 1-4 Link Here

(-)./distinfo (-4 / +6 lines)
1	MD5 (fuhquake-source-v0.28.zip) = 7e77a97a1e1524b289ffa6978ce5377e	1	MD5 (fuhquake/fuhquake-source-v0.31.zip) = 3db5852cfbdf4a4855072305c32f6075
2	MD5 (fuhquake-linux-v0.28.zip) = 72e99f8df1baab11e0492b7cee93fdd3	2	SIZE (fuhquake/fuhquake-source-v0.31.zip) = 789610
3	MD5 (pak0.pak) = 2fa37c49cb1d3902d97cb82a1c96115a	3	MD5 (fuhquake/fuhquake-linux-v0.31.zip) = 479a6f8dad1174333819e850b3aca8c1
4	MD5 (q1-shareware-pak0.pak) = 5906e5998fc3d896ddaf5e6a62e03abb	4	SIZE (fuhquake/fuhquake-linux-v0.31.zip) = 4520020
		5	MD5 (fuhquake/q1-shareware-pak0.pak) = 5906e5998fc3d896ddaf5e6a62e03abb
		6	SIZE (fuhquake/q1-shareware-pak0.pak) = 18689235




.endif

.if make(glx)
DO_CFLAGS +=	-DWITH_ZLIB -DWITH_PNG -DWITH_JPEG -DGLQUAKE -DWITH_DGA -DWITH_VMODE
.endif

.if defined(WITH_OPTIMIZED_CFLAGS)

		cl_main.o \
		cl_parse.o \
		cl_pred.o \
		cl_screen.o \
		cl_slist.o \
		cl_tent.o \
		cl_view.o \
\
		cmd.o \
		com_msg.o \
		common.o \
		console.o \
		crc.o \

		config_manager.o \
		fchecks.o \
		fmod.o \
		fragstats.o \
		ignore.o \
		logging.o \
		match_tools.o \
		modules.o \
		movie.o \
		mp3_player.o \

		d_fill.o \
		d_init.o \
		d_modech.o \
		d_part.o \
		d_polyse.o \
		d_scan.o \
		d_sky.o \

		d_vars.o \
		d_zpoint.o \
\
		screen.o \
\
		r_aclip.o \
		r_alias.o \
		r_bsp.o \

		r_drawa.o \
		r_edgea.o \
		r_varsa.o \
		surf16.o \
		surf8.o
.endif



CL_GLX_OBJS = \
		gl_draw.o \
		gl_image.o \
		gl_mesh.o \
		gl_model.o \
		gl_ngraph.o \

		gl_rmisc.o \
		gl_rpart.o \
		gl_rsurf.o \
		gl_screen.o \
		gl_texture.o \
		gl_warp.o \
		r_part.o \

Lines 38-54 Link Here

(-)./files/nonintel.c (-11 lines)
38		38
39	/*	39	/*
40	================	40	================
41	R_Surf16Patch
42	================
43	*/
44	void R_Surf16Patch ()
45	{
46	// we only patch code on Intel
47	}
48
49
50	/*
51	================
52	R_SurfacePatch	41	R_SurfacePatch
53	================	42	================
54	*/	43	*/

Lines 1-11 Link Here

(-)./files/patch-common.c (-5 / +5 lines)
1	--- common.c.orig Thu Aug 28 18:15:40 2003	1	--- common.c.orig Thu Feb 5 01:05:19 2004
2	+++ common.c Thu Aug 28 18:16:04 2003	2	+++ common.c Thu Feb 5 01:09:07 2004
3	@@ -1512,7 +1512,7 @@	3	@@ -1006,7 +1006,7 @@
4	if ((i = COM_CheckParm ("-basedir")) && i < com_argc - 1)	4	if ((i = COM_CheckParm ("-basedir")) && i < com_argc - 1)
5	Q_strncpyz (com_basedir, com_argv[i + 1], sizeof(com_basedir));	5	Q_strncpyz (com_basedir, com_argv[i + 1], sizeof(com_basedir));
6	else	6	else
7	- strcpy (com_basedir, ".");	7	- getcwd(com_basedir, sizeof(com_basedir) - 1);
8	+ strcpy (com_basedir, "%%%%BASEDIR%%%%");	8	+ strcpy(com_basedir, "%%BASEDIR%%");
9		9
10	for (i = 0; i < strlen(com_basedir); i++)	10	for (i = 0; i < strlen(com_basedir); i++)
11	if (com_basedir[i] == '\\')	11	if (com_basedir[i] == '\\')




--- menu.c.orig	Thu Feb  5 00:33:07 2004
+++ menu.c	Thu Feb  5 00:34:32 2004
@@ -411,9 +436,11 @@
 		void M_Menu_Fps_f (void);
 		void M_Menu_Video_f (void);
 	void M_Menu_MP3_Control_f (void);
+	void M_Menu_Help_f (void);
 	void M_Menu_Quit_f (void);
 
 void M_Main_Draw (void);
@@ -78,6 +79,7 @@
 		void M_Keys_Draw (void);
 		void M_Fps_Draw (void);
 		void M_Video_Draw (void);
+	void M_MP3_Control_Draw (void);
 	void M_Help_Draw (void);
 	void M_Quit_Draw (void);
 
@@ -95,6 +97,7 @@
 		void M_Keys_Key (int key);
 		void M_Fps_Key (int key);
 		void M_Video_Key (int key);
+	void M_MP3_Control_Key (int key);
 	void M_Help_Key (int key);
 	void M_Quit_Key (int key);
 
@@ -251,7 +254,11 @@
 /* MAIN MENU */
 
 int	m_main_cursor;
+#if defined(_WIN32) || defined(__XMMS__)
+#define	MAIN_ITEMS	6
+#else
 #define	MAIN_ITEMS	5
+#endif
 
 
 void M_Menu_Main_f (void) {
@@ -269,7 +276,13 @@
 	M_DrawTransPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") );
 	p = Draw_CachePic ("gfx/ttl_main.lmp");
 	M_DrawPic ( (320-p->width)/2, 4, p);
-	M_DrawTransPic (72, 32, Draw_CachePic ("gfx/mainmenu.lmp") );
+	M_DrawTransPic (72, 32, Draw_CachePic
+#if defined(_WIN32) || defined(__XMMS__)
+	("gfx/mainmenu_mp3.lmp")
+#else
+	("gfx/mainmenu.lmp")
+#endif
+	);
 
 	f = (int)(curtime * 10)%6;
 	
@@ -332,7 +345,19 @@
 			break;
 	#endif
 
+	#if defined(_WIN32) || defined(__XMMS__)
 		case 4:
+	#else
+		case 3:
+	#endif
+			M_Menu_Help_f ();
+			break;
+
+	#if defined(_WIN32) || defined(__XMMS__)
+		case 5:
+	#else
+		case 4:
+	#endif
 			M_Menu_Quit_f ();
 			break;
 		}
@@ -442,9 +467,11 @@
 		Cvar_SetValue (&cl_hudswap, !cl_hudswap.value);
 		break;
 

 	}
 }
 
@@ -873,24 +900,24 @@
 	r = v_contrast.value - 1.0;
 	M_DrawSlider (220, 72, r);
 
-	M_Print (16, 80, "           Mouse Speed");
+	M_Print (16, 80, "           Mouse speed");
 	r = (sensitivity.value - 1)/10;
 	M_DrawSlider (220, 80, r);
 
-	M_Print (16, 88, "       CD Music Volume");
+	M_Print (16, 88, "       CD music volume");
 	r = bgmvolume.value;
 	M_DrawSlider (220, 88, r);
 
-	M_Print (16, 96, "          Sound Volume");
+	M_Print (16, 96, "          Sound volume");
 	r = s_volume.value;
 	M_DrawSlider (220, 96, r);
 
-	M_Print (16, 104,  "            Always Run");
+	M_Print (16, 104,  "            Always run");
 	M_DrawCheckbox (220, 104, cl_forwardspeed.value > 200);
 
 	M_Print (16, 112, "            Mouse look");
 	M_DrawCheckbox (220, 112, freelook.value);
 
-	M_Print (16, 120, "          Invert Mouse");
+	M_Print (16, 120, "          Invert mouse");
 	M_DrawCheckbox (220, 120, m_pitch.value < 0);
 
 	M_Print (16, 128, "            Lookstrafe");
@@ -524,17 +551,19 @@
 	M_Print (16, 152, "          FPS settings");
 
 	if (vid_menudrawfn)
-		M_Print (16, 160, "           Video Modes");
+		M_Print (16, 160, "           Video modes");
 
+#ifndef NO_WINDOWED_MOUSE
 #ifdef _WIN32
 	if (modestate == MS_WINDOWED)
 	{
 #endif
-		M_Print (16, 168, "             Use Mouse");
+		M_Print (16, 168, "             Use mouse");
 		M_DrawCheckbox (220, 168, _windowed_mouse.value);
 #ifdef _WIN32
 	}
 #endif
+#endif /* NO_WINDOWED_MOUSE */
 
 // cursor
 	M_DrawCharacter (200, 32 + options_cursor*8, 12+((int)(curtime*4)&1));
@@ -611,22 +640,34 @@
 		break;
 	}
 
-	if (options_cursor == 16 && vid_menudrawfn == NULL) {
-		if (k == K_UPARROW || k == K_END || k == K_PGDN)
+	if (k == K_UPARROW || k == K_END || k == K_PGDN)
+	{
+#ifdef NO_WINDOWED_MOUSE
+		if ((options_cursor == 17)
+#ifdef _WIN32
+		&& (modestate != MS_WINDOWED)
+#endif
+		)
+			options_cursor = 16;
+#endif /* NO_WINDOWED_MOUSE */
+
+		if (options_cursor == 16 && vid_menudrawfn == NULL)
 			options_cursor = 15;
-		else
-			options_cursor = 0;
 	}
+	else
+	{
+		if (options_cursor == 16 && vid_menudrawfn == NULL)
+			options_cursor = 17;
 
-	if ((options_cursor == 17)
+#ifdef NO_WINDOWED_MOUSE
+		if ((options_cursor == 17)
 #ifdef _WIN32
-	&& (modestate != MS_WINDOWED)
+		&& (modestate != MS_WINDOWED)
 #endif
-	)
-	if (k == K_UPARROW || k == K_END || k == K_PGDN)
-		options_cursor = 16;
-	else
-		options_cursor = 0;
+		)
+			options_cursor = 0;
+#endif /* NO_WINDOWED_MOUSE */
+	}
 }
 
 
@@ -894,24 +935,24 @@
 	M_Print (16, 96, "        Pickup flashes");
 	M_DrawCheckbox (ALIGN_FPS_OPTIONS, 96, v_bonusflash.value);
 
-	M_Print (16, 104, "         Powerup glow");
+	M_Print (16, 104, "          Powerup glow");
 	M_Print (ALIGN_FPS_OPTIONS, 104, r_powerupglow.value==2 ? "own off" :
 		r_powerupglow.value ? "on" : "off");
 
-	M_Print (16, 112, "         Draw torches");
+	M_Print (16, 112, "          Draw torches");
 	M_DrawCheckbox (ALIGN_FPS_OPTIONS, 112, r_drawflame.value);
 
-	M_Print (16, 120, "             Fast sky");
+	M_Print (16, 120, "              Fast sky");
 	M_DrawCheckbox (ALIGN_FPS_OPTIONS, 120, r_fastsky.value);
 
 #ifdef GLQUAKE
-	M_Print (16, 128, "          Fast lights");
+	M_Print (16, 128, "           Fast lights");
 	M_DrawCheckbox (ALIGN_FPS_OPTIONS, 128, gl_flashblend.value);
 #endif
 
-	M_PrintWhite (16, 136, "            Fast mode");

+	M_PrintWhite (16, 144, "          High quality");
 
 // cursor
 	M_DrawCharacter (196, 32 + fps_cursor * 8, 12 + ((int) (curtime * 4) & 1));




--- modules.c.orig	Wed Feb  4 21:05:56 2004
+++ modules.c	Wed Feb  4 21:14:23 2004
@@ -31,10 +31,6 @@
 char _temp_modulename[MAX_OSPATH];
 static registeredModule_t registeredModules[qlib_nummodules];
 
-#ifdef __linux
-#include <dlfcn.h>
-#endif
-
 #ifdef _WIN32
 #define SECURITY_GETFUNC(f) (Security_##f = (Security_##f##_t) GetProcAddress(hSecurity, "Security_" #f))
 #else




--- mp3_player.c.orig	Wed Feb  4 21:19:26 2004
+++ mp3_player.c	Wed Feb  4 21:23:46 2004
@@ -56,9 +56,10 @@
 
 #ifdef __XMMS__
 

 #include <sys/wait.h>
 
-cvar_t mp3_dir = {"mp3_xmms_dir", "/usr/local/bin"};
+cvar_t mp3_dir = {"mp3_xmms_dir", "%%X11BASE%%/bin"};
 cvar_t mp3_xmms_session = {"mp3_xmms_session", "0"};
 
 #endif
@@ -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
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__FreeBSD__)
 
 #ifdef __XMMS__
 

Lines 1-10 Link Here

(-)./files/patch-version.h (-6 / +12 lines)
1	--- version.h.orig Thu Sep 18 23:36:30 2003	1	--- version.h.orig Wed Sep 24 20:56:57 2003
2	+++ version.h Thu Sep 18 23:36:50 2003	2	+++ version.h Wed Sep 24 20:58:44 2003
3	@@ -7,7 +7,7 @@	3	@@ -4,10 +4,12 @@
4	#ifdef _WIN32	4	#define FUH_VERSION "0.30"
		5	#define LINUX_VERSION 0.98
		6
		7	-#ifdef _WIN32
		8	+#if defined(_WIN32)
5	#define QW_PLATFORM "Win32"	9	#define QW_PLATFORM "Win32"
6	#else	10	-#else
7	-#define QW_PLATFORM "Linux"	11	+#elif defined(__linux__)
		12	#define QW_PLATFORM "Linux"
		13	+#elif defined(__FreeBSD__)
8	+#define QW_PLATFORM "FreeBSD"	14	+#define QW_PLATFORM "FreeBSD"
9	#endif	15	#endif
10		16




 #include <stdarg.h>
 #include <stdio.h>
 #include <signal.h>
@@ -284,8 +286,8 @@
 	case MotionNotify:
 #ifdef WITH_DGA
 		if (dgamouse && _windowed_mouse.value) {
-			mouse_x = event.xmotion.x_root;
-			mouse_y = event.xmotion.y_root;
+			mouse_x += event.xmotion.x_root;
+			mouse_y += event.xmotion.y_root;
 		} else
 #endif
 		{
@@ -601,8 +603,9 @@
 #ifdef WITH_VMODE
 	// fullscreen
 	if (vidmode_active) {
-		mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask;
+		mask = CWBackPixel | CWColormap | CWSaveUnder | CWBackingStore | CWEventMask | CWOverrideRedirect;
 		attr.backing_store = NotUseful;
+		attr.override_redirect = True;
 		attr.save_under = False;
 	}
 #endif




--- vid_svgalib.c.orig	Thu Feb  5 00:41:00 2004
+++ vid_svgalib.c	Thu Feb  5 00:51:44 2004
@@ -20,12 +20,18 @@
 #include <termios.h>
 #include <sys/ioctl.h>

 cvar_t	m_filter = {"m_filter","0"};
 cvar_t cl_keypad = {"cl_keypad", "1"};
 
@@ -307,45 +312,41 @@
 }
 
 static byte scantokey_kp[128] = {

-	KP_ENTER,K_RCTRL,KP_SLASH,0, K_RALT,  K_PAUSE,K_HOME, K_UPARROW,
-	K_PGUP, K_LEFTARROW,K_RIGHTARROW,K_END, K_DOWNARROW,K_PGDN,K_INS,K_DEL,        // 6
-	0,      0,      0,      0,      0,      0,      0,      K_PAUSE,
-	0,      0,      0,      0,      0,      K_LWIN, K_RWIN, K_MENU					// 7
+	0,            K_ESCAPE,   '1',          '2',           '3',         '4',           '5',         '6',
+	'7',          '8',        '9',          '0',           '-',         '=',           K_BACKSPACE, 9,
+	'q',          'w',        'e',          'r',           't',         'y',           'u',         'i',

+	KP_DOWNARROW, KP_PGDN,     KP_INS,       KP_DEL,       0,           0,             0,           K_F11,
+	K_F12,        KP_ENTER,    K_RCTRL,      KP_SLASH,     K_PRINTSCR,  K_RALT,        K_HOME,      K_UPARROW,
+	K_PGUP,       K_LEFTARROW, K_RIGHTARROW, K_END,        K_DOWNARROW, K_PGDN,        K_INS,       K_DEL,
+	K_PAUSE,      K_LWIN,      K_RWIN,       K_MENU,       0,           0,             0,           0,
+	0,            0,           0,            0,            0,           0,             0,           0,
+	0,            0,           0,            0,            0,           0,             0,           0
 };

-	K_ENTER,K_RCTRL,'/',     0, K_RALT,  K_PAUSE,K_HOME, K_UPARROW,
-	K_PGUP, K_LEFTARROW,K_RIGHTARROW,K_END, K_DOWNARROW,K_PGDN,K_INS,K_DEL,        // 6
-	0,      0,      0,      0,      0,      0,      0,      K_PAUSE,
-	0,      0,      0,      0,      0,      K_LWIN, K_RWIN, K_MENU			// 7
+	0,           K_ESCAPE,   '1',          '2',          '3',         '4',          '5',         '6',
+	'7',         '8',        '9',          '0',          '-',         '=',          K_BACKSPACE, 9,
+	'q',         'w',        'e',          'r',          't',         'y',          'u',         'i',

+	K_DOWNARROW, K_PGDN,      K_INS,        K_DEL,       0,           0,            0,           K_F11,
+	K_F12,       K_ENTER,     K_RCTRL,      '/',         K_PRINTSCR,  K_RALT,       K_HOME,      K_UPARROW,
+	K_PGUP,      K_LEFTARROW, K_RIGHTARROW, K_END,       K_DOWNARROW, K_PGDN,       K_INS,       K_DEL,
+	K_PAUSE,     K_LWIN,      K_RWIN,       K_MENU,      0,           0,            0,           0,
+	0,           0,           0,            0,           0,           0,            0,           0,
+	0,           0,           0,            0,           0,           0,            0,           0
 };

Lines 6-15 Link Here

(-)./pkg-message (-5 / +5 lines)
6	You must also have registered version of	6	You must also have registered version of
7	Quake per to be able to legally copy the	7	Quake per to be able to legally copy the
8	PAK files (pak*.pak) from id1/ directory	8	PAK files (pak*.pak) from id1/ directory
9	to ${DATADIR}/id1/ from CDROM or Windows	9	to ${DATADIR}/id1/ from a
10	installation. In case it is not an opt-	10	Windows installation or CDROM. If it is
11	ion, you can rebuild the port with "make	11	not an option, you can still rebuild the
12	-DWITH_SHAREWARE_DATA", and thus install	12	port with WITH_SHAREWARE_DATA knob so to
13	demo version (shareware) data files.	13	install shareware version data files.
14		14
15	================================================	15	================================================




%%X11%%bin/fuhquake-x11
%%GLX%%bin/fuhquake-glx
%%SVGA%%bin/fuhquake-svga
%%PORTDOCS%%%%DOCSDIR%%/FAQ-v0.30-b585.txt
%%PORTDOCS%%%%DOCSDIR%%/FuhQuake-v0.31-FAQ.txt
%%PORTDOCS%%%%DOCSDIR%%/benchmark.txt
%%PORTDOCS%%%%DOCSDIR%%/config_manager.txt
%%PORTDOCS%%%%DOCSDIR%%/crosshairs.txt
%%PORTDOCS%%%%DOCSDIR%%/fuhquake.txt
%%PORTDOCS%%%%DOCSDIR%%/linux.txt
%%PORTDOCS%%%%DOCSDIR%%/logitech.txt
%%PORTDOCS%%%%DOCSDIR%%/match_tools.txt
%%PORTDOCS%%%%DOCSDIR%%/mp3.txt
%%PORTDOCS%%%%DOCSDIR%%/particles.txt
%%PORTDOCS%%%%DOCSDIR%%/pointing.txt
%%PORTDOCS%%%%DOCSDIR%%/rulesets.txt
%%PORTDOCS%%%%DOCSDIR%%/track.txt
%%PORTDOCS%%@dirrm %%DOCSDIR%%
share/fuhquake/fuhquake/pak0.pak
%%SHAREWARE%%share/fuhquake/id1/pak0.pak
share/fuhquake/qw/fragfile.dat
share/fuhquake/qw/qwprogs.dat
share/fuhquake/qw/spprogs.dat
@dirrm share/fuhquake/qw
%%SHAREWARE%%@dirrm share/fuhquake/id1
@dirrm share/fuhquake/fuhquake
@dirrm share/fuhquake

Return to bug 65929

Lines 6-27 Link Here

(-)./Makefile (-31 / +21 lines)
6	#	6	#
7		7
8	PORTNAME= fuhquake	8	PORTNAME= fuhquake
9	PORTVERSION= 0.28	9	PORTVERSION= 0.31
10	PORTREVISION= 1
11	CATEGORIES= games	10	CATEGORIES= games
12	MASTER_SITES= http://www.fuhquake.net/files/source/:src \	11	MASTER_SITES= http://www.fuhquake.net/files/releases/v${PORTVERSION}/:src \
13	http://www.fuhquake.net/files/releases/:dat \	12	http://www.fuhquake.net/files/releases/v${PORTVERSION}/:dat \
14	http://freebsd.nsu.ru/distfiles/:pak	13	http://freebsd.nsu.ru/distfiles/:pak
15	DISTNAME= ${PORTNAME}-source-v${PORTVERSION}	14	DISTNAME= ${PORTNAME}-source-v${PORTVERSION}
		15
16	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src \	16	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src \
17	${PORTNAME}-linux-v${PORTVERSION}${EXTRACT_SUFX}:dat \	17	${PORTNAME}-linux-v${PORTVERSION}${EXTRACT_SUFX}:dat
18	pak0.pak:pak	18	DIST_SUBDIR= ${PORTNAME}
		19	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \
		20	${PORTNAME}-linux-v${PORTVERSION}${EXTRACT_SUFX}
19		21
20	MAINTAINER= danfe@regency.nsu.ru	22	MAINTAINER= danfe@regency.nsu.ru
21	COMMENT= An excellent QuakeWorld client	23	COMMENT= An excellent QuakeWorld client
22		24
23	BROKEN= "Checksum mismatch"
24
25	.if defined(WITH_SHAREWARE_DATA)	25	.if defined(WITH_SHAREWARE_DATA)
26	DISTFILES+= q1-shareware-pak0.pak:pak	26	DISTFILES+= q1-shareware-pak0.pak:pak
27	PLIST_SUB+= SHAREWARE=""	27	PLIST_SUB+= SHAREWARE=""
Lines 29-37 Link Here
29	PLIST_SUB+= SHAREWARE="@comment "	29	PLIST_SUB+= SHAREWARE="@comment "
30	.endif	30	.endif
31		31
32	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \
33	${PORTNAME}-linux-v${PORTVERSION}${EXTRACT_SUFX}
34
35	.if exists(${LOCALBASE}/lib/libvga.so.1)	32	.if exists(${LOCALBASE}/lib/libvga.so.1)
36	WITH_SVGA= yes	33	WITH_SVGA= yes
37	.endif	34	.endif
Lines 75-83 Link Here
75	pre-everything::	72	pre-everything::
76	.if ${MACHINE_ARCH} == "i386" && !defined(WITH_SVGA)	73	.if ${MACHINE_ARCH} == "i386" && !defined(WITH_SVGA)
77	@${ECHO_MSG} "Define WITH_SVGA to build SVGA client"	74	@${ECHO_MSG} "Define WITH_SVGA to build SVGA client"
		75	.elif !defined(WITHOUT_SVGA)
		76	@${ECHO_MSG} "Define WITHOUT_SVGA to disable building of SVGA client"
78	.endif	77	.endif
79	.if !defined(WITH_XMMS)	78	.if !defined(WITH_XMMS)
80	@${ECHO_MSG} "Define WITH_XMMS to enable \`\`MP3 Player'' feature"	79	@${ECHO_MSG} "Define WITH_XMMS to enable \`\`MP3 Player'' feature"
		80	.elif !defined(WITHOUT_XMMS)
		81	@${ECHO_MSG} "Define WITHOUT_XMMS to build without \`\`MP3 Player'' feature"
81	.endif	82	.endif
82	.if !defined(WITHOUT_X11)	83	.if !defined(WITHOUT_X11)
83	@${ECHO_MSG} "Define WITHOUT_X11 to disable building of X11 client"	84	@${ECHO_MSG} "Define WITHOUT_X11 to disable building of X11 client"
Lines 88-96 Link Here
88	.if defined(WITH_SHAREWARE_DATA)	89	.if defined(WITH_SHAREWARE_DATA)
89	@${ECHO_MSG} "Define WITH_SHAREWARE_DATA to install demo version game data"	90	@${ECHO_MSG} "Define WITH_SHAREWARE_DATA to install demo version game data"
90	.endif	91	.endif
91	.if !defined(WITHOUT_XMMS) && exists(${X11BASE}/lib/libxmms.so.4)
92	@${ECHO_MSG} "Define WITHOUT_XMMS to build without \`\`MP3 Player'' feature"
93	.endif
94	.if !defined(WITH_OPTIMIZED_CFLAGS)	92	.if !defined(WITH_OPTIMIZED_CFLAGS)
95	@${ECHO_MSG} "Define WITH_OPTIMIZED_CFLAGS to enable extra optimization options"	93	@${ECHO_MSG} "Define WITH_OPTIMIZED_CFLAGS to enable extra optimization options"
96	.endif	94	.endif
Lines 103-120 Link Here
103	USE_ZIP= yes	101	USE_ZIP= yes
104	WRKSRC= ${WRKDIR}/source	102	WRKSRC= ${WRKDIR}/source
105		103
106	post-extract:
107	@${FIND} -E ${WRKDIR} -type f -iregex ".*\.(c\|h\|s\|txt)" -exec ${FILESDIR}/fix^m.sh '{}' \;
108	@${CP} ${FILESDIR}/*.c ${WRKSRC}
109
110	post-patch:	104	post-patch:
111	@${REINPLACE_CMD} -e 's\|%%%%BASEDIR%%%%\|${DATADIR}\|' ${WRKSRC}/common.c	105	@${REINPLACE_CMD} -e 's\|%%BASEDIR%%\|${DATADIR}\|' ${WRKSRC}/common.c
112	.for file in cmd.h common.h render.h console.h quakedef.h cvar.h cvar_groups.h \	106	@${REINPLACE_CMD} -e 's\|%%X11BASE%%\|${X11BASE}\|' ${WRKSRC}/mp3_player.c
113	fmod.h config_manager.h auth.h logging.h ignore.h fchecks.h rulesets.h \	107	@${CP} ${FILESDIR}/*.c ${WRKSRC}
114	modules.h mp3_player.h r_local.h movie.c logging.c quotes.h zone.c \
115	gl_local.h gl_image.h gl_warp_sin.h
116	@${ECHO_CMD} "" >> ${WRKSRC}/${file}
117	.endfor
118		108
119	do-build:	109	do-build:
120	.if !defined(WITHOUT_X11)	110	.if !defined(WITHOUT_X11)
Lines 133-152 Link Here
133	.for tgt in ${END_TARGETS}	123	.for tgt in ${END_TARGETS}
134	${INSTALL_PROGRAM} ${WRKSRC}/${tgt} ${PREFIX}/bin	124	${INSTALL_PROGRAM} ${WRKSRC}/${tgt} ${PREFIX}/bin
135	.endfor	125	.endfor
136	@${MKDIR} ${DATADIR}/qw ${DATADIR}/${PORTNAME}	126	@${MKDIR} ${DATADIR}/qw
		127	${INSTALL_DATA} ${WRKDIR}/qw/fragfile.dat ${DATADIR}/qw
137	${INSTALL_DATA} ${WRKDIR}/qw/qwprogs.dat ${DATADIR}/qw	128	${INSTALL_DATA} ${WRKDIR}/qw/qwprogs.dat ${DATADIR}/qw
138	${INSTALL_DATA} ${WRKDIR}/qw/spprogs.dat ${DATADIR}/qw	129	${INSTALL_DATA} ${WRKDIR}/qw/spprogs.dat ${DATADIR}/qw
139	${INSTALL_DATA} ${DISTDIR}/pak0.pak ${DATADIR}/${PORTNAME}
140	.if defined(WITH_SHAREWARE_DATA)	130	.if defined(WITH_SHAREWARE_DATA)
141	@${MKDIR} ${DATADIR}/id1	131	@${MKDIR} ${DATADIR}/id1
142	${INSTALL_DATA} ${DISTDIR}/q1-shareware-pak0.pak \	132	${INSTALL_DATA} ${_DISTDIR}/q1-shareware-pak0.pak \
143	${DATADIR}/id1/pak0.pak	133	${DATADIR}/id1/pak0.pak
144	.endif	134	.endif
145	.if !defined(NOPORTDOCS)	135	.if !defined(NOPORTDOCS)
146	@${MKDIR} ${DOCSDIR}	136	@${MKDIR} ${DOCSDIR}
147	. for txt in benchmark config_manager crosshairs linux logitech mp3 \	137	. for txt in FAQ-v0.30-b585 FuhQuake-v0.31-FAQ benchmark config_manager crosshairs \
148	particles pointing rulesets track	138	linux logitech match_tools mp3 particles pointing rulesets track
149	${INSTALL_DATA} ${WRKDIR}/doc/${txt}.txt ${DOCSDIR}	139	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/${txt}.txt ${DOCSDIR}
150	. endfor	140	. endfor
151	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.txt ${DOCSDIR}	141	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.txt ${DOCSDIR}
152	.endif	142	.endif

Lines 23-29 Link Here

(-)./files/Makefile (-7 / +5 lines)
23	.endif	23	.endif
24		24
25	.if make(glx)	25	.if make(glx)
26	DO_CFLAGS += -DWITH_PNG -DWITH_JPEG -DGLQUAKE -DWITH_DGA -DWITH_VMODE	26	DO_CFLAGS += -DWITH_ZLIB -DWITH_PNG -DWITH_JPEG -DGLQUAKE -DWITH_DGA -DWITH_VMODE
27	.endif	27	.endif
28		28
29	.if defined(WITH_OPTIMIZED_CFLAGS)	29	.if defined(WITH_OPTIMIZED_CFLAGS)
Lines 84-94 Link Here
84	cl_main.o \	84	cl_main.o \
85	cl_parse.o \	85	cl_parse.o \
86	cl_pred.o \	86	cl_pred.o \
		87	cl_screen.o \
87	cl_slist.o \	88	cl_slist.o \
88	cl_tent.o \	89	cl_tent.o \
89	cl_view.o \	90	cl_view.o \
90	\	91	\
91	cmd.o \	92	cmd.o \
		93	com_msg.o \
92	common.o \	94	common.o \
93	console.o \	95	console.o \
94	crc.o \	96	crc.o \
Lines 108-115 Link Here
108	config_manager.o \	110	config_manager.o \
109	fchecks.o \	111	fchecks.o \
110	fmod.o \	112	fmod.o \
		113	fragstats.o \
111	ignore.o \	114	ignore.o \
112	logging.o \	115	logging.o \
		116	match_tools.o \
113	modules.o \	117	modules.o \
114	movie.o \	118	movie.o \
115	mp3_player.o \	119	mp3_player.o \
Lines 129-135 Link Here
129	d_fill.o \	133	d_fill.o \
130	d_init.o \	134	d_init.o \
131	d_modech.o \	135	d_modech.o \
132	d_part.o \
133	d_polyse.o \	136	d_polyse.o \
134	d_scan.o \	137	d_scan.o \
135	d_sky.o \	138	d_sky.o \
Lines 138-145 Link Here
138	d_vars.o \	141	d_vars.o \
139	d_zpoint.o \	142	d_zpoint.o \
140	\	143	\
141	screen.o \
142	\
143	r_aclip.o \	144	r_aclip.o \
144	r_alias.o \	145	r_alias.o \
145	r_bsp.o \	146	r_bsp.o \
Lines 171-177 Link Here
171	r_drawa.o \	172	r_drawa.o \
172	r_edgea.o \	173	r_edgea.o \
173	r_varsa.o \	174	r_varsa.o \
174	surf16.o \
175	surf8.o	175	surf8.o
176	.endif	176	.endif
177		177
Lines 179-185 Link Here
179		179
180	CL_GLX_OBJS = \	180	CL_GLX_OBJS = \
181	gl_draw.o \	181	gl_draw.o \
182	gl_image.o \
183	gl_mesh.o \	182	gl_mesh.o \
184	gl_model.o \	183	gl_model.o \
185	gl_ngraph.o \	184	gl_ngraph.o \
Lines 189-195 Link Here
189	gl_rmisc.o \	188	gl_rmisc.o \
190	gl_rpart.o \	189	gl_rpart.o \
191	gl_rsurf.o \	190	gl_rsurf.o \
192	gl_screen.o \
193	gl_texture.o \	191	gl_texture.o \
194	gl_warp.o \	192	gl_warp.o \
195	r_part.o \	193	r_part.o \

Lines 1-77 Link Here

(-)./files/patch-menu.c (-180 / +10 lines)
1	--- menu.c.orig Wed May 21 17:18:36 2003	1	--- menu.c.orig Thu Feb 5 00:33:07 2004
2	+++ menu.c Tue May 27 23:06:19 2003	2	+++ menu.c Thu Feb 5 00:34:32 2004
3	@@ -62,6 +62,7 @@	3	@@ -411,9 +436,11 @@
4	void M_Menu_Fps_f (void);
5	void M_Menu_Video_f (void);
6	void M_Menu_MP3_Control_f (void);
7	+ void M_Menu_Help_f (void);
8	void M_Menu_Quit_f (void);
9
10	void M_Main_Draw (void);
11	@@ -78,6 +79,7 @@
12	void M_Keys_Draw (void);
13	void M_Fps_Draw (void);
14	void M_Video_Draw (void);
15	+ void M_MP3_Control_Draw (void);
16	void M_Help_Draw (void);
17	void M_Quit_Draw (void);
18
19	@@ -95,6 +97,7 @@
20	void M_Keys_Key (int key);
21	void M_Fps_Key (int key);
22	void M_Video_Key (int key);
23	+ void M_MP3_Control_Key (int key);
24	void M_Help_Key (int key);
25	void M_Quit_Key (int key);
26
27	@@ -251,7 +254,11 @@
28	/* MAIN MENU */
29
30	int m_main_cursor;
31	+#if defined(_WIN32) \|\| defined(__XMMS__)
32	+#define MAIN_ITEMS 6
33	+#else
34	#define MAIN_ITEMS 5
35	+#endif
36
37
38	void M_Menu_Main_f (void) {
39	@@ -269,7 +276,13 @@
40	M_DrawTransPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") );
41	p = Draw_CachePic ("gfx/ttl_main.lmp");
42	M_DrawPic ( (320-p->width)/2, 4, p);
43	- M_DrawTransPic (72, 32, Draw_CachePic ("gfx/mainmenu.lmp") );
44	+ M_DrawTransPic (72, 32, Draw_CachePic
45	+#if defined(_WIN32) \|\| defined(__XMMS__)
46	+ ("gfx/mainmenu_mp3.lmp")
47	+#else
48	+ ("gfx/mainmenu.lmp")
49	+#endif
50	+ );
51
52	f = (int)(curtime * 10)%6;
53
54	@@ -332,7 +345,19 @@
55	break;
56	#endif
57
58	+ #if defined(_WIN32) \|\| defined(__XMMS__)
59	case 4:
60	+ #else
61	+ case 3:
62	+ #endif
63	+ M_Menu_Help_f ();
64	+ break;
65	+
66	+ #if defined(_WIN32) \|\| defined(__XMMS__)
67	+ case 5:
68	+ #else
69	+ case 4:
70	+ #endif
71	M_Menu_Quit_f ();
72	break;
73	}
74	@@ -442,9 +467,11 @@
75	Cvar_SetValue (&cl_hudswap, !cl_hudswap.value);	4	Cvar_SetValue (&cl_hudswap, !cl_hudswap.value);
76	break;	5	break;
77		6
Lines 83-208 Link Here
83	}	12	}
84	}	13	}
85		14
86	@@ -491,25 +518,25 @@	15	@@ -873,24 +900,24 @@
87	r = v_contrast.value - 1.0;
88	M_DrawSlider (220, 72, r);
89
90	- M_Print (16, 80, " Mouse Speed");
91	+ M_Print (16, 80, " Mouse speed");
92	r = (sensitivity.value - 1)/10;
93	M_DrawSlider (220, 80, r);
94
95	- M_Print (16, 88, " CD Music Volume");
96	+ M_Print (16, 88, " CD music volume");
97	r = bgmvolume.value;
98	M_DrawSlider (220, 88, r);
99
100	- M_Print (16, 96, " Sound Volume");
101	+ M_Print (16, 96, " Sound volume");
102	r = s_volume.value;
103	M_DrawSlider (220, 96, r);
104
105	- M_Print (16, 104, " Always Run");
106	+ M_Print (16, 104, " Always run");
107	M_DrawCheckbox (220, 104, cl_forwardspeed.value > 200);
108
109	M_Print (16, 112, " Mouse look");
110	M_DrawCheckbox (220, 112, freelook.value);
111
112	- M_Print (16, 120, " Invert Mouse");
113	+ M_Print (16, 120, " Invert mouse");
114	M_DrawCheckbox (220, 120, m_pitch.value < 0);
115
116	M_Print (16, 128, " Lookstrafe");
117	@@ -524,17 +551,19 @@
118	M_Print (16, 152, " FPS settings");
119
120	if (vid_menudrawfn)
121	- M_Print (16, 160, " Video Modes");
122	+ M_Print (16, 160, " Video modes");
123
124	+#ifndef NO_WINDOWED_MOUSE
125	#ifdef _WIN32
126	if (modestate == MS_WINDOWED)
127	{
128	#endif
129	- M_Print (16, 168, " Use Mouse");
130	+ M_Print (16, 168, " Use mouse");
131	M_DrawCheckbox (220, 168, _windowed_mouse.value);
132	#ifdef _WIN32
133	}
134	#endif
135	+#endif /* NO_WINDOWED_MOUSE */
136
137	// cursor
138	M_DrawCharacter (200, 32 + options_cursor8, 12+((int)(curtime4)&1));
139	@@ -611,22 +640,34 @@
140	break;
141	}
142
143	- if (options_cursor == 16 && vid_menudrawfn == NULL) {
144	- if (k == K_UPARROW \|\| k == K_END \|\| k == K_PGDN)
145	+ if (k == K_UPARROW \|\| k == K_END \|\| k == K_PGDN)
146	+ {
147	+#ifdef NO_WINDOWED_MOUSE
148	+ if ((options_cursor == 17)
149	+#ifdef _WIN32
150	+ && (modestate != MS_WINDOWED)
151	+#endif
152	+ )
153	+ options_cursor = 16;
154	+#endif /* NO_WINDOWED_MOUSE */
155	+
156	+ if (options_cursor == 16 && vid_menudrawfn == NULL)
157	options_cursor = 15;
158	- else
159	- options_cursor = 0;
160	}
161	+ else
162	+ {
163	+ if (options_cursor == 16 && vid_menudrawfn == NULL)
164	+ options_cursor = 17;
165
166	- if ((options_cursor == 17)
167	+#ifdef NO_WINDOWED_MOUSE
168	+ if ((options_cursor == 17)
169	#ifdef _WIN32
170	- && (modestate != MS_WINDOWED)
171	+ && (modestate != MS_WINDOWED)
172	#endif
173	- )
174	- if (k == K_UPARROW \|\| k == K_END \|\| k == K_PGDN)
175	- options_cursor = 16;
176	- else
177	- options_cursor = 0;
178	+ )
179	+ options_cursor = 0;
180	+#endif /* NO_WINDOWED_MOUSE */
181	+ }
182	}
183
184
185	@@ -894,24 +935,24 @@
186	M_Print (16, 96, " Pickup flashes");	16	M_Print (16, 96, " Pickup flashes");
187	M_DrawCheckbox (220, 96, v_bonusflash.value);	17	M_DrawCheckbox (ALIGN_FPS_OPTIONS, 96, v_bonusflash.value);
188		18
189	- M_Print (16, 104, " Powerup glow");	19	- M_Print (16, 104, " Powerup glow");
190	+ M_Print (16, 104, " Powerup glow");	20	+ M_Print (16, 104, " Powerup glow");
191	M_Print (220, 104, r_powerupglow.value==2 ? "own off" :	21	M_Print (ALIGN_FPS_OPTIONS, 104, r_powerupglow.value==2 ? "own off" :
192	r_powerupglow.value ? "on" : "off");	22	r_powerupglow.value ? "on" : "off");
193		23
194	- M_Print (16, 112, " Draw torches");	24	- M_Print (16, 112, " Draw torches");
195	+ M_Print (16, 112, " Draw torches");	25	+ M_Print (16, 112, " Draw torches");
196	M_DrawCheckbox (220, 112, r_drawflame.value);	26	M_DrawCheckbox (ALIGN_FPS_OPTIONS, 112, r_drawflame.value);
197		27
198	- M_Print (16, 120, " Fast sky");	28	- M_Print (16, 120, " Fast sky");
199	+ M_Print (16, 120, " Fast sky");	29	+ M_Print (16, 120, " Fast sky");
200	M_DrawCheckbox (220, 120, r_fastsky.value);	30	M_DrawCheckbox (ALIGN_FPS_OPTIONS, 120, r_fastsky.value);
201		31
202	#ifdef GLQUAKE	32	#ifdef GLQUAKE
203	- M_Print (16, 128, " Fast lights");	33	- M_Print (16, 128, " Fast lights");
204	+ M_Print (16, 128, " Fast lights");	34	+ M_Print (16, 128, " Fast lights");
205	M_DrawCheckbox (220, 128, gl_flashblend.value);	35	M_DrawCheckbox (ALIGN_FPS_OPTIONS, 128, gl_flashblend.value);
206	#endif	36	#endif
207		37
208	- M_PrintWhite (16, 136, " Fast mode");	38	- M_PrintWhite (16, 136, " Fast mode");
Lines 212-215 Link Here
212	+ M_PrintWhite (16, 144, " High quality");	42	+ M_PrintWhite (16, 144, " High quality");
213		43
214	// cursor	44	// cursor
215	M_DrawCharacter (200, 32 + fps_cursor8, 12+((int)(curtime4)&1));	45	M_DrawCharacter (196, 32 + fps_cursor * 8, 12 + ((int) (curtime * 4) & 1));

Lines 1-11 Link Here

(-)./files/patch-modules.c (-9 / +11 lines)
1	--- modules.c.orig Wed May 21 17:18:36 2003	1	--- modules.c.orig Wed Feb 4 21:05:56 2004
2	+++ modules.c Wed May 21 17:22:37 2003	2	+++ modules.c Wed Feb 4 21:14:23 2004
3	@@ -22,7 +22,7 @@	3	@@ -31,10 +31,6 @@
4	#include "modules.h"	4	char _temp_modulename[MAX_OSPATH];
5	#include "version.h"	5	static registeredModule_t registeredModules[qlib_nummodules];
6		6
7	-#ifdef __linux	7	-#ifdef __linux
8	+#if defined(__linux__) \|\| defined(__FreeBSD__)	8	-#include <dlfcn.h>
9	#include <dlfcn.h>	9	-#endif
10	#endif	10	-
11		11	#ifdef _WIN32
		12	#define SECURITY_GETFUNC(f) (Security_##f = (Security_##f##_t) GetProcAddress(hSecurity, "Security_" #f))
		13	#else

Lines 1-6 Link Here

(-)./files/patch-mp3_player.c (-22 / +4 lines)
1	--- mp3_player.c.orig Mon Sep 1 18:18:40 2003	1	--- mp3_player.c.orig Wed Feb 4 21:19:26 2004
2	+++ mp3_player.c Mon Sep 1 18:20:09 2003	2	+++ mp3_player.c Wed Feb 4 21:23:46 2004
3	@@ -48,9 +48,10 @@	3	@@ -56,9 +56,10 @@
4		4
5	#ifdef __XMMS__	5	#ifdef __XMMS__
6		6
Lines 8-32 Link Here
8	#include <sys/wait.h>	8	#include <sys/wait.h>
9		9
10	-cvar_t mp3_dir = {"mp3_xmms_dir", "/usr/local/bin"};	10	-cvar_t mp3_dir = {"mp3_xmms_dir", "/usr/local/bin"};
11	+cvar_t mp3_dir = {"mp3_xmms_dir", "/usr/X11R6/bin"};	11	+cvar_t mp3_dir = {"mp3_xmms_dir", "%%X11BASE%%/bin"};
12	cvar_t mp3_xmms_session = {"mp3_xmms_session", "0"};	12	cvar_t mp3_xmms_session = {"mp3_xmms_session", "0"};
13		13
14	#endif	14	#endif
15	@@ -288,7 +289,7 @@
16	#define XMMS_COMMAND(Name, Param) \
17	void MP3_##Name##_f(void) { \
18	if (MP3_IsPlayerRunning()) { \
19	- xmms_remote_##Param##(XMMS_SESSION); \
20	+ xmms_remote_##Param(XMMS_SESSION); \
21	} else { \
22	Com_Printf("%s\n", mp3_notrunning_msg); \
23	} \
24	@@ -769,7 +770,7 @@
25
26	#endif
27
28	-#ifdef __linux__
29	+#if defined(__linux__) \|\| defined(__FreeBSD__)
30
31	#ifdef __XMMS__
32

Lines 10-34 Link Here

(-)./files/patch-vid_glx.c (-22 lines)
10	#include <stdarg.h>	10	#include <stdarg.h>
11	#include <stdio.h>	11	#include <stdio.h>
12	#include <signal.h>	12	#include <signal.h>
13	@@ -284,8 +286,8 @@
14	case MotionNotify:
15	#ifdef WITH_DGA
16	if (dgamouse && _windowed_mouse.value) {
17	- mouse_x = event.xmotion.x_root;
18	- mouse_y = event.xmotion.y_root;
19	+ mouse_x += event.xmotion.x_root;
20	+ mouse_y += event.xmotion.y_root;
21	} else
22	#endif
23	{
24	@@ -601,8 +603,9 @@
25	#ifdef WITH_VMODE
26	// fullscreen
27	if (vidmode_active) {
28	- mask = CWBackPixel \| CWColormap \| CWSaveUnder \| CWBackingStore \| CWEventMask;
29	+ mask = CWBackPixel \| CWColormap \| CWSaveUnder \| CWBackingStore \| CWEventMask \| CWOverrideRedirect;
30	attr.backing_store = NotUseful;
31	+ attr.override_redirect = True;
32	attr.save_under = False;
33	}
34	#endif

Lines 1-5 Link Here

(-)./files/patch-vid_svga.c (-7 / +7 lines)
1	--- vid_svgalib.c.orig Thu May 29 17:56:45 2003	1	--- vid_svgalib.c.orig Thu Feb 5 00:41:00 2004
2	+++ vid_svgalib.c Thu May 29 17:56:28 2003	2	+++ vid_svgalib.c Thu Feb 5 00:51:44 2004
3	@@ -20,12 +20,18 @@	3	@@ -20,12 +20,18 @@
4	#include <termios.h>	4	#include <termios.h>
5	#include <sys/ioctl.h>	5	#include <sys/ioctl.h>
Lines 27-33 Link Here
27	cvar_t m_filter = {"m_filter","0"};	27	cvar_t m_filter = {"m_filter","0"};
28	cvar_t cl_keypad = {"cl_keypad", "1"};	28	cvar_t cl_keypad = {"cl_keypad", "1"};
29		29
30	@@ -330,45 +335,41 @@	30	@@ -307,45 +312,41 @@
31	}	31	}
32		32
33	static byte scantokey_kp[128] = {	33	static byte scantokey_kp[128] = {
Lines 48-54 Link Here
48	- KP_ENTER,K_RCTRL,KP_SLASH,0, K_RALT, K_PAUSE,K_HOME, K_UPARROW,	48	- KP_ENTER,K_RCTRL,KP_SLASH,0, K_RALT, K_PAUSE,K_HOME, K_UPARROW,
49	- K_PGUP, K_LEFTARROW,K_RIGHTARROW,K_END, K_DOWNARROW,K_PGDN,K_INS,K_DEL, // 6	49	- K_PGUP, K_LEFTARROW,K_RIGHTARROW,K_END, K_DOWNARROW,K_PGDN,K_INS,K_DEL, // 6
50	- 0, 0, 0, 0, 0, 0, 0, K_PAUSE,	50	- 0, 0, 0, 0, 0, 0, 0, K_PAUSE,
51	- 0, 0, 0, 0, 0, 0, 0, 0 // 7	51	- 0, 0, 0, 0, 0, K_LWIN, K_RWIN, K_MENU // 7
52	+ 0, K_ESCAPE, '1', '2', '3', '4', '5', '6',	52	+ 0, K_ESCAPE, '1', '2', '3', '4', '5', '6',
53	+ '7', '8', '9', '0', '-', '=', K_BACKSPACE, 9,	53	+ '7', '8', '9', '0', '-', '=', K_BACKSPACE, 9,
54	+ 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i',	54	+ 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i',
Lines 62-68 Link Here
62	+ KP_DOWNARROW, KP_PGDN, KP_INS, KP_DEL, 0, 0, 0, K_F11,	62	+ KP_DOWNARROW, KP_PGDN, KP_INS, KP_DEL, 0, 0, 0, K_F11,
63	+ K_F12, KP_ENTER, K_RCTRL, KP_SLASH, K_PRINTSCR, K_RALT, K_HOME, K_UPARROW,	63	+ K_F12, KP_ENTER, K_RCTRL, KP_SLASH, K_PRINTSCR, K_RALT, K_HOME, K_UPARROW,
64	+ K_PGUP, K_LEFTARROW, K_RIGHTARROW, K_END, K_DOWNARROW, K_PGDN, K_INS, K_DEL,	64	+ K_PGUP, K_LEFTARROW, K_RIGHTARROW, K_END, K_DOWNARROW, K_PGDN, K_INS, K_DEL,
65	+ K_PAUSE, K_LWINDOW, K_RWINDOW, K_POPUPMENU, 0, 0, 0, 0,	65	+ K_PAUSE, K_LWIN, K_RWIN, K_MENU, 0, 0, 0, 0,
66	+ 0, 0, 0, 0, 0, 0, 0, 0,	66	+ 0, 0, 0, 0, 0, 0, 0, 0,
67	+ 0, 0, 0, 0, 0, 0, 0, 0	67	+ 0, 0, 0, 0, 0, 0, 0, 0
68	};	68	};
Lines 85-91 Link Here
85	- K_ENTER,K_RCTRL,'/', 0, K_RALT, K_PAUSE,K_HOME, K_UPARROW,	85	- K_ENTER,K_RCTRL,'/', 0, K_RALT, K_PAUSE,K_HOME, K_UPARROW,
86	- K_PGUP, K_LEFTARROW,K_RIGHTARROW,K_END, K_DOWNARROW,K_PGDN,K_INS,K_DEL, // 6	86	- K_PGUP, K_LEFTARROW,K_RIGHTARROW,K_END, K_DOWNARROW,K_PGDN,K_INS,K_DEL, // 6
87	- 0, 0, 0, 0, 0, 0, 0, K_PAUSE,	87	- 0, 0, 0, 0, 0, 0, 0, K_PAUSE,
88	- 0, 0, 0, 0, 0, 0, 0, 0 // 7	88	- 0, 0, 0, 0, 0, K_LWIN, K_RWIN, K_MENU // 7
89	+ 0, K_ESCAPE, '1', '2', '3', '4', '5', '6',	89	+ 0, K_ESCAPE, '1', '2', '3', '4', '5', '6',
90	+ '7', '8', '9', '0', '-', '=', K_BACKSPACE, 9,	90	+ '7', '8', '9', '0', '-', '=', K_BACKSPACE, 9,
91	+ 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i',	91	+ 'q', 'w', 'e', 'r', 't', 'y', 'u', 'i',
Lines 99-105 Link Here
99	+ K_DOWNARROW, K_PGDN, K_INS, K_DEL, 0, 0, 0, K_F11,	99	+ K_DOWNARROW, K_PGDN, K_INS, K_DEL, 0, 0, 0, K_F11,
100	+ K_F12, K_ENTER, K_RCTRL, '/', K_PRINTSCR, K_RALT, K_HOME, K_UPARROW,	100	+ K_F12, K_ENTER, K_RCTRL, '/', K_PRINTSCR, K_RALT, K_HOME, K_UPARROW,
101	+ K_PGUP, K_LEFTARROW, K_RIGHTARROW, K_END, K_DOWNARROW, K_PGDN, K_INS, K_DEL,	101	+ K_PGUP, K_LEFTARROW, K_RIGHTARROW, K_END, K_DOWNARROW, K_PGDN, K_INS, K_DEL,
102	+ K_PAUSE, K_LWINDOW, K_RWINDOW, K_POPUPMENU, 0, 0, 0, 0,	102	+ K_PAUSE, K_LWIN, K_RWIN, K_MENU, 0, 0, 0, 0,
103	+ 0, 0, 0, 0, 0, 0, 0, 0,	103	+ 0, 0, 0, 0, 0, 0, 0, 0,
104	+ 0, 0, 0, 0, 0, 0, 0, 0	104	+ 0, 0, 0, 0, 0, 0, 0, 0
105	};	105	};

Lines 1-23 Link Here

(-)./pkg-plist (-2 / +4 lines)
1	%%X11%%bin/fuhquake-x11	1	%%X11%%bin/fuhquake-x11
2	%%GLX%%bin/fuhquake-glx	2	%%GLX%%bin/fuhquake-glx
3	%%SVGA%%bin/fuhquake-svga	3	%%SVGA%%bin/fuhquake-svga
		4	%%PORTDOCS%%%%DOCSDIR%%/FAQ-v0.30-b585.txt
		5	%%PORTDOCS%%%%DOCSDIR%%/FuhQuake-v0.31-FAQ.txt
4	%%PORTDOCS%%%%DOCSDIR%%/benchmark.txt	6	%%PORTDOCS%%%%DOCSDIR%%/benchmark.txt
5	%%PORTDOCS%%%%DOCSDIR%%/config_manager.txt	7	%%PORTDOCS%%%%DOCSDIR%%/config_manager.txt
6	%%PORTDOCS%%%%DOCSDIR%%/crosshairs.txt	8	%%PORTDOCS%%%%DOCSDIR%%/crosshairs.txt
7	%%PORTDOCS%%%%DOCSDIR%%/fuhquake.txt	9	%%PORTDOCS%%%%DOCSDIR%%/fuhquake.txt
8	%%PORTDOCS%%%%DOCSDIR%%/linux.txt	10	%%PORTDOCS%%%%DOCSDIR%%/linux.txt
9	%%PORTDOCS%%%%DOCSDIR%%/logitech.txt	11	%%PORTDOCS%%%%DOCSDIR%%/logitech.txt
		12	%%PORTDOCS%%%%DOCSDIR%%/match_tools.txt
10	%%PORTDOCS%%%%DOCSDIR%%/mp3.txt	13	%%PORTDOCS%%%%DOCSDIR%%/mp3.txt
11	%%PORTDOCS%%%%DOCSDIR%%/particles.txt	14	%%PORTDOCS%%%%DOCSDIR%%/particles.txt
12	%%PORTDOCS%%%%DOCSDIR%%/pointing.txt	15	%%PORTDOCS%%%%DOCSDIR%%/pointing.txt
13	%%PORTDOCS%%%%DOCSDIR%%/rulesets.txt	16	%%PORTDOCS%%%%DOCSDIR%%/rulesets.txt
14	%%PORTDOCS%%%%DOCSDIR%%/track.txt	17	%%PORTDOCS%%%%DOCSDIR%%/track.txt
15	%%PORTDOCS%%@dirrm %%DOCSDIR%%	18	%%PORTDOCS%%@dirrm %%DOCSDIR%%
16	share/fuhquake/fuhquake/pak0.pak
17	%%SHAREWARE%%share/fuhquake/id1/pak0.pak	19	%%SHAREWARE%%share/fuhquake/id1/pak0.pak
		20	share/fuhquake/qw/fragfile.dat
18	share/fuhquake/qw/qwprogs.dat	21	share/fuhquake/qw/qwprogs.dat
19	share/fuhquake/qw/spprogs.dat	22	share/fuhquake/qw/spprogs.dat
20	@dirrm share/fuhquake/qw	23	@dirrm share/fuhquake/qw
21	%%SHAREWARE%%@dirrm share/fuhquake/id1	24	%%SHAREWARE%%@dirrm share/fuhquake/id1
22	@dirrm share/fuhquake/fuhquake
23	@dirrm share/fuhquake	25	@dirrm share/fuhquake