1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

1. Enable sound.

2. Honour SDL_CONFIG makevar.
3. Bump PORTREVISION due to (1).
This commit is contained in:
Maxim Sobolev 2001-02-08 16:21:05 +00:00
parent 806b2d0a38
commit d0c05b67f4
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=38112
3 changed files with 58 additions and 18 deletions

View File

@ -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

View File

@ -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

View File

@ -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