1. Enable sound.

2. Honour SDL_CONFIG makevar.
3. Bump PORTREVISION due to (1).

3 files changed, 58 insertions, 18 deletions

diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile
index c0aabe38d6fd..1c97a80edcf3 100644
--- a/games/gemdropx/Makefile
+++ b/games/gemdropx/Makefile
@@ -7,17 +7,20 @@
 
 PORTNAME=	gemdropx
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	SDL-1.0.2:${PORTSDIR}/devel/sdl
+LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
+
+SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
-ALL_TARGET=	nosound
-MAKE_ARGS=	JOY=NO DATA_PREFIX=${PREFIX}/share/gemdropx -f
+MAKE_ENV=	JOY=NO \
+		SDL_CONFIG="${SDL_CONFIG}"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gemdropx ${PREFIX}/bin
diff --git a/games/gemdropx/files/patch-aa b/games/gemdropx/files/patch-aa
index 183ed83f1087..cdadfe785f67 100644
--- a/games/gemdropx/files/patch-aa
+++ b/games/gemdropx/files/patch-aa
@@ -1,6 +1,23 @@
---- Makefile.orig	Tue Dec 28 17:33:54 1999
-+++ Makefile	Thu Mar 30 00:18:17 2000
-@@ -22,7 +22,7 @@
+
+$FreeBSD$
+
+--- Makefile.orig	Tue Dec 28 10:33:54 1999
++++ Makefile	Thu Feb  8 18:04:06 2001
+@@ -12,17 +12,17 @@
+ # 100% SDL Version: December 27, 1999
+ 
+ 
+-DATA_PREFIX=data
+-SDL_CFLAGS := $(shell sdl-config --cflags)
+-SDL_LDFLAGS := $(shell sdl-config --libs)
++DATA_PREFIX=$(PREFIX)/share/gemdropx
++SDL_CFLAGS := $(shell $(SDL_CONFIG) --cflags)
++SDL_LDFLAGS := $(shell $(SDL_CONFIG) --libs)
+ 
+ 
+-MIXER=-lmixer
++MIXER=-lSDL_mixer
+ NOSOUNDFLAG=$(SOUND)SOUND
  JOYFLAG=$(JOY)JOYSTICK
  
  
@@ -9,12 +26,3 @@
  	-DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(NOSOUNDFLAG) -D$(JOYFLAG)
  SDL_LIB=$(MIXER) $(SDL_LDFLAGS)
  
-@@ -30,7 +30,7 @@
- all:	gemdropx
- 
- nosound:
--	make MIXER= NOSOUNDFLAG=NOSOUND JOY=$(JOY)
-+	$(MAKE) MIXER= NOSOUNDFLAG=NOSOUND JOY=$(JOY)
- 
- clean:
- 	-rm gemdropx
diff --git a/games/gemdropx/files/patch-ab b/games/gemdropx/files/patch-ab
index 7e58af38b3d0..7f384d2e7cf4 100644
--- a/games/gemdropx/files/patch-ab
+++ b/games/gemdropx/files/patch-ab
@@ -1,6 +1,35 @@
---- gemdropx.c.orig	Tue Dec 28 18:54:17 1999
-+++ gemdropx.c	Thu Mar 30 00:25:25 2000
-@@ -2231,9 +2231,11 @@
+
+$FreeBSD$
+
+--- gemdropx.c.orig	Tue Dec 28 11:54:17 1999
++++ gemdropx.c	Thu Feb  8 18:04:42 2001
+@@ -26,7 +26,7 @@
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <unistd.h>
+-#include <SDL/SDL.h>
++#include <SDL.h>
+ 
+ #ifndef NOJOYSTICK
+ #include <sys/stat.h>
+@@ -36,7 +36,7 @@
+ #endif
+ 
+ #ifndef NOSOUND
+-#include <mixer.h>
++#include <SDL_mixer.h>
+ #endif
+ 
+ #include "data/images/nothing.xbm"
+@@ -281,6 +281,7 @@
+               SDL_GetError());
+       exit(1);
+     }
++  atexit(SDL_Quit);
+   
+   
+   /* Set the size of the window: */
+@@ -2231,9 +2232,11 @@
  		 (JS_VERSION & 0x0000FF));
  #endif