Attachment #13926 for bug #26300

View | Details | Raw Unified | Return to bug 26300
Collapse All | Expand All

Lines 154-172 Link Here

(-)xmame/Makefile (-2 / +27 lines)
154	-malign-functions=4 -malign-jumps=4 -malign-loops=4	154	-malign-functions=4 -malign-jumps=4 -malign-loops=4
155	.endif	155	.endif
156		156
157	# SDL extension - enabled by default because x{mame,mess} can run full	157	# Choose one of several display targets:
		158	# WITH_GL OpenGL based, displays vector games with hardware
		159	# acceleration
		160	# WITH_SDL Uses the SDL library to be able to play fullscreen
		161	# without root rights
		162	# WITH_X11 The standard display target, should work without
		163	# dependancies other than X
		164	#
		165	# WITH_SDL is enabled by default because x{mame,mess} can run full
158	# screen without having to be setuid root.	166	# screen without having to be setuid root.
		167	.if defined(WITH_GL) && ${WITH_GL} == "yes"
		168	CFLAGS+= ${PTHREAD_CFLAGS}
		169	USE_MESA= yes
		170	DISPLAY_METHOD= xgl
		171	PLIST_SUB+= OPENGL=""
		172	.else
		173	PLIST_SUB+= OPENGL="@comment "
159	.if !defined(WITH_SDL) \|\| ${WITH_SDL} != "no"	174	.if !defined(WITH_SDL) \|\| ${WITH_SDL} != "no"
160	LIB_DEPENDS= SDL-1.1.3:${PORTSDIR}/devel/sdl-devel	175	LIB_DEPENDS= SDL-1.1.3:${PORTSDIR}/devel/sdl-devel
161	SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config	176	SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
162	MAKE_ENV+= SDL_CONFIG=${SDL_CONFIG}	177	MAKE_ENV+= SDL_CONFIG=${SDL_CONFIG}
163	DISPLAY_METHOD= SDL	178	DISPLAY_METHOD= SDL
		179	.if !defined(WITH_SDL)
164	pre-everything::	180	pre-everything::
165	@${ECHO_MSG} "===> If you don't want ${MAMEMESS:U} to be built with SDL support,"	181	@${ECHO_MSG} "===> If you don't want ${MAMEMESS:U} to be built with SDL support,"
166	@${ECHO_MSG} " use \"make WITH_SDL=no\""	182	@${ECHO_MSG} " use \"make WITH_SDL=no\""
		183	@${ECHO_MSG} "===> If you want to build ${MAMEMESS:U} with OpenGL support for vector games,"
		184	@${ECHO_MSG} " use \"make WITH_GL=yes\""
		185	.endif
167	.else	186	.else
168	DISPLAY_METHOD= x11	187	DISPLAY_METHOD= x11
169	.endif	188	.endif
		189	.endif
170		190
171	# The large number of sed regexes here is intended to make this port a whole	191	# The large number of sed regexes here is intended to make this port a whole
172	# lot easier to maintain - please don't convert them into a patch.	192	# lot easier to maintain - please don't convert them into a patch.
Lines 182-190 Link Here
182	-e "s@= x11@= ${DISPLAY_METHOD}@g" \	202	-e "s@= x11@= ${DISPLAY_METHOD}@g" \
183	-e "s@= mame@= ${MAMEMESS}@g" \	203	-e "s@= mame@= ${MAMEMESS}@g" \
184	-e "s@# X86_ASM@${ASM_COMMENT}X86_ASM@g" \	204	-e "s@# X86_ASM@${ASM_COMMENT}X86_ASM@g" \
		205	-e "s@GLLIBS=.-ldl@GLLIBS= ${PTHREAD_LIBS}@g" \
