From alepulver@FreeBSD.org  Thu Feb 22 04:13:12 2007
Return-Path: <alepulver@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0B3B116A401
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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" <alepulver@FreeBSD.org>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: [UPDATE] emulators/xmame: remove DATFILES option (split to emulators/mame-extras)
X-Send-Pr-Version: gtk-send-pr 0.4.8 
X-GNATS-Notify:

>Number:         109419
>Category:       ports
>Synopsis:       [UPDATE] emulators/xmame: remove DATFILES option (split to emulators/mame-extras)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    alepulver
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Feb 22 04:20:04 GMT 2007
>Closed-Date:    Sun Feb 25 15:08:43 GMT 2007
>Last-Modified:  Sun Feb 25 15:10:18 GMT 2007
>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 <bsd.port.post.mk>
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:
Responsible-Changed-From-To: freebsd-ports-bugs->alepulver 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Feb 22 04:20:19 UTC 2007 
Responsible-Changed-Why:  
Submitter has GNATS access 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109419 
State-Changed-From-To: open->feedback 
State-Changed-By: alepulver 
State-Changed-When: Thu Feb 22 14:25:30 UTC 2007 
State-Changed-Why:  
Ask maintainer for approval. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109419 
State-Changed-From-To: feedback->open 
State-Changed-By: alepulver 
State-Changed-When: Thu Feb 22 14:29:01 UTC 2007 
State-Changed-Why:  
Maintainer was reset 11 days ago. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109419 
State-Changed-From-To: open->closed 
State-Changed-By: alepulver 
State-Changed-When: Sun Feb 25 15:08:39 UTC 2007 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109419 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/109419: commit references a PR
Date: Sun, 25 Feb 2007 15:06:22 +0000 (UTC)

 alepulver    2007-02-25 15:06:17 UTC
 
   FreeBSD ports repository
 
   Modified files:
     emulators/xmame      Makefile pkg-plist 
   Added files:
     emulators/xmame      pkg-message 
   Log:
   - 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 with information about the new port.
   
   PR:             ports/109419
   Submitted by:   alepulver (myself)
   
   Revision  Changes    Path
   1.111     +9 -51     ports/emulators/xmame/Makefile
   1.1       +8 -0      ports/emulators/xmame/pkg-message (new)
   1.36      +0 -3      ports/emulators/xmame/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
