Date: Wed, 12 Feb 2003 11:11:33 +0100 (CET) From: Stijn Hoop <stijn@win.tue.nl> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/48202: [MAINTAINER UPDATE]: emulators/xmame & emulators/xmess Message-ID: <200302121011.h1CABXEe090872@pcwin002.win.tue.nl>
next in thread | raw e-mail | index | archive | help
>Number: 48202 >Category: ports >Synopsis: [MAINTAINER UPDATE]: emulators/xmame & emulators/xmess >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Feb 12 02:20:06 PST 2003 >Closed-Date: >Last-Modified: >Originator: Stijn Hoop >Release: FreeBSD 4.7-STABLE i386 >Organization: >Environment: System: FreeBSD pcwin002.win.tue.nl 4.7-STABLE FreeBSD 4.7-STABLE #0: Tue Feb 11 15:47:22 CET 2003 stijn@pcwin002.win.tue.nl:/usr/obj/usr/src/sys/PCWIN002 i386 >Description: - Update of xmame/xmess to 0.65.1 >How-To-Repeat: N/A >Fix: - Apply attached patch - Added file: xmame/files/patch-src::unix::unix.mak, don't forget to cvs add diff -urN --exclude=CVS /usr/ports/emulators/xmame/Makefile xmame/Makefile --- /usr/ports/emulators/xmame/Makefile Mon Jan 6 10:14:42 2003 +++ xmame/Makefile Wed Feb 12 10:24:19 2003 @@ -6,14 +6,14 @@ # PORTNAME?= xmame -PORTVERSION?= 0.61.1 +PORTVERSION?= 0.65.1 CATEGORIES= emulators MASTER_SITES= http://x.mame.net/download/:xmame \ http://www.sys2064.com/files/util/:history \ http://www.sys2064.com/files/mame/:highscore \ http://cheat.retrogames.com/:cheat \ http://www.win.tue.nl/~stijn/xmame/:history,highscore,cheat -DISTNAME= xmame-${XMAMEVERSION:S/.p/-pr/} +DISTNAME= xmame-${XMAMEVERSION:S/.r/-rc/} DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:xmame DIST_SUBDIR= xmame @@ -52,6 +52,7 @@ GENERALDOCS= changes.unix \ ctrlr.txt \ dga2.txt \ + img/xmame.jpg \ liesmich.unix \ listinfo.txt \ multiplayer-readme.txt \ @@ -85,7 +86,8 @@ imgtool.txt \ messhelp.txt \ messroms.txt \ - old-changes.mess + old-changes.mess \ + readme.mess PINMAMEDOCS= pinmame/simulation.txt \ pinmame/whatsnew.txt \ pinmame/pinmame.txt \ @@ -106,8 +108,7 @@ PKGOPTS= ${FILESDIR}/pkg-opts # -# Various options are processed here. Note that due to a bug in make(1), at -# present the conditionals are suboptimal. See PR bin/34032. +# Various options are processed here. # # Option WITH_DATFILES @@ -148,7 +149,7 @@ .if ${WITH_ASM68K:L} == "yes" ASM_COMMENT= .else -ASM_COMMENT=\# +ASM_COMMENT=\#\ .endif # Option WITH_OPTIMIZATION @@ -160,6 +161,8 @@ .endif .endif +SDLSOUNDCOMMENT= \#\ + # Option DISPLAY_TARGET .if !defined(DISPLAY_TARGET) DISPLAY_TARGET=sdl @@ -176,8 +179,6 @@ .if ${DISPLAY_TARGET:L} == "svgalib" LIB_DEPENDS= vga.1:${PORTSDIR}/graphics/svgalib -CFLAGS+= -I${LOCALBASE}/include -MAKE_ENV+= LOCALBASE=${LOCALBASE} DISPLAY_METHOD= svgalib .else @@ -194,6 +195,7 @@ LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config DISPLAY_METHOD= SDL +SDLSOUNDCOMMENT= .endif .endif .endif @@ -250,24 +252,30 @@ # The large number of sed regexes here is intended to make this port a whole # lot easier to maintain - please don't convert them into a patch. +# +# XXX: The -Imess part was added because of a conflict with cdparanoia-3.9.8_3 +# which (imho bogusly) installs an 'utils.h' header in $LOCALBASE/include do-configure: ${SED} -e "s@= gcc@?= ${CC}@g" \ - -e "s@^CFLAGS.*@CFLAGS ?= ${CFLAGS}@g" \ - -e "s@lib/x\$$(TARGET)@share/x\$$(TARGET)@g" \ - -e "s@/usr/X11R6@${X11BASE}@g" \ - -e "s@-g bin@-g wheel@g" \ - -e "s@^ARCH = linux@ARCH = freebsd@g" \ - -e "s@# X11_XV@X11_XV@g" \ - -e "s@# X11_DGA@X11_DGA@g" \ - -e "s@= x11@= ${DISPLAY_METHOD}@g" \ - -e "s@= mame@= ${MAMEMESS}@g" \ - -e "s@# X86_ASM@${ASM_COMMENT}X86_ASM@g" \ - -e "s@# SOUND_ESOUND@${ESOUNDCOMMENT}SOUND_ESOUND@g" \ + -e "s@^TARGET.*@TARGET = ${MAMEMESS}@g" \ -e "s@# MAME_NET@${NETWORK}MAME_NET@g" \ + -e "s@# X86_ASM_68000@${ASM_COMMENT}X86_ASM_68000@g" \ + -e "s@^CFLAGS.*@CFLAGS ?= ${CFLAGS}@g" \ + -e "s@^INSTALL_GROUP.*@INSTALL_GROUP = wheel@g" \ -e "s@# LIBS.*@LIBS = -L${LOCALBASE}/lib@g" \ - -e "s@sdl-config@${SDL_CONFIG}@g" \ + -e "s@# INCLUDES.*@INCLUDES = -Imess -I${LOCALBASE}/include@g" \ + -e "s@^PREFIX.*@PREFIX = ${PREFIX}@g" \ + -e "s@/share/man@/man@g" \ + -e "s@^MY_CPU.*@MY_CPU = ${ARCH}@g" \ + -e "s@^ARCH.*@ARCH = freebsd@g" \ -e "s@# JOY_USB@JOY_USB@g" \ - -e "s@GLLIBS=.-ldl@GLLIBS= ${PTHREAD_LIBS}@g" \ + -e "s@# SOUND_ESOUND@${ESOUNDCOMMENT}SOUND_ESOUND@g" \ + -e "s@# SOUND_SDL@${SDLSOUNDCOMMENT}SOUND_SDL@g" \ + -e "s@^DISPLAY_METHOD.*@DISPLAY_METHOD = ${DISPLAY_METHOD}@g" \ + -e "s@# X11_DGA@X11_DGA@g" \ + -e "s@/usr/X11R6@${X11BASE}@g" \ + -e "s@^SDL_CONFIG.*@SDL_CONFIG = ${SDL_CONFIG}@g" \ + -e "s@^GLLIBS=.*@GLLIBS= ${PTHREAD_LIBS}@g" \ ${WRKSRC}/makefile.unix > ${WRKSRC}/Makefile post-build: @@ -296,6 +304,7 @@ ${PREFIX}/share/x${MAMEMESS}/x${MAMEMESS}rc .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/x${MAMEMESS} + ${MKDIR} ${PREFIX}/share/doc/x${MAMEMESS}/img .for file in ${ALLDOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/x${MAMEMESS} .endfor diff -urN --exclude=CVS /usr/ports/emulators/xmame/distinfo xmame/distinfo --- /usr/ports/emulators/xmame/distinfo Tue Nov 26 11:33:37 2002 +++ xmame/distinfo Wed Feb 12 08:53:35 2003 @@ -1,4 +1,4 @@ -MD5 (xmame/xmame-0.61.1.tar.bz2) = 8d0babde89ff1af4280c76f36750a457 +MD5 (xmame/xmame-0.65.1.tar.bz2) = 7bf1f83c22d3093944c322bb5315d317 MD5 (xmame/xmame-0.59.2.tar.bz2) = f35a5f9a79da963c157867015c284562 MD5 (xmame/cheat.zip) = b745ea4df1a3a517c00fedae1ee49a14 MD5 (xmame/history.dat.zip) = 8c758537d5f5bc90fc3224b19421ae12 diff -urN --exclude=CVS /usr/ports/emulators/xmame/files/patch-src::unix::unix.mak xmame/files/patch-src::unix::unix.mak --- /usr/ports/emulators/xmame/files/patch-src::unix::unix.mak Thu Jan 1 01:00:00 1970 +++ xmame/files/patch-src::unix::unix.mak Wed Feb 12 10:04:21 2003 @@ -0,0 +1,22 @@ +--- src/unix/unix.mak.orig Wed Feb 12 05:13:26 2003 ++++ src/unix/unix.mak Wed Feb 12 10:04:04 2003 +@@ -31,7 +31,7 @@ + LIBS.macosx = -framework CoreAudio + #LIBS.openbsd = -lossaudio + LIBS.nto = -lsocket -lasound +-LIBS.beos = `sdl-config --libs` ++LIBS.beos = `$(SDL_CONFIG) --libs` + + ############################################################################## + # **** Display dependent settings. +@@ -219,8 +219,8 @@ + endif + + ifdef SOUND_SDL +-CONFIG += -DSYSDEP_DSP_SDL `sdl-config --cflags` +-MY_LIBS += `sdl-config --libs` ++CONFIG += -DSYSDEP_DSP_SDL `$(SDL_CONFIG) --cflags` ++MY_LIBS += `$(SDL_CONFIG) --libs` + endif + + ifdef SOUND_WAVEOUT diff -urN --exclude=CVS /usr/ports/emulators/xmame/pkg-plist xmame/pkg-plist --- /usr/ports/emulators/xmame/pkg-plist Tue Nov 26 11:33:37 2002 +++ xmame/pkg-plist Wed Feb 12 10:00:24 2003 @@ -4,7 +4,9 @@ %%PORTDOCS%%share/doc/%%MAMEMESS%%/changes.unix %%PORTDOCS%%share/doc/%%MAMEMESS%%/ctrlr.txt %%PORTDOCS%%share/doc/%%MAMEMESS%%/dga2.txt +%%PORTDOCS%%share/doc/%%MAMEMESS%%/img/xmame.jpg %%PORTDOCS%%share/doc/%%MAMEMESS%%/liesmich.unix +%%PORTDOCS%%share/doc/%%MAMEMESS%%/listinfo.txt %%PORTDOCS%%share/doc/%%MAMEMESS%%/multiplayer-readme.txt %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc-1.html %%PORTDOCS%%share/doc/%%MAMEMESS%%/xmame-doc-2.html @@ -40,6 +42,7 @@ %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/messhelp.txt %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/messroms.txt %%MESSONLY%%%%PORTDOCS%%share/doc/xmess/old-changes.mess +%%MESSONLY%%%%PORTDOCS%%share/doc/xmess/readme.mess %%MESSONLY%%share/xmess/history.dat %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/simulation.txt %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/whatsnew.txt @@ -48,6 +51,7 @@ %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/keys.txt %%PINMAMEONLY%%%%PORTDOCS%%share/doc/xpinmame/sounds.dat %%OPENGL%%%%PORTDOCS%%share/doc/%%MAMEMESS%%/changes.opengl +%%PORTDOCS%%@dirrm share/doc/%%MAMEMESS%%/img %%PORTDOCS%%@dirrm share/doc/%%MAMEMESS%% %%OPENGL%%share/%%MAMEMESS%%/cab/glmame/cabfront.jpg %%OPENGL%%share/%%MAMEMESS%%/cab/glmame/cabtitle.jpg diff -urN --exclude=CVS /usr/ports/emulators/xmess/Makefile xmess/Makefile --- /usr/ports/emulators/xmess/Makefile Tue Feb 11 10:46:10 2003 +++ xmess/Makefile Wed Feb 12 11:07:12 2003 @@ -6,7 +6,7 @@ # PORTNAME= xmess -PORTVERSION= 0.61.1 +PORTVERSION= 0.65.1 MAINTAINER= stijn@win.tue.nl >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302121011.h1CABXEe090872>