185	${WRKSRC}/makefile.unix.sed > ${WRKSRC}/makefile.unix	206	${WRKSRC}/makefile.unix.sed > ${WRKSRC}/makefile.unix
186	.if !defined(WITH_SDL) \|\| ${WITH_SDL} != "no"
187	${PERL} -pi -e 's@SDL/@SDL11/@' ${WRKSRC}/src/unix/video-drivers/SDL.c	207	${PERL} -pi -e 's@SDL/@SDL11/@' ${WRKSRC}/src/unix/video-drivers/SDL.c
		208	.if ${XMAMEVERSION} != "0.37b12.1"
		209	${PERL} -pi -e 's@png.h@../../png.h@' \
		210	${WRKSRC}/src/unix/video-drivers/glexport.c
		211	${PERL} -pi -e 's@malloc.h@stdlib.h@' \
		212	${WRKSRC}/src/unix/video-drivers/gljpg.c
188	.endif	213	.endif
189		214
190	post-build:	215	post-build:

Lines 4-7 Link Here

(-)xmame/distinfo (-1 / +1 lines)
4	MD5 (xmame/history.zip) = 69da5c33e6a78092c6cd75cbeb737c6a	4	MD5 (xmame/history.zip) = 69da5c33e6a78092c6cd75cbeb737c6a
5	MD5 (xmame/hsdat7.zip) = 9e4a7e36448895f13128a675327e34e4	5	MD5 (xmame/hsdat7.zip) = 9e4a7e36448895f13128a675327e34e4
6	MD5 (xmame/xmame-0.37b13.1-cps2-20010330.patch.gz) = bf1d53ea84a4905d8377a187d3478883	6	MD5 (xmame/xmame-0.37b13.1-cps2-20010330.patch.gz) = bf1d53ea84a4905d8377a187d3478883
7	MD5 (xmame/xmame-0.37b13.1-pinmame-0.99b.patch.gz) = ea61399643a49b96025629960652455b	7	MD5 (xmame/xmame-0.37b13.1-pinmame-0.99b1.patch.gz) = 06526474f4bd5afa0874237ffe653d34

Lines 1-6 Link Here

(-)xmame/files/patch-ac (-5 / +21 lines)
1	--- src/unix/unix.mak.orig Sat Mar 24 02:33:38 2001	1	--- src/unix/unix.mak.orig Sat Mar 24 02:33:38 2001
2	+++ src/unix/unix.mak Fri Mar 30 09:52:29 2001	2	+++ src/unix/unix.mak Mon Apr 2 12:32:36 2001
3	@@ -50,14 +50,14 @@	3	@@ -46,18 +46,18 @@
		4	LIBS.x11 = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext
		5	LIBS.svgalib = $(X11LIB) -lvga -lvgagl
		6	LIBS.ggi = $(X11LIB) -lggi
		7	-LIBS.xgl = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext $(GLLIBS) -ljpeg
		8	+LIBS.xgl = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext $(GLLIBS) -L/usr/local/lib -ljpeg $(PTHREAD_LIBS)
4	LIBS.xfx = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext -lglide2x	9	LIBS.xfx = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext -lglide2x
5	LIBS.svgafx = $(X11LIB) -lvga -lvgagl -lglide2x	10	LIBS.svgafx = $(X11LIB) -lvga -lvgagl -lglide2x
6	LIBS.openstep = -framework AppKit	11	LIBS.openstep = -framework AppKit
Lines 9-15 Link Here
9	LIBS.photon2 = -L/usr/lib -lph -lphrender	14	LIBS.photon2 = -L/usr/lib -lph -lphrender
10		15
11	CFLAGS.x11 = $(X11INC) $(JOY_X11_CFLAGS)	16	CFLAGS.x11 = $(X11INC) $(JOY_X11_CFLAGS)
12	CFLAGS.xgl = $(X11INC) $(JOY_X11_CFLAGS)	17	-CFLAGS.xgl = $(X11INC) $(JOY_X11_CFLAGS)
		18	+CFLAGS.xgl = $(X11INC) $(JOY_X11_CFLAGS) -I/usr/local/include $(PTHREAD_CFLAGS)
