From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Feb 22 04:20:04 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C155D16A404 for ; Thu, 22 Feb 2007 04:20:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id A322C13C474 for ; Thu, 22 Feb 2007 04:20:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l1M4K4cf063752 for ; Thu, 22 Feb 2007 04:20:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l1M4K4QZ063751; Thu, 22 Feb 2007 04:20:04 GMT (envelope-from gnats) Resent-Date: Thu, 22 Feb 2007 04:20:04 GMT Resent-Message-Id: <200702220420.l1M4K4QZ063751@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Alejandro Pulver" Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0B3B116A401 for ; Thu, 22 Feb 2007 04:13:12 +0000 (UTC) (envelope-from alepulver@FreeBSD.org) Received: from relay03.pair.com (relay03.pair.com [209.68.5.17]) by mx1.freebsd.org (Postfix) with SMTP id AF18A13C478 for ; Thu, 22 Feb 2007 04:13:11 +0000 (UTC) (envelope-from alepulver@FreeBSD.org) Received: (qmail 48201 invoked from network); 22 Feb 2007 04:06:29 -0000 Received: from 190.55.88.152 (HELO phobos.mars.bsd) (190.55.88.152) by relay03.pair.com with SMTP; 22 Feb 2007 04:06:29 -0000 Message-Id: <1172117184.65426@phobos.mars.bsd> Date: Thu, 22 Feb 2007 01:06:24 -0300 From: "Alejandro Pulver" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.8 Cc: Subject: ports/109419: [UPDATE] emulators/xmame: remove DATFILES option (split to emulators/mame-extras) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Feb 2007 04:20:04 -0000 >Number: 109419 >Category: ports >Synopsis: [UPDATE] emulators/xmame: remove DATFILES option (split to emulators/mame-extras) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Feb 22 04:20:04 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Alejandro Pulver >Release: FreeBSD 6.1-RELEASE-p1 i386 >Organization: >Environment: System: FreeBSD 6.1-RELEASE-p1 #3: Mon Jun 19 14:49:35 ART 2006 root@phobos.mars.bsd:/usr/obj/usr/src/sys/ATHLON-PHOBOS >Description: - Remove DATFILES option (a port emulators/mame-extras will be added soon, because there will be more MAME/MESS ports). - Remove unused entries and groups from MASTER_SITES. - Add pkg-message about the new port. Note: this PR will be committed after the emulators/mame-extras port is added. >How-To-Repeat: >Fix: --- xmame.diff begins here --- Index: xmame/Makefile =================================================================== RCS file: /home/pcvs/ports/emulators/xmame/Makefile,v retrieving revision 1.109 diff -u -r1.109 Makefile --- xmame/Makefile 14 Dec 2006 07:34:39 -0000 1.109 +++ xmame/Makefile 22 Feb 2007 03:52:02 -0000 @@ -9,21 +9,12 @@ PORTVERSION?= 0.106 PORTREVISION?= 1 CATEGORIES= emulators -MASTER_SITES= http://www.franksworld.org/dist/xmame/:xmame \ - http://x.mame.net/download/:xmame \ - http://www.energyhq.es.eu.org/files/:xmame \ - http://www.energyhq.be/files/:xmame \ - http://www.pkix.net/mirror/x.mame.net/:xmame \ - http://www.franksworld.org/dist/xmame/:history \ - http://www.arcade-history.com/download/:history \ - http://www.energyhq.es.eu.org/files/:history \ - http://www.franksworld.org/dist/xmame/:highscore \ - http://www.mameworld.net/highscore/:highscore \ - http://www.franksworld.org/dist/xmame/:cheat \ - http://cheat.retrogames.com/:cheat +MASTER_SITES= http://www.franksworld.org/dist/xmame/ \ + http://x.mame.net/download/ \ + http://www.energyhq.es.eu.org/files/ \ + http://www.energyhq.be/files/ \ + http://www.pkix.net/mirror/x.mame.net/ \ DISTNAME= xmame-${XMAMEVERSION:S/.r/-rc/} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:xmame -DIST_SUBDIR= xmame MAINTAINER?= mmendez@energyhq.be COMMENT?= UNIX/X11 port of the Multi Arcade Machine Emulator (MAME) @@ -54,7 +45,6 @@ ASM68K "Enable the speedier but buggy 68k emulator" off \ OPTIMIZATION "Enable maximum C compiler optimization" off \ ESOUND "Enable esound support" off \ - DATFILES "Installs additional information files" on \ NETWORK "Include support for network play (**BROKEN**)" off XMAMEVERSION?= ${PORTVERSION} @@ -128,38 +118,6 @@ USE_GCC= 3.4+ .endif -# Option WITH_DATFILES -.if ${MAMEMESS} == "mame" - -.if defined(WITH_DATFILES) -PLIST_SUB+= DATFILES="" - -EXTRACT_DEPENDS= unzip:${PORTSDIR}/archivers/unzip - -HIVER= 0100 -HISTVER= 1_06a - -DISTFILES+= uhsdat${HIVER}.zip:highscore \ - history${HISTVER}.zip:history \ - cheat.zip:cheat -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -post-extract: - cd ${WRKDIR} && \ - ${UNZIP_CMD} -q ${DISTDIR}/${DIST_SUBDIR}/uhsdat${HIVER}.zip \ - hiscore.dat - cd ${WRKDIR} && \ - ${UNZIP_CMD} -q ${DISTDIR}/${DIST_SUBDIR}/history${HISTVER}.zip \ - history.dat - cd ${WRKDIR} && \ - ${UNZIP_CMD} -q ${DISTDIR}/${DIST_SUBDIR}/cheat.zip cheat.dat -.else -PLIST_SUB+= DATFILES="@comment " -.endif -.else # xmess -PLIST_SUB+= DATFILES="@comment " -.endif - .if defined(WITH_ASM68K) ASM_COMMENT= .else @@ -310,10 +268,10 @@ ${INSTALL_DATA} ${WRKSRC}/doc/mess/sysinfo.dat \ ${DATADIR}/history.dat .endif -.if ${MAMEMESS} == "mame" && defined(WITH_DATFILES) - ${INSTALL_DATA} ${WRKDIR}/hiscore.dat ${DATADIR} - ${INSTALL_DATA} ${WRKDIR}/history.dat ${DATADIR} - ${INSTALL_DATA} ${WRKDIR}/cheat.dat ${DATADIR} +.if ${MAMEMESS} == "mame" + @${ECHO_CMD} + @${CAT} ${PKGMESSAGE} + @${ECHO_CMD} .endif .include Index: xmame/pkg-message =================================================================== RCS file: xmame/pkg-message diff -N xmame/pkg-message --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ xmame/pkg-message 22 Feb 2007 03:52:02 -0000 @@ -0,0 +1,8 @@ +============================================================================== + +xmame has heen installed. + +To install additional MAME files (like cheats, hiscore, history, artwork, +etc.) please use the "emulators/mame-extras" port. + +============================================================================== Index: xmame/pkg-plist =================================================================== RCS file: /home/pcvs/ports/emulators/xmame/pkg-plist,v retrieving revision 1.35 diff -u -r1.35 pkg-plist --- xmame/pkg-plist 14 Dec 2006 07:34:39 -0000 1.35 +++ xmame/pkg-plist 22 Feb 2007 03:52:02 -0000 @@ -52,9 +52,6 @@ %%OPENGL%%%%DATADIR%%/cab/trans/trans.cab %%OPENGL%%@dirrm %%DATADIR%%/cab/trans %%OPENGL%%@dirrm %%DATADIR%%/cab -%%DATFILES%%%%DATADIR%%/hiscore.dat -%%DATFILES%%%%DATADIR%%/history.dat -%%DATFILES%%%%DATADIR%%/cheat.dat @exec mkdir -p %D/%%DATADIR%%/roms || true @dirrm %%DATADIR%%/roms @dirrm %%DATADIR%% --- xmame.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: