View | Details | Raw Unified | Return to bug 164990 | Differences between
and this patch

Collapse All | Expand All

(-)emulators/mame/Makefile (-52 / +65 lines)
Lines 6-46 Link Here
6
#
6
#
7
7
8
PORTNAME=	mame
8
PORTNAME=	mame
9
PATCHLEVEL=	2
9
PORTVERSION=	0.145${PATCHSUFFIX}
10
PORTVERSION=	0.143${PATCHSUFFIX}
11
CATEGORIES=	emulators
10
CATEGORIES=	emulators
12
MASTER_SITES=	http://mame.mirrors.zippykid.com/releases/:src \
11
MASTER_SITES=	http://mame.mirrors.zippykid.com/releases/ \
13
		http://emumovies.com/aarongiles/releases/:src \
12
		http://emumovies.com/aarongiles/releases/ \
14
		http://mamedev.mameworld.info/releases/:src \
13
		http://mamedev.mameworld.info/releases/ \
15
		http://mamedev.thiswebhost.com/releases/:src \
14
		http://mamedev.thiswebhost.com/releases/ \
16
		ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/:src \
17
		http://mamedev.org/updates/:patchsets
15
		http://mamedev.org/updates/:patchsets
18
DISTFILES=	\
16
DISTNAME=	${PORTNAME}${PORTVERSION:S/.//:C/\.p[0-9]*$//}s
19
	${PORTNAME}${PORTVERSION:S/.//:C/\.p[0-9]*$//}s${EXTRACT_SUFX}:src \
17
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
20
	${UPDATE_PATCHES:C/$/.zip:patchsets/}
18
		${UPDATE_PATCHES:C/$/.zip:patchsets/}
21
DIST_SUBDIR=	${PORTNAME}
19
DIST_SUBDIR=	${PORTNAME}
22
20
23
MAINTAINER=	ports@FreeBSD.org
21
MAINTAINER=	ports@FreeBSD.org
24
COMMENT=	The popular MAME (Multi Arcade Machine Emulator)
22
COMMENT=	The popular MAME (Multi Arcade Machine Emulator)
25
23
26
LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
24
LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
25
		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
26
RUN_DEPENDS=	liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
27
28
OPTIONS=	BUILTIN_DEBUGGER "Enable builtin debugger support" off
29
30
ONLY_FOR_ARCHS=	i386 amd64
27
31
28
USE_ZIP=	yes
29
NO_WRKSUBDIR=	yes
32
NO_WRKSUBDIR=	yes
30
USE_XORG=	xext xrender xinerama xi
33
34
USE_ZIP=	yes
35
USE_XORG=	xext xi xinerama xrender
31
USE_GL=		gl
36
USE_GL=		gl
32
USE_GNOME?=	gtk20 gconf2
33
USE_GMAKE=	yes
34
MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
35
USE_SDL=	sdl ttf
37
USE_SDL=	sdl ttf
36
USE_GCC=	4.2+
38
USE_GCC=	4.4+
39
USE_GMAKE=	yes
40
MAKE_ENV=	NOWERROR=1 OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}"
37
MAKEFILE=	makefile
41
MAKEFILE=	makefile
38
ONLY_FOR_ARCHS=	i386 amd64
42
MAKE_JOBS_SAFE=	yes
43
39
SUB_FILES=	pkg-message
44
SUB_FILES=	pkg-message
40
USE_DOS2UNIX=	makefile sdl.mak debugcpu.c *.c *.h
41
45
42
PORTDOCS=	*
46
PATCHLEVEL=	# none
43
PORTEXAMPLES=	*
44
47
45
.if defined(PATCHLEVEL) && ${PATCHLEVEL}
48
.if defined(PATCHLEVEL) && ${PATCHLEVEL}
46
PATCHSUFFIX=	.p${PATCHLEVEL}
49
PATCHSUFFIX=	.p${PATCHLEVEL}
Lines 49-71 Link Here
49
		${PATCHLEVEL} 1 ${PATCHLEVEL}
52
		${PATCHLEVEL} 1 ${PATCHLEVEL}
50
.endif
53
.endif
51
54
52
OPTIONS=	DEBUG "Build mame debugger" off
55
.include <bsd.port.options.mk>
53
56
54
.include <bsd.port.pre.mk>
57
.if defined(WITH_BUILTIN_DEBUGGER)
55
58
USE_GNOME=	gtk20 gconf2
56
.if !defined(WITH_DEBUG)
59
MAKE_ENV+=	GTK_INCPATH="$$(pkg-config --cflags-only-I gtk+-2.0 gconf-2.0)" \
57
USE_GNOME=		#
60
		GTK_CCOMFLAGS="$$(pkg-config --cflags-only-other gtk+-2.0 gconf-2.0)" \
58
EXTRA_PATCHES+=		${PATCHDIR}/sdl.mak.patch
61
		GTK_LIBS="$$(pkg-config --libs gtk+-2.0 gconf-2.0)"
62
.else
63
MAKE_ENV+=	NO_DEBUGGER=1 \
64
		GTK_INCPATH="" \
65
		GTK_CCOMFLAGS="" \
66
		GTK_LIBS=""
59
.endif
67
.endif
60
68
61
MAKE_JOBS_SAFE=	yes
69
.include <bsd.port.pre.mk>
62
70
63
.if ${ARCH} == "amd64"
71
.if ${ARCH} == "amd64"
64
MAKE_ENV+=	PTR64=1
72
MAKE_ENV+=	PTR64=1
65
.endif
73
.endif
66
.if ${ARCH} == "sparc64"
67
BROKEN=		Does not compile on sparc64
68
.endif
69
74
70
post-extract:
75
post-extract:
71
	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/mame.zip ${EXTRACT_AFTER_ARGS}
76
	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/mame.zip ${EXTRACT_AFTER_ARGS}
Lines 80-114 Link Here
80
.endif
85
.endif
81
86
82
post-patch:
87
post-patch:
83
	@${REINPLACE_CMD} -e "s|ui.bdf|${DATADIR}/ui.bdf|g" ${WRKSRC}/src/emu/ui.c
88
	@${REINPLACE_CMD} -e \
84
	@${REINPLACE_CMD} -e "s|int getc()|int getcf()|g" ${WRKSRC}/src/emu/fileio.h
89
		's|^BUILD_EXPAT|# BUILD_EXPAT| ; \
85
	@${REINPLACE_CMD} -e "s|::getc()|::getcf()|g" ${WRKSRC}/src/emu/fileio.c
90
		 s|^BUILD_ZLIB|# BUILD_ZLIB| ; \
91
		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
92
		 s| = @gcc| := $$(CC)| ; \
93
		 s| = @g++| := $$(CXX)| ; \
94
		 s|^FULLNAME =.*|FULLNAME = $$(NAME)|' ${WRKSRC}/makefile
95
	@${REINPLACE_CMD} -e \
96
		'/-system/s|/usr/local/|${LOCALBASE}/| ; \
97
		 /--cflags-only-I gtk+-2.0/s|=.*|= $$(GTK_INCPATH)| ; \
98
		 /--cflags-only-other gtk+-2.0/s|=.*|= $$(GTK_CCOMFLAGS)| ; \
99
		 /--libs gtk+-2.0/s|=.*|= $$(GTK_LIBS)| ; \
100
		 /X11R6/s|^|#|' ${WRKSRC}/src/osd/sdl/sdl.mak
101
	@${REINPLACE_CMD} -e \
102
		's|int getc()|int getcf()|g' ${WRKSRC}/src/emu/fileio.h
103
	@${REINPLACE_CMD} -e \
104
		's|::getc()|::getcf()|g' ${WRKSRC}/src/emu/fileio.c
86
105
87
do-install:
106
do-install:
88
	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
107
	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
89
	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
108
	@${MKDIR} ${PREFIX}/libexec/${PORTNAME}
90
	${INSTALL_PROGRAM} ${WRKSRC}/chdman ${PREFIX}/libexec/${PORTNAME}
109
.for FILE in chdman jedutil ldresample ldverify romcmp testkeys unidasm
91
	${INSTALL_PROGRAM} ${WRKSRC}/ldresample ${PREFIX}/libexec/${PORTNAME}
110
	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${PREFIX}/libexec/${PORTNAME}
92
	${INSTALL_PROGRAM} ${WRKSRC}/ldverify ${PREFIX}/libexec/${PORTNAME}
111
.endfor
93
	${INSTALL_PROGRAM} ${WRKSRC}/romcmp ${PREFIX}/libexec/${PORTNAME}
112
	@${MKDIR} ${DATADIR}
94
	${INSTALL_PROGRAM} ${WRKSRC}/testkeys ${PREFIX}/libexec/${PORTNAME}
113
	@(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${DATADIR})
95
	${INSTALL_PROGRAM} ${WRKSRC}/unidasm ${PREFIX}/libexec/${PORTNAME}
114
	@(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${DATADIR})
96
115
	@(cd ${WRKSRC}/src/osd/sdl && ${COPYTREE_SHARE} keymaps ${DATADIR})
97
.if !defined(NOPORTDOCS)
116
.if !defined(NOPORTDOCS)
98
	${MKDIR} ${DOCSDIR}
117
	@${MKDIR} ${DOCSDIR}
99
	${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR}
118
	${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR}
100
	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} docs ${DOCSDIR})
