Update to 0.134: all changes from upstream.diff -r1.6 -r1.7 pkgsrc/emulators/sdlmame/Makefile
(wiz)
@@ -1,20 +1,19 @@ | @@ -1,20 +1,19 @@ | |||
1 | # $NetBSD: Makefile,v 1.6 2009/08/26 20:20:33 sno Exp $ | 1 | # $NetBSD: Makefile,v 1.7 2009/09/20 10:03:58 wiz Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | # Don't update to 0.XXXuN, those are development snapshots. | 4 | # Don't update to 0.XXXuN, those are development snapshots. | |
5 | DISTNAME= sdlmame0133 | 5 | DISTNAME= sdlmame0134 | |
6 | PKGNAME= ${DISTNAME:S/0/-0./} | 6 | PKGNAME= ${DISTNAME:S/0/-0./} | |
7 | PKGREVISION= 1 | |||
8 | 7 | |||
9 | COMMENT= Multiple Arcade Machine Emulator, SDL port | 8 | COMMENT= Multiple Arcade Machine Emulator, SDL port | |
10 | 9 | |||
11 | CONFLICTS= xmame-[0-9]* | 10 | CONFLICTS= xmame-[0-9]* | |
12 | 11 | |||
13 | MAKE_FILE= makefile | 12 | MAKE_FILE= makefile | |
14 | 13 | |||
15 | DOCDIR= share/doc/sdlmame | 14 | DOCDIR= share/doc/sdlmame | |
16 | INSTALLATION_DIRS= bin ${DOCDIR} | 15 | INSTALLATION_DIRS= bin ${DOCDIR} | |
17 | 16 | |||
18 | do-install: | 17 | do-install: | |
19 | set -e; \ | 18 | set -e; \ | |
20 | for prg in chdman jedutil mame romcmp; \ | 19 | for prg in chdman jedutil mame romcmp; \ |
@@ -1,11 +1,11 @@ | @@ -1,11 +1,11 @@ | |||
1 | $NetBSD: distinfo,v 1.7 2009/09/01 15:20:23 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.8 2009/09/20 10:03:58 wiz Exp $ | |
2 | 2 | |||
3 | SHA1 (sdlmame0133.zip) = 083d4ac915ad3c91729335f92661904a42d9d886 | 3 | SHA1 (sdlmame0134.zip) = 562760edf0abebd87d005e3fac614919802abfdf | |
4 | RMD160 (sdlmame0133.zip) = dea54228e0cfc574251caa17ca292d6b35688b87 | 4 | RMD160 (sdlmame0134.zip) = 8dcc9a6351631bae4ccf1eab0aa6cae557802d77 | |
5 | Size (sdlmame0133.zip) = 17983288 bytes | 5 | Size (sdlmame0134.zip) = 18230792 bytes | |
6 | SHA1 (patch-aa) = 426d88bb1a50a8665d14bdea1e96c42aefa33443 | 6 | SHA1 (patch-aa) = 93dd00e02110e8257f3fe0c18a94d7f7ca594352 | |
7 | SHA1 (patch-ab) = a7471766661974f7f092bede9d37d18a48d8499c | 7 | SHA1 (patch-ab) = a7471766661974f7f092bede9d37d18a48d8499c | |
8 | SHA1 (patch-ac) = 54de6042993dee19e0438d1ce1126be91bc594d1 | 8 | SHA1 (patch-ac) = 54de6042993dee19e0438d1ce1126be91bc594d1 | |
9 | SHA1 (patch-ad) = b12160915cad1d0a8a0ee784553b1b9f207d069b | 9 | SHA1 (patch-ad) = b12160915cad1d0a8a0ee784553b1b9f207d069b | |
10 | SHA1 (patch-ae) = d110f0338d224823d959c8a2b57026321a3f0a38 | 10 | SHA1 (patch-ae) = d110f0338d224823d959c8a2b57026321a3f0a38 | |
11 | SHA1 (patch-ah) = f2dbfc44e30857fd9b52ed5d107b5190d5e5f6da | 11 | SHA1 (patch-ah) = f2dbfc44e30857fd9b52ed5d107b5190d5e5f6da |
@@ -1,16 +1,16 @@ | @@ -1,16 +1,16 @@ | |||
1 | $NetBSD: patch-aa,v 1.3 2009/07/25 22:26:12 wiz Exp $ | 1 | $NetBSD: patch-aa,v 1.4 2009/09/20 10:03:58 wiz Exp $ | |
2 | 2 | |||
3 | --- makefile.orig 2009-06-11 04:38:13.000000000 +0000 | 3 | --- makefile.orig 2009-08-31 04:45:36.000000000 +0000 | |
4 | +++ makefile | 4 | +++ makefile | |
5 | @@ -125,10 +125,10 @@ endif | 5 | @@ -125,10 +125,10 @@ endif | |
6 | # BIGENDIAN = 1 | 6 | # BIGENDIAN = 1 | |
7 | 7 | |||
8 | # uncomment next line to build expat as part of MAME build | 8 | # uncomment next line to build expat as part of MAME build | |
9 | -BUILD_EXPAT = 1 | 9 | -BUILD_EXPAT = 1 | |
10 | +# BUILD_EXPAT = 1 | 10 | +# BUILD_EXPAT = 1 | |
11 | 11 | |||
12 | # uncomment next line to build zlib as part of MAME build | 12 | # uncomment next line to build zlib as part of MAME build | |
13 | -BUILD_ZLIB = 1 | 13 | -BUILD_ZLIB = 1 | |
14 | +# BUILD_ZLIB = 1 | 14 | +# BUILD_ZLIB = 1 | |
15 | 15 | |||
16 | # uncomment next line to include the symbols | 16 | # uncomment next line to include the symbols | |
@@ -105,22 +105,22 @@ $NetBSD: patch-aa,v 1.3 2009/07/25 22:26 | @@ -105,22 +105,22 @@ $NetBSD: patch-aa,v 1.3 2009/07/25 22:26 | |||
105 | +#LDFLAGS = -Wl,--warn-common | 105 | +#LDFLAGS = -Wl,--warn-common | |
106 | endif | 106 | endif | |
107 | endif | 107 | endif | |
108 | endif | 108 | endif | |
109 | @@ -410,7 +410,7 @@ endif | 109 | @@ -410,7 +410,7 @@ endif | |
110 | ifndef SYMBOLS | 110 | ifndef SYMBOLS | |
111 | ifndef PROFILE | 111 | ifndef PROFILE | |
112 | ifneq ($(TARGETOS),macosx) | 112 | ifneq ($(TARGETOS),macosx) | |
113 | -LDFLAGS += -s | 113 | -LDFLAGS += -s | |
114 | +#LDFLAGS += -s | 114 | +#LDFLAGS += -s | |
115 | endif | 115 | endif | |
116 | endif | 116 | endif | |
117 | endif | 117 | endif | |
118 | @@ -560,7 +560,7 @@ $(VERSIONOBJ): $(DRVLIBS) $(LIBOSD) $(LI | 118 | @@ -561,7 +561,7 @@ $(VERSIONOBJ): $(DRVLIBS) $(LIBOSD) $(LI | |
119 | 119 | |||
120 | $(EMULATOR): $(VERSIONOBJ) $(DRVLIBS) $(LIBOSD) $(LIBEMU) $(LIBCPU) $(LIBSOUND) $(LIBUTIL) $(EXPAT) $(ZLIB) $(LIBOCORE) $(RESFILE) | 120 | $(EMULATOR): $(VERSIONOBJ) $(DRVLIBS) $(LIBOSD) $(LIBEMU) $(LIBCPU) $(LIBDASM) $(LIBSOUND) $(LIBUTIL) $(EXPAT) $(ZLIB) $(LIBOCORE) $(RESFILE) | |
121 | @echo Linking $@... | 121 | @echo Linking $@... | |
122 | - $(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $^ $(LIBS) -o $@ | 122 | - $(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $^ $(LIBS) -o $@ | |
123 | + $(CC) $(LDFLAGS) $(LDFLAGSEMULATOR) $^ $(LIBS) -o $@ | 123 | + $(CC) $(LDFLAGS) $(LDFLAGSEMULATOR) $^ $(LIBS) -o $@ | |
124 | 124 | |||
125 | endif | 125 | endif | |
126 | 126 |