Date: Tue, 24 Sep 2002 15:11:20 +0200 (CEST) From: Stijn Hoop <stijn@win.tue.nl> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/43330: [FIX BENTO]: emulators/xpinmame Message-ID: <200209241311.g8ODBKx3083486@pcwin002.win.tue.nl>
next in thread | raw e-mail | index | archive | help
>Number: 43330
>Category: ports
>Synopsis: [FIX BENTO]: emulators/xpinmame
>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: Tue Sep 24 06:20:02 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Stijn Hoop
>Release: FreeBSD 4.6-STABLE i386
>Organization:
N/A
>Environment:
System: FreeBSD pcwin002.win.tue.nl 4.6-STABLE FreeBSD 4.6-STABLE #0: Wed Aug 21 04:35:22 CEST 2002 src@pcwin002.win.tue.nl:/usr/obj/usr/src/sys/PCWIN002 i386
>Description:
- Fix bento errors for emulators/xpinmame:
- Add FreeBSD patches to account for the old version of xmame used.
- Fix pkg-plist (done in xmame PR)
- Fix WWW address in pkg-descr
- This PR depends on the FIX BENTO PR for xmame because this is a slave port.
>How-To-Repeat:
N/A
>Fix:
diff -urN --exclude=CVS /usr/ports/emulators/xpinmame/Makefile xpinmame/Makefile
--- /usr/ports/emulators/xpinmame/Makefile Mon May 14 22:02:10 2001
+++ xpinmame/Makefile Tue Sep 24 14:43:59 2002
@@ -14,6 +14,7 @@
MAINTAINER= stijn@win.tue.nl
MASTERDIR= ${.CURDIR}/../xmame
+PATCHDIR= ${.CURDIR}/files
COMMENT= ${.CURDIR}/pkg-comment
DESCR= ${.CURDIR}/pkg-descr
diff -urN --exclude=CVS /usr/ports/emulators/xpinmame/files/patch-ac xpinmame/files/patch-ac
--- /usr/ports/emulators/xpinmame/files/patch-ac Thu Jan 1 01:00:00 1970
+++ xpinmame/files/patch-ac Tue Sep 24 14:47:15 2002
@@ -0,0 +1,44 @@
+--- src/unix/unix.mak.orig Mon Apr 9 03:54:42 2001
++++ src/unix/unix.mak Tue Apr 10 10:52:06 2001
+@@ -46,18 +46,18 @@
+ LIBS.x11 = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext
+ LIBS.svgalib = $(X11LIB) -lvga -lvgagl
+ LIBS.ggi = $(X11LIB) -lggi
+-LIBS.xgl = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext $(GLLIBS) -ljpeg
++LIBS.xgl = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext $(GLLIBS) -L/usr/local/lib -ljpeg
+ LIBS.xfx = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext -lglide2x
+ LIBS.svgafx = $(X11LIB) -lvga -lvgagl -lglide2x
+ LIBS.openstep = -framework AppKit
+-LIBS.SDL = -ldl -lSDL -lpthread -D_REENTRANT
++LIBS.SDL = `$(SDL_CONFIG) --libs`
+ LIBS.photon2 = -L/usr/lib -lph -lphrender
+
+ CFLAGS.x11 = $(X11INC) $(JOY_X11_CFLAGS)
+-CFLAGS.xgl = $(X11INC) $(JOY_X11_CFLAGS) $(GLCFLAGS)
++CFLAGS.xgl = -DGLU_VERSION_1_2 $(X11INC) $(JOY_X11_CFLAGS) $(GLCFLAGS) -I/usr/local/include $(PTHREAD_CFLAGS)
+ CFLAGS.xfx = $(X11INC) $(JOY_X11_CFLAGS) -I/usr/include/glide
+ CFLAGS.svgafx = -I/usr/include/glide
+-CFLAGS.SDL = -D_REENTRANT
++CFLAGS.SDL = `$(SDL_CONFIG) --cflags`
+ CFLAGS.photon2 =
+
+ INST.x11 = doinstall
+@@ -322,7 +322,7 @@
+
+ doc/x$(TARGET)rc.dist: all src/unix/xmamerc-keybinding-notes.txt
+ ./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -showconfig | \
+- grep -v loadconfig > doc/x$(TARGET)rc.dist
++ grep -v loadconfig | tr "\033" \# > doc/x$(TARGET)rc.dist
+ cat src/unix/xmamerc-keybinding-notes.txt >> doc/x$(TARGET)rc.dist
+
+ doc/gamelist.$(TARGET): all
+@@ -331,7 +331,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
+- ./x$(TARGET).$(DISPLAY_METHOD) -manhelp >> doc/x$(TARGET).6
++ ./x$(TARGET).$(DISPLAY_METHOD) -noloadconfig -manhelp | \
++ tr "\033" \# >> doc/x$(TARGET).6
+ cat src/unix/xmame.6-3 >> doc/x$(TARGET).6
+
+ install: $(INST.$(DISPLAY_METHOD)) install-man
diff -urN --exclude=CVS /usr/ports/emulators/xpinmame/pkg-descr xpinmame/pkg-descr
--- /usr/ports/emulators/xpinmame/pkg-descr Sun Apr 1 19:22:26 2001
+++ xpinmame/pkg-descr Tue Sep 24 14:54:27 2002
@@ -6,4 +6,4 @@
It includes simulators to artificially press the 'switches' on the table,
however it does not simulate any game play, nor a real pinball table.
-WWW: http://pinmame.emuviews.com/
+WWW: http://pinmame.retrogames.com/
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200209241311.g8ODBKx3083486>