119
	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${DOCSDIR})
101
.endif
120
.endif
102
	${MKDIR} ${DATADIR}
103
	(cd ${WRKSRC}/src/osd/sdl/ && ${COPYTREE_SHARE} keymaps ${DATADIR})
104
.if !defined(NOPORTEXAMPLES)
121
.if !defined(NOPORTEXAMPLES)
105
	${MKDIR} ${EXAMPLESDIR}
122
	@${MKDIR} ${EXAMPLESDIR}
106
	${INSTALL_DATA} ${FILESDIR}/mame.ini ${EXAMPLESDIR}
123
	${INSTALL_DATA} ${FILESDIR}/mame.ini ${EXAMPLESDIR}
107
.endif
124
.endif
108
109
post-install:
110
	@${ECHO_CMD}
111
	@${CAT} ${PKGMESSAGE}
125
	@${CAT} ${PKGMESSAGE}
112
	@${ECHO_CMD}
113
126
114
.include <bsd.port.post.mk>
127
.include <bsd.port.post.mk>
(-)emulators/mame/distinfo (-6 / +2 lines)
Lines 1-6 Link Here
1
SHA256 (mame/mame0143s.zip) = 677f04756ed7bc00e1adc6e68bbb174f89845887758dc287c7244a58e6ac266f
1
SHA256 (mame/mame0145s.zip) = a6a9a72cfd0eb83fb9748fb6cb69cd60df16283346a81ca3637552a283318b16
2
SIZE (mame/mame0143s.zip) = 17902802
2
SIZE (mame/mame0145s.zip) = 20346129
3
SHA256 (mame/0143u1_diff.zip) = 307172c6956f58251590a5c30c454c99fbdf02ae554d0e3aaa0133fc9989eee8
4
SIZE (mame/0143u1_diff.zip) = 250465
5
SHA256 (mame/0143u2_diff.zip) = 4f6fa5961fe9fe99dfd6d315daf5280b2516ac96213b2a2c0fcf849c284db086
6
SIZE (mame/0143u2_diff.zip) = 679992
(-)emulators/mame/files/mame.ini (-4 / +15 lines)
Lines 10-20 Link Here
10
# CORE SEARCH PATH OPTIONS
10
# CORE SEARCH PATH OPTIONS
11
#
11
#
12
rompath                   $HOME/.mame/roms
12
rompath                   $HOME/.mame/roms
13
hashpath                  $HOME/.mame/hash;/usr/local/share/mame/hash/
13
samplepath                $HOME/.mame/samples
14
samplepath                $HOME/.mame/samples
14
artpath                   $HOME/.mame/artwork
15
artpath                   $HOME/.mame/artwork;/usr/local/share/mame/artwork/
15
ctrlrpath                 $HOME/.mame/ctrlr
16
ctrlrpath                 $HOME/.mame/ctrlr
16
inipath                   $HOME/.mame;.;ini
17
inipath                   $HOME/.mame;.;ini
17
fontpath                  $HOME/.mame/.
18
fontpath                  $HOME/.mame/font;/usr/local/share/mame/
18
cheatpath                 $HOME/.mame/cheat
19
cheatpath                 $HOME/.mame/cheat
19
crosshairpath             $HOME/.mame/crosshair
20
crosshairpath             $HOME/.mame/crosshair
20
21
Lines 74-79 Link Here
74
use_backdrops             1
75
use_backdrops             1
75
use_overlays              1
76
use_overlays              1
76
use_bezels                1
77
use_bezels                1
78
use_cpanels               1
79
use_marquees              1
77
80
78
#
81
#
79
# CORE SCREEN OPTIONS
82
# CORE SCREEN OPTIONS
Lines 82-87 Link Here
82
contrast                  1.0
85
contrast                  1.0
83
gamma                     1.0
86
gamma                     1.0
84
pause_brightness          0.65
87
pause_brightness          0.65
88
effect                    none
85
89
86
#
90
#
87
# CORE VECTOR OPTIONS
91
# CORE VECTOR OPTIONS
Lines 114-120 Link Here
114
joystick_deadzone         0.3
118
joystick_deadzone         0.3
115
joystick_saturation       0.85
119
joystick_saturation       0.85
116
natural                   0
120
natural                   0
117
uimodekey                 auto
121
joystick_contradictory    0
122
coin_impulse              0
118
123
119
#
124
#
120
# CORE INPUT AUTOMATIC ENABLE OPTIONS
125
# CORE INPUT AUTOMATIC ENABLE OPTIONS
Lines 144-154 Link Here
144
bios                      
149
bios                      
145
cheat                     0
150
cheat                     0
146
skip_gameinfo             0
151
skip_gameinfo             0
152
uifont                    default
153
ramsize                   
154
confirm_quit              0
147
155
148
#
156
#
149
# DEBUGGING OPTIONS
157
# DEBUGGING OPTIONS
150
#
158
#
151
oslog                     0
159
oslog                     0
160
watchdog                  0
152
161
153
#
162
#
154
# PERFORMANCE OPTIONS
163
# PERFORMANCE OPTIONS
Lines 156-161 Link Here
156
multithreading            0
165
multithreading            0
157
numprocessors             auto
166
numprocessors             auto
158
sdlvideofps               0
167
sdlvideofps               0
168
bench                     0
159
169
160
#
170
#
161
# VIDEO OPTIONS
171
# VIDEO OPTIONS
Lines 166-175 Link Here
166
maximize                  1
176
maximize                  1
167
keepaspect                1
177
keepaspect                1
168
unevenstretch             1
178
unevenstretch             1
169
effect                    none
170
centerh                   1
179
centerh                   1
171
centerv                   1
180
centerv                   1
172
waitvsync                 0
181
waitvsync                 0
182
syncrefresh               0
173
scalemode                 none
183
scalemode                 none
174
184
175
#
185
#
Lines 245-250 Link Here
245
#
255
#
246
keymap                    0
256
keymap                    0
247
keymap_file               keymap.dat
257
keymap_file               keymap.dat
258
uimodekey                 auto
248
259
249
#
260
#
250
# SDL JOYSTICK MAPPING
261
# SDL JOYSTICK MAPPING
(-)emulators/mame/files/patch-makefile (-22 lines)
Lines 1-22 Link Here
1
--- makefile.orig	2010-07-30 10:42:41.000000000 +0200
2
+++ makefile	2010-07-30 10:43:26.000000000 +0200
3
@@ -295,8 +295,8 @@
4
 