13	CFLAGS.xfx = $(X11INC) $(JOY_X11_CFLAGS) -I/usr/include/glide	19	CFLAGS.xfx = $(X11INC) $(JOY_X11_CFLAGS) -I/usr/include/glide
14	CFLAGS.svgafx = -I/usr/include/glide	20	CFLAGS.svgafx = -I/usr/include/glide
15	-CFLAGS.SDL = -D_REENTRANT	21	-CFLAGS.SDL = -D_REENTRANT
Lines 17-28 Link Here
17	CFLAGS.photon2 =	23	CFLAGS.photon2 =
18		24
19	INST.x11 = doinstall	25	INST.x11 = doinstall
20	@@ -326,7 +326,7 @@	26	@@ -317,7 +317,7 @@
		27
		28	doc/x$(TARGET)rc.dist: all src/unix/xmamerc-keybinding-notes.txt
		29	./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -showconfig \| \
		30	- grep -v loadconfig > doc/x$(TARGET)rc.dist
		31	+ grep -v loadconfig \| tr "\033" \# > doc/x$(TARGET)rc.dist
		32	cat src/unix/xmamerc-keybinding-notes.txt >> doc/x$(TARGET)rc.dist
		33
		34	doc/gamelist.$(TARGET): all
		35	@@ -326,7 +326,8 @@
21		36
22	doc/x$(TARGET).6: all src/unix/xmame.6-1 src/unix/xmame.6-3	37	doc/x$(TARGET).6: all src/unix/xmame.6-1 src/unix/xmame.6-3
23	cat src/unix/xmame.6-1 > doc/x$(TARGET).6	38	cat src/unix/xmame.6-1 > doc/x$(TARGET).6
24	- ./x$(TARGET).$(DISPLAY_METHOD) -manhelp >> doc/x$(TARGET).6	39	- ./x$(TARGET).$(DISPLAY_METHOD) -manhelp >> doc/x$(TARGET).6
25	+ ./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -manhelp >> doc/x$(TARGET).6	40	+ ./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -manhelp \| \
		41	+ tr "\033" \# >> doc/x$(TARGET).6
26	cat src/unix/xmame.6-3 >> doc/x$(TARGET).6	42	cat src/unix/xmame.6-3 >> doc/x$(TARGET).6
27		43
28	install: $(INST.$(DISPLAY_METHOD)) install-man	44	install: $(INST.$(DISPLAY_METHOD)) install-man

Lines 2-8 Link Here

(-)xmame/pkg-descr (-3 / +1 lines)
2	the hardware, video, sound, and other services, of many classic arcade	2	the hardware, video, sound, and other services, of many classic arcade
3	game machines.	3	game machines.
4		4
5	As of this release, XMAME supports an incredible 2073 arcade games, and	5	As of this release, XMAME supports an incredible 2843 arcade games, and
6	the number grows every day! A partial list of the (more popular and	6	the number grows every day! A partial list of the (more popular and
7	well-known) games currently supported by this emulator include:	7	well-known) games currently supported by this emulator include:
8		8
Lines 20-24 Link Here
20	you can obtain ROM images for XMAME on the Net.	20	you can obtain ROM images for XMAME on the Net.
21		21
22	WWW: http://x.mame.net/	22	WWW: http://x.mame.net/
23
24	[ Maintained by Jacob A. Hart <c9710216@studentmail.newcastle.edu.au>. ]




