5 files changed, 12 insertions, 50 deletions

diff --git a/games/quake2lnx/Makefile b/games/quake2lnx/Makefile
index 42da4da8446f..7c0879943906 100644
--- a/games/quake2lnx/Makefile
+++ b/games/quake2lnx/Makefile
@@ -166,8 +166,6 @@ PLIST_SUB+=	CTF="@comment "
 
 .if defined(WITH_ROGUE)
 DISTFILES+=	roguesrc320.shar.Z:id
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_rogue_g__local.h \
-		${FILESDIR}/extra-patch-src_rogue_q__shared.c
 MAKE_ARGS+=	BUILD_ROGUE=YES
 Q2MP+=		rogue
 ROGUE_OFF=	454
@@ -178,7 +176,6 @@ PLIST_SUB+=	ROGUE="@comment "
 
 .if defined(WITH_XATRIX)
 DISTFILES+=	xatrixsrc320.shar.Z:id
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src_xatrix_q__shared.c
 MAKE_ARGS+=	BUILD_XATRIX=YES
 Q2MP+=		xatrix
 XATRIX_OFF=	441
@@ -230,13 +227,17 @@ MAKE_ARGS+=	NO_X86_ASM=YES
 ## END OF CONFIGURATION KNOBS ##
 #                            ###
 
-post-extract:
+post-extract: .SILENT
 .for mp in ${Q2MP}
-	@${MKDIR} ${WRKSRC}/src/${mp}
-	@(cd ${WRKSRC}/src/${mp} && ${GUNZIP_CMD} -c \
+	${MKDIR} ${WRKSRC}/src/${mp}
+	cd ${WRKSRC}/src/${mp} && ${GUNZIP_CMD} -c \
 		${DISTDIR}/${DIST_SUBDIR}/${mp}src320.shar.Z > \
 		${mp}src320.shar && \
-		${TAIL} +${${mp:U}_OFF} ${mp}src320.shar | ${SH})
+		${TAIL} +${${mp:U}_OFF} ${mp}src320.shar | ${SH} > /dev/null
+.   if defined(WITH_XATRIX) || defined(WITH_ROGUE)
+	${REINPLACE_CMD} -e 's/__ $$/&|| defined __FreeBSD__/' \
+		${WRKSRC}/src/${mp}/q_shared.c
+.   endif
 .endfor
 
 post-patch: .SILENT
@@ -245,6 +246,10 @@ post-patch: .SILENT
 		${WRKSRC}/src/linux/vid_so.c
 	${REINPLACE_CMD} -e 's|dllname, RTLD_LAZY|& \| RTLD_GLOBAL|' \
 		${WRKSRC}/src/linux/qgl_linux.c
+.if defined(WITH_ROGUE)
+	${REINPLACE_CMD} -e '/^#include <nan.h>/d' ${WRKSRC}/src/rogue/g_local.h
+.endif
+	${REINPLACE_CMD} -e 's|/dev/js|/dev/joy|' ${WRKSRC}/src/linux/joystick.c
 
 do-install:
 .for tgt in ${EXE_TARGETS}
diff --git a/games/quake2lnx/files/extra-patch-src_rogue_g__local.h b/games/quake2lnx/files/extra-patch-src_rogue_g__local.h
deleted file mode 100644
index 6b43c988effc..000000000000
--- a/games/quake2lnx/files/extra-patch-src_rogue_g__local.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/rogue/g_local.h.orig	Mon Nov 30 17:53:20 1998
-+++ src/rogue/g_local.h	Tue Sep 27 20:20:27 2005
-@@ -22,7 +22,6 @@
- //==================================================================
- 
- #ifndef _WIN32
--#include <nan.h>
- #define min(a,b) ((a) < (b) ? (a) : (b))
- #define max(a,b) ((a) > (b) ? (a) : (b))
- #ifdef __sun__
diff --git a/games/quake2lnx/files/extra-patch-src_rogue_q__shared.c b/games/quake2lnx/files/extra-patch-src_rogue_q__shared.c
deleted file mode 100644
index 25ffc42c24b4..000000000000
--- a/games/quake2lnx/files/extra-patch-src_rogue_q__shared.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/rogue/q_shared.c.orig	Mon Nov 30 17:53:34 1998
-+++ src/rogue/q_shared.c	Tue Sep 27 20:03:24 2005
-@@ -329,7 +329,7 @@
- Returns 1, 2, or 1 + 2
- ==================
- */
--#if !id386 || defined __linux__ 
-+#if !id386 || defined __linux__ || defined __FreeBSD__
- int BoxOnPlaneSide (vec3_t emins, vec3_t emaxs, struct cplane_s *p)
- {
- 	float	dist1, dist2;
diff --git a/games/quake2lnx/files/extra-patch-src_xatrix_q__shared.c b/games/quake2lnx/files/extra-patch-src_xatrix_q__shared.c
deleted file mode 100644
index 917934b400b9..000000000000
--- a/games/quake2lnx/files/extra-patch-src_xatrix_q__shared.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/xatrix/q_shared.c.orig	Mon Nov 30 17:55:36 1998
-+++ src/xatrix/q_shared.c	Tue Sep 27 20:04:53 2005
-@@ -326,7 +326,7 @@
- Returns 1, 2, or 1 + 2
- ==================
- */
--#if !id386 || defined __linux__ 
-+#if !id386 || defined __linux__ || defined __FreeBSD__
- int BoxOnPlaneSide (vec3_t emins, vec3_t emaxs, struct cplane_s *p)
- {
- 	float	dist1, dist2;
diff --git a/games/quake2lnx/files/patch-src_linux_joystick.c b/games/quake2lnx/files/patch-src_linux_joystick.c
deleted file mode 100644
index f06b903a5aef..000000000000
--- a/games/quake2lnx/files/patch-src_linux_joystick.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/linux/joystick.c.orig	Thu Jan 27 19:35:20 2005
-+++ src/linux/joystick.c	Tue Sep 27 20:21:45 2005
-@@ -75,7 +75,7 @@
-   in_joystick = ri.Cvar_Get ("in_joystick", "1", CVAR_ARCHIVE);
-   if (in_joystick->value) {
-     joy_name = ri.Cvar_Get ("joy_name", "joystick", 0);
--    joy_dev = ri.Cvar_Get ("joy_dev","/dev/js*",CVAR_ARCHIVE);
-+    joy_dev = ri.Cvar_Get ("joy_dev","/dev/joy*",CVAR_ARCHIVE);
-     joy_advanced = ri.Cvar_Get ("joy_advanced","0",0);
-     joy_advaxisx = ri.Cvar_Get ("joy_advaxisx","4",0);
-     joy_advaxisy = ri.Cvar_Get ("joy_advaxisy","2",0);