Date: Mon, 2 Apr 2001 23:50:03 -0700 (PDT) From: Stijn Hoop <stijn@win.tue.nl> To: freebsd-ports@FreeBSD.org Subject: Re: ports/26300: Request for xmame port Message-ID: <200104030650.f336o3V99788@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/26300; it has been noted by GNATS.
From: Stijn Hoop <stijn@win.tue.nl>
To: Nick Sayer <nsayer@quack.kfu.com>
Cc: freebsd-gnats-submit@freebsd.org
Subject: Re: ports/26300: Request for xmame port
Date: Tue, 3 Apr 2001 08:47:34 +0200
--YiEDa0DAkWCtVeE4
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
On Mon, Apr 02, 2001 at 10:48:56PM -0700, Nick Sayer wrote:
> I've committed what I think is a good xmame patch. Can you update and
> send me anything else (like the xmess stuff) that needs doing?
Find the patch attached. Thanks!
--Stijn
--
Tact, n.:
The unsaid part of what you're thinking.
--YiEDa0DAkWCtVeE4
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="xmamemess-20010403.txt"
diff -urN --exclude=CVS xmame.nsayer/Makefile xmame/Makefile
--- xmame.nsayer/Makefile Tue Apr 3 07:57:03 2001
+++ xmame/Makefile Tue Apr 3 08:45:09 2001
@@ -176,11 +176,13 @@
SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
MAKE_ENV+= SDL_CONFIG=${SDL_CONFIG}
DISPLAY_METHOD= SDL
+.if !defined(WITH_SDL)
pre-everything::
@${ECHO_MSG} "===> If you don't want ${MAMEMESS:U} to be built with SDL support,"
@${ECHO_MSG} " use \"make WITH_SDL=no\""
- @${ECHO_MSG} "===> You can also build ${MAMEMESS:U} with OpenGL support."
- @${ECHO_MSG} " use \"make WITH_GL=yes\" for this"
+ @${ECHO_MSG} "===> If you want to build ${MAMEMESS:U} with OpenGL support for vector games,"
+ @${ECHO_MSG} " use \"make WITH_GL=yes\""
+.endif
.else
DISPLAY_METHOD= x11
.endif
@@ -203,8 +205,12 @@
-e "s@GLLIBS=.-ldl@GLLIBS= ${PTHREAD_LIBS}@g" \
${WRKSRC}/makefile.unix.sed > ${WRKSRC}/makefile.unix
${PERL} -pi -e 's@SDL/@SDL11/@' ${WRKSRC}/src/unix/video-drivers/SDL.c
+.if ${XMAMEVERSION} != "0.37b12.1"
${PERL} -pi -e 's@png.h@../../png.h@' \
${WRKSRC}/src/unix/video-drivers/glexport.c
+ ${PERL} -pi -e 's@malloc.h@stdlib.h@' \
+ ${WRKSRC}/src/unix/video-drivers/gljpg.c
+.endif
post-build:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} SDL_VIDEODRIVER=aalib \
diff -urN --exclude=CVS xmame.nsayer/distinfo xmame/distinfo
--- xmame.nsayer/distinfo Sun Apr 1 19:15:54 2001
+++ xmame/distinfo Mon Apr 2 12:39:36 2001
@@ -4,4 +4,4 @@
MD5 (xmame/history.zip) = 69da5c33e6a78092c6cd75cbeb737c6a
MD5 (xmame/hsdat7.zip) = 9e4a7e36448895f13128a675327e34e4
MD5 (xmame/xmame-0.37b13.1-cps2-20010330.patch.gz) = bf1d53ea84a4905d8377a187d3478883
-MD5 (xmame/xmame-0.37b13.1-pinmame-0.99b.patch.gz) = ea61399643a49b96025629960652455b
+MD5 (xmame/xmame-0.37b13.1-pinmame-0.99b1.patch.gz) = 06526474f4bd5afa0874237ffe653d34
diff -urN --exclude=CVS xmame.nsayer/files/patch-ac xmame/files/patch-ac
--- xmame.nsayer/files/patch-ac Tue Apr 3 07:57:04 2001
+++ xmame/files/patch-ac Mon Apr 2 12:32:41 2001
@@ -1,5 +1,5 @@
--- src/unix/unix.mak.orig Sat Mar 24 02:33:38 2001
-+++ src/unix/unix.mak Mon Apr 2 10:33:48 2001
++++ src/unix/unix.mak Mon Apr 2 12:32:36 2001
@@ -46,18 +46,18 @@
LIBS.x11 = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext
LIBS.svgalib = $(X11LIB) -lvga -lvgagl
@@ -23,12 +23,22 @@
CFLAGS.photon2 =
INST.x11 = doinstall
-@@ -326,7 +326,7 @@
+@@ -317,7 +317,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
+@@ -326,7 +326,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 >> 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/xmess/files/patch-ac xmess/files/patch-ac
--- /usr/ports/emulators/xmess/files/patch-ac Sun Apr 1 19:15:56 2001
+++ xmess/files/patch-ac Mon Apr 2 12:36:31 2001
@@ -1,5 +1,5 @@
---- src/unix/unix.mak.orig Sat Mar 10 09:11:54 2001
-+++ src/unix/unix.mak Sun Mar 11 19:26:27 2001
+--- src/unix/unix.mak.orig Sat Mar 17 03:11:38 2001
++++ src/unix/unix.mak Mon Apr 2 12:36:22 2001
@@ -50,14 +50,14 @@
LIBS.xfx = $(X11LIB) $(JOY_X11_LIBS) -lX11 -lXext -lglide2x
LIBS.svgafx = $(X11LIB) -lvga -lvgagl -lglide2x
@@ -17,12 +17,22 @@
CFLAGS.photon2 =
INST.x11 = doinstall
-@@ -326,7 +326,7 @@
+@@ -317,7 +317,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
+@@ -326,7 +326,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 >> 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/Makefile xpinmame/Makefile
--- /usr/ports/emulators/xpinmame/Makefile Mon Apr 2 11:14:18 2001
+++ xpinmame/Makefile Mon Apr 2 12:34:02 2001
@@ -19,6 +19,6 @@
MAMEMESS= pinmame
XMAMEVERSION= 0.37b13.1
-PINMAMEVERSION= 0.99b
+PINMAMEVERSION= 0.99b1
.include "${MASTERDIR}/Makefile"
--YiEDa0DAkWCtVeE4--
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?200104030650.f336o3V99788>