%%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/keys.txt
%%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/sounds.dat
%%PORTDOCS%%@dirrm share/doc/%%MAMEMESS%%
%%OPENGL%%share/%%MAMEMESS%%/cab/glmame/cabfront.jpg
%%OPENGL%%share/%%MAMEMESS%%/cab/glmame/cabtitle.jpg
%%OPENGL%%share/%%MAMEMESS%%/cab/glmame/glmame.cab
%%OPENGL%%@dirrm share/%%MAMEMESS%%/cab/glmame
%%OPENGL%%share/%%MAMEMESS%%/cab/glmamejau/cabfront.jpg
%%OPENGL%%share/%%MAMEMESS%%/cab/glmamejau/cabside.jpg
%%OPENGL%%share/%%MAMEMESS%%/cab/glmamejau/cabtitle.jpg
%%OPENGL%%share/%%MAMEMESS%%/cab/glmamejau/glmamejau.cab
%%OPENGL%%@dirrm share/%%MAMEMESS%%/cab/glmamejau
%%OPENGL%%share/%%MAMEMESS%%/cab/trans/trans.cab
%%OPENGL%%@dirrm share/%%MAMEMESS%%/cab/trans
%%OPENGL%%@dirrm share/%%MAMEMESS%%/cab
@dirrm share/%%MAMEMESS%%/roms
@dirrm share/%%MAMEMESS%%
@unexec rmdir %%SPOOLGAMES%%/%%MAMEMESS%% 2>/dev/null || true




--- src/unix/unix.mak.orig	Sat Mar 17 03:11:38 2001
+++ src/unix/unix.mak	Mon Apr  2 12:36:22 2001
@@ -50,14 +50,14 @@
 LIBS.xfx        = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext -lglide2x
 LIBS.svgafx     = $(X11LIB) -lvga -lvgagl -lglide2x

 CFLAGS.photon2	=
 
 INST.x11        = doinstall
@@ -317,7 +317,7 @@
 	
 doc/x$(TARGET)rc.dist: all src/unix/xmamerc-keybinding-notes.txt
 	./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -showconfig | \
-	 grep -v loadconfig > doc/x$(TARGET)rc.dist
+	 grep -v loadconfig | tr "\033" \# > doc/x$(TARGET)rc.dist
 	cat src/unix/xmamerc-keybinding-notes.txt >> doc/x$(TARGET)rc.dist
 	
 doc/gamelist.$(TARGET): all
@@ -326,7 +326,8 @@
 
 doc/x$(TARGET).6: all src/unix/xmame.6-1 src/unix/xmame.6-3
 	cat src/unix/xmame.6-1 > doc/x$(TARGET).6
-	./x$(TARGET).$(DISPLAY_METHOD) -manhelp >> doc/x$(TARGET).6
+	./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -manhelp | \
+	 tr "\033" \# >> doc/x$(TARGET).6
 	cat src/unix/xmame.6-3 >> doc/x$(TARGET).6
 
 install: $(INST.$(DISPLAY_METHOD)) install-man

Lines 19-24 Link Here

(-)xpinmame/Makefile (-1 / +1 lines)
19		19
20	MAMEMESS= pinmame	20	MAMEMESS= pinmame
21	XMAMEVERSION= 0.37b13.1	21	XMAMEVERSION= 0.37b13.1
22	PINMAMEVERSION= 0.99b	22	PINMAMEVERSION= 0.99b1
23		23
24	.include "${MASTERDIR}/Makefile"	24	.include "${MASTERDIR}/Makefile"

Return to bug 26300

Lines 36-41 Link Here

(-)xmame/pkg-plist (+12 lines)
36	%%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/keys.txt	36	%%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/keys.txt
37	%%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/sounds.dat	37	%%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/sounds.dat
38	%%PORTDOCS%%@dirrm share/doc/%%MAMEMESS%%	38	%%PORTDOCS%%@dirrm share/doc/%%MAMEMESS%%
		39	%%OPENGL%%share/%%MAMEMESS%%/cab/glmame/cabfront.jpg
		40	%%OPENGL%%share/%%MAMEMESS%%/cab/glmame/cabtitle.jpg
		41	%%OPENGL%%share/%%MAMEMESS%%/cab/glmame/glmame.cab
		42	%%OPENGL%%@dirrm share/%%MAMEMESS%%/cab/glmame
		43	%%OPENGL%%share/%%MAMEMESS%%/cab/glmamejau/cabfront.jpg
		44	%%OPENGL%%share/%%MAMEMESS%%/cab/glmamejau/cabside.jpg
		45	%%OPENGL%%share/%%MAMEMESS%%/cab/glmamejau/cabtitle.jpg
		46	%%OPENGL%%share/%%MAMEMESS%%/cab/glmamejau/glmamejau.cab
		47	%%OPENGL%%@dirrm share/%%MAMEMESS%%/cab/glmamejau
		48	%%OPENGL%%share/%%MAMEMESS%%/cab/trans/trans.cab
		49	%%OPENGL%%@dirrm share/%%MAMEMESS%%/cab/trans
		50	%%OPENGL%%@dirrm share/%%MAMEMESS%%/cab