5
 # compiler, linker and utilities
6
 AR = @ar
7
-CC = @gcc
8
-LD = @g++
9
+CC:= @$(CC)
10
+LD:= @$(CXX)
11
 MD = -mkdir$(EXE)
12
 RM = @rm -f
13
 OBJDUMP = @objdump
14
@@ -344,7 +344,7 @@
15
 endif
16
 
17
 # fullname is prefix+name+suffix+suffix64+suffixdebug
18
-FULLNAME = $(PREFIX)$(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)$(SUFFIXPROFILE)
19
+FULLNAME = $(NAME)
20
 
21
 # add an EXE suffix to get the final emulator name
22
 EMULATOR = $(FULLNAME)$(EXE)
(-)emulators/mame/files/pkg-message.in (-1 / +2 lines)
Lines 2-8 Link Here
2
2
3
MAME has been installed.
3
MAME has been installed.
4
4
5
A example configuration file has been installed in "%%EXAMPLESDIR%%/mame.ini"
5
A example configuration file has been installed in
6
"%%EXAMPLESDIR%%/mame.ini"
6
Should you create a "~/.mame" directory and place it here or
7
Should you create a "~/.mame" directory and place it here or
7
launch "mame -createconfig" and place the mame.ini created instead.
8
launch "mame -createconfig" and place the mame.ini created instead.
8
9
(-)emulators/mame/files/sdl.mak.patch (-46 lines)
Lines 1-46 Link Here
1
$FreeBSD: ports/emulators/mame/files/sdl.mak.patch,v 1.6 2011/08/13 17:04:38 crees Exp $
2
3
This is applied if WITH_DEBUG is unset.
4
5
--- src/osd/sdl/sdl.mak	2011-06-21 19:58:18.000000000 -0500
6
+++ src/osd/sdl/sdl.mak	2011-06-21 20:01:07.000000000 -0500
7
@@ -139,7 +139,7 @@
8
 ifeq ($(TARGETOS),freebsd)
