Tue Mar 31 16:35:29 2015 UTC ()
When checking for C99 features, it helps to actually use C99.


(joerg)
diff -r1.32 -r1.33 pkgsrc/emulators/mame/distinfo
diff -r1.10 -r1.11 pkgsrc/emulators/mame/patches/patch-makefile
cvs diff -r1.32 -r1.33 pkgsrc/emulators/mame/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/mame/distinfo 2015/02/28 11:58:53 1.32
+++ pkgsrc/emulators/mame/distinfo 2015/03/31 16:35:29 1.33
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.32 2015/02/28 11:58:53 wiz Exp $ 1$NetBSD: distinfo,v 1.33 2015/03/31 16:35:29 joerg Exp $
2 2
3SHA1 (mame0159s.zip) = 0170b73e45dcaa6c9842948f69c54310bf314934 3SHA1 (mame0159s.zip) = 0170b73e45dcaa6c9842948f69c54310bf314934
4RMD160 (mame0159s.zip) = 9b02aeeebf956c453b2c041c6c40c2952ce3521c 4RMD160 (mame0159s.zip) = 9b02aeeebf956c453b2c041c6c40c2952ce3521c
5Size (mame0159s.zip) = 80801723 bytes 5Size (mame0159s.zip) = 80801723 bytes
6SHA1 (patch-makefile) = 0009c7f66fbbb30a085aae6d8b4ace3241c17f61 6SHA1 (patch-makefile) = 57837dbc8571682e4fd73a2be5771df109c7225f
cvs diff -r1.10 -r1.11 pkgsrc/emulators/mame/patches/patch-makefile (expand / switch to unified diff)

--- pkgsrc/emulators/mame/patches/patch-makefile 2015/02/28 11:58:53 1.10
+++ pkgsrc/emulators/mame/patches/patch-makefile 2015/03/31 16:35:29 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-makefile,v 1.10 2015/02/28 11:58:53 wiz Exp $ 1$NetBSD: patch-makefile,v 1.11 2015/03/31 16:35:29 joerg Exp $
2 2
3Link against pkgsrc versions of expat, zlib, flac, jpeg, and 3Link against pkgsrc versions of expat, zlib, flac, jpeg, and
4sqlite3, and add appropriate linker search paths. 4sqlite3, and add appropriate linker search paths.
5 5
6--- makefile.orig 2015-02-28 10:39:06.000000000 +0000 6--- makefile.orig 2015-02-28 10:39:06.000000000 +0000
7+++ makefile 7+++ makefile
8@@ -227,19 +227,19 @@ endif 8@@ -227,19 +227,19 @@ endif
9 # BIGENDIAN = 1 9 # BIGENDIAN = 1
10  10
11 # uncomment next line to build expat as part of MAME build 11 # uncomment next line to build expat as part of MAME build
12-BUILD_EXPAT = 1 12-BUILD_EXPAT = 1
13+#BUILD_EXPAT = 1 13+#BUILD_EXPAT = 1
14  14
@@ -20,22 +20,31 @@ sqlite3, and add appropriate linker sear @@ -20,22 +20,31 @@ sqlite3, and add appropriate linker sear
20-BUILD_FLAC = 1 20-BUILD_FLAC = 1
21+#BUILD_FLAC = 1 21+#BUILD_FLAC = 1
22  22
23 # uncomment next line to build jpeglib as part of MAME build 23 # uncomment next line to build jpeglib as part of MAME build
24-BUILD_JPEGLIB = 1 24-BUILD_JPEGLIB = 1
25+#BUILD_JPEGLIB = 1 25+#BUILD_JPEGLIB = 1
26  26
27 # uncomment next line to build libsqlite3 as part of MAME/MESS build 27 # uncomment next line to build libsqlite3 as part of MAME/MESS build
28-BUILD_SQLITE3 = 1 28-BUILD_SQLITE3 = 1
29+#BUILD_SQLITE3 = 1 29+#BUILD_SQLITE3 = 1
30  30
31 # uncomment next line to build PortMidi as part of MAME/MESS build 31 # uncomment next line to build PortMidi as part of MAME/MESS build
32 BUILD_MIDILIB = 1 32 BUILD_MIDILIB = 1
 33@@ -527,7 +527,7 @@ CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS) $(
 34
 35 # we compile C-only to C89 standard with GNU extensions
 36 # we compile C++ code to C++98 standard with GNU extensions
 37-CONLYFLAGS += -std=gnu89
 38+CONLYFLAGS += -std=gnu99
 39 ifdef CPP11
 40 CPPONLYFLAGS += -x c++ -std=gnu++11
 41 else
33@@ -742,7 +742,7 @@ DRIVLISTOBJ = $(OBJ)/$(TARGET)/$(SUBTARG 42@@ -742,7 +742,7 @@ DRIVLISTOBJ = $(OBJ)/$(TARGET)/$(SUBTARG
34 #------------------------------------------------- 43 #-------------------------------------------------
35  44
36 # start with an empty set of libs 45 # start with an empty set of libs
37-LIBS =  46-LIBS =
38+LIBS = -Wl,-R${PREFIX}/lib -L${PREFIX}/lib 47+LIBS = -Wl,-R${PREFIX}/lib -L${PREFIX}/lib
39  48
40 # add expat XML library 49 # add expat XML library
41 ifeq ($(BUILD_EXPAT),1) 50 ifeq ($(BUILD_EXPAT),1)