39	@dirrm share/%%MAMEMESS%%/roms	51	@dirrm share/%%MAMEMESS%%/roms
40	@dirrm share/%%MAMEMESS%%	52	@dirrm share/%%MAMEMESS%%
41	@unexec rmdir %%SPOOLGAMES%%/%%MAMEMESS%% 2>/dev/null \|\| true	53	@unexec rmdir %%SPOOLGAMES%%/%%MAMEMESS%% 2>/dev/null \|\| true

Lines 1-5 Link Here

(-)xmess/files/patch-ac (-4 / +14 lines)
1	--- src/unix/unix.mak.orig Sat Mar 10 09:11:54 2001	1	--- src/unix/unix.mak.orig Sat Mar 17 03:11:38 2001
2	+++ src/unix/unix.mak Sun Mar 11 19:26:27 2001	2	+++ src/unix/unix.mak Mon Apr 2 12:36:22 2001
3	@@ -50,14 +50,14 @@	3	@@ -50,14 +50,14 @@
4	LIBS.xfx = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext -lglide2x	4	LIBS.xfx = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext -lglide2x
5	LIBS.svgafx = $(X11LIB) -lvga -lvgagl -lglide2x	5	LIBS.svgafx = $(X11LIB) -lvga -lvgagl -lglide2x
Lines 17-28 Link Here
17	CFLAGS.photon2 =	17	CFLAGS.photon2 =
18		18
19	INST.x11 = doinstall	19	INST.x11 = doinstall
20	@@ -326,7 +326,7 @@	20	@@ -317,7 +317,7 @@
		21
		22	doc/x$(TARGET)rc.dist: all src/unix/xmamerc-keybinding-notes.txt
		23	./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -showconfig \| \
		24	- grep -v loadconfig > doc/x$(TARGET)rc.dist
		25	+ grep -v loadconfig \| tr "\033" \# > doc/x$(TARGET)rc.dist
		26	cat src/unix/xmamerc-keybinding-notes.txt >> doc/x$(TARGET)rc.dist
		27
		28	doc/gamelist.$(TARGET): all
		29	@@ -326,7 +326,8 @@
21		30
22	doc/x$(TARGET).6: all src/unix/xmame.6-1 src/unix/xmame.6-3	31	doc/x$(TARGET).6: all src/unix/xmame.6-1 src/unix/xmame.6-3
23	cat src/unix/xmame.6-1 > doc/x$(TARGET).6	32	cat src/unix/xmame.6-1 > doc/x$(TARGET).6
24	- ./x$(TARGET).$(DISPLAY_METHOD) -manhelp >> doc/x$(TARGET).6	33	- ./x$(TARGET).$(DISPLAY_METHOD) -manhelp >> doc/x$(TARGET).6
25	+ ./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -manhelp >> doc/x$(TARGET).6	34	+ ./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -manhelp \| \
		35	+ tr "\033" \# >> doc/x$(TARGET).6
26	cat src/unix/xmame.6-3 >> doc/x$(TARGET).6	36	cat src/unix/xmame.6-3 >> doc/x$(TARGET).6
27		37
28	install: $(INST.$(DISPLAY_METHOD)) install-man	38	install: $(INST.$(DISPLAY_METHOD)) install-man