diff options
| author | salo <salo@pkgsrc.org> | 2003-04-18 08:07:51 +0000 |
|---|---|---|
| committer | salo <salo@pkgsrc.org> | 2003-04-18 08:07:51 +0000 |
| commit | d39f30c231ee71a0bda2f5eb5daa622a1239d8a6 (patch) | |
| tree | 01b9d0883a65d5871163459a38de626847c34bcf /games | |
| parent | a91bf70d99879c4dc98ab6ab1da2433b099f4b44 (diff) | |
| download | pkgsrc-d39f30c231ee71a0bda2f5eb5daa622a1239d8a6.tar.gz | |
Better patch, add CFLAGS to generated Makefile, add space between content of CFLAGS and `sdl-config --cflags`.
Diffstat (limited to 'games')
| -rw-r--r-- | games/frozen-bubble/patches/patch-aa | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/games/frozen-bubble/patches/patch-aa b/games/frozen-bubble/patches/patch-aa index 1b7d25046e9..0172f88511d 100644 --- a/games/frozen-bubble/patches/patch-aa +++ b/games/frozen-bubble/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.3 2003/04/16 22:04:32 salo Exp $ +$NetBSD: patch-aa,v 1.4 2003/04/18 08:07:51 salo Exp $ --- c_stuff/Makefile.PL.orig 2002-04-18 11:44:20.000000000 +0200 -+++ c_stuff/Makefile.PL 2003-04-16 23:27:54.000000000 +0200 ++++ c_stuff/Makefile.PL 2003-04-18 09:57:58.000000000 +0200 @@ -34,7 +34,7 @@ ccompile('#include <SDL/SDL.h> #include <SDL/SDL_mixer.h>', '', - `sdl-config --cflags`, -+ chomp_($ENV{CFLAGS} . `sdl-config --cflags`), ++ chomp_($ENV{CFLAGS} . ' ' . `sdl-config --cflags`), chomp_(`sdl-config --libs`) . ' -lSDL_mixer') or die_ 'SDL_mixer is needed (and, by the way, version >= 1.2.2 will be needed)'; @@ -16,7 +16,15 @@ $NetBSD: patch-aa,v 1.3 2003/04/16 22:04:32 salo Exp $ #include <SDL/SDL_mixer.h>', 'Mix_FadeInMusicPos(NULL, 0, 0, 0);', - `sdl-config --cflags`, -+ chomp_($ENV{CFLAGS} . `sdl-config --cflags`), ++ chomp_($ENV{CFLAGS} . ' ' . `sdl-config --cflags`), chomp_(`sdl-config --libs`) . ' -lSDL_mixer') or die_ 'SDL_mixer >= 1.2.2 is needed (function Mix_FadeInMusicPos is missing)'; +@@ -55,6 +55,6 @@ + 'VERSION_FROM' => 'fb_c_stuff.pm', # finds VERSION + 'OBJECT' => 'fb_c_stuff.o', + 'INC' => chomp_(`sdl-config --cflags`) . ' -I.', +- 'OPTIMIZE' => '-O2 -Wall', ++ 'OPTIMIZE' => chomp_($ENV{CFLAGS} . ' -O2 -Wall'), + 'MAKEFILE' => 'Makefile_c', + ); |