Attachment #34536 for bug #56085

Lines 7-12 Link Here

(-)fuhquake/Makefile (-6 / +29 lines)
7		7
8	PORTNAME= fuhquake	8	PORTNAME= fuhquake
9	PORTVERSION= 0.28	9	PORTVERSION= 0.28
		10	PORTREVISION= 1
10	CATEGORIES= games	11	CATEGORIES= games
11	MASTER_SITES= http://www.fuhquake.net/files/source/:src \	12	MASTER_SITES= http://www.fuhquake.net/files/source/:src \
12	http://www.fuhquake.net/files/releases/:dat \	13	http://www.fuhquake.net/files/releases/:dat \
Lines 14-20 Link Here
14	DISTNAME= ${PORTNAME}-source-v${PORTVERSION}	15	DISTNAME= ${PORTNAME}-source-v${PORTVERSION}
15	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src \	16	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:src \
16	${PORTNAME}-linux-v${PORTVERSION}${EXTRACT_SUFX}:dat \	17	${PORTNAME}-linux-v${PORTVERSION}${EXTRACT_SUFX}:dat \
17	pak0.pak${EXTRACT_SUFX}:pak	18	pak0.pak:pak
		19	.if defined(WITH_SHAREWARE_DATA)
		20	DISTFILES+= q1-shareware-pak0.pak:pak
		21	PLIST_SUB+= SHAREWARE=""
		22	.else
		23	PLIST_SUB+= SHAREWARE="@comment "
		24	.endif
		25
		26	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} \
		27	${PORTNAME}-linux-v${PORTVERSION}${EXTRACT_SUFX}
18		28
19	MAINTAINER= danfe@regency.nsu.ru	29	MAINTAINER= danfe@regency.nsu.ru
20	COMMENT= An excellent QuakeWorld client	30	COMMENT= An excellent QuakeWorld client
Lines 72-77 Link Here
72	.if !defined(WITHOUT_GLX)	82	.if !defined(WITHOUT_GLX)
73	@${ECHO_MSG} "Define WITHOUT_GLX to disable building of GLX client"	83	@${ECHO_MSG} "Define WITHOUT_GLX to disable building of GLX client"
74	.endif	84	.endif
		85	.if defined(WITH_SHAREWARE_DATA)
		86	@${ECHO_MSG} "Define WITH_SHAREWARE_DATA to install demo version game data"
		87	.endif
		88	.if !defined(WITHOUT_XMMS) && exists(${X11BASE}/lib/libxmms.so.3)
		89	@${ECHO_MSG} "Define WITHOUT_XMMS to build without \`\`MP3 Player'' feature"
		90	.endif
75	.if !defined(WITH_OPTIMIZED_CFLAGS)	91	.if !defined(WITH_OPTIMIZED_CFLAGS)
76	@${ECHO_MSG} "Define WITH_OPTIMIZED_CFLAGS to enable extra optimization options"	92	@${ECHO_MSG} "Define WITH_OPTIMIZED_CFLAGS to enable extra optimization options"
77	.endif	93	.endif
Lines 80-93 Link Here
80	.endif	96	.endif
81		97
82	MAKEFILE= ${FILESDIR}/Makefile	98	MAKEFILE= ${FILESDIR}/Makefile
		99	USE_REINPLACE= yes
