diff options
| author | sobomax <sobomax@FreeBSD.org> | 2001-01-24 01:40:51 +0800 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2001-01-24 01:40:51 +0800 |
| commit | e94f492aad29492818592ec694feef44cfcf4745 (patch) | |
| tree | 7f3dbab8fafb99520942af1db0b1cc68e0d21701 /games | |
| parent | 0b25e183026f1557e44ac0d26e455b1ba3060e38 (diff) | |
| download | freebsd-ports-gnome-e94f492aad29492818592ec694feef44cfcf4745.tar.gz freebsd-ports-gnome-e94f492aad29492818592ec694feef44cfcf4745.tar.zst freebsd-ports-gnome-e94f492aad29492818592ec694feef44cfcf4745.zip | |
Honour SDL_CONFIG make var to be in line with another SDL ports.
Diffstat (limited to 'games')
| -rw-r--r-- | games/amphetamine/Makefile | 3 | ||||
| -rw-r--r-- | games/amphetamine/files/patch-aa | 11 | ||||
| -rw-r--r-- | games/amphetamine/files/patch-src_SoundList.hpp | 24 | ||||
| -rw-r--r-- | games/amphetamine/files/patch-src_System.hpp | 14 |
4 files changed, 48 insertions, 4 deletions
diff --git a/games/amphetamine/Makefile b/games/amphetamine/Makefile index 97fe158c372f..273e42a2327c 100644 --- a/games/amphetamine/Makefile +++ b/games/amphetamine/Makefile @@ -18,10 +18,13 @@ LIB_DEPENDS= SDL-1.0.2:${PORTSDIR}/devel/sdl DATAVERSION= 0.8.6 +SDL_CONFIG?= ${LOCALBASE}/bin/sdl-config + USE_X_PREFIX= yes USE_XPM= yes USE_BZIP2= yes USE_GMAKE= yes +MAKE_ENV= SDL_CONFIG="${SDL_CONFIG}" post-install: @(cd ${WRKDIR}/amph && ${TAR} -c -f - * ) \ diff --git a/games/amphetamine/files/patch-aa b/games/amphetamine/files/patch-aa index 2cf9ddfc2c0b..036909d4b3f7 100644 --- a/games/amphetamine/files/patch-aa +++ b/games/amphetamine/files/patch-aa @@ -1,5 +1,8 @@ + +$FreeBSD$ + --- Makefile.orig Sun Feb 27 15:45:57 2000 -+++ Makefile Mon Jun 5 14:43:04 2000 ++++ Makefile Mon Jan 22 23:14:32 2001 @@ -5,14 +5,14 @@ # User settings #=============== @@ -14,7 +17,7 @@ USE_LIB_XPM := TRUE -SDL_HEADERS := `sdl-config --cflags` -+SDL_HEADERS := `${LOCALBASE}/bin/sdl-config --cflags` ++SDL_HEADERS := `$(SDL_CONFIG) --cflags` # For framerate dislpay (doesn't work yet) USE_LIB_SGE := FLASE @@ -47,7 +50,7 @@ # linker -LOADLIBES := -lm `sdl-config --libs` -+LOADLIBES := -lm `${LOCALBASE}/bin/sdl-config --libs` ++LOADLIBES := -lm `$(SDL_CONFIG) --libs` ifeq ($(USE_LIB_XPM),TRUE) LOADLIBES := $(LOADLIBES) -lXpm -lXt @@ -56,7 +59,7 @@ endif -LDFLAGS = -L/usr/lib -L/usr/local/lib -L/usr/X11R6/lib -+LDFLAGS = -L${X11BASE}/lib ++LDFLAGS = -L$(X11BASE)/lib .PHONY : default default : amph diff --git a/games/amphetamine/files/patch-src_SoundList.hpp b/games/amphetamine/files/patch-src_SoundList.hpp new file mode 100644 index 000000000000..6bbafc7a0773 --- /dev/null +++ b/games/amphetamine/files/patch-src_SoundList.hpp @@ -0,0 +1,24 @@ + +$FreeBSD$ + +--- src/SoundList.hpp 2001/01/22 21:09:51 1.1 ++++ src/SoundList.hpp 2001/01/22 21:10:20 +@@ -6,9 +6,9 @@ + #define _AMPH_SOUND_LIST_
+
+ extern "C" {
+-#include <SDL/SDL.h>
+-#include <SDL/SDL_audio.h>
+-#include <SDL/SDL_types.h>
++#include <SDL.h>
++#include <SDL_audio.h>
++#include <SDL_types.h>
+ }
+
+ class CSound;
+@@ -55,4 +55,4 @@ + SoundState *first, *prev, *current;
+ };
+
+-#endif ++#endif diff --git a/games/amphetamine/files/patch-src_System.hpp b/games/amphetamine/files/patch-src_System.hpp new file mode 100644 index 000000000000..7afa10225646 --- /dev/null +++ b/games/amphetamine/files/patch-src_System.hpp @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- src/System.hpp 2001/01/22 21:09:51 1.1 ++++ src/System.hpp 2001/01/22 21:10:27 +@@ -9,7 +9,7 @@ + #include "AmpHead.hpp" + + extern "C" { +-#include <SDL/SDL.h> ++#include <SDL.h> + } + + #ifndef INSTALL_DIR |