From stijn@pcwin002.win.tue.nl  Fri Aug  3 02:50:54 2001
Return-Path: <stijn@pcwin002.win.tue.nl>
Received: from pcwin002.win.tue.nl (pcwin002.win.tue.nl [131.155.71.72])
	by hub.freebsd.org (Postfix) with ESMTP id EC1BD37B405
	for <FreeBSD-gnats-submit@freebsd.org>; Fri,  3 Aug 2001 02:50:53 -0700 (PDT)
	(envelope-from stijn@pcwin002.win.tue.nl)
Received: (from stijn@localhost)
	by pcwin002.win.tue.nl (8.11.4/8.11.4) id f739oTe14369;
	Fri, 3 Aug 2001 11:50:29 +0200 (CEST)
	(envelope-from stijn)
Message-Id: <200108030950.f739oTe14369@pcwin002.win.tue.nl>
Date: Fri, 3 Aug 2001 11:50:29 +0200 (CEST)
From: stijn@win.tue.nl
Reply-To: stijn@win.tue.nl
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER UPDATE]: emulators/xmame
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         29409
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE]: emulators/xmame
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 03 03:00:08 PDT 2001
>Closed-Date:    Fri Aug 3 06:21:33 PDT 2001
>Last-Modified:  Fri Aug 03 06:21:44 PDT 2001
>Originator:     Stijn Hoop
>Release:        FreeBSD 4.3-STABLE i386
>Organization:
>Environment:

System: FreeBSD 4.3-STABLE #0: Fri Jul 27 04:34:50 CEST 2001

>Description:

- Update CPS2 patches to 2001/07/11
- Disable optimization by default - it's known to break things now
- With thanks to Jimmy Olgeni <olgeni@FreeBSD.org> for updating the
  port while I was away

>How-To-Repeat:

N/A

>Fix:

diff -urN --exclude=CVS /usr/ports/emulators/xmame/Makefile xmame/Makefile
--- /usr/ports/emulators/xmame/Makefile	Fri Jul 13 05:34:44 2001
+++ xmame/Makefile	Fri Aug  3 11:44:38 2001
@@ -92,12 +92,10 @@
 # CPS-2 patches - this enables extra games in MAME.
 .if ${MAMEMESS} == "mame"
 .if defined(WITH_CPS2) && ${WITH_CPS2} == "yes"
-# CPS2VERSION=	20010527
+CPS2VERSION=	20010711
 
-# PATCH_SITES+=	http://www.win.tue.nl/~stijn/xmame/
-# PATCHFILES+=	${DISTNAME}-cps2-${CPS2VERSION}.patch.gz
-pre-everything::
-	@${ECHO_MSG} "===> Warning: CPS2 patches temporarily unavailable"
+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\""
@@ -143,12 +141,19 @@
 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"
+# Heavy optimization - disabled by default because it breaks things. It's
+# still available because it enables considerable speedup.
+.if defined(WITH_OPTIMIZATION) && ${WITH_OPTIMIZATION} == "yes"
 CFLAGS+=	-O3 -Wall -Wno-unused -funroll-loops \
 		-fstrength-reduce -fomit-frame-pointer -ffast-math \
 		-malign-functions=4 -malign-jumps=4 -malign-loops=4
+.else
+.if !defined(WITH_OPTIMIZATION)
+pre-everything::
+	@${ECHO_MSG} "===> If you want to enable high optimization levels, use "
+	@${ECHO_MSG} "     \"make WITH_OPTIMIZATION=yes\". Be warned that this is known to"
+	@${ECHO_MSG} "     break some games though."
+.endif
 .endif
 
 # Choose one of several display targets:
diff -urN --exclude=CVS /usr/ports/emulators/xmame/distinfo xmame/distinfo
--- /usr/ports/emulators/xmame/distinfo	Fri Jul 13 05:34:44 2001
+++ xmame/distinfo	Fri Aug  3 11:23:14 2001
@@ -4,5 +4,5 @@
 MD5 (xmame/cheat.zip) = dc380436c04780950cee07d3e31bfb0b
 MD5 (xmame/history.zip) = 69da5c33e6a78092c6cd75cbeb737c6a
 MD5 (xmame/hsdat7.zip) = 9e4a7e36448895f13128a675327e34e4
-MD5 (xmame/xmame-0.37b15.1-cps2-20010527.patch.gz) = 2f469fd33150fae1e871dfb8b5964b53
+MD5 (xmame/xmame-0.37b16.1-cps2-20010711.patch.gz) = 2c64e9ab3fc49b9c7adea1e97001c126
 MD5 (xmame/xmame-0.37b14.2-pinmame-0.99b3.patch.gz) = aeefd4f6593d389cddbb7081cfc4eb42
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: olgeni 
State-Changed-When: Fri Aug 3 06:21:33 PDT 2001 
State-Changed-Why:  
Committed, thanks! 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=29409 
>Unformatted:
