- Remove pkg-message (in the latest version the workaround is not needed).

- Use "/dev/dsp" as the default sound device instead of the invalid "default".
- Bump PORTREVISION.

4 files changed, 12 insertions, 22 deletions

diff --git a/games/ezquake/Makefile b/games/ezquake/Makefile
index 3137164759cd..be379e4ed204 100644
--- a/games/ezquake/Makefile
+++ b/games/ezquake/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ezquake
 PORTVERSION=	1754
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_source_${PORTVERSION}
@@ -82,9 +83,7 @@ post-patch:
 
 do-install:
 	${MKDIR} ${Q1DIR}/${PORTNAME}
-.for f in cfg help keymaps manual pak0.pak sb textures ../qw/*
-	${CP} -R ${WRKSRC}/ezquake/${f} ${Q1DIR}/${PORTNAME}
-.endfor
+	${CP} -R ${WRKSRC}/ezquake/* ${WRKSRC}/qw/* ${Q1DIR}/${PORTNAME}
 .if !defined(WITHOUT_GLX)
 	${INSTALL_PROGRAM} ${WRKSRC}/release/ezquake-gl.glx \
 		${PREFIX}/bin/ezquake-glx
@@ -94,9 +93,4 @@ do-install:
 		${PREFIX}/bin/ezquake-x11
 .endif
 
-post-install:
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
-
 .include <bsd.port.post.mk>
diff --git a/games/ezquake/files/patch-snd_dma.c b/games/ezquake/files/patch-snd_dma.c
index d746ea7aff50..dac408ff9ef6 100644
--- a/games/ezquake/files/patch-snd_dma.c
+++ b/games/ezquake/files/patch-snd_dma.c
@@ -1,6 +1,6 @@
---- snd_dma.c.orig	Thu Oct 19 16:52:41 2006
-+++ snd_dma.c	Tue Dec 19 20:53:19 2006
-@@ -90,7 +90,7 @@
+--- snd_dma.c.orig	Fri Dec 22 02:00:07 2006
++++ snd_dma.c	Fri Dec 22 02:00:22 2006
+@@ -90,11 +90,11 @@
  cvar_t s_swapstereo = {"s_swapstereo", "0", CVAR_ARCHIVE};
  
  cvar_t s_khz = {"s_khz", "11", CVAR_ARCHIVE};
@@ -9,6 +9,11 @@
  cvar_t s_noalsa = {"s_noalsa", "0"};
  // ALSA only -->
  cvar_t s_stereo = {"s_stereo", "1"};
+-cvar_t s_device = {"s_device", "default"};
++cvar_t s_device = {"s_device", "/dev/dsp"};
+ cvar_t s_bits = {"s_bits", "16"};
+ // <-- ALSA only
+ #endif
 @@ -185,7 +185,7 @@
  	Cvar_Register(&s_show);
  	Cvar_Register(&s_mixahead);
diff --git a/games/ezquake/files/patch-snd_oss.c b/games/ezquake/files/patch-snd_oss.c
index c3c468b6ef35..010e9a99d32f 100644
--- a/games/ezquake/files/patch-snd_oss.c
+++ b/games/ezquake/files/patch-snd_oss.c
@@ -1,5 +1,5 @@
---- snd_oss.c.orig	Wed Nov 15 16:21:49 2006
-+++ snd_oss.c	Tue Dec 19 19:26:57 2006
+--- snd_oss.c.orig	Fri Dec 22 01:11:27 2006
++++ snd_oss.c	Fri Dec 22 01:14:20 2006
 @@ -27,7 +27,11 @@
  #include <sys/mman.h>
  #include <sys/shm.h>
diff --git a/games/ezquake/pkg-message b/games/ezquake/pkg-message
deleted file mode 100644
index c29e130b8b22..000000000000
--- a/games/ezquake/pkg-message
+++ /dev/null
@@ -1,9 +0,0 @@
-==============================================================================
-
-ezQuake has been installed.
-
-If you have mouse problems you can try running it with the "-nomdga"
-parameter (this will make the mouse work fine when the DGA X11 extension is
-disabled).
-
-==============================================================================