Attachment #108375 for bug #149191

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




# $FreeBSD: ports/emulators/sdlmess/Makefile,v 1.29 2010/02/22 00:45:14 wen Exp $
#

PORTNAME=	mess
PORTVERSION=	0.139
CATEGORIES=	emulators
MASTER_SITES=	http://www.aarongiles.com/mirror/releases/:mame \
		http://www.mess.org/files/:mess \
		ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/
DISTFILES=	mame${PORTVERSION:S/.//}s.zip:mame \
		mess${PORTVERSION:S/.//}s.zip:mess

MAINTAINER=	elbarto@ArcadeBSD.org
COMMENT=	The popular MESS (Multiple Emulator Super System)

FETCH_ENV=	HTTP_USER_AGENT=defined
USE_ZIP=	yes
NO_WRKSUBDIR=	yes
USE_XORG=	xext xrender xinerama xi
USE_GL=		gl
USE_GNOME?=	gtk20 gconf2
USE_GMAKE=	yes
MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" TARGET=mess
USE_SDL=	sdl
USE_GCC=	4.4+
MAKEFILE=	makefile
ONLY_FOR_ARCHS=	i386 amd64
SUB_FILES=	pkg-message

OPTIONS=	DEBUG "Build mess debugger" off

.include <bsd.port.pre.mk>


EXTRA_PATCHES+=		${FILESDIR}/sdl.mak.patch
.endif

MAKE_JOBS_SAFE=	yes

.if ${ARCH} == "amd64"
MAKE_ENV+=	PTR64=1

BROKEN=		Does not compile on sparc64
.endif

post-extract:
	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/mame.zip ${EXTRACT_AFTER_ARGS}
	@${RM} -f ${WRKDIR}/mame.zip

post-patch:
	@${REINPLACE_CMD} -e "s|ui.bdf|${DATADIR}/ui.bdf|g" ${WRKSRC}/src/emu/ui.c

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
	${INSTALL_PROGRAM} ${WRKSRC}/chdman ${PREFIX}/libexec/${PORTNAME}
	${INSTALL_PROGRAM} ${WRKSRC}/imgtool ${PREFIX}/libexec/${PORTNAME}
	${INSTALL_PROGRAM} ${WRKSRC}/jedutil ${PREFIX}/libexec/${PORTNAME}
	${INSTALL_PROGRAM} ${WRKSRC}/ldresample ${PREFIX}/libexec/${PORTNAME}
	${INSTALL_PROGRAM} ${WRKSRC}/ldverify ${PREFIX}/libexec/${PORTNAME}
	${INSTALL_PROGRAM} ${WRKSRC}/testkeys ${PREFIX}/libexec/${PORTNAME}
	${INSTALL_PROGRAM} ${WRKSRC}/unidasm ${PREFIX}/libexec/${PORTNAME}
.if !defined(NOPORTDOCS)
	${MKDIR} ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR}
	${CP} -R ${WRKSRC}/docs ${DOCSDIR}
.endif
	${MKDIR} ${DATADIR}
	${CP} ${WRKSRC}/ui.bdf ${DATADIR}/
	${CP} -R ${WRKSRC}/keymaps ${DATADIR}/
	${CP} -R ${WRKSRC}/hash ${DATADIR}/
	${CP} -R ${WRKSRC}/artwork ${DATADIR}/
	${MKDIR} ${EXAMPLESDIR}

Lines 1-3 Link Here

(-)mess/distinfo (-3 / +6 lines)
1	MD5 (sdlmess0136.zip) = ad07a5df80f0f7a548f14703aa6ff756	1	MD5 (mame0139s.zip) = e9f81e86b786e0131eb6fb59e6bfe189
2	SHA256 (sdlmess0136.zip) = c8be6f3c939738370bcfabd629661691926d00ae0f70032d8f8379313dca88bb	2	SHA256 (mame0139s.zip) = e9dc268530b9a2b6fe17330af96dc5680dadba1b5e444bf7ef8fa1f15de7f3d6
3	SIZE (sdlmess0136.zip) = 36705871	3	SIZE (mame0139s.zip) = 16706970
		4	MD5 (mess0139s.zip) = 21617dc50408612905c138ed2d6b2930
		5	SHA256 (mess0139s.zip) = def723e0e87c6b541c145c9a5c92d86187d530662fb88b186f0c596e1e1309ed
		6	SIZE (mess0139s.zip) = 18474426

Line 0 Link Here

(-)mess/files/patch-debugcpu.c (+13 lines)
	1	--- src/emu/debug/debugcpu.c.orig 2010-08-01 23:31:06.000000000 +0200
	2	+++ src/emu/debug/debugcpu.c 2010-08-01 23:31:23.000000000 +0200
	3	@@ -49,7 +49,9 @@
	4	#include "debugint/debugint.h"
	5	#include "uiinput.h"
	6	#include <ctype.h>
	7	-
	8	+#ifdef __FreeBSD__
	9	+#undef tolower
	10	+#endif
	11
	12
	13	/***************************************************************************




--- makefile.orig	2010-08-01 23:04:35.000000000 +0200
+++ makefile	2010-08-01 23:04:58.000000000 +0200
@@ -295,8 +295,8 @@
 
 # compiler, linker and utilities
 AR = @ar
-CC = @gcc
-LD = @g++
+CC:= @$(CC)
+LD:= @$(CXX)
 MD = -mkdir$(EXE)
 RM = @rm -f
 OBJDUMP = @objdump
@@ -344,7 +344,7 @@
 endif
 
 # fullname is prefix+name+suffix+suffix64+suffixdebug
-FULLNAME = $(PREFIX)$(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)$(SUFFIXPROFILE)
+FULLNAME = $(NAME)
 
 # add an EXE suffix to get the final emulator name
 EMULATOR = $(FULLNAME)$(EXE)




--- makefile.sdl.orig	2009-09-17 02:49:53.000000000 +0200
+++ makefile.sdl	2009-11-24 07:25:56.000000000 +0100
@@ -59,7 +59,7 @@
 ifeq ($(OSD),windows)
 TARGETOS = win32
 else
-TARGETOS = unix
+TARGETOS = freebsd
 endif
 endif
 
@@ -197,8 +197,8 @@
 
 # compiler, linker and utilities
 AR = @ar
-CC = @gcc
-LD = @gcc
+CC := @$(CC)
+LD := @$(CC)
 MD = -mkdir$(EXE)
 RM = @rm -f
 
@@ -227,7 +227,7 @@
 endif
 
 # fullname is prefix+name+suffix+debugsuffix
-FULLNAME = $(PREFIX)$(NAME)$(CPPSUFFIX)$(SUFFIX)$(DEBUGSUFFIX)
+FULLNAME = sdl$(NAME)$(CPPSUFFIX)$(SUFFIX)$(DEBUGSUFFIX)
 
 # add an EXE suffix to get the final emulator name
 EMULATOR = $(FULLNAME)$(EXE)
@@ -338,7 +338,7 @@
 ifneq ($(OPTIMIZE),0)
 ifneq ($(TARGETOS),os2)
 ifndef IA64
-CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS)
+CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
 else
 endif
 else
@@ -382,6 +382,7 @@
 	-I$(SRC)/lib/util \
 	-I$(SRC)/osd \
 	-I$(SRC)/osd/$(OSD) \
+	-I$(LOCALBASE)/include \
 
 
 
@@ -395,7 +396,7 @@
 ifneq ($(TARGETOS),macosx)
 ifneq ($(TARGETOS),os2)
 ifneq ($(TARGETOS),solaris)
-LDFLAGS = -Wl,--warn-common
+LDFLAGS = -Wl,--warn-common $(PTHREAD_LIBS) -L$(LOCALBASE)/lib
 endif
 endif
 endif




--- src/osd/sdl/sdl.mak.orig	2010-02-14 04:47:30.000000000 +0100
+++ src/osd/sdl/sdl.mak	2010-08-02 11:50:12.000000000 +0200
@@ -139,7 +139,8 @@
 ifeq ($(TARGETOS),freebsd)
 BASE_TARGETOS = unix
 SYNC_IMPLEMENTATION = tc
-DEFS += -DNO_AFFINITY_NP
+DEFS += -DNO_AFFINITY_NP -DNO_DEBUGGER
+NO_DEBUGGER=1
 # /usr/local/include is not considered a system include directory
 # on FreeBSD. GL.h resides there and throws warnings
 CCOMFLAGS += -isystem /usr/local/include
@@ -304,7 +305,7 @@
 ifeq ($(BASE_TARGETOS),unix)
 
 DEFS += -DSDLMAME_UNIX
-DEBUGOBJS = $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
+DEBUGOBJS = $(SDLOBJ)/debugwin.o
 LIBGL = -lGL
 ifeq ($(NO_X11),1)
 NO_DEBUGGER = 1
@@ -454,8 +455,8 @@
 
 # the new debugger relies on GTK+ in addition to the base SDLMAME needs
 # Non-X11 builds can not use the debugger
-CCOMFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0`
-LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
+#CCOMFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0`
+#LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
 #CCOMFLAGS += -DGTK_DISABLE_DEPRECATED
 
 # some systems still put important things in a different prefix




bin/mess
libexec/mess/chdman
libexec/mess/imgtool
libexec/mess/jedutil
libexec/mess/ldresample
libexec/mess/ldverify
libexec/mess/testkeys
libexec/mess/unidasm
%%PORTDOCS%%%%DOCSDIR%%/SDLMESS.txt
%%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
%%PORTDOCS%%%%DOCSDIR%%/docs/config.txt
%%PORTDOCS%%%%DOCSDIR%%/docs/credits.htm

%%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
%%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt
%%PORTDOCS%%%%DOCSDIR%%/docs/wintoc.xml
%%PORTDOCS%%%%DOCSDIR%%/docs/images/logo.gif
%%PORTDOCS%%%%DOCSDIR%%/docs/windows/choice.htm
%%PORTDOCS%%%%DOCSDIR%%/docs/windows/compile.htm
%%PORTDOCS%%%%DOCSDIR%%/docs/windows/config.htm

%%PORTDOCS%%%%DOCSDIR%%/docs/windows/guiconf.htm
%%PORTDOCS%%%%DOCSDIR%%/docs/windows/guiuse.htm
%%PORTDOCS%%%%DOCSDIR%%/docs/windows/install.htm
%%PORTDOCS%%%%DOCSDIR%%/docs/windows/instbios.htm
%%PORTDOCS%%%%DOCSDIR%%/docs/windows/instroms.htm
%%PORTDOCS%%%%DOCSDIR%%/docs/windows/main.htm
%%PORTDOCS%%%%DOCSDIR%%/docs/windows/mgebios.htm
%%PORTDOCS%%%%DOCSDIR%%/docs/windows/mgeroms.htm
%%PORTDOCS%%%%DOCSDIR%%/docs/windows/osmenu.htm
%%PORTDOCS%%%%DOCSDIR%%/docs/windows/runsw.htm

%%DATADIR%%/artwork/dallas.zip
%%DATADIR%%/artwork/dallas16.zip
%%DATADIR%%/artwork/dallas32.zip
%%DATADIR%%/artwork/dir.txt
%%DATADIR%%/artwork/floppyr.png
%%DATADIR%%/artwork/floppyw.png
%%DATADIR%%/artwork/glasgow.zip
%%DATADIR%%/artwork/hp48g.zip
%%DATADIR%%/artwork/hp48gp.zip

%%DATADIR%%/artwork/hp48sx.zip
%%DATADIR%%/artwork/junior.zip
%%DATADIR%%/artwork/kim1.zip
%%DATADIR%%/artwork/ledoff.png
%%DATADIR%%/artwork/ledon.png
%%DATADIR%%/artwork/mk1.zip
%%DATADIR%%/artwork/mk2.zip
%%DATADIR%%/artwork/mm4.zip

%%DATADIR%%/artwork/mm50.zip
%%DATADIR%%/artwork/mpf1.zip
%%DATADIR%%/artwork/mpf1b.zip
%%DATADIR%%/artwork/nes.zip
%%DATADIR%%/artwork/pc1401.zip
%%DATADIR%%/artwork/pc1402.zip
%%DATADIR%%/artwork/pc1403.zip
%%DATADIR%%/artwork/rebel5.zip
%%DATADIR%%/artwork/roma32.zip
%%DATADIR%%/artwork/ssystem3.zip
%%DATADIR%%/artwork/thomson.lay
%%DATADIR%%/artwork/thomson.zip
%%DATADIR%%/hash/a2600.hsi
%%DATADIR%%/hash/a5200.hsi

%%DATADIR%%/hash/channelf.hsi
%%DATADIR%%/hash/coco.hsi
%%DATADIR%%/hash/coleco.hsi
%%DATADIR%%/hash/coupe.hsi
%%DATADIR%%/hash/cpc464.hsi
%%DATADIR%%/hash/cpc6128.hsi
%%DATADIR%%/hash/dragon64.hsi

%%DATADIR%%/hash/mc10.hsi
%%DATADIR%%/hash/megaduck.hsi
%%DATADIR%%/hash/microtan.hsi
%%DATADIR%%/hash/mo5.hsi
%%DATADIR%%/hash/msx.hsi
%%DATADIR%%/hash/msx2.hsi
%%DATADIR%%/hash/mtx512.hsi

%%DATADIR%%/hash/svision.hsi
%%DATADIR%%/hash/ti99_4a.hsi
%%DATADIR%%/hash/ts2068.hsi
%%DATADIR%%/hash/vboy.hsi
%%DATADIR%%/hash/vc4000.hsi
%%DATADIR%%/hash/vectrex.hsi
%%DATADIR%%/hash/vic20.hsi
%%DATADIR%%/hash/wswan.hsi
%%DATADIR%%/keymaps/km-be.txt
%%DATADIR%%/keymaps/km-ch.txt
%%DATADIR%%/keymaps/km-de.txt
%%DATADIR%%/keymaps/km-fr-OSX.txt
%%DATADIR%%/keymaps/km-fr.txt
%%DATADIR%%/keymaps/km_it.txt
%%DATADIR%%/ui.bdf
%%EXAMPLESDIR%%/mess.ini
@dirrm %%DATADIR%%/artwork
@dirrm %%DATADIR%%/hash
@dirrm %%DATADIR%%/keymaps
@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/images
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/windows/images
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/windows
%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%EXAMPLESDIR%%
@dirrm libexec/mess

Return to bug 149191

Lines 5-32 Link Here

(-)mess/Makefile (-20 / +26 lines)
5	# $FreeBSD: ports/emulators/sdlmess/Makefile,v 1.29 2010/02/22 00:45:14 wen Exp $	5	# $FreeBSD: ports/emulators/sdlmess/Makefile,v 1.29 2010/02/22 00:45:14 wen Exp $
6	#	6	#
7		7
8	PORTNAME= sdlmess	8	PORTNAME= mess
9	PORTVERSION= 0.136	9	PORTVERSION= 0.139
10	CATEGORIES= emulators	10	CATEGORIES= emulators
11	MASTER_SITES= ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/	11	MASTER_SITES= http://www.aarongiles.com/mirror/releases/:mame \
12	DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}	12	http://www.mess.org/files/:mess \
		13	ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/
		14	DISTFILES= mame${PORTVERSION:S/.//}s.zip:mame \
		15	mess${PORTVERSION:S/.//}s.zip:mess
13		16
14	MAINTAINER= elbarto@ArcadeBSD.org	17	MAINTAINER= elbarto@ArcadeBSD.org
15	COMMENT= SDL port of the popular MESS (Multiple Emulator Super System)	18	COMMENT= The popular MESS (Multiple Emulator Super System)
16		19
17	FETCH_ENV= HTTP_USER_AGENT=defined
18	USE_ZIP= yes	20	USE_ZIP= yes
		21	NO_WRKSUBDIR= yes
19	USE_XORG= xext xrender xinerama xi	22	USE_XORG= xext xrender xinerama xi
20	USE_GL= gl	23	USE_GL= gl
21	USE_GNOME?= gtk20 gconf2	24	USE_GNOME?= gtk20 gconf2
22	USE_GMAKE= yes	25	USE_GMAKE= yes
23	MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}"	26	MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" TARGET=mess
24	USE_SDL= sdl	27	USE_SDL= sdl
25	MAKEFILE= makefile.sdl	28	USE_GCC= 4.4+
		29	MAKEFILE= makefile
26	ONLY_FOR_ARCHS= i386 amd64	30	ONLY_FOR_ARCHS= i386 amd64
27	SUB_FILES= pkg-message	31	SUB_FILES= pkg-message
28		32
29	OPTIONS= DEBUG "Build sdlmess debugger" off	33	OPTIONS= DEBUG "Build mess debugger" off
30		34
31	.include <bsd.port.pre.mk>	35	.include <bsd.port.pre.mk>
32		36
Lines 35-41 Link Here
35	EXTRA_PATCHES+= ${FILESDIR}/sdl.mak.patch	39	EXTRA_PATCHES+= ${FILESDIR}/sdl.mak.patch
36	.endif	40	.endif
37		41
38	MAKE_JOBS_UNSAFE= yes	42	MAKE_JOBS_SAFE= yes
39		43
40	.if ${ARCH} == "amd64"	44	.if ${ARCH} == "amd64"
41	MAKE_ENV+= PTR64=1	45	MAKE_ENV+= PTR64=1
Lines 44-70 Link Here
44	BROKEN= Does not compile on sparc64	48	BROKEN= Does not compile on sparc64
45	.endif	49	.endif
46		50
		51	post-extract:
		52	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/mame.zip ${EXTRACT_AFTER_ARGS}
		53	@${RM} -f ${WRKDIR}/mame.zip
		54
47	post-patch:	55	post-patch:
48	@${REINPLACE_CMD} -e "s\|ui.bdf\|${DATADIR}/ui.bdf\|g" ${WRKSRC}/src/emu/ui.c	56	@${REINPLACE_CMD} -e "s\|ui.bdf\|${DATADIR}/ui.bdf\|g" ${WRKSRC}/src/emu/ui.c
49		57
50	do-install:	58	do-install:
51	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/	59	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
52	${MKDIR} ${PREFIX}/libexec/sdlmess	60	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
53	${INSTALL_PROGRAM} ${WRKSRC}/chdman ${PREFIX}/libexec/sdlmess	61	${INSTALL_PROGRAM} ${WRKSRC}/chdman ${PREFIX}/libexec/${PORTNAME}
54	${INSTALL_PROGRAM} ${WRKSRC}/imgtool ${PREFIX}/libexec/sdlmess	62	${INSTALL_PROGRAM} ${WRKSRC}/imgtool ${PREFIX}/libexec/${PORTNAME}
55	${INSTALL_PROGRAM} ${WRKSRC}/jedutil ${PREFIX}/libexec/sdlmess	63	${INSTALL_PROGRAM} ${WRKSRC}/jedutil ${PREFIX}/libexec/${PORTNAME}
56	${INSTALL_PROGRAM} ${WRKSRC}/ldresample ${PREFIX}/libexec/sdlmess	64	${INSTALL_PROGRAM} ${WRKSRC}/ldresample ${PREFIX}/libexec/${PORTNAME}
57	${INSTALL_PROGRAM} ${WRKSRC}/ldverify ${PREFIX}/libexec/sdlmess	65	${INSTALL_PROGRAM} ${WRKSRC}/ldverify ${PREFIX}/libexec/${PORTNAME}
58	${INSTALL_PROGRAM} ${WRKSRC}/testkeys ${PREFIX}/libexec/sdlmess	66	${INSTALL_PROGRAM} ${WRKSRC}/testkeys ${PREFIX}/libexec/${PORTNAME}
59	${INSTALL_PROGRAM} ${WRKSRC}/unidasm ${PREFIX}/libexec/sdlmess	67	${INSTALL_PROGRAM} ${WRKSRC}/unidasm ${PREFIX}/libexec/${PORTNAME}
60	.if !defined(NOPORTDOCS)	68	.if !defined(NOPORTDOCS)
61	${MKDIR} ${DOCSDIR}	69	${MKDIR} ${DOCSDIR}
62	${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR}	70	${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR}
63	${CP} -R ${WRKSRC}/docs ${DOCSDIR}	71	${CP} -R ${WRKSRC}/docs ${DOCSDIR}
64	.endif	72	.endif
65	${MKDIR} ${DATADIR}	73	${MKDIR} ${DATADIR}
66	${CP} ${WRKSRC}/ui.bdf ${DATADIR}/
67	${CP} -R ${WRKSRC}/keymaps ${DATADIR}/
68	${CP} -R ${WRKSRC}/hash ${DATADIR}/	74	${CP} -R ${WRKSRC}/hash ${DATADIR}/
69	${CP} -R ${WRKSRC}/artwork ${DATADIR}/	75	${CP} -R ${WRKSRC}/artwork ${DATADIR}/
70	${MKDIR} ${EXAMPLESDIR}	76	${MKDIR} ${EXAMPLESDIR}

Line 0 Link Here

(-)mess/files/patch-makefile (+22 lines)
	1	--- makefile.orig 2010-08-01 23:04:35.000000000 +0200
	2	+++ makefile 2010-08-01 23:04:58.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)

Lines 1-57 Link Here

(-)mess/files/patch-makefile.sdl (-57 lines)
1	--- makefile.sdl.orig 2009-09-17 02:49:53.000000000 +0200
2	+++ makefile.sdl 2009-11-24 07:25:56.000000000 +0100
3	@@ -59,7 +59,7 @@
4	ifeq ($(OSD),windows)
5	TARGETOS = win32
6	else
7	-TARGETOS = unix
8	+TARGETOS = freebsd
9	endif
10	endif
11
12	@@ -197,8 +197,8 @@
13
14	# compiler, linker and utilities
15	AR = @ar
16	-CC = @gcc
17	-LD = @gcc
18	+CC := @$(CC)
19	+LD := @$(CC)
20	MD = -mkdir$(EXE)
21	RM = @rm -f
22
23	@@ -227,7 +227,7 @@
24	endif
25
26	# fullname is prefix+name+suffix+debugsuffix
27	-FULLNAME = $(PREFIX)$(NAME)$(CPPSUFFIX)$(SUFFIX)$(DEBUGSUFFIX)
28	+FULLNAME = sdl$(NAME)$(CPPSUFFIX)$(SUFFIX)$(DEBUGSUFFIX)
29
30	# add an EXE suffix to get the final emulator name
31	EMULATOR = $(FULLNAME)$(EXE)
32	@@ -338,7 +338,7 @@
33	ifneq ($(OPTIMIZE),0)
34	ifneq ($(TARGETOS),os2)
35	ifndef IA64
36	-CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS)
37	+CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
38	else
39	endif
40	else
41	@@ -382,6 +382,7 @@
42	-I$(SRC)/lib/util \
43	-I$(SRC)/osd \
44	-I$(SRC)/osd/$(OSD) \
45	+ -I$(LOCALBASE)/include \
46
47
48
49	@@ -395,7 +396,7 @@
50	ifneq ($(TARGETOS),macosx)
51	ifneq ($(TARGETOS),os2)
52	ifneq ($(TARGETOS),solaris)
53	-LDFLAGS = -Wl,--warn-common
54	+LDFLAGS = -Wl,--warn-common $(PTHREAD_LIBS) -L$(LOCALBASE)/lib
55	endif
56	endif
57	endif

Lines 1-25 Link Here

(-)mess/files/sdl.mak.patch (-25 / +32 lines)
1	--- src/osd/sdl/sdl.mak.orig 2009-11-13 11:09:21.000000000 +0100	1	--- src/osd/sdl/sdl.mak.orig 2010-02-14 04:47:30.000000000 +0100
2	+++ src/osd/sdl/sdl.mak 2009-11-13 11:10:24.000000000 +0100	2	+++ src/osd/sdl/sdl.mak 2010-08-02 11:50:12.000000000 +0200
3	@@ -140,6 +140,7 @@	3	@@ -139,7 +139,8 @@
4	endif	4	ifeq ($(TARGETOS),freebsd)
5		5	BASE_TARGETOS = unix
6	ifeq ($(TARGETOS),freebsd)	6	SYNC_IMPLEMENTATION = tc
7	+DEFS += -DNO_DEBUGGER	7	-DEFS += -DNO_AFFINITY_NP
8	TARGETOS = unix	8	+DEFS += -DNO_AFFINITY_NP -DNO_DEBUGGER
9	SYNC_IMPLEMENTATION = ntc	9	+NO_DEBUGGER=1
10	endif	10	# /usr/local/include is not considered a system include directory
11	@@ -288,10 +289,10 @@	11	# on FreeBSD. GL.h resides there and throws warnings
12	# the new debugger relies on GTK+ in addition to the base SDLMAME needs	12	CCOMFLAGS += -isystem /usr/local/include
13	# Non-X11 builds can not use the debugger	13	@@ -304,7 +305,7 @@
14	ifndef NO_X11	14	ifeq ($(BASE_TARGETOS),unix)
15	-OSDCOREOBJS += $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o	15
16	-CFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0`	16	DEFS += -DSDLMAME_UNIX
17	-LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`	17	-DEBUGOBJS = $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
18	-CFLAGS += -DGTK_DISABLE_DEPRECATED	18	+DEBUGOBJS = $(SDLOBJ)/debugwin.o
19	+OSDCOREOBJS += $(SDLOBJ)/debugwin.o	19	LIBGL = -lGL
20	+#CFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0`	20	ifeq ($(NO_X11),1)
21	+#LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`	21	NO_DEBUGGER = 1
22	+#CFLAGS += -DGTK_DISABLE_DEPRECATED	22	@@ -454,8 +455,8 @@
23	else	23
24	OSDCOREOBJS += $(SDLOBJ)/debugwin.o	24	# the new debugger relies on GTK+ in addition to the base SDLMAME needs
25	endif # NO_X11	25	# Non-X11 builds can not use the debugger
		26	-CCOMFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0`
		27	-LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
		28	+#CCOMFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0`
		29	+#LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
		30	#CCOMFLAGS += -DGTK_DISABLE_DEPRECATED
		31
		32	# some systems still put important things in a different prefix

Lines 1-12 Link Here

(-)mess/pkg-plist (-30 / +11 lines)
1	bin/sdlmess	1	bin/mess
2	libexec/sdlmess/chdman	2	libexec/mess/chdman
3	libexec/sdlmess/imgtool	3	libexec/mess/imgtool
4	libexec/sdlmess/jedutil	4	libexec/mess/jedutil
5	libexec/sdlmess/ldresample	5	libexec/mess/ldresample
6	libexec/sdlmess/ldverify	6	libexec/mess/ldverify
7	libexec/sdlmess/testkeys	7	libexec/mess/testkeys
8	libexec/sdlmess/unidasm	8	libexec/mess/unidasm
9	%%PORTDOCS%%%%DOCSDIR%%/SDLMESS.txt
10	%%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt	9	%%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
11	%%PORTDOCS%%%%DOCSDIR%%/docs/config.txt	10	%%PORTDOCS%%%%DOCSDIR%%/docs/config.txt
12	%%PORTDOCS%%%%DOCSDIR%%/docs/credits.htm	11	%%PORTDOCS%%%%DOCSDIR%%/docs/credits.htm
Lines 18-24 Link Here
18	%%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt	17	%%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
19	%%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt	18	%%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt
20	%%PORTDOCS%%%%DOCSDIR%%/docs/wintoc.xml	19	%%PORTDOCS%%%%DOCSDIR%%/docs/wintoc.xml
21	%%PORTDOCS%%%%DOCSDIR%%/docs/images/logo.gif
22	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/choice.htm	20	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/choice.htm
23	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/compile.htm	21	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/compile.htm
24	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/config.htm	22	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/config.htm
Lines 26-35 Link Here
26	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/guiconf.htm	24	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/guiconf.htm
27	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/guiuse.htm	25	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/guiuse.htm
28	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/install.htm	26	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/install.htm
29	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/instbios.htm
30	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/instroms.htm	27	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/instroms.htm
31	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/main.htm	28	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/main.htm
32	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/mgebios.htm
33	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/mgeroms.htm	29	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/mgeroms.htm
34	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/osmenu.htm	30	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/osmenu.htm
35	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/runsw.htm	31	%%PORTDOCS%%%%DOCSDIR%%/docs/windows/runsw.htm
Lines 62-70 Link Here
62	%%DATADIR%%/artwork/dallas.zip	58	%%DATADIR%%/artwork/dallas.zip
63	%%DATADIR%%/artwork/dallas16.zip	59	%%DATADIR%%/artwork/dallas16.zip
64	%%DATADIR%%/artwork/dallas32.zip	60	%%DATADIR%%/artwork/dallas32.zip
65	%%DATADIR%%/artwork/dir.txt
66	%%DATADIR%%/artwork/floppyr.png
67	%%DATADIR%%/artwork/floppyw.png
68	%%DATADIR%%/artwork/glasgow.zip	61	%%DATADIR%%/artwork/glasgow.zip
69	%%DATADIR%%/artwork/hp48g.zip	62	%%DATADIR%%/artwork/hp48g.zip
70	%%DATADIR%%/artwork/hp48gp.zip	63	%%DATADIR%%/artwork/hp48gp.zip
Lines 73-80 Link Here
73	%%DATADIR%%/artwork/hp48sx.zip	66	%%DATADIR%%/artwork/hp48sx.zip
74	%%DATADIR%%/artwork/junior.zip	67	%%DATADIR%%/artwork/junior.zip
75	%%DATADIR%%/artwork/kim1.zip	68	%%DATADIR%%/artwork/kim1.zip
76	%%DATADIR%%/artwork/ledoff.png
77	%%DATADIR%%/artwork/ledon.png
78	%%DATADIR%%/artwork/mk1.zip	69	%%DATADIR%%/artwork/mk1.zip
79	%%DATADIR%%/artwork/mk2.zip	70	%%DATADIR%%/artwork/mk2.zip
80	%%DATADIR%%/artwork/mm4.zip	71	%%DATADIR%%/artwork/mm4.zip
Lines 82-95 Link Here
82	%%DATADIR%%/artwork/mm50.zip	73	%%DATADIR%%/artwork/mm50.zip
83	%%DATADIR%%/artwork/mpf1.zip	74	%%DATADIR%%/artwork/mpf1.zip
84	%%DATADIR%%/artwork/mpf1b.zip	75	%%DATADIR%%/artwork/mpf1b.zip
85	%%DATADIR%%/artwork/nes.zip
86	%%DATADIR%%/artwork/pc1401.zip	76	%%DATADIR%%/artwork/pc1401.zip
87	%%DATADIR%%/artwork/pc1402.zip	77	%%DATADIR%%/artwork/pc1402.zip
88	%%DATADIR%%/artwork/pc1403.zip	78	%%DATADIR%%/artwork/pc1403.zip
89	%%DATADIR%%/artwork/rebel5.zip	79	%%DATADIR%%/artwork/rebel5.zip
90	%%DATADIR%%/artwork/roma32.zip	80	%%DATADIR%%/artwork/roma32.zip
91	%%DATADIR%%/artwork/ssystem3.zip	81	%%DATADIR%%/artwork/ssystem3.zip
92	%%DATADIR%%/artwork/thomson.lay
93	%%DATADIR%%/artwork/thomson.zip	82	%%DATADIR%%/artwork/thomson.zip
94	%%DATADIR%%/hash/a2600.hsi	83	%%DATADIR%%/hash/a2600.hsi
95	%%DATADIR%%/hash/a5200.hsi	84	%%DATADIR%%/hash/a5200.hsi
Lines 117-123 Link Here
117	%%DATADIR%%/hash/channelf.hsi	106	%%DATADIR%%/hash/channelf.hsi
118	%%DATADIR%%/hash/coco.hsi	107	%%DATADIR%%/hash/coco.hsi
119	%%DATADIR%%/hash/coleco.hsi	108	%%DATADIR%%/hash/coleco.hsi
120	%%DATADIR%%/hash/coupe.hsi
121	%%DATADIR%%/hash/cpc464.hsi	109	%%DATADIR%%/hash/cpc464.hsi
122	%%DATADIR%%/hash/cpc6128.hsi	110	%%DATADIR%%/hash/cpc6128.hsi
123	%%DATADIR%%/hash/dragon64.hsi	111	%%DATADIR%%/hash/dragon64.hsi
Lines 140-145 Link Here
140	%%DATADIR%%/hash/mc10.hsi	128	%%DATADIR%%/hash/mc10.hsi
141	%%DATADIR%%/hash/megaduck.hsi	129	%%DATADIR%%/hash/megaduck.hsi
142	%%DATADIR%%/hash/microtan.hsi	130	%%DATADIR%%/hash/microtan.hsi
		131	%%DATADIR%%/hash/mo5.hsi
143	%%DATADIR%%/hash/msx.hsi	132	%%DATADIR%%/hash/msx.hsi
144	%%DATADIR%%/hash/msx2.hsi	133	%%DATADIR%%/hash/msx2.hsi
145	%%DATADIR%%/hash/mtx512.hsi	134	%%DATADIR%%/hash/mtx512.hsi
Lines 165-190 Link Here
165	%%DATADIR%%/hash/svision.hsi	154	%%DATADIR%%/hash/svision.hsi
166	%%DATADIR%%/hash/ti99_4a.hsi	155	%%DATADIR%%/hash/ti99_4a.hsi
167	%%DATADIR%%/hash/ts2068.hsi	156	%%DATADIR%%/hash/ts2068.hsi
		157	%%DATADIR%%/hash/vboy.hsi
168	%%DATADIR%%/hash/vc4000.hsi	158	%%DATADIR%%/hash/vc4000.hsi
169	%%DATADIR%%/hash/vectrex.hsi	159	%%DATADIR%%/hash/vectrex.hsi
170	%%DATADIR%%/hash/vic20.hsi	160	%%DATADIR%%/hash/vic20.hsi
171	%%DATADIR%%/hash/wswan.hsi	161	%%DATADIR%%/hash/wswan.hsi
172	%%DATADIR%%/keymaps/km-be.txt
173	%%DATADIR%%/keymaps/km-ch.txt
174	%%DATADIR%%/keymaps/km-de.txt
175	%%DATADIR%%/keymaps/km-fr-OSX.txt
176	%%DATADIR%%/keymaps/km-fr.txt
177	%%DATADIR%%/keymaps/km_it.txt
178	%%DATADIR%%/ui.bdf
179	%%EXAMPLESDIR%%/mess.ini	162	%%EXAMPLESDIR%%/mess.ini
180	@dirrm %%DATADIR%%/artwork	163	@dirrm %%DATADIR%%/artwork
181	@dirrm %%DATADIR%%/hash	164	@dirrm %%DATADIR%%/hash
182	@dirrm %%DATADIR%%/keymaps
183	@dirrm %%DATADIR%%	165	@dirrm %%DATADIR%%
184	%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/images
185	%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/windows/images	166	%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/windows/images
186	%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/windows	167	%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/windows
187	%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs	168	%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
188	%%PORTDOCS%%@dirrm %%DOCSDIR%%	169	%%PORTDOCS%%@dirrm %%DOCSDIR%%
189	@dirrm %%EXAMPLESDIR%%	170	@dirrm %%EXAMPLESDIR%%
190	@dirrm libexec/sdlmess	171	@dirrm libexec/mess