From 9f0183ed5afc8071a4ec34cbe4b0f9cc7416edcd Mon Sep 17 00:00:00 2001 From: Jimmy Olgeni Date: Tue, 27 Mar 2001 10:38:45 +0000 Subject: - Update to the version 0.37b12.1 of xmame/xmess - Make emulators/xmess a slave port of emulators/xmame - Add SDL support (enabled by default) - Add DGA support for non-SDL builds - Define spool directory to /var/games/x{mame,mess}, and install binary setgid games to avoid creating a world writable directory - Add hiscore.dat, history.dat, and cheat.dat support for xmame - Convert patch-ab into ${SED} in ports Makefile - Add CPS-2 patches for xmame; this enables more games - Enable optimization for xmame/xmess by default PR: 25921 (with more patches from originator) Submitted by: Stijn Hoop --- emulators/xmame/Makefile | 203 +++++++++++++++++++++++++++++++++++------ emulators/xmame/distinfo | 7 +- emulators/xmame/files/patch-ab | 31 ------- emulators/xmame/files/patch-ac | 28 ++++++ emulators/xmame/pkg-plist | 65 +++++++------ emulators/xmess/Makefile | 48 ++-------- emulators/xmess/distinfo | 2 - emulators/xmess/files/patch-aa | 99 -------------------- emulators/xmess/files/patch-ab | 12 --- emulators/xmess/files/patch-ae | 13 --- emulators/xmess/files/patch-af | 31 ------- emulators/xmess/files/patch-ag | 14 --- emulators/xmess/files/patch-ba | 26 ------ emulators/xmess/files/patch-be | 21 ----- emulators/xmess/pkg-descr | 2 +- emulators/xmess/pkg-plist | 6 -- 16 files changed, 255 insertions(+), 353 deletions(-) delete mode 100644 emulators/xmame/files/patch-ab create mode 100644 emulators/xmame/files/patch-ac delete mode 100644 emulators/xmess/distinfo delete mode 100644 emulators/xmess/files/patch-aa delete mode 100644 emulators/xmess/files/patch-ab delete mode 100644 emulators/xmess/files/patch-ae delete mode 100644 emulators/xmess/files/patch-af delete mode 100644 emulators/xmess/files/patch-ag delete mode 100644 emulators/xmess/files/patch-ba delete mode 100644 emulators/xmess/files/patch-be delete mode 100644 emulators/xmess/pkg-plist (limited to 'emulators') diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile index 754c9e22402a..cc74b3f58e62 100644 --- a/emulators/xmame/Makefile +++ b/emulators/xmame/Makefile @@ -5,30 +5,54 @@ # $FreeBSD$ # -PORTNAME= xmame -PORTVERSION= 0.37b11.2 +PORTNAME?= xmame +PORTVERSION?= 0.37b12.1 CATEGORIES= emulators MASTER_SITES= http://x.mame.net/download/ \ ftp://ftp.kaupp.cx/pub/xmame/ \ - http://www.ozemail.com.au/~knebauer/xmame/files/ + http://www.ozemail.com.au/~knebauer/xmame/files/ \ + http://www.mame.net/zips/ \ + http://cheat.retrogames.com/ \ + http://www.sys2064.com/files/mame/ +DISTNAME= xmame-${PORTVERSION:S/p/pre/} +DIST_SUBDIR= xmame +EXTRACT_SUFX= .tgz -MAINTAINER= c9710216@studentmail.newcastle.edu.au +MAINTAINER?= c9710216@studentmail.newcastle.edu.au -USE_BZIP2= yes USE_XPM= yes USE_X_PREFIX= yes USE_GMAKE= yes MAKEFILE= makefile.unix -MAN6= xmame.6 +MAN6= x${MAMEMESS}.6 -XMAMEDOCS= changes.mame \ - changes.unix \ +# Are we building MAME, MESS or WPCmame? (also set by slave ports) +MAMEMESS?= mame + +PLIST_SUB+= MAMEMESS="x${MAMEMESS}" SPOOLGAMES="${SPOOLGAMES}" +.if ${MAMEMESS} == "mame" +PLIST_SUB+= MAMEONLY="" MESSONLY="@comment " WPCMAMEONLY="@comment " +.else +.if ${MAMEMESS} == "mess" +PLIST_SUB+= MAMEONLY="@comment " MESSONLY="" WPCMAMEONLY="@comment " +.else +.if ${MAMEMESS} == "wpcmame" +PLIST_SUB+= MAMEONLY="@comment " MESSONLY="@comment " WPCMAMEONLY="" +.else +.error MAMEMESS must be set to one of "mame", "mess" or "wpcmame". +.endif +.endif +.endif + +# Where do we want game spool data? +SPOOLGAMES?= /var/games + +# Docs list +GENERALDOCS= changes.unix \ credits.txt \ - gamelist.mame \ liesmich.unix \ multiplayer-readme.txt \ - readme.mame \ xmame-doc-1.html \ xmame-doc-2.html \ xmame-doc-3.html \ @@ -41,29 +65,156 @@ XMAMEDOCS= changes.mame \ xmame-doc.ps \ xmame-doc.sgml \ xmame-doc.txt +XMAMEDOCS= changes.mame \ + gamelist.mame \ + readme.mame +XMESSDOCS= changes.mess \ + gamelist.mess \ + readme.mess \ + messold.txt \ + messroms.txt +WPCMAMEDOCS= wpcmame/simulation.txt \ + wpcmame/whatsnew.txt \ + wpcmame/wpcmame.txt +.if ${MAMEMESS} == "mame" +ALLDOCS= ${GENERALDOCS} ${XMAMEDOCS} +.else +.if ${MAMEMESS} == "mess" +ALLDOCS= ${GENERALDOCS} ${XMESSDOCS} +.else +ALLDOCS= ${GENERALDOCS} ${WPCMAMEDOCS} +.endif +.endif + +# CPS-2 patches - this enables extra games in MAME. +.if ${MAMEMESS} == "mame" +.if defined(WITH_CPS2) && ${WITH_CPS2} == "yes" +CPS2VERSION= 20010309 + +PATCH_SITES+= http://www.win.tue.nl/~stijn/xmame/ +PATCHFILES+= ${DISTNAME}-cps2-${CPS2VERSION}.patch.gz +.else +pre-everything:: + @${ECHO_MSG} "===> If you want to compile MAME with CPS-2 support, use \"make WITH_CPS2=yes\"" +.endif +.endif + +# Datfiles - for history/bugs/cheats/highscores in MAME +.if ${MAMEMESS} == "mame" +.if defined(WITH_DATFILES) && ${WITH_DATFILES} == "yes" +PLIST_SUB+= DATFILES="" -# the large number of sed regexes here is intended to make this port a whole +BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip + +HIVER= 7 + +DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} \ + hsdat${HIVER}.zip history.zip cheat.zip +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} + +post-extract: + cd ${WRKDIR} && \ + unzip -q ${DISTDIR}/${DIST_SUBDIR}/hsdat${HIVER}.zip hiscore.dat + cd ${WRKDIR} && \ + unzip -q ${DISTDIR}/${DIST_SUBDIR}/history.zip history.dat + cd ${WRKDIR} && \ + unzip -q ${DISTDIR}/${DIST_SUBDIR}/cheat.zip cheat.dat +.else +PLIST_SUB+= DATFILES="@comment " +pre-everything:: + @${ECHO_MSG} "===> If you want to install additional information with MAME (such as game" + @${ECHO_MSG} " history, cheats, and highscores) use \"make WITH_DATFILES=yes\"" +.endif +.endif + +# ASM 68k cores - disabled by default, because they break things (pbobble2 +# being a prime example). These also only work on i386. Should be enabled +# by default when ready for prime time. +.if defined(WITH_ASM68K) && ${WITH_ASM68K} == "yes" +ASM_COMMENT= +.else +ASM_COMMENT=\# +.endif + +# Heavy optimization - enabled by default because it doesn't seem +# to break things, and enables considerable speedup. +.if !defined(WITH_OPTIMIZATION) || ${WITH_OPTIMIZATION} != "no" +CFLAGS+= -O3 -march=i686 -Wall -Wno-unused -funroll-loops \ + -fstrength-reduce -fomit-frame-pointer -ffast-math \ + -malign-functions=4 -malign-jumps=4 -malign-loops=4 +.endif + +# SDL extension - enabled by default because x{mame,mess} can run full +# screen without having to be setuid root. +.if !defined(WITH_SDL) || ${WITH_SDL} != "no" +LIB_DEPENDS= SDL-1.1.3:${PORTSDIR}/devel/sdl-devel +SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config +MAKE_ENV+= SDL_CONFIG=${SDL_CONFIG} +DISPLAY_METHOD= SDL +pre-everything:: + @${ECHO_MSG} "===> If you don't want ${MAMEMESS:U} to be built with SDL support," + @${ECHO_MSG} " use \"make WITH_SDL=no\"" +.else +DISPLAY_METHOD= x11 +.endif + +# 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. -post-patch: - ${PERL} -pi -e "s@%%PREFIX%%@${PREFIX}@g" ${WRKSRC}/doc/xmamerc.dist +do-configure: @${CP} ${WRKSRC}/makefile.unix ${WRKSRC}/makefile.unix.sed - ${SED} -e "s@= gcc@?= ${CC}@g" -e "s@= -O -Wall@?= ${CFLAGS}@g" \ - -e "s@= cp@?= ${INSTALL} ${COPY}@g" -e "s@/usr/games@${PREFIX}/bin@g" \ - -e "s@/usr/local/man/man6@${PREFIX}/man/man6@g" \ - -e "s@/usr/games/lib/\$\(NAME\)@${PREFIX}/share/\$\(NAME\)@g" \ - -e "s@/usr/X11R6@${X11BASE}@g" -e "s@ARCH = linux@ARCH = freebsd@g" \ + ${SED} -e "s@= gcc@?= ${CC}@g" \ + -e "s@= -O2 -Wall@?= ${CFLAGS}@g" \ + -e "s@= cp@?= ${INSTALL} ${COPY}@g" \ + -e "s@lib/x\$$(TARGET)@share/x\$$(TARGET)@g" \ + -e "s@/usr/X11R6@${X11BASE}@g" \ + -e "s@ARCH = linux@ARCH = freebsd@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" \ ${WRKSRC}/makefile.unix.sed > ${WRKSRC}/makefile.unix +.if !defined(WITH_SDL) || ${WITH_SDL} != "no" + ${PERL} -pi -e 's@SDL/@SDL11/@' ${WRKSRC}/src/unix/video-drivers/SDL.c +.endif + +post-build: + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} SDL_VIDEODRIVER=aalib \ + ${GMAKE} -f ${MAKEFILE} doc/x${MAMEMESS}.6 + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} SDL_VIDEODRIVER=aalib \ + ${GMAKE} -f ${MAKEFILE} doc/x${MAMEMESS}rc.dist + @${CP} ${WRKSRC}/doc/x${MAMEMESS}rc.dist \ + ${WRKSRC}/doc/x${MAMEMESS}rc.dist.sed + ${SED} -e "s@^spooldir.*\$$@spooldir ${SPOOLGAMES}/x${MAMEMESS}@" \ + -e "s@^rompath.*\$$@rompath ${PREFIX}/share/x${MAMEMESS}/roms@" \ + ${WRKSRC}/doc/x${MAMEMESS}rc.dist.sed > ${WRKSRC}/doc/x${MAMEMESS}rc.dist post-install: - ${MV} ${PREFIX}/bin/xmame.x11 ${PREFIX}/bin/xmame - ${MKDIR} ${PREFIX}/share/xmame ${PREFIX}/share/xmame/hi ${PREFIX}/share/xmame/roms - ${CHMOD} 777 ${PREFIX}/share/xmame/hi - ${INSTALL_DATA} ${WRKSRC}/doc/xmamerc.dist ${PREFIX}/share/xmame/xmamerc + ${MV} ${PREFIX}/bin/x${MAMEMESS}.${DISPLAY_METHOD} \ + ${PREFIX}/bin/x${MAMEMESS} + ${CHOWN} root:games ${PREFIX}/bin/x${MAMEMESS} + ${CHMOD} u-s,g+s ${PREFIX}/bin/x${MAMEMESS} + ${MKDIR} ${PREFIX}/share/x${MAMEMESS} ${PREFIX}/share/x${MAMEMESS}/roms + ${MKDIR} ${SPOOLGAMES}/x${MAMEMESS} + ${CHOWN} -R root:games ${SPOOLGAMES}/x${MAMEMESS} + ${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) - ${MKDIR} ${PREFIX}/share/doc/xmame -.for file in ${XMAMEDOCS} - ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/xmame + ${MKDIR} ${PREFIX}/share/doc/x${MAMEMESS} +.for file in ${ALLDOCS} + ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/x${MAMEMESS} .endfor .endif - +.if ${MAMEMESS} == "mame" && defined(WITH_DATFILES) && ${WITH_DATFILES} == "yes" + ${INSTALL_DATA} ${WRKDIR}/hiscore.dat ${PREFIX}/share/xmame + ${INSTALL_DATA} ${WRKDIR}/history.dat ${PREFIX}/share/xmame + ${INSTALL_DATA} ${WRKDIR}/cheat.dat ${PREFIX}/share/xmame +.endif + .include diff --git a/emulators/xmame/distinfo b/emulators/xmame/distinfo index 09f36bc8877d..da7c70e2b5cf 100644 --- a/emulators/xmame/distinfo +++ b/emulators/xmame/distinfo @@ -1 +1,6 @@ -MD5 (xmame-0.37b11.2.tar.bz2) = 723caaa67908860b952f9df6e3744b05 +MD5 (xmame/xmame-0.37b12.1.tgz) = 8f08ef945ec49872397862d99676690f +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 diff --git a/emulators/xmame/files/patch-ab b/emulators/xmame/files/patch-ab deleted file mode 100644 index d123931c6c3e..000000000000 --- a/emulators/xmame/files/patch-ab +++ /dev/null @@ -1,31 +0,0 @@ ---- doc/xmamerc.dist.orig Sun Nov 5 15:30:02 2000 -+++ doc/xmamerc.dist Sun Nov 5 15:32:12 2000 -@@ -60,7 +60,7 @@ - samples 1 - samplefreq 22050 - bufsize 3.000000 --volume -3 -+volume -13 - # audiodevice (not set) - # mixerdevice (not set) - -@@ -70,13 +70,13 @@ - mouse 1 - - ### Fileio Related ### --rompath /usr/games/lib/xmame --spooldir /usr/games/lib/xmame -+rompath %%PREFIX%%/share/xmame/roms -+spooldir %%PREFIX%%/share/xmame/hi - screenshotdir . --cheatfile /usr/games/lib/xmame/cheat.dat --hiscorefile /usr/games/lib/xmame/hiscore.dat --historyfile /usr/games/lib/xmame/history.dat --mameinfofile /usr/games/lib/xmame/mameinfo.dat -+cheatfile %%PREFIX%%/share/xmame/cheat.dat -+hiscorefile %%PREFIX%%/share/xmame/hiscore.dat -+historyfile %%PREFIX%%/share/xmame/history.dat -+mameinfofile %%PREFIX%%/share/xmame/mameinfo.dat - - ### Mame Related ### - defaultgame pacman diff --git a/emulators/xmame/files/patch-ac b/emulators/xmame/files/patch-ac new file mode 100644 index 000000000000..c7fbc9ba5e9f --- /dev/null +++ b/emulators/xmame/files/patch-ac @@ -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 --git a/emulators/xmame/pkg-plist b/emulators/xmame/pkg-plist index 98a089f5dcf4..e99665a8870f 100644 --- a/emulators/xmame/pkg-plist +++ b/emulators/xmame/pkg-plist @@ -1,28 +1,37 @@ -bin/xmame -share/xmame/xmamerc -%%PORTDOCS%%share/doc/xmame/changes.mame -%%PORTDOCS%%share/doc/xmame/changes.unix -%%PORTDOCS%%share/doc/xmame/credits.txt -%%PORTDOCS%%share/doc/xmame/gamelist.mame -%%PORTDOCS%%share/doc/xmame/liesmich.unix -%%PORTDOCS%%share/doc/xmame/multiplayer-readme.txt -%%PORTDOCS%%share/doc/xmame/readme.mame -%%PORTDOCS%%share/doc/xmame/xmame-doc-1.html -%%PORTDOCS%%share/doc/xmame/xmame-doc-2.html -%%PORTDOCS%%share/doc/xmame/xmame-doc-3.html -%%PORTDOCS%%share/doc/xmame/xmame-doc-4.html -%%PORTDOCS%%share/doc/xmame/xmame-doc-5.html -%%PORTDOCS%%share/doc/xmame/xmame-doc-6.html -%%PORTDOCS%%share/doc/xmame/xmame-doc-7.html -%%PORTDOCS%%share/doc/xmame/xmame-doc.html -%%PORTDOCS%%share/doc/xmame/xmame-doc.lyx -%%PORTDOCS%%share/doc/xmame/xmame-doc.ps -%%PORTDOCS%%share/doc/xmame/xmame-doc.sgml -%%PORTDOCS%%share/doc/xmame/xmame-doc.txt -@exec mkdir -p %D/share/xmame/hi -@exec mkdir -p %D/share/xmame/roms -@exec chmod 777 %D/share/xmame/hi -@unexec rmdir %D/share/xmame/roms 2>/dev/null || true -@unexec rmdir %D/share/xmame/hi 2>/dev/null || true -@unexec rmdir %D/share/xmame 2>/dev/null || true -%%PORTDOCS%%@dirrm share/doc/xmame +bin/%%MAMEMESS%% +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 +%%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc-2.html +%%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc-3.html +%%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc-4.html +%%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc-5.html +%%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc-6.html +%%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc-7.html +%%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc.html +%%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc.lyx +%%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc.ps +%%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc.sgml +%%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc.txt +%%MAMEONLY%%%%DATFILES%%share/xmame/hiscore.dat +%%MAMEONLY%%%%DATFILES%%share/xmame/history.dat +%%MAMEONLY%%%%DATFILES%%share/xmame/cheat.dat +%%MAMEONLY%%%%PORTDOCS%%share/doc/xmame/changes.mame +%%MAMEONLY%%%%PORTDOCS%%share/doc/xmame/gamelist.mame +%%MAMEONLY%%%%PORTDOCS%%share/doc/xmame/readme.mame +%%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 +%%PORTDOCS%%@dirrm share/doc/%%MAMEMESS%% +@dirrm share/%%MAMEMESS%%/roms +@dirrm share/%%MAMEMESS%% +@unexec rmdir %%SPOOLGAMES%%/%%MAMEMESS%% 2>/dev/null || true diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile index ffdb50d4e2c6..5ea93fc65bff 100644 --- a/emulators/xmess/Makefile +++ b/emulators/xmess/Makefile @@ -6,50 +6,14 @@ # PORTNAME= xmess -PORTVERSION= 0.2b4.1 -CATEGORIES= emulators -MASTER_SITES= http://mess.emuverse.com/files/ \ - http://www.vintagegaming.com/hosted/vectrex/ -DISTNAME= unix02s4 -DISTFILES= ${DISTNAME}.tgz pdp1.zip +PORTVERSION= 0.37b12.1 -#MAINTAINER= mycroft@NetBSD.ORG # NetBSD MAINTAINER= nox@jelal.kn-bremen.de -EXTRACT_ONLY= ${DISTNAME}.tgz +MASTERDIR= ${.CURDIR}/../xmame +COMMENT= ${.CURDIR}/pkg-comment +DESCR= ${.CURDIR}/pkg-descr -USE_X_PREFIX= yes -USE_XPM= yes -USE_GMAKE= yes -MAKE_ENV+= OPSYS=${OPSYS} ARCH=${ARCH} MACHINE_ARCH=${ARCH} \ - DESTDIR=${DESTDIR} \ - INSTALL_MAN="${INSTALL_MAN}" \ - INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - NETBSD_JOYSTICK="${NETBSD_JOYSTICK}" \ - DISPLAY_METHOD="${DISPLAY_METHOD}" -MAKEFILE= makefile.unix -DISPLAY_METHOD= x11 -ALL_TARGET= xmess.${DISPLAY_METHOD} +MAMEMESS= mess -WRKSRC= ${WRKDIR}/xmess-0.2b4.1 - -MESSDIR= ${PREFIX}/share/xmess -MESSLIB= ${PREFIX}/lib/xmess -.if exists(/usr/include/machine/joystick.h) -NETBSD_JOYSTICK=yes -.else -NETBSD_JOYSTICK=no -.endif - -post-patch: - (cd ${WRKSRC}/doc && ${SED} 's|@MESSDIR@|${MESSDIR}|;s|@MESSLIB@|${MESSLIB}|' xmessrc.dist >xmessrc) - -do-install: - (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${ALL_TARGET} ${PREFIX}/bin/xmess) - ${MKDIR} ${MESSDIR} - (cd ${WRKSRC}/doc && ${INSTALL_DATA} xmessrc ${MESSDIR}/xmessrc) - ${MKDIR} ${MESSLIB} - ${INSTALL_DATA} ${_DISTDIR}/pdp1.zip ${MESSLIB}/spacewar.zip - @${ECHO} try \`xmess pdp1 spacewar\' for the original 1961 Space Wars - -.include +.include "${MASTERDIR}/Makefile" diff --git a/emulators/xmess/distinfo b/emulators/xmess/distinfo deleted file mode 100644 index 087f803b1938..000000000000 --- a/emulators/xmess/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (unix02s4.tgz) = 2036d994aba7315d3204a9310c66f37c -MD5 (pdp1.zip) = f2aec13d697055e31d830c3bc0974184 diff --git a/emulators/xmess/files/patch-aa b/emulators/xmess/files/patch-aa deleted file mode 100644 index c198b74b2d85..000000000000 --- a/emulators/xmess/files/patch-aa +++ /dev/null @@ -1,99 +0,0 @@ -$NetBSD: patch-aa,v 1.11 1999/07/27 03:20:38 mycroft Exp $ - ---- makefile.unix.orig Wed Aug 26 18:40:21 1998 -+++ makefile.unix Mon Aug 31 04:06:42 1998 -@@ -39,7 +39,7 @@ - # GNU MAKE is MANDATORY !!! - # so please give me the path... - # if GNU make is "native" use this --MAKE = make -+MAKE = gmake - # else ... - # MAKE=/usr/people/jantonio/bin/gmake - -@@ -99,18 +99,18 @@ - # *** Select destination directory for your compiled program , manual page - # and binary distribution ( if you want to... ) - # ( only needed to install, not to compile... ) --DESTDIR = /usr/games --MANDIR = /usr/local/man/man6 -+DESTDIR = ${PREFIX}/bin -+MANDIR = ${PREFIX}/man/man6 - DISTDIR = /home/ftp/pub/emulators/$(NAME) - - # *** Where the ROM source tree ? --ROMPATH = \"/usr/games/lib/$(NAME)\" -+ROMPATH = \"${PREFIX}/share/$(NAME)\" - - # *** Where to store high scores ? --SDIR = \"/usr/games/lib/$(NAME)\" -+SDIR = \"${PREFIX}/share/$(NAME)\" - - # *** Where resides global configuration file ? --MRC = \"/usr/games/lib/$(NAME)/$(NAME)rc\" -+MRC = \"${PREFIX}/share/$(NAME)/$(NAME)rc\" - - - ############################################################################## -@@ -118,7 +118,9 @@ - ############################################################################## - - # *** To disable joystick support comment next line --# JOY = -DUSE_JOYSTICK -+ifeq (${NETBSD_JOYSTICK},yes) -+JOY = -DUSE_JOYSTICK -+endif - - # *** To disable mouse support comment next line - MOUSE = -DUSE_MOUSE -@@ -137,7 +139,9 @@ - # JSLIB = -lXi - - # On iX86 based OS's, if supported, you can use standard joystick driver --# JS = -DI386_JOYSTICK -+ifeq (${NETBSD_JOYSTICK},yes) -+JS = -DI386_JOYSTICK -+endif - - # Linux FM-TOWNS game PAD joystick emulation support - # Thanks to Osamu Kurati for provided patch -@@ -158,8 +162,8 @@ - # you might decide to use these feature. Otherwise, you should use a - # timer based audio code and ajust in src/unix/sound.h AUDIO_TIMER_FREQ item - # --S_TIM = -DDONTUSE_TIMER --# S_TIM = -DUSE_TIMER -+# S_TIM = -DDONTUSE_TIMER -+S_TIM = -DUSE_TIMER - - # *** When using timer, you should provide the frequency to generate audio sample - # frames in your system. See readme.unix notes about these item -@@ -192,7 +196,7 @@ - # note: x11 is the only one supported on all platforms - - ### normal X11 --DISPLAY_METHOD = x11 -+#DISPLAY_METHOD = x11 - ### XFree86's DGA extension, only tested under linux - #DISPLAY_METHOD = xf86_dga - ### svgalib, only supported under linux -@@ -215,14 +219,16 @@ - # *** If you haven't the MIT-Shared Memory X Extensions, comment the following: - # ( Test if available by mean of xdpyinfo command ) - # Comment it if not compiling for normal x11 --# MSHM = -DUSE_MITSHM -+ifeq (${DISPLAY_METHOD},x11) -+MSHM = -DUSE_MITSHM -+endif - - # standard location for X11 - # X11INC = -I/usr/include/X11 - # X11LIB = -L/usr/lib/X11 - # standard location for XFree86 --X11INC = -I/usr/X11R6/include --X11LIB = -L/usr/X11R6/lib -+X11INC = -I${PREFIX}/include -+X11LIB = -L${PREFIX}/lib -Wl,-R${PREFIX}/lib - # for Sun systems - # X11INC = -I/usr/openwin/include - # X11LIB = -L/usr/openwin/lib diff --git a/emulators/xmess/files/patch-ab b/emulators/xmess/files/patch-ab deleted file mode 100644 index 47373f020c95..000000000000 --- a/emulators/xmess/files/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.4 1998/08/29 19:42:00 frueauf Exp $ - ---- src/unix/Makefile.orig Tue Aug 25 07:39:20 1998 -+++ src/unix/Makefile Fri Aug 28 23:08:49 1998 -@@ -16,6 +16,7 @@ - - $(TARGET): $(OBJS) - ar -rcv $@ $(OBJS) -+ ranlib $@ - - $(OBJDIR)/%.o: %.c xmame.h sound.h - $(CC) -I../../src/ $(CFLAGS) -o $@ -c $< diff --git a/emulators/xmess/files/patch-ae b/emulators/xmess/files/patch-ae deleted file mode 100644 index 97cce4da7316..000000000000 --- a/emulators/xmess/files/patch-ae +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ae,v 1.2 1998/08/07 10:40:37 agc Exp $ - ---- doc/xmessrc.dist.orig Tue Jun 9 08:14:22 1998 -+++ doc/xmessrc.dist Thu Jul 9 08:11:39 1998 -@@ -21,7 +21,7 @@ - ############################ General options ########################## - # - # Mess needs a public-writable directory to store high scores --spooldir /var/games/mess -+spooldir @MESSDIR@ - - # Type here the name of the display where play xmame - # overriden by DISPLAY environment variable. Not usefull in config file but... diff --git a/emulators/xmess/files/patch-af b/emulators/xmess/files/patch-af deleted file mode 100644 index 101fe7cf39ff..000000000000 --- a/emulators/xmess/files/patch-af +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-af,v 1.2 1998/08/07 10:40:38 agc Exp $ - ---- src/unix/devices.c.orig Wed Jun 17 05:48:00 1998 -+++ src/unix/devices.c Sat Jul 4 07:42:07 1998 -@@ -60,7 +60,7 @@ - #elif I386_JOYSTICK - void i386_poll_joystick (void); - /* specific joystick for PC clones */ --#ifdef netbsd_i386 -+#ifdef __FreeBSD__ - #include - extern struct joystick joy_data,joy_orig; - #else -@@ -658,7 +658,7 @@ - { - #if ( defined USE_JOYSTICK ) && ( defined I386_JOYSTICK ) - int res; --#ifdef netbsd_i386 -+#ifdef __FreeBSD__ - res = read(joy_fd,&joy_data,sizeof(struct joystick) ); - if (res == sizeof(struct joystick )) { - #else -@@ -666,7 +666,7 @@ - if (res == sizeof(struct JS_DATA_TYPE )) { - #endif - /* get value of buttons */ --#ifdef netbsd_i386 -+#ifdef __FreeBSD__ - joy_b1 = joy_data.b1; - joy_b2 = joy_data.b2; - #else diff --git a/emulators/xmess/files/patch-ag b/emulators/xmess/files/patch-ag deleted file mode 100644 index 795340d28302..000000000000 --- a/emulators/xmess/files/patch-ag +++ /dev/null @@ -1,14 +0,0 @@ -Index: src/unix/FREEBSD.c -@@ -10,7 +10,12 @@ - #include "sound.h" - - #ifdef USE_JOYSTICK -+#ifdef __FreeBSD__ -+#include -+#define JS_DATA_TYPE joystick -+#else - #include -+#endif - struct JS_DATA_TYPE joy_data,joy_orig; - int joy_fd; /* joystick file descriptor */ - #endif diff --git a/emulators/xmess/files/patch-ba b/emulators/xmess/files/patch-ba deleted file mode 100644 index 498ae2d71890..000000000000 --- a/emulators/xmess/files/patch-ba +++ /dev/null @@ -1,26 +0,0 @@ -Index: makefile.unix -@@ -249,9 +249,9 @@ - ######## Alpha/Linux - # ARCH = linux_alpha - ######## ix86/Linux --ARCH = linux_i386 -+# ARCH = linux_i386 - ######## ix86/FreeBSD and ix86/BSDi --# ARCH = FREEBSD -+ARCH = FREEBSD - ######## ix86/NetBSD - # ARCH = netbsd_i386 - ######## Sparc/SunOS ( no sound ) -@@ -287,7 +287,12 @@ - DEFS.linux_powerpc = -Dlinux -DACORN - DEFS.linux_alpha = -Dlinux -DLSB_FIRST -DAXP_ASM -DACORN - DEFS.linux_i386 = -Dlinux -DLSB_FIRST -DX86_ASM -+ifeq (${MACHINE_ARCH},i386) - DEFS.FREEBSD = -DLSB_FIRST -DX86_ASM -Dlinux -DFREEBSD_SOUND_WORKAROUND -+else -+# someone with an alpha pls check this -+DEFS.FREEBSD = -DLSB_FIRST -DACORN -Dlinux -DFREEBSD_SOUND_WORKAROUND -+endif - DEFS.netbsd_i386 = -DLSB_FIRST -DX86_ASM -DNETBSD -DUSE_AUDIO - DEFS.sunos = -Dsun -DCLOCKS_PER_SEC=1000000 -DACORN - DEFS.solaris = -Dsun -DACORN diff --git a/emulators/xmess/files/patch-be b/emulators/xmess/files/patch-be deleted file mode 100644 index 295c4d5b480f..000000000000 --- a/emulators/xmess/files/patch-be +++ /dev/null @@ -1,21 +0,0 @@ -Index: doc/xmessrc.dist -@@ -21,7 +21,7 @@ - ############################ General options ########################## - # - # Tell mess where to find it's rom/diskimages, : seperated path --rompath /usr/lib/mess:/usr/local/lib/mess:/opt/mess -+rompath @MESSLIB@ - - # Mess needs a public-writable directory to store high scores - spooldir @MESSDIR@ -@@ -77,8 +77,8 @@ - # - - # Define X and Y axis scale related to original bitmap. Default is 1 --widthscale 2 --heightscale 2 -+widthscale 1 -+heightscale 1 - - # If your screen refresh is to slow, you can skip frames with frameskip option - frameskip 3 diff --git a/emulators/xmess/pkg-descr b/emulators/xmess/pkg-descr index dbc941911b97..a0421d2f43b9 100644 --- a/emulators/xmess/pkg-descr +++ b/emulators/xmess/pkg-descr @@ -7,7 +7,7 @@ PALs and detailed information about the memory layout of each machine. MESS currently emulates the Nintendo Entertainment System (NES), Sega Genesis/Megadrive, TRS-80 models 1 and 3, Colour Genie, Colecovision, Vectrex, Apple ][ series, Atari 800, Atari 5200, Sega Master System/Game -Gear, Bally Astrocade, Kaypro 2x and PDP-1. +Gear, Bally Astrocade, Kaypro 2x and PDP-1, among others. To play games in X-MESS you must have a copy of the original game, extracted from a cartridge, floppy or tape image. diff --git a/emulators/xmess/pkg-plist b/emulators/xmess/pkg-plist deleted file mode 100644 index f4843d462838..000000000000 --- a/emulators/xmess/pkg-plist +++ /dev/null @@ -1,6 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 1998/08/29 04:24:29 mycroft Exp $ -bin/xmess -lib/xmess/spacewar.zip -share/xmess/xmessrc -@dirrm lib/xmess -@dirrm share/xmess -- cgit v1.2.3