83	USE_ZIP= yes	100	USE_ZIP= yes
84	EXTRACT_BEFORE_ARGS+= -qo
85	WRKSRC= ${WRKDIR}/source	101	WRKSRC= ${WRKDIR}/source
86		102
87	post-extract:	103	post-extract:
88	@${FIND} -E ${WRKDIR} -type f -iregex ".*\.(c\|h\|s\|txt)" -exec ${FILESDIR}/fix^m.sh '{}' \;	104	@${FIND} -E ${WRKDIR} -type f -iregex ".*\.(c\|h\|s\|txt)" -exec ${FILESDIR}/fix^m.sh '{}' \;
89	@${CP} ${FILESDIR}/*.c ${WRKSRC}	105	@${CP} ${FILESDIR}/*.c ${WRKSRC}
90		106
		107	post-patch:
		108	@${REINPLACE_CMD} -e 's\|%%%%BASEDIR%%%%\|${DATADIR}\|' ${WRKSRC}/common.c
		109
91	do-build:	110	do-build:
92	.if !defined(WITHOUT_X11)	111	.if !defined(WITHOUT_X11)
93	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} clean x11)	112	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} clean x11)
Lines 105-115 Link Here
105	.for tgt in ${END_TARGETS}	124	.for tgt in ${END_TARGETS}
106	${INSTALL_PROGRAM} ${WRKSRC}/${tgt} ${PREFIX}/bin	125	${INSTALL_PROGRAM} ${WRKSRC}/${tgt} ${PREFIX}/bin
107	.endfor	126	.endfor
108	@${MKDIR} ${DATADIR}/qw	127	@${MKDIR} ${DATADIR}/qw ${DATADIR}/${PORTNAME}
109	@${MKDIR} ${DATADIR}/${PORTNAME}
110	${INSTALL_DATA} ${WRKDIR}/qw/qwprogs.dat ${DATADIR}/qw	128	${INSTALL_DATA} ${WRKDIR}/qw/qwprogs.dat ${DATADIR}/qw
111	${INSTALL_DATA} ${WRKDIR}/qw/spprogs.dat ${DATADIR}/qw	129	${INSTALL_DATA} ${WRKDIR}/qw/spprogs.dat ${DATADIR}/qw
112	${INSTALL_DATA} ${WRKDIR}/pak0.pak ${DATADIR}/${PORTNAME}	130	${INSTALL_DATA} ${DISTDIR}/pak0.pak ${DATADIR}/${PORTNAME}
		131	.if defined(WITH_SHAREWARE_DATA)
		132	@${MKDIR} ${DATADIR}/id1
		133	${INSTALL_DATA} ${DISTDIR}/q1-shareware-pak0.pak \
		134	${DATADIR}/id1/pak0.pak
		135	.endif
113	.if !defined(NOPORTDOCS)	136	.if !defined(NOPORTDOCS)
114	@${MKDIR} ${DOCSDIR}	137	@${MKDIR} ${DOCSDIR}
115	. for txt in benchmark config_manager crosshairs linux logitech mp3 \	138	. for txt in benchmark config_manager crosshairs linux logitech mp3 \
Lines 120-125 Link Here
120	.endif	143	.endif
121		144
122	post-install:	145	post-install:
123	@${SED} -e 's#$${PREFIX}#${PREFIX}#g' ${PKGMESSAGE}	146	@${SED} -e 's\|$${PREFIX}\|${PREFIX}\|g' ${PKGMESSAGE}
124		147
125	.include <bsd.port.mk>	148	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)fuhquake/distinfo (-1 / +2 lines)
1	MD5 (fuhquake-source-v0.28.zip) = 7e77a97a1e1524b289ffa6978ce5377e	1	MD5 (fuhquake-source-v0.28.zip) = 7e77a97a1e1524b289ffa6978ce5377e
2	MD5 (fuhquake-linux-v0.28.zip) = 72e99f8df1baab11e0492b7cee93fdd3	2	MD5 (fuhquake-linux-v0.28.zip) = 72e99f8df1baab11e0492b7cee93fdd3
3	MD5 (pak0.pak.zip) = eaedb54f2f0fabb1b621afb831185748	3	MD5 (pak0.pak) = 2fa37c49cb1d3902d97cb82a1c96115a
		4	MD5 (q1-shareware-pak0.pak) = 5906e5998fc3d896ddaf5e6a62e03abb




--- vid_glx.c.orig	Thu Aug 28 18:08:22 2003
+++ vid_glx.c	Thu Aug 28 18:08:03 2003
@@ -20,7 +20,9 @@
 #include <termios.h>
 #include <sys/ioctl.h>

 #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

Lines 1-6 Link Here

(-)fuhquake/pkg-message (-1 / +10 lines)
1	================================================	1	================================================
2		2
3	Install models, skins, maps, and mods in	3	Install models, skins, maps, and mods in
4	${PREFIX}/share/fuhquake/	4	${DATADIR}/ directory.
		5
		6	You must also have registered version of
		7	Quake per to be able to legally copy the
		8	PAK files (pak*.pak) from id1/ directory
		9	to ${DATADIR}/id1/ from CDROM or Windows
		10	installation. In case it is not an opt-
		11	ion, you can rebuild the port with "make
		12	-DWITH_SHAREWARE_DATA", and thus install
		13	demo version (shareware) data files.
5		14
6	================================================	15	================================================

Lines 14-21 Link Here

(-)fuhquake/pkg-plist (+2 lines)
14	%%PORTDOCS%%share/doc/fuhquake/track.txt	14	%%PORTDOCS%%share/doc/fuhquake/track.txt
15	%%PORTDOCS%%@dirrm share/doc/fuhquake	15	%%PORTDOCS%%@dirrm share/doc/fuhquake
16	share/fuhquake/fuhquake/pak0.pak	16	share/fuhquake/fuhquake/pak0.pak
		17	%%SHAREWARE%%share/fuhquake/id1/pak0.pak
17	share/fuhquake/qw/qwprogs.dat	18	share/fuhquake/qw/qwprogs.dat
18	share/fuhquake/qw/spprogs.dat	19	share/fuhquake/qw/spprogs.dat
19	@dirrm share/fuhquake/qw	20	@dirrm share/fuhquake/qw
		21	%%SHAREWARE%%@dirrm share/fuhquake/id1
20	@dirrm share/fuhquake/fuhquake	22	@dirrm share/fuhquake/fuhquake
21	@dirrm share/fuhquake	23	@dirrm share/fuhquake

Return to bug 56085

Lines 1-5 Link Here

(-)fuhquake/files/patch-vid_glx.c (-2 / +13 lines)
1	--- vid_glx.c.orig Wed May 21 17:18:37 2003	1	--- vid_glx.c.orig Thu Aug 28 18:08:22 2003
2	+++ vid_glx.c Mon Jun 2 20:04:34 2003	2	+++ vid_glx.c Thu Aug 28 18:08:03 2003
3	@@ -20,7 +20,9 @@	3	@@ -20,7 +20,9 @@
4	#include <termios.h>	4	#include <termios.h>
5	#include <sys/ioctl.h>	5	#include <sys/ioctl.h>
Lines 10-15 Link Here
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	{
13	@@ -601,8 +603,9 @@	24	@@ -601,8 +603,9 @@
14	#ifdef WITH_VMODE	25	#ifdef WITH_VMODE
15	// fullscreen	26	// fullscreen