Sat Dec 25 10:53:22 2010 UTC ()
Fixed patch-ad: now configure doesn't stop on Mac OS X.


(adam)
diff -r1.15 -r1.16 pkgsrc/emulators/atari800/distinfo
diff -r1.5 -r1.6 pkgsrc/emulators/atari800/patches/patch-ad
cvs diff -r1.15 -r1.16 pkgsrc/emulators/atari800/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/atari800/distinfo 2009/11/04 11:44:15 1.15
+++ pkgsrc/emulators/atari800/distinfo 2010/12/25 10:53:21 1.16
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.15 2009/11/04 11:44:15 adam Exp $ 1$NetBSD: distinfo,v 1.16 2010/12/25 10:53:21 adam Exp $
2 2
3SHA1 (atari800-2.1.0.tar.gz) = 3888ad49718bb5e1232fb544375bb635654b5ca5 3SHA1 (atari800-2.1.0.tar.gz) = 3888ad49718bb5e1232fb544375bb635654b5ca5
4RMD160 (atari800-2.1.0.tar.gz) = c793855b27843975fcf04fea47c49499909b49ee 4RMD160 (atari800-2.1.0.tar.gz) = c793855b27843975fcf04fea47c49499909b49ee
5Size (atari800-2.1.0.tar.gz) = 1214047 bytes 5Size (atari800-2.1.0.tar.gz) = 1214047 bytes
6SHA1 (xf25.zip) = e65923fd3a4845c1c72d1677db0fda969187eb42 6SHA1 (xf25.zip) = e65923fd3a4845c1c72d1677db0fda969187eb42
7RMD160 (xf25.zip) = e3960898223dd4d1b9a9cc5cfb1251bd726ea5a7 7RMD160 (xf25.zip) = e3960898223dd4d1b9a9cc5cfb1251bd726ea5a7
8Size (xf25.zip) = 188942 bytes 8Size (xf25.zip) = 188942 bytes
9SHA1 (patch-aa) = 6b610bab5957474e0eb63ec67f04c6cc3bc5287c 9SHA1 (patch-aa) = 6b610bab5957474e0eb63ec67f04c6cc3bc5287c
10SHA1 (patch-ab) = ff02962059156632dc72d750ae82d91c012ab178 10SHA1 (patch-ab) = ff02962059156632dc72d750ae82d91c012ab178
11SHA1 (patch-ac) = 69d0ec42303b04a38b8d6b2bd7c1311d42060a11 11SHA1 (patch-ac) = 69d0ec42303b04a38b8d6b2bd7c1311d42060a11
12SHA1 (patch-ad) = d4d17fd8c505b170ff45e4c432f8fc6c37843275 12SHA1 (patch-ad) = 5214a52d94de3f63eb0ee9143fd6439a21df2f6c
cvs diff -r1.5 -r1.6 pkgsrc/emulators/atari800/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/emulators/atari800/patches/Attic/patch-ad 2009/11/04 11:44:15 1.5
+++ pkgsrc/emulators/atari800/patches/Attic/patch-ad 2010/12/25 10:53:22 1.6
@@ -1,23 +1,25 @@ @@ -1,23 +1,25 @@
1$NetBSD: patch-ad,v 1.5 2009/11/04 11:44:15 adam Exp $ 1$NetBSD: patch-ad,v 1.6 2010/12/25 10:53:22 adam Exp $
2 2
3--- configure.orig 2009-03-27 10:13:51.000000000 +0100 3--- configure.orig 2009-03-27 10:13:51.000000000 +0100
4+++ configure 4+++ configure
5@@ -3507,7 +3507,6 @@ case "$a8_target" in 5@@ -3506,9 +3506,6 @@ case "$a8_target" in
 6 sdlcheck="X_`sdl-config --cflags`"
6 if [ "$sdlcheck" != "X_" ]; then 7 if [ "$sdlcheck" != "X_" ]; then
7 CFLAGS="$CFLAGS `sdl-config --cflags`" 8 CFLAGS="$CFLAGS `sdl-config --cflags`"
8 if [ "$a8_host" = "win" ]; then 9- if [ "$a8_host" = "win" ]; then
9- CFLAGS=${CFLAGS/-Dmain=SDL_main/} 10- CFLAGS=${CFLAGS/-Dmain=SDL_main/}
10 fi 11- fi
11 else 12 else
12 { { echo "$as_me:$LINENO: error: \"No output from sdl-config! Is sdl-config installed?\"" >&5 13 { { echo "$as_me:$LINENO: error: \"No output from sdl-config! Is sdl-config installed?\"" >&5
 14 echo "$as_me: error: \"No output from sdl-config! Is sdl-config installed?\"" >&2;}
13@@ -6558,10 +6557,8 @@ _ACEOF 15@@ -6558,10 +6557,8 @@ _ACEOF
14 OBJS="atari_sdl.o" 16 OBJS="atari_sdl.o"
15 CFLAGS="$CFLAGS -ansi -pedantic -Waggregate-return -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wstrict-prototypes -Winline" 17 CFLAGS="$CFLAGS -ansi -pedantic -Waggregate-return -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls -Wstrict-prototypes -Winline"
16 if [ "$a8_host" = "win" ]; then 18 if [ "$a8_host" = "win" ]; then
17- LIBS=${LIBS/-lSDLmain/} 19- LIBS=${LIBS/-lSDLmain/}
18 OBJS="$OBJS SDL_win32_main.o" 20 OBJS="$OBJS SDL_win32_main.o"
19 CFLAGS="$CFLAGS -DNO_STDIO_REDIRECT" 21 CFLAGS="$CFLAGS -DNO_STDIO_REDIRECT"
20- LIBS=${LIBS/-mwindows/} 22- LIBS=${LIBS/-mwindows/}
21 fi 23 fi
22  24
23 cat >>confdefs.h <<\_ACEOF 25 cat >>confdefs.h <<\_ACEOF