From owner-freebsd-ports Mon Apr 23 11:10:15 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id E62B537B424 for ; Mon, 23 Apr 2001 11:10:01 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id f3NIA1v55700; Mon, 23 Apr 2001 11:10:01 -0700 (PDT) (envelope-from gnats) Received: from pcwin002.win.tue.nl (pcwin002.win.tue.nl [131.155.71.72]) by hub.freebsd.org (Postfix) with ESMTP id CD68737B59E for ; Mon, 23 Apr 2001 11:02:27 -0700 (PDT) (envelope-from stijn@pcwin002.win.tue.nl) Received: (from stijn@localhost) by pcwin002.win.tue.nl (8.11.3/8.11.3) id f3NI1q307799; Mon, 23 Apr 2001 20:01:52 +0200 (CEST) (envelope-from stijn) Message-Id: <200104231801.f3NI1q307799@pcwin002.win.tue.nl> Date: Mon, 23 Apr 2001 20:01:52 +0200 (CEST) From: stijn@win.tue.nl Reply-To: stijn@win.tue.nl To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/26799: [MAINTAINER UPDATE]: emulators/xmame Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 26799 >Category: ports >Synopsis: [MAINTAINER UPDATE]: emulators/xmame >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Apr 23 11:10:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Stijn Hoop >Release: FreeBSD 4.3-STABLE i386 >Organization: >Environment: System: FreeBSD 4.3-RC #1: Tue Apr 10 11:37:24 CEST 2001 >Description: - Update to xmame-0.37b14.1 - Update CPS2 patch to 2001/04/22 >How-To-Repeat: N/A >Fix: diff -urN --exclude=CVS /usr/ports/emulators/xmame/Makefile xmame/Makefile --- /usr/ports/emulators/xmame/Makefile Wed Apr 18 05:32:21 2001 +++ xmame/Makefile Mon Apr 23 19:49:34 2001 @@ -6,7 +6,7 @@ # PORTNAME?= xmame -PORTVERSION?= 0.37b13.2 +PORTVERSION?= 0.37b14.1 CATEGORIES= emulators MASTER_SITES= http://x.mame.net/download/ \ ftp://ftp.kaupp.cx/pub/xmame/ \ @@ -51,7 +51,6 @@ # Docs list GENERALDOCS= changes.unix \ liesmich.unix \ - credits.txt \ multiplayer-readme.txt \ xmame-doc-1.html \ xmame-doc-2.html \ @@ -72,8 +71,10 @@ gamelist.mess \ readme.mess \ messold.txt \ - messroms.txt -PINMAMEDOCS= pinmame/simulation.txt \ + messroms.txt \ + credits.txt +PINMAMEDOCS= credits.txt \ + pinmame/simulation.txt \ pinmame/whatsnew.txt \ pinmame/pinmame.txt \ pinmame/gamelist.txt \ @@ -93,7 +94,7 @@ # CPS-2 patches - this enables extra games in MAME. .if ${MAMEMESS} == "mame" .if defined(WITH_CPS2) && ${WITH_CPS2} == "yes" -CPS2VERSION= 20010415 +CPS2VERSION= 20010422 PATCH_SITES+= http://www.win.tue.nl/~stijn/xmame/ PATCHFILES+= ${DISTNAME}-cps2-${CPS2VERSION}.patch.gz @@ -125,11 +126,13 @@ unzip -q ${DISTDIR}/${DIST_SUBDIR}/cheat.zip cheat.dat .else PLIST_SUB+= DATFILES="@comment " +.if !defined(WITH_DATFILES) 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 +.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 @@ -183,6 +186,16 @@ .endif .endif +# USB joysticks - only enabled on -STABLE because of conflicting USB +# prototypes in -STABLE & -CURRENT. +.include + +.if ${OSVERSION} >= 500000 +JOYUSBCOMMENT=\#\ +.else +JOYUSBCOMMENT= +.endif + # Some simple patches that don't warrant a separate patch post-patch: ${PERL} -pi -e 's@SDL/@SDL11/@' ${WRKSRC}/src/unix/video-drivers/SDL.c @@ -202,7 +215,7 @@ -e "s@-g bin@-g wheel@g" \ -e "s@ARCH = linux@ARCH = freebsd@g" \ -e "s@# X11_DGA@X11_DGA@g" \ - -e "s@# JOY_USB@JOY_USB@g" \ + -e "s@# JOY_USB@${JOYUSBCOMMENT}JOY_USB@g" \ -e "s@= x11@= ${DISPLAY_METHOD}@g" \ -e "s@= mame@= ${MAMEMESS}@g" \ -e "s@# X86_ASM@${ASM_COMMENT}X86_ASM@g" \ @@ -250,4 +263,4 @@ ${INSTALL_DATA} ${WRKDIR}/cheat.dat ${PREFIX}/share/xmame .endif -.include +.include diff -urN --exclude=CVS /usr/ports/emulators/xmame/distinfo xmame/distinfo --- /usr/ports/emulators/xmame/distinfo Wed Apr 18 05:32:21 2001 +++ xmame/distinfo Mon Apr 23 19:54:59 2001 @@ -1,6 +1,7 @@ MD5 (xmame/xmame-0.37b13.2.tar.bz2) = 70ec7ae3fba3110a6d85a7f5bfdb84f1 +MD5 (xmame/xmame-0.37b14.1.tar.bz2) = a15c6c5b8f2bbc1e2cda3420c6454bee MD5 (xmame/cheat.zip) = dc380436c04780950cee07d3e31bfb0b MD5 (xmame/history.zip) = 69da5c33e6a78092c6cd75cbeb737c6a MD5 (xmame/hsdat7.zip) = 9e4a7e36448895f13128a675327e34e4 -MD5 (xmame/xmame-0.37b13.2-cps2-20010415.patch.gz) = 16101e5395f6592cc27561b5dd97ae3b +MD5 (xmame/xmame-0.37b14.1-cps2-20010422.patch.gz) = cd36e3b92acea42e96cc97ae604d6cd2 MD5 (xmame/xmame-0.37b13.1-pinmame-0.99b1.patch.gz) = 06526474f4bd5afa0874237ffe653d34 diff -urN --exclude=CVS /usr/ports/emulators/xmame/pkg-plist xmame/pkg-plist --- /usr/ports/emulators/xmame/pkg-plist Sun Apr 15 05:32:17 2001 +++ xmame/pkg-plist Mon Apr 23 18:42:53 2001 @@ -3,7 +3,6 @@ share/%%MAMEMESS%%/%%MAMEMESS%%rc %%PORTDOCS%%share/doc/%%MAMEMESS%%/changes.unix %%PORTDOCS%%share/doc/%%MAMEMESS%%/liesmich.unix -%%PORTDOCS%%share/doc/%%MAMEMESS%%/credits.txt %%PORTDOCS%%share/doc/%%MAMEMESS%%/multiplayer-readme.txt %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc-1.html %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc-2.html @@ -23,6 +22,7 @@ %%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/credits.txt %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/changes.mess %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/gamelist.mess %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/readme.mess @@ -66,6 +66,7 @@ %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/sysinfo/t1000hx.txt %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/sysinfo/vip.txt %%MESSONLY%%%%PORTDOCS%%@dirrm share/doc/xmess/sysinfo +%%PINMAMEONLY%%%%PORTDOCS%%share/doc/credits.txt %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/simulation.txt %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/whatsnew.txt %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/pinmame.txt >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message