Mon Jun 9 05:57:35 2008 UTC ()
Pass $SDL_LIBS when checking SDL_mixer in configure.  Fixes build on
DragonFly.  Fix from Hasso Tepper in PR pkg/38853.


(snj)
diff -r1.4 -r1.5 pkgsrc/games/crack-attack/distinfo
diff -r1.3 -r1.4 pkgsrc/games/crack-attack/patches/patch-aa
cvs diff -r1.4 -r1.5 pkgsrc/games/crack-attack/distinfo (expand / switch to unified diff)

--- pkgsrc/games/crack-attack/distinfo 2006/10/10 20:05:09 1.4
+++ pkgsrc/games/crack-attack/distinfo 2008/06/09 05:57:35 1.5
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.4 2006/10/10 20:05:09 rillig Exp $ 1$NetBSD: distinfo,v 1.5 2008/06/09 05:57:35 snj Exp $
2 2
3SHA1 (crack-attack-1.1.14.tar.gz) = fbf445f95d77267d23a766a485fd55edbd333bb4 3SHA1 (crack-attack-1.1.14.tar.gz) = fbf445f95d77267d23a766a485fd55edbd333bb4
4RMD160 (crack-attack-1.1.14.tar.gz) = 81ff2e601455362e1106cf5ef4b735cbd4497081 4RMD160 (crack-attack-1.1.14.tar.gz) = 81ff2e601455362e1106cf5ef4b735cbd4497081
5Size (crack-attack-1.1.14.tar.gz) = 975066 bytes 5Size (crack-attack-1.1.14.tar.gz) = 975066 bytes
6SHA1 (patch-aa) = 7d5ad43d9312d417dd28fb8903fc544e6f8b9539 6SHA1 (patch-aa) = 8fdb551045cbeb6789f8bb6c6c3f40bab0668500
cvs diff -r1.3 -r1.4 pkgsrc/games/crack-attack/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/games/crack-attack/patches/patch-aa 2006/10/10 20:05:10 1.3
+++ pkgsrc/games/crack-attack/patches/patch-aa 2008/06/09 05:57:35 1.4
@@ -1,17 +1,26 @@ @@ -1,17 +1,26 @@
1$NetBSD: patch-aa,v 1.3 2006/10/10 20:05:10 rillig Exp $ 1$NetBSD: patch-aa,v 1.4 2008/06/09 05:57:35 snj Exp $
2 2
3--- configure.orig 2006-10-10 22:02:41.000000000 +0200 3--- configure.orig 2005-05-13 22:29:09 +0300
4+++ configure 2006-10-10 22:04:28.000000000 +0200 4+++ configure 2008-06-03 15:42:38 +0300
 5@@ -5088,7 +5088,7 @@ if test "${ac_cv_lib_SDL_mixer_Mix_OpenA
 6 echo $ECHO_N "(cached) $ECHO_C" >&6
 7 else
 8 ac_check_lib_save_LIBS=$LIBS
 9-LIBS="-lSDL_mixer $LIBS"
 10+LIBS="-lSDL_mixer $SDL_LIBS $LIBS"
 11 cat >conftest.$ac_ext <<_ACEOF
 12 /* confdefs.h. */
 13 _ACEOF
5@@ -5248,12 +5248,12 @@ rm -f conftest.err conftest.$ac_objext \ 14@@ -5248,12 +5248,12 @@ rm -f conftest.err conftest.$ac_objext \
6 rm -f conf.sdltest 15 rm -f conf.sdltest
7  16
8  17
9- if test "$enable_sound" == "yes" -a "$found_sound" == "no"; then 18- if test "$enable_sound" == "yes" -a "$found_sound" == "no"; then
10+ if test "$enable_sound" = "yes" -a "$found_sound" = "no"; then 19+ if test "$enable_sound" = "yes" -a "$found_sound" = "no"; then
11 { { echo "$as_me:$LINENO: error: libSDL and SDL_mixer are required for sound" >&5 20 { { echo "$as_me:$LINENO: error: libSDL and SDL_mixer are required for sound" >&5
12 echo "$as_me: error: libSDL and SDL_mixer are required for sound" >&2;} 21 echo "$as_me: error: libSDL and SDL_mixer are required for sound" >&2;}
13 { (exit 1); exit 1; }; } 22 { (exit 1); exit 1; }; }
14 fi 23 fi
15- if test "$found_sound" == "yes"; then 24- if test "$found_sound" == "yes"; then
16+ if test "$found_sound" = "yes"; then 25+ if test "$found_sound" = "yes"; then
17 AUDIO_CFLAGS="$SDL_CFLAGS" 26 AUDIO_CFLAGS="$SDL_CFLAGS"