From owner-freebsd-ports Mon May 6 5:10:17 2002 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 BEDD737B408 for <freebsd-ports@hub.freebsd.org>; Mon, 6 May 2002 05:10:01 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g46CA1Q34190; Mon, 6 May 2002 05: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 4973137B406 for <FreeBSD-gnats-submit@freebsd.org>; Mon, 6 May 2002 05:06:55 -0700 (PDT) Received: from pcwin002.win.tue.nl (orb_rules@localhost [127.0.0.1]) by pcwin002.win.tue.nl (8.12.3/8.12.2) with ESMTP id g46C6rD0049296 for <FreeBSD-gnats-submit@freebsd.org>; Mon, 6 May 2002 14:06:53 +0200 (CEST) (envelope-from stijn@pcwin002.win.tue.nl) Received: (from stijn@localhost) by pcwin002.win.tue.nl (8.12.3/8.12.3/Submit) id g46C6rMj049295; Mon, 6 May 2002 14:06:53 +0200 (CEST) Message-Id: <200205061206.g46C6rMj049295@pcwin002.win.tue.nl> Date: Mon, 6 May 2002 14:06:53 +0200 (CEST) From: Stijn Hoop <stijn@win.tue.nl> Reply-To: Stijn Hoop <stijn@win.tue.nl> To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/37787: [MAINTAINER UPDATE]: emulators/xmame Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: <freebsd-ports.FreeBSD.ORG> List-Archive: <http://docs.freebsd.org/mail/> (Web Archive) List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions) List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-ports> List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-ports> X-Loop: FreeBSD.org >Number: 37787 >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 May 06 05:10:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Stijn Hoop >Release: FreeBSD 4.5-STABLE i386 >Organization: >Environment: System: FreeBSD 4.5-STABLE #0: Wed May 1 04:32:43 CEST 2002 >Description: - Update to xmame 0.60.1. - Catchup with the USB library rename - this will hopefully solve the USB joystick problem for people with devel/libusb installed. >How-To-Repeat: N/A >Fix: diff -urN --exclude=CVS /usr/ports/emulators/xmame/Makefile xmame/Makefile --- /usr/ports/emulators/xmame/Makefile Thu Apr 18 05:33:38 2002 +++ xmame/Makefile Mon May 6 13:59:18 2002 @@ -6,7 +6,7 @@ # PORTNAME?= xmame -PORTVERSION?= 0.59.1 +PORTVERSION?= 0.60.1 CATEGORIES= emulators MASTER_SITES= http://x.mame.net/download/ \ http://www.mame.net/zips/ \ @@ -70,6 +70,7 @@ xmame.css \ xmame-doc.lyx \ xmame-doc.txt \ + ctrlr.txt \ dga2.txt XMAMEDOCS= changes.mame \ gamelist.mame \ diff -urN --exclude=CVS /usr/ports/emulators/xmame/distinfo xmame/distinfo --- /usr/ports/emulators/xmame/distinfo Wed Apr 17 05:33:43 2002 +++ xmame/distinfo Mon May 6 13:18:01 2002 @@ -1,4 +1,4 @@ -MD5 (xmame/xmame-0.59.1.tar.bz2) = 5b46b6edac55d8a4db8dc46ff56d035b +MD5 (xmame/xmame-0.60.1.tar.bz2) = 887e3956e410b06b92165637ba219070 MD5 (xmame/xmame-0.56.2.tar.bz2) = e43dd5e087f954351948fb9848485924 MD5 (xmame/xmame-0.37b14.2.tar.bz2) = 34bfba3d1412a8f8e1abd4d738de3f27 MD5 (xmame/cheat.zip) = b745ea4df1a3a517c00fedae1ee49a14 diff -urN --exclude=CVS /usr/ports/emulators/xmame/files/patch-ac xmame/files/patch-ac --- /usr/ports/emulators/xmame/files/patch-ac Sun Mar 24 05:33:39 2002 +++ xmame/files/patch-ac Mon May 6 14:04:26 2002 @@ -1,5 +1,5 @@ ---- src/unix/unix.mak.orig Mon Mar 18 02:41:37 2002 -+++ src/unix/unix.mak Tue Mar 19 18:05:20 2002 +--- src/unix/unix.mak.orig Fri May 3 04:53:53 2002 ++++ src/unix/unix.mak Mon May 6 14:04:08 2002 @@ -50,20 +50,20 @@ # svga and ggi also use $(X11LIB) since that's where zlib often is @@ -26,7 +26,26 @@ CFLAGS.photon2 = INST.x11 = doinstall -@@ -357,7 +357,7 @@ +@@ -235,9 +235,18 @@ + MY_LIBS += -lusb + endif + else ++ifeq ($(ARCH), freebsd) ++ifeq ($(shell test -f /usr/include/usbhid.h && echo have_usbhid), have_usbhid) ++CONFIG += -DHAVE_USBHID_H ++MY_LIBS += -lusbhid ++else ++MY_LIBS += /usr/lib/libusb.a ++endif ++else + MY_LIBS += -lusb + endif + endif ++endif + + ifdef EFENCE + MY_LIBS += -lefence +@@ -366,7 +375,7 @@ doc/x$(TARGET)rc.dist: all src/unix/xmamerc-keybinding-notes.txt ./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -showconfig | \ @@ -35,7 +54,7 @@ cat src/unix/xmamerc-keybinding-notes.txt >> doc/x$(TARGET)rc.dist doc/gamelist.$(TARGET): all -@@ -366,7 +366,8 @@ +@@ -375,7 +384,8 @@ 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 diff -urN --exclude=CVS /usr/ports/emulators/xmame/pkg-plist xmame/pkg-plist --- /usr/ports/emulators/xmame/pkg-plist Sun Jan 6 05:33:45 2002 +++ xmame/pkg-plist Mon May 6 13:53:29 2002 @@ -25,6 +25,7 @@ %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame.css %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc.lyx %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc.txt +%%PORTDOCS%%share/doc/%%MAMEMESS%%/ctrlr.txt %%PORTDOCS%%share/doc/%%MAMEMESS%%/dga2.txt %%MAMEONLY%%%%DATFILES%%share/xmame/hiscore.dat %%MAMEONLY%%%%DATFILES%%share/xmame/history.dat >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message