9
 BASE_TARGETOS = unix
10
 SYNC_IMPLEMENTATION = tc
11
-DEFS += -DNO_AFFINITY_NP
12
+DEFS += -DNO_AFFINITY_NP -DNO_DEBUGGER
13
 LIBS += -lutil
14
 # /usr/local/include is not considered a system include directory
15
 # on FreeBSD. GL.h resides there and throws warnings
16
@@ -213,7 +213,7 @@
17
 ifndef GTK_INSTALL_ROOT
18
 NO_DEBUGGER = 1
19
 else
20
-DEBUGOBJS = $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
21
+DEBUGOBJS = $(SDLOBJ)/debugwin.o
22
 LIBS += -lgtk-win32-2.0 -lgdk-win32-2.0 -lgmodule-2.0 -lglib-2.0 -lgobject-2.0 \
23
 	-lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0
24
 CCOMFLAGS += -mms-bitfields
25
@@ -315,7 +315,7 @@
26
 ifeq ($(BASE_TARGETOS),unix)
27
 
28
 DEFS += -DSDLMAME_UNIX
29
-DEBUGOBJS = $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
30
+DEBUGOBJS = $(SDLOBJ)/debugwin.o
31
 LIBGL = -lGL
32
 ifeq ($(NO_X11),1)
