Date: Wed, 22 Feb 2006 20:41:00 -0300 From: "Alejandro Pulver" <alejandro@varnet.biz> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/93731: [MAINTAINER UPDATE] games/quake2forge: fix mouse problems Message-ID: <1140651660.4024@phobos.mars.bsd> Resent-Message-ID: <200602222350.k1MNo6iw057651@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 93731
>Category: ports
>Synopsis: [MAINTAINER UPDATE] games/quake2forge: fix mouse problems
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Feb 22 23:50:06 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Alejandro Pulver
>Release: FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:
System: FreeBSD 5.4-RELEASE #0: Sat May 21 12:14:47 ART 2005
root@ale.varnet.bsd:/usr/src/sys/i386/compile/ATHLON-ALE
>Description:
* Remove USE_REINPLACE.
* Install binary as "quake2forge".
* Add patch to fix and error by an OpenGL macro redefinition.
* Add patch to fix mouse problems when not using DGA.
* Change pkg-message.
Note: this PR includes the respective change from ports/93546, and also needs the other parts of it to be committed to work.
>How-To-Repeat:
>Fix:
--- quake2forge.diff begins here ---
diff -urNd /usr/ports/games/quake2forge/Makefile quake2forge/Makefile
--- /usr/ports/games/quake2forge/Makefile Thu Dec 22 14:27:08 2005
+++ quake2forge/Makefile Wed Feb 22 20:35:01 2006
@@ -9,8 +9,7 @@
PORTVERSION= 0.3
CATEGORIES= games
MASTER_SITES= http://www.galgenberg.net/distfiles/:qf \
- ftp://ftp.idsoftware.com/idstuff/quake2/source/:id \
- ftp://ftp.fasta.fh-dortmund.de/mirror/idstuff/quake2/source/:id
+ ${MASTER_SITE_IDSOFTWARE:S|$|quake2/source/:id|}
DISTNAME= quake2-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:qf
DIST_SUBDIR= ${PORTNAME}
@@ -19,12 +18,11 @@
MAINTAINER= alejandro@varnet.biz
COMMENT= First Person Shooter with many addons available
-USE_BZIP2= yes
USE_AUTOTOOLS= autoconf:259 libtool:15
-USE_REINPLACE= yes
+USE_BZIP2= yes
WANT_SDL= yes
-CONFIGURE_ARGS= --program-transform-name='s/^quake2$$/q2f/'
+CONFIGURE_ARGS= --program-transform-name='s/^quake2$$/${PORTNAME}/'
CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
OPTIONS= AO "Enable libao support" off \
diff -urNd /usr/ports/games/quake2forge/files/patch-src__gl_fxmesa.c quake2forge/files/patch-src__gl_fxmesa.c
--- /usr/ports/games/quake2forge/files/patch-src__gl_fxmesa.c Wed Dec 31 21:00:00 1969
+++ quake2forge/files/patch-src__gl_fxmesa.c Wed Feb 22 20:31:55 2006
@@ -0,0 +1,11 @@
+--- src/gl_fxmesa.c.orig Sat Jul 20 01:30:46 2002
++++ src/gl_fxmesa.c Wed Feb 22 20:24:51 2006
+@@ -72,8 +72,6 @@
+ extern cvar_t *vid_fullscreen;
+ extern cvar_t *vid_ref;
+
+-#define GLAPI extern
+-#define GLAPIENTRY
+
+ #define FXMESA_NONE 0 // to terminate attribList
+ #define FXMESA_DOUBLEBUFFER 10
diff -urNd /usr/ports/games/quake2forge/files/patch-src__gl_glx.c quake2forge/files/patch-src__gl_glx.c
--- /usr/ports/games/quake2forge/files/patch-src__gl_glx.c Wed Dec 31 21:00:00 1969
+++ quake2forge/files/patch-src__gl_glx.c Wed Feb 22 20:31:30 2006
@@ -0,0 +1,11 @@
+--- src/gl_glx.c.orig Sun Mar 14 23:25:43 2004
++++ src/gl_glx.c Wed Feb 22 20:20:51 2006
+@@ -797,8 +797,6 @@
+ {
+ mx += ((int)event.xmotion.x - mwx) * 2;
+ my += ((int)event.xmotion.y - mwy) * 2;
+- mwx = event.xmotion.x;
+- mwy = event.xmotion.y;
+
+ if (mx || my)
+ dowarp = true;
diff -urNd /usr/ports/games/quake2forge/pkg-message quake2forge/pkg-message
--- /usr/ports/games/quake2forge/pkg-message Tue Nov 22 02:15:42 2005
+++ quake2forge/pkg-message Wed Feb 22 20:30:45 2006
@@ -1,9 +1,15 @@
-============================================================
+==============================================================================
-If you experience problems with mouse movements when running
-in GLX-Mode, try setting in_dgamouse to 1.
+Quake2Forge has been installed.
-ATTENTION: The Quake2Forge binary now gets installed as q2f
-instead of quake2 to avoid conflicting with games/quake2lnx
+The Quake2Forge binary now gets installed as "quake2forge" instead of "quake2"
+to avoid conflicting with "games/quake2lnx".
-============================================================
+If you experience problems with mouse movements when running in GLX-Mode, try
+setting in_dgamouse to 1 (this is actually for people that use the DGA X11
+extension).
+
+You can not change the gamma in SDL-Mode, but you can use "xgamma" to adjust
+the gamma before and after running Quake2Forge.
+
+==============================================================================
diff -urNd /usr/ports/games/quake2forge/pkg-plist quake2forge/pkg-plist
--- /usr/ports/games/quake2forge/pkg-plist Tue Nov 22 02:15:42 2005
+++ quake2forge/pkg-plist Wed Feb 22 20:12:57 2006
@@ -1,4 +1,4 @@
-bin/q2f
+bin/quake2forge
lib/quake2forge/baseq2/game.so
lib/quake2forge/ctf/game.so
%%ROGUE%%lib/quake2forge/rogue/game.so
--- quake2forge.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1140651660.4024>