[MAINTAINER UPDATE]: emulators/xmame & emulators/xmess

	Update of xmame/xmess to 0.65.1

PR:		ports/48202
Submitted by:	Stijn Hoop <stijn@win.tue.nl>

5 files changed, 58 insertions, 23 deletions

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 224ec1c0202d..eba9327f73ed 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME?=	xmame
-PORTVERSION?=	0.61.1
+PORTVERSION?=	0.65.1
 CATEGORIES=	emulators
 MASTER_SITES=	http://x.mame.net/download/:xmame \
 		http://www.sys2064.com/files/util/:history \
 		http://www.sys2064.com/files/mame/:highscore \
 		http://cheat.retrogames.com/:cheat \
 		http://www.win.tue.nl/~stijn/xmame/:history,highscore,cheat
-DISTNAME=	xmame-${XMAMEVERSION:S/.p/-pr/}
+DISTNAME=	xmame-${XMAMEVERSION:S/.r/-rc/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:xmame
 DIST_SUBDIR=	xmame
 
@@ -53,6 +53,7 @@ SPOOLGAMES?=	/var/games
 GENERALDOCS=	changes.unix \
 		ctrlr.txt \
 		dga2.txt \
+		img/xmame.jpg \
 		liesmich.unix \
 		listinfo.txt \
 		multiplayer-readme.txt \
@@ -86,7 +87,8 @@ XMESSDOCS=	changes.mess \
 		imgtool.txt \
 		messhelp.txt \
 		messroms.txt \
-		old-changes.mess
+		old-changes.mess \
+		readme.mess
 PINMAMEDOCS=	pinmame/simulation.txt \
 		pinmame/whatsnew.txt \
 		pinmame/pinmame.txt \
@@ -107,8 +109,7 @@ ALLDOCS=	${GENERALDOCS} ${PINMAMEDOCS}
 PKGOPTS=	${FILESDIR}/pkg-opts
 
 #
-# Various options are processed here. Note that due to a bug in make(1), at
-# present the conditionals are suboptimal. See PR bin/34032.
+# Various options are processed here.
 #
 
 # Option WITH_DATFILES
@@ -149,7 +150,7 @@ WITH_ASM68K=	no
 .if ${WITH_ASM68K:L} == "yes"
 ASM_COMMENT=
 .else
-ASM_COMMENT=\#
+ASM_COMMENT=\#\ 
 .endif
 
 # Option WITH_OPTIMIZATION
@@ -161,6 +162,8 @@ CFLAGS+=	-O3 -Wall -Wno-unused -funroll-loops \
 .endif
 .endif
 
+SDLSOUNDCOMMENT= \#\ 
+
 # Option DISPLAY_TARGET
 .if !defined(DISPLAY_TARGET)
 DISPLAY_TARGET=sdl
@@ -177,8 +180,6 @@ PLIST_SUB+=	OPENGL="@comment "
 
 .if ${DISPLAY_TARGET:L} == "svgalib"
 LIB_DEPENDS=	vga.1:${PORTSDIR}/graphics/svgalib
-CFLAGS+=	-I${LOCALBASE}/include
-MAKE_ENV+=	LOCALBASE=${LOCALBASE}
 DISPLAY_METHOD=	svgalib
 .else
 
@@ -195,6 +196,7 @@ pre-everything::
 LIB_DEPENDS=    SDL-1.1.5:${PORTSDIR}/devel/sdl12
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 DISPLAY_METHOD=	SDL
+SDLSOUNDCOMMENT=
 .endif
 .endif
 .endif
@@ -251,24 +253,30 @@ pre-everything::
 
 # The large number of sed regexes here is intended to make this port a whole
 # lot easier to maintain - please don't convert them into a patch.
+#
+# XXX: The -Imess part was added because of a conflict with cdparanoia-3.9.8_3
+#      which (imho bogusly) installs an 'utils.h' header in $LOCALBASE/include
 do-configure:
 	${SED} -e "s@= gcc@?=  ${CC}@g" \
-		-e "s@^CFLAGS.*@CFLAGS ?= ${CFLAGS}@g" \
-		-e "s@lib/x\$$(TARGET)@share/x\$$(TARGET)@g" \
-		-e "s@/usr/X11R6@${X11BASE}@g" \
-		-e "s@-g bin@-g wheel@g" \
-		-e "s@^ARCH  = linux@ARCH  = freebsd@g" \
-		-e "s@# X11_XV@X11_XV@g" \
-		-e "s@# X11_DGA@X11_DGA@g" \
-		-e "s@= x11@= ${DISPLAY_METHOD}@g" \
-		-e "s@= mame@= ${MAMEMESS}@g" \
-		-e "s@# X86_ASM@${ASM_COMMENT}X86_ASM@g" \
-		-e "s@# SOUND_ESOUND@${ESOUNDCOMMENT}SOUND_ESOUND@g" \
+		-e "s@^TARGET.*@TARGET = ${MAMEMESS}@g" \
 		-e "s@# MAME_NET@${NETWORK}MAME_NET@g" \
+		-e "s@# X86_ASM_68000@${ASM_COMMENT}X86_ASM_68000@g" \
+		-e "s@^CFLAGS.*@CFLAGS ?= ${CFLAGS}@g" \
+		-e "s@^INSTALL_GROUP.*@INSTALL_GROUP = wheel@g" \
 		-e "s@# LIBS.*@LIBS = -L${LOCALBASE}/lib@g" \
-		-e "s@sdl-config@${SDL_CONFIG}@g" \
+		-e "s@# INCLUDES.*@INCLUDES = -Imess -I${LOCALBASE}/include@g" \
+		-e "s@^PREFIX.*@PREFIX = ${PREFIX}@g" \
+		-e "s@/share/man@/man@g" \
+		-e "s@^MY_CPU.*@MY_CPU = ${ARCH}@g" \
+		-e "s@^ARCH.*@ARCH = freebsd@g" \
 		-e "s@# JOY_USB@JOY_USB@g" \
-		-e "s@GLLIBS=.-ldl@GLLIBS= ${PTHREAD_LIBS}@g" \
+		-e "s@# SOUND_ESOUND@${ESOUNDCOMMENT}SOUND_ESOUND@g" \
+		-e "s@# SOUND_SDL@${SDLSOUNDCOMMENT}SOUND_SDL@g" \
+		-e "s@^DISPLAY_METHOD.*@DISPLAY_METHOD = ${DISPLAY_METHOD}@g" \
+		-e "s@# X11_DGA@X11_DGA@g" \
+		-e "s@/usr/X11R6@${X11BASE}@g" \
+		-e "s@^SDL_CONFIG.*@SDL_CONFIG = ${SDL_CONFIG}@g" \
+		-e "s@^GLLIBS=.*@GLLIBS= ${PTHREAD_LIBS}@g" \
 			${WRKSRC}/makefile.unix > ${WRKSRC}/Makefile
 
 post-build:
@@ -297,6 +305,7 @@ post-install:
 				${PREFIX}/share/x${MAMEMESS}/x${MAMEMESS}rc
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/x${MAMEMESS}
+	${MKDIR} ${PREFIX}/share/doc/x${MAMEMESS}/img
 .for file in ${ALLDOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/x${MAMEMESS}
 .endfor
diff --git a/emulators/xmame/distinfo b/emulators/xmame/distinfo
index d34d26b96e4e..e1d3bd99c71f 100644
--- a/emulators/xmame/distinfo
+++ b/emulators/xmame/distinfo
@@ -1,4 +1,4 @@
-MD5 (xmame/xmame-0.61.1.tar.bz2) = 8d0babde89ff1af4280c76f36750a457
+MD5 (xmame/xmame-0.65.1.tar.bz2) = 7bf1f83c22d3093944c322bb5315d317
 MD5 (xmame/xmame-0.59.2.tar.bz2) = f35a5f9a79da963c157867015c284562
 MD5 (xmame/cheat.zip) = b745ea4df1a3a517c00fedae1ee49a14
 MD5 (xmame/history.dat.zip) = 8c758537d5f5bc90fc3224b19421ae12
diff --git a/emulators/xmame/files/patch-src::unix::unix.mak b/emulators/xmame/files/patch-src::unix::unix.mak
new file mode 100644
index 000000000000..1c652a13eeb8
--- /dev/null
+++ b/emulators/xmame/files/patch-src::unix::unix.mak
@@ -0,0 +1,22 @@
+--- src/unix/unix.mak.orig	Wed Feb 12 05:13:26 2003
++++ src/unix/unix.mak	Wed Feb 12 10:04:04 2003
+@@ -31,7 +31,7 @@
+ LIBS.macosx	   = -framework CoreAudio
+ #LIBS.openbsd       = -lossaudio
+ LIBS.nto	   = -lsocket -lasound
+-LIBS.beos          = `sdl-config --libs`
++LIBS.beos          = `$(SDL_CONFIG) --libs`
+ 
+ ##############################################################################
+ # **** Display dependent settings.
+@@ -219,8 +219,8 @@
+ endif
+ 
+ ifdef SOUND_SDL
+-CONFIG  += -DSYSDEP_DSP_SDL `sdl-config --cflags`
+-MY_LIBS += `sdl-config --libs`
++CONFIG  += -DSYSDEP_DSP_SDL `$(SDL_CONFIG) --cflags`
++MY_LIBS += `$(SDL_CONFIG) --libs`
+ endif
+ 
+ ifdef SOUND_WAVEOUT
diff --git a/emulators/xmame/pkg-plist b/emulators/xmame/pkg-plist
index 6ee1ca84b204..dfb8b3661f75 100644
--- a/emulators/xmame/pkg-plist
+++ b/emulators/xmame/pkg-plist
@@ -4,7 +4,9 @@ share/%%MAMEMESS%%/%%MAMEMESS%%rc
 %%PORTDOCS%%share/doc/%%MAMEMESS%%/changes.unix
 %%PORTDOCS%%share/doc/%%MAMEMESS%%/ctrlr.txt
 %%PORTDOCS%%share/doc/%%MAMEMESS%%/dga2.txt
+%%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame.jpg
 %%PORTDOCS%%share/doc/%%MAMEMESS%%/liesmich.unix
+%%PORTDOCS%%share/doc/%%MAMEMESS%%/listinfo.txt
 %%PORTDOCS%%share/doc/%%MAMEMESS%%/multiplayer-readme.txt
 %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc-1.html
 %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc-2.html
@@ -40,6 +42,7 @@ share/%%MAMEMESS%%/%%MAMEMESS%%rc
 %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/messhelp.txt
 %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/messroms.txt
 %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/old-changes.mess
+%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/readme.mess
 %%MESSONLY%%share/xmess/history.dat
 %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/simulation.txt
 %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/whatsnew.txt
@@ -48,6 +51,7 @@ share/%%MAMEMESS%%/%%MAMEMESS%%rc
 %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/keys.txt
 %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/sounds.dat
 %%OPENGL%%%%PORTDOCS%%share/doc/%%MAMEMESS%%/changes.opengl
+%%PORTDOCS%%@dirrm share/doc/%%MAMEMESS%%/img
 %%PORTDOCS%%@dirrm share/doc/%%MAMEMESS%%
 %%OPENGL%%share/%%MAMEMESS%%/cab/glmame/cabfront.jpg
 %%OPENGL%%share/%%MAMEMESS%%/cab/glmame/cabtitle.jpg
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index a95fec642132..15915b8eb87b 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmess
-PORTVERSION=	0.61.1
+PORTVERSION=	0.65.1
 
 MAINTAINER=	stijn@win.tue.nl
 COMMENT=	X11 emulator for game consoles