33
 NO_DEBUGGER = 1
34
@@ -484,9 +484,9 @@
35
 
36
 # the new debugger relies on GTK+ in addition to the base SDLMAME needs
37
 # Non-X11 builds can not use the debugger
38
-INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0`
39
-CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0`
40
-LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
41
+#INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0`
42
+#CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0`
43
+#LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
44
 #CCOMFLAGS += -DGTK_DISABLE_DEPRECATED
45
 
46
 # some systems still put important things in a different prefix
(-)emulators/mame/pkg-plist (-2 / +22 lines)
Lines 1-16 Link Here
1
bin/mame
1
bin/mame
2
libexec/mame/chdman
2
libexec/mame/chdman
3
libexec/mame/jedutil
3
libexec/mame/ldresample
4
libexec/mame/ldresample
4
libexec/mame/ldverify
5
libexec/mame/ldverify
5
libexec/mame/romcmp
6
libexec/mame/romcmp
6
libexec/mame/testkeys
7
libexec/mame/testkeys
7
libexec/mame/unidasm
8
libexec/mame/unidasm
9
%%PORTDOCS%%%%DOCSDIR%%/docs/config.txt
10
%%PORTDOCS%%%%DOCSDIR%%/docs/hlsl.txt
11
%%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
12
%%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
13
%%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
14
%%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt
15
%%PORTDOCS%%%%DOCSDIR%%/whatsnew_0145.txt
16
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mame.ini
17
%%DATADIR%%/artwork/aperture.png
18
%%DATADIR%%/artwork/white.png
19
%%DATADIR%%/hash/megatech.xml
20
%%DATADIR%%/hash/neogeo.xml
21
%%DATADIR%%/hash/softwarelist.dtd
22
%%DATADIR%%/hash/stv.xml
8
%%DATADIR%%/keymaps/km-be.txt
23
%%DATADIR%%/keymaps/km-be.txt
9
%%DATADIR%%/keymaps/km-ch.txt
24
%%DATADIR%%/keymaps/km-ch.txt
10
%%DATADIR%%/keymaps/km-de.txt
25
%%DATADIR%%/keymaps/km-de.txt
11
%%DATADIR%%/keymaps/km-fr-OSX.txt
26
%%DATADIR%%/keymaps/km-fr-OSX.txt
12
%%DATADIR%%/keymaps/km-fr.txt
27
%%DATADIR%%/keymaps/km-fr.txt
13
%%DATADIR%%/keymaps/km_it.txt
28
%%DATADIR%%/keymaps/km_it.txt
14
@dirrm %%DATADIR%%/keymaps/
29
@dirrm %%DATADIR%%/keymaps
15
@dirrm %%DATADIR%%/
30
@dirrm %%DATADIR%%/hash
31
@dirrm %%DATADIR%%/artwork
32
@dirrm %%DATADIR%%
33
%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
34
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
35
%%PORTDOCS%%@dirrm %%DOCSDIR%%
16
@dirrm libexec/mame
36
@dirrm libexec/mame

Return to bug 164990