Attachment 13867 Details for Bug 26217 – file.diff

[patch] file.diff

file.diff (text/plain), 10.11 KB, created by stijn on 2001-03-30 14:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: stijn

Created: 2001-03-30 14:10:01 UTC

Size: 10.11 KB

patch

obsolete

>diff -urN --exclude=CVS /usr/ports/emulators/xmame/Makefile xmame/Makefile
>--- /usr/ports/emulators/xmame/Makefile	Tue Mar 27 12:38:34 2001
>+++ xmame/Makefile	Fri Mar 30 14:51:36 2001
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME?=	xmame
>-PORTVERSION?=	0.37b12.1
>+PORTVERSION?=	0.37b13.1
> CATEGORIES=	emulators
> MASTER_SITES=	http://x.mame.net/download/ \
> 		ftp://ftp.kaupp.cx/pub/xmame/ \
>@@ -14,11 +14,17 @@
> 		http://www.mame.net/zips/ \
> 		http://cheat.retrogames.com/ \
> 		http://www.sys2064.com/files/mame/
>-DISTNAME=	xmame-${PORTVERSION:S/p/pre/}
>+DISTNAME=	xmame-${XMAMEVERSION:S/p/pre/}
> DIST_SUBDIR=	xmame
>+XMAMEVERSION?=	${PORTVERSION}
>+.if ${XMAMEVERSION} == "0.37b12.1"
> EXTRACT_SUFX=	.tgz
>+.else
>+USE_BZIP2=	yes
>+EXTRACT_SUFX=	.tar.bz2
>+.endif
> 
>-MAINTAINER?=	c9710216@studentmail.newcastle.edu.au
>+MAINTAINER?=	stijn@win.tue.nl
> 
> USE_XPM=	yes
> USE_X_PREFIX=	yes
>@@ -27,20 +33,20 @@
> 
> MAN6=		x${MAMEMESS}.6
> 
>-# Are we building MAME, MESS or WPCmame? (also set by slave ports)
>+# Are we building MAME, MESS or PinMAME? (also set by slave ports)
> MAMEMESS?=	mame
> 
> PLIST_SUB+=	MAMEMESS="x${MAMEMESS}" SPOOLGAMES="${SPOOLGAMES}"
> .if ${MAMEMESS} == "mame"
>-PLIST_SUB+=	MAMEONLY="" MESSONLY="@comment " WPCMAMEONLY="@comment "
>+PLIST_SUB+=	MAMEONLY="" MESSONLY="@comment " PINMAMEONLY="@comment "
> .else
> .if ${MAMEMESS} == "mess"
>-PLIST_SUB+=	MAMEONLY="@comment " MESSONLY="" WPCMAMEONLY="@comment "
>+PLIST_SUB+=	MAMEONLY="@comment " MESSONLY="" PINMAMEONLY="@comment "
> .else
>-.if ${MAMEMESS} == "wpcmame"
>-PLIST_SUB+=	MAMEONLY="@comment " MESSONLY="@comment " WPCMAMEONLY=""
>+.if ${MAMEMESS} == "pinmame"
>+PLIST_SUB+=	MAMEONLY="@comment " MESSONLY="@comment " PINMAMEONLY=""
> .else
>-.error MAMEMESS must be set to one of "mame", "mess" or "wpcmame".
>+.error MAMEMESS must be set to one of "mame", "mess" or "pinmame".
> .endif
> .endif
> .endif
>@@ -50,7 +56,6 @@
> 
> # Docs list
> GENERALDOCS=	changes.unix \
>-		credits.txt \
> 		liesmich.unix \
> 		multiplayer-readme.txt \
> 		xmame-doc-1.html \
>@@ -66,30 +71,35 @@
> 		xmame-doc.sgml \
> 		xmame-doc.txt
> XMAMEDOCS=	changes.mame \
>+		changes.opengl \
> 		gamelist.mame \
> 		readme.mame
> XMESSDOCS=	changes.mess \
>+		credits.txt \
> 		gamelist.mess \
> 		readme.mess \
> 		messold.txt \
> 		messroms.txt
>-WPCMAMEDOCS=	wpcmame/simulation.txt \
>-		wpcmame/whatsnew.txt \
>-		wpcmame/wpcmame.txt
>+PINMAMEDOCS=	pinmame/simulation.txt \
>+		pinmame/whatsnew.txt \
>+		pinmame/pinmame.txt \
>+		pinmame/gamelist.txt \
>+		pinmame/keys.txt \
>+		pinmame/sounds.dat
> .if ${MAMEMESS} == "mame"
> ALLDOCS=	${GENERALDOCS} ${XMAMEDOCS}
> .else
> .if ${MAMEMESS} == "mess"
> ALLDOCS=	${GENERALDOCS} ${XMESSDOCS}
> .else
>-ALLDOCS=	${GENERALDOCS} ${WPCMAMEDOCS}
>+ALLDOCS=	${GENERALDOCS} ${PINMAMEDOCS}
> .endif
> .endif
> 
> # CPS-2 patches - this enables extra games in MAME.
> .if ${MAMEMESS} == "mame"
> .if defined(WITH_CPS2) && ${WITH_CPS2} == "yes"
>-CPS2VERSION=	20010309
>+CPS2VERSION=	20010330
> 
> PATCH_SITES+=	http://www.win.tue.nl/~stijn/xmame/
> PATCHFILES+=	${DISTNAME}-cps2-${CPS2VERSION}.patch.gz
>@@ -199,10 +209,6 @@
> 	${CHMOD} 775 ${SPOOLGAMES}/x${MAMEMESS}
> 	${INSTALL_DATA} ${WRKSRC}/doc/x${MAMEMESS}rc.dist \
> 				${PREFIX}/etc/x${MAMEMESS}rc.sample
>-	@if [ ! -e ${PREFIX}/etc/x${MAMEMESS}rc ]; then			\
>-		( cd ${PREFIX}/etc && 					\
>-		  ${LN} -sf x${MAMEMESS}rc.sample x${MAMEMESS}rc );	\
>-	fi
> 	${LN} -sf ${PREFIX}/etc/x${MAMEMESS}rc \
> 				${PREFIX}/share/x${MAMEMESS}/x${MAMEMESS}rc
> .if !defined(NOPORTDOCS)
>diff -urN --exclude=CVS /usr/ports/emulators/xmame/distinfo xmame/distinfo
>--- /usr/ports/emulators/xmame/distinfo	Tue Mar 27 12:38:34 2001
>+++ xmame/distinfo	Fri Mar 30 14:18:53 2001
>@@ -1,6 +1,7 @@
> MD5 (xmame/xmame-0.37b12.1.tgz) = 8f08ef945ec49872397862d99676690f
>+MD5 (xmame/xmame-0.37b13.1.tar.bz2) = ab81777720d7b1e724ff8d1d432325b1
> MD5 (xmame/cheat.zip) = dc380436c04780950cee07d3e31bfb0b
> MD5 (xmame/history.zip) = 69da5c33e6a78092c6cd75cbeb737c6a
> MD5 (xmame/hsdat7.zip) = 9e4a7e36448895f13128a675327e34e4
>-MD5 (xmame/xmame-0.37b12.1-cps2-20010309.patch.gz) = 140c5891d70be13aef79d6702ee171ae
>-MD5 (xmame/xmame-0.37b12.1-wpcmame-6.0.patch.gz) = c1bab845806bb13a3e24375701cd4a05
>+MD5 (xmame/xmame-0.37b13.1-cps2-20010330.patch.gz) = bf1d53ea84a4905d8377a187d3478883
>+MD5 (xmame/xmame-0.37b13.1-pinmame-0.99b.patch.gz) = ea61399643a49b96025629960652455b
>diff -urN --exclude=CVS /usr/ports/emulators/xmame/files/patch-ac xmame/files/patch-ac
>--- /usr/ports/emulators/xmame/files/patch-ac	Tue Mar 27 12:38:39 2001
>+++ xmame/files/patch-ac	Fri Mar 30 09:53:05 2001
>@@ -1,5 +1,5 @@
>---- src/unix/unix.mak.orig	Sat Mar 10 09:11:54 2001
>-+++ src/unix/unix.mak	Sun Mar 11 19:26:27 2001
>+--- src/unix/unix.mak.orig	Sat Mar 24 02:33:38 2001
>++++ src/unix/unix.mak	Fri Mar 30 09:52:29 2001
> @@ -50,14 +50,14 @@
>  LIBS.xfx        = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext -lglide2x
>  LIBS.svgafx     = $(X11LIB) -lvga -lvgagl -lglide2x
>@@ -9,7 +9,7 @@
>  LIBS.photon2	= -L/usr/lib -lph -lphrender
>  
>  CFLAGS.x11      = $(X11INC) $(JOY_X11_CFLAGS)
>- CFLAGS.xgl      = $(X11INC) $(JOY_X11_CFLAGS) $(GLDRIVER)
>+ CFLAGS.xgl      = $(X11INC) $(JOY_X11_CFLAGS)
>  CFLAGS.xfx      = $(X11INC) $(JOY_X11_CFLAGS) -I/usr/include/glide
>  CFLAGS.svgafx   = -I/usr/include/glide
> -CFLAGS.SDL      = -D_REENTRANT
>diff -urN --exclude=CVS /usr/ports/emulators/xmame/pkg-plist xmame/pkg-plist
>--- /usr/ports/emulators/xmame/pkg-plist	Tue Mar 27 12:38:34 2001
>+++ xmame/pkg-plist	Fri Mar 30 14:32:52 2001
>@@ -2,7 +2,6 @@
> etc/%%MAMEMESS%%rc.sample
> share/%%MAMEMESS%%/%%MAMEMESS%%rc
> %%PORTDOCS%%share/doc/%%MAMEMESS%%/changes.unix
>-%%PORTDOCS%%share/doc/%%MAMEMESS%%/credits.txt
> %%PORTDOCS%%share/doc/%%MAMEMESS%%/liesmich.unix
> %%PORTDOCS%%share/doc/%%MAMEMESS%%/multiplayer-readme.txt
> %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc-1.html
>@@ -21,16 +20,21 @@
> %%MAMEONLY%%%%DATFILES%%share/xmame/history.dat
> %%MAMEONLY%%%%DATFILES%%share/xmame/cheat.dat
> %%MAMEONLY%%%%PORTDOCS%%share/doc/xmame/changes.mame
>+%%MAMEONLY%%%%PORTDOCS%%share/doc/xmame/changes.opengl
> %%MAMEONLY%%%%PORTDOCS%%share/doc/xmame/gamelist.mame
> %%MAMEONLY%%%%PORTDOCS%%share/doc/xmame/readme.mame
>+%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/credits.txt
> %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/changes.mess
> %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/gamelist.mess
> %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/readme.mess
> %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/messold.txt
> %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/messroms.txt
>-%%WPCMAMEONLY%%%%PORTDOCS%%share/doc/xwpcmame/simulation.txt
>-%%WPCMAMEONLY%%%%PORTDOCS%%share/doc/xwpcmame/whatsnew.txt
>-%%WPCMAMEONLY%%%%PORTDOCS%%share/doc/xwpcmame/wpcmame.txt
>+%%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/simulation.txt
>+%%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/whatsnew.txt
>+%%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/pinmame.txt
>+%%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/gamelist.txt
>+%%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/keys.txt
>+%%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/sounds.dat
> %%PORTDOCS%%@dirrm share/doc/%%MAMEMESS%%
> @dirrm share/%%MAMEMESS%%/roms
> @dirrm share/%%MAMEMESS%%
>diff -urN --exclude=CVS /usr/ports/emulators/xmess/Makefile xmess/Makefile
>--- /usr/ports/emulators/xmess/Makefile	Tue Mar 27 12:38:41 2001
>+++ xmess/Makefile	Fri Mar 30 11:13:26 2001
>@@ -8,9 +8,10 @@
> PORTNAME=	xmess
> PORTVERSION=	0.37b12.1
> 
>-MAINTAINER=	nox@jelal.kn-bremen.de
>+MAINTAINER=	stijn@win.tue.nl
> 
> MASTERDIR=	${.CURDIR}/../xmame
>+PATCHDIR=	${.CURDIR}/files
> COMMENT=	${.CURDIR}/pkg-comment
> DESCR=		${.CURDIR}/pkg-descr
> 
>diff -urN --exclude=CVS /usr/ports/emulators/xmess/files/patch-ac xmess/files/patch-ac
>--- /usr/ports/emulators/xmess/files/patch-ac	Thu Jan  1 01:00:00 1970
>+++ xmess/files/patch-ac	Fri Mar 30 10:54:23 2001
>@@ -0,0 +1,28 @@
>+--- src/unix/unix.mak.orig	Sat Mar 10 09:11:54 2001
>++++ src/unix/unix.mak	Sun Mar 11 19:26:27 2001
>+@@ -50,14 +50,14 @@
>+ LIBS.xfx        = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext -lglide2x
>+ LIBS.svgafx     = $(X11LIB) -lvga -lvgagl -lglide2x
>+ LIBS.openstep	= -framework AppKit
>+-LIBS.SDL	= -ldl -lSDL -lpthread -D_REENTRANT
>++LIBS.SDL	= `$(SDL_CONFIG) --libs`
>+ LIBS.photon2	= -L/usr/lib -lph -lphrender
>+ 
>+ CFLAGS.x11      = $(X11INC) $(JOY_X11_CFLAGS)
>+ CFLAGS.xgl      = $(X11INC) $(JOY_X11_CFLAGS) $(GLDRIVER)
>+ CFLAGS.xfx      = $(X11INC) $(JOY_X11_CFLAGS) -I/usr/include/glide
>+ CFLAGS.svgafx   = -I/usr/include/glide
>+-CFLAGS.SDL      = -D_REENTRANT
>++CFLAGS.SDL      = `$(SDL_CONFIG) --cflags`
>+ CFLAGS.photon2	=
>+ 
>+ INST.x11        = doinstall
>+@@ -326,7 +326,7 @@
>+ 
>+ 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 >> doc/x$(TARGET).6
>+ 	cat src/unix/xmame.6-3 >> doc/x$(TARGET).6
>+ 
>+ install: $(INST.$(DISPLAY_METHOD)) install-man
>diff -urN --exclude=CVS xpinold/Makefile xpinmame/Makefile
>--- xpinold/Makefile	Thu Jan  1 01:00:00 1970
>+++ xpinmame/Makefile	Fri Mar 30 11:53:37 2001
>@@ -0,0 +1,24 @@
>+# New ports collection makefile for:	xpinmame
>+# Date created:				Fri Mar 30 11:00:42 CEST 2001
>+# Whom:					stijn@win.tue.nl
>+#
>+# $FreeBSD$
>+#
>+
>+PORTNAME=	xpinmame
>+PORTVERSION=	${XMAMEVERSION}+${PINMAMEVERSION}
>+
>+PATCH_SITES+=	http://www.win.tue.nl/~stijn/xmame/
>+PATCHFILES+=	${DISTNAME}-pinmame-${PINMAMEVERSION}.patch.gz
>+
>+MAINTAINER=	stijn@win.tue.nl
>+
>+MASTERDIR=	${.CURDIR}/../xmame
>+COMMENT=	${.CURDIR}/pkg-comment
>+DESCR=		${.CURDIR}/pkg-descr
>+
>+MAMEMESS=	pinmame
>+XMAMEVERSION=	0.37b13.1
>+PINMAMEVERSION=	0.99b
>+
>+.include "${MASTERDIR}/Makefile"
>diff -urN --exclude=CVS xpinold/pkg-comment xpinmame/pkg-comment
>--- xpinold/pkg-comment	Thu Jan  1 01:00:00 1970
>+++ xpinmame/pkg-comment	Mon Mar 19 12:46:52 2001
>@@ -0,0 +1 @@
>+X11 emulator for pinball ROMs
>diff -urN --exclude=CVS xpinold/pkg-descr xpinmame/pkg-descr
>--- xpinold/pkg-descr	Thu Jan  1 01:00:00 1970
>+++ xpinmame/pkg-descr	Fri Mar 30 14:16:46 2001
>@@ -0,0 +1,9 @@
>+xpinmame is the X11 port of PinMAME, the Pinball Console emulator.
>+
>+It runs pinball roms from Williams/Bally games, from 1977 onwards to
>+the new WPC system, around 1998. It also runs some Data East games.
>+
>+It includes simulators to artificially press the 'switches' on the table,
>+however it does not simulate any game play, nor a real pinball table.
>+
>+WWW: http://pinmame.emuviews.com/

Actions: View | Diff

Attachments on bug 26217: 13867