From owner-freebsd-ports Wed May 3 8:30:20 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id A10B937B631 for ; Wed, 3 May 2000 08:30:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id IAA44455; Wed, 3 May 2000 08:30:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Date: Wed, 3 May 2000 08:30:02 -0700 (PDT) Message-Id: <200005031530.IAA44455@freefall.freebsd.org> To: freebsd-ports@FreeBSD.org Cc: From: "KATO Tsuguru" Subject: Re: ports/18368: Update port emulators/xmame to 0.37b1.2 Reply-To: "KATO Tsuguru" Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org The following reply was made to PR ports/18368; it has been noted by GNATS. From: "KATO Tsuguru" To: c9710216@studentmail.newcastle.edu.au Cc: FreeBSD-gnats-submit@freebsd.org Subject: Re: ports/18368: Update port emulators/xmame to 0.37b1.2 Date: Thu, 4 May 2000 00:28:41 +0900 > Tried contacting him but got no response -- I will take over as > maintainer of this port if he no longer has time. Although I'd appreciate you to become a new maintainer, you had better read ports section of the Handbook carefully before writing patch. It seems that your patch is breaking several regulation we have to follow. Here is an trial rewriting port stuff to conform to the rule. By the way, is unzip really required in building this port? I couldn't find where it's used. diff -urN /usr/ports/emulators/xmame/Makefile emulators/xmame/Makefile --- /usr/ports/emulators/xmame/Makefile Wed Apr 12 21:21:20 2000 +++ emulators/xmame/Makefile Wed May 3 23:45:08 2000 @@ -1,32 +1,46 @@ -# New ports collection makefile for: xmame -# Date created: 4 Sep 1999 -# Whom: Donald Burr +# New ports collection makefile for: xmame +# Date created: 4 Sep 1999 +# Whom: Donald Burr # # $FreeBSD: ports/emulators/xmame/Makefile,v 1.11 2000/04/12 04:56:13 mharo Exp $ # PORTNAME= xmame -PORTVERSION= 0.36b3.1 +PORTVERSION= 0.37b1.2 CATEGORIES= emulators -MASTER_SITES= http://xmame.retrogames.com/download/ \ - ftp://ftp.kaupp.cx/pub/xmame/ \ - ftp://ftp.bingo-ev.de/pub/software/emulator/ -EXTRACT_SUFX= .tgz +MASTER_SITES= http://x.mame.net/download/ \ + http://www.ozemail.com.au/~knebauer/xmame/files/ +DISTFILES= ${PORTNAME}-${PORTVERSION}.tgz \ + ${PORTNAME}-extras-${PORTVERSION}.tgz -MAINTAINER= dburr@FreeBSD.org - -LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm +MAINTAINER= c9710216@studentmail.newcastle.edu.au +FETCH_BEFORE_ARGS= -b +USE_X_PREFIX= YES USE_GMAKE= YES MAKEFILE= makefile.unix MAN6= xmame.6 +XMAMEDOCS= changes.mame changes.unix credits.unix leeme.unix \ + liesmich.unix maillist.txt multiplayer-readme.txt \ + readme.fx readme.mame readme.unix readme.xgl todo + +post-patch: + @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/xmamerc.dist + post-install: - ${MKDIR} ${PREFIX}/lib/xmame ${PREFIX}/lib/xmame/doc ${PREFIX}/lib/xmame/hi ${PREFIX}/lib/xmame/roms - ${CHMOD} 777 ${PREFIX}/lib/xmame/hi - for file in cheat.dat history.dat README.unix gamelist.txt; do ${INSTALL} -C -o root -g wheel -m 444 ${WRKSRC}/doc/$${file} ${PREFIX}/lib/xmame/$${file}; done - ${INSTALL} -C -o root -g wheel -m 644 ${WRKSRC}/doc/xmamerc.dist ${PREFIX}/lib/xmame/xmamerc - for file in Changes LEEME.unix MailList.notes README.fx README.xgl TODO cheat.doc credits.unix liesmich.unix multiplayer-readme.txt readme.dos whatsnew.txt; do ${INSTALL} -C -o root -g wheel -m 444 ${WRKSRC}/doc/$${file} ${PREFIX}/lib/xmame/doc/$${file}; done + @${MKDIR} ${PREFIX}/share/xmame ${PREFIX}/share/xmame/hi ${PREFIX}/share/xmame/roms + ${CHMOD} 777 ${PREFIX}/share/xmame/hi + ${INSTALL_DATA} ${WRKSRC}/contrib/modelines ${PREFIX}/share/xmame + ${INSTALL_DATA} ${WRKSRC}/doc/xmamerc.dist ${PREFIX}/share/xmame/xmamerc + ${INSTALL_DATA} ${WRKSRC}/extras/*.dat ${PREFIX}/share/xmame +.if !defined(NOPORTDOCS) + @${MKDIR} ${PREFIX}/share/doc/xmame + ${INSTALL_DATA} ${WRKSRC}/extras/*.txt ${PREFIX}/share/doc/xmame +.for file in ${XMAMEDOCS} + ${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/xmame +.endfor +.endif .include diff -urN /usr/ports/emulators/xmame/files/md5 emulators/xmame/files/md5 --- /usr/ports/emulators/xmame/files/md5 Sun Sep 5 05:22:27 1999 +++ emulators/xmame/files/md5 Wed May 3 23:08:32 2000 @@ -1 +1,2 @@ -MD5 (xmame-0.36b3.1.tgz) = 708c424175f08dde4bc52a8b4b8f96d1 +MD5 (xmame-0.37b1.2.tgz) = ec659d262dcac53c6a610f8fba0546f7 +MD5 (xmame-extras-0.37b1.2.tgz) = 21fcb49f8c71714e99227cd4da447f60 diff -urN /usr/ports/emulators/xmame/patches/patch-aa emulators/xmame/patches/patch-aa --- /usr/ports/emulators/xmame/patches/patch-aa Sun Sep 5 05:22:28 1999 +++ emulators/xmame/patches/patch-aa Wed May 3 23:35:00 2000 @@ -1,92 +1,95 @@ ---- makefile.unix.orig Thu Aug 26 23:59:21 1999 -+++ makefile.unix Sat Sep 4 22:38:22 1999 -@@ -39,12 +39,12 @@ - # GNU MAKE is MANDATORY !!! - # so please give me the path... - # if GNU make is "native" use this --MAKE = make -+MAKE = gmake - # else ... - # MAKE=/usr/people/jantonio/bin/gmake +--- makefile.unix.orig Thu Apr 13 05:14:42 2000 ++++ makefile.unix Wed May 3 21:00:00 2000 +@@ -49,7 +49,7 @@ # *** Choose your compiler + # Use gcc if available -CC = gcc -+CC = cc ++CC ?= gcc + # otherwise try the default cc + # CC = cc # Use of `c89' is recommend for ultrix as it generates faster code (which - # means less frames to be skipped and better graphics) but `gcc' works just - # as well. However, stay away from the `cc' ultrix compiler if possible. -@@ -71,7 +71,7 @@ +@@ -70,7 +70,7 @@ + # next/macosx needs -traditional-cpp + # + ### for normal optimalisation, full warnings +-CFLAGS = -O -Wall ++CFLAGS ?= -O -Wall + ### this should work with all compilers + # CFLAGS = + ### to get full optimization under gcc/x Intel based OS's.. +@@ -116,7 +116,7 @@ # RANLIB = true # *** How to install executable? ( some OS's doesn't support install command ) -INSTALL = cp -+INSTALL = install -C ++INSTALL ?= cp - # *** set to aproppiate flag if want to debug/optimize - # normal -@@ -80,7 +80,7 @@ - # DBGFLAGS = -ggdb - - ### normal optimization flags --OPTFLAGS = -O -Wall -+#OPTFLAGS = -O -Wall - # use these for debugging on x86-gcc - # OPTFLAGS = -O2 -m486 -Wall -Wno-unused - ### to get full optimization under gcc/x Intel based OS's.. ( !!else comment!! ) -@@ -121,14 +121,14 @@ + # *** Extra include and or library paths, sometimes needed for zlib, + # with suse linux -L/usr/X11R6/lib is needed for example, +@@ -143,14 +143,14 @@ # *** Select destination directory for your compiled program , manual page # and binary distribution ( if you want to... ) # ( only needed to install, not to compile... ) -DESTDIR = /usr/games -+DESTDIR = /usr/local/bin/ - MANDIR = /usr/local/man/man6 +-MANDIR = /usr/local/man/man6 ++DESTDIR = ${PREFIX}/bin ++MANDIR = ${PREFIX}/man/man6 DISTDIR = /home/ftp/pub/emulators/$(NAME) # *** xmameroot, this is the default rompath, place where the highscores are # stored, global rc location etc. Since most of these are configurable through # the rc-file anyway, there are no longer seperate defines for each. -XMAMEROOT = /usr/games/lib/$(NAME) -+XMAMEROOT = /usr/local/lib/$(NAME) ++XMAMEROOT = ${PREFIX}/share/$(NAME) ############################################################################## -@@ -317,9 +317,9 @@ - ######## Alpha/Linux - # ARCH = linux_alpha - ######## ix86/Linux --ARCH = linux_i386 -+# ARCH = linux_i386 - ######## ix86/FreeBSD and ix86/BSDi --# ARCH = FREEBSD -+ARCH = FREEBSD - ######## ix86/NetBSD - # ARCH = netbsd_i386 - ######## Alpha/NetBSD -@@ -452,7 +452,7 @@ - - # Perhaps one day original mame/mess sources will use POSIX strcasecmp and M_PI - # instead MS-DOS counterparts... ( a long and sad history ...) --CFLAGS = $(TD) $(DBGFLAGS) $(OPTFLAGS) $(IL) $(INCDIRS) $(CFLAGS.$(ARCH)) \ -+CFLAGS+= $(TD) $(DBGFLAGS) $(IL) $(INCDIRS) $(CFLAGS.$(ARCH)) \ - -Dstricmp=strcasecmp -DPI=M_PI -DUNIX -DSIGNED_SAMPLES \ - $(DEFS.$(ARCH)) -D$(ARCH) -D$(DISPLAY_METHOD) $(MAMENET) $(DEBUG) \ - -Iobj/cpu/m68000 -Isrc/cpu/m68000 $(EXTRA_INCLUDES) $(ZLIB_INCLUDES) \ -@@ -493,6 +493,9 @@ - $(MAKE) libz.a \ - ) - -+obj/cpu/i86/%.o: src/cpu/i86/%.c -+ $(CC) $(CFLAGS) -O -o $@ -c $< -+ - obj/%.o: src/%.c - $(CC) $(CFLAGS) -o $@ -c $< +@@ -279,8 +279,8 @@ + # X11INC = -I/usr/include/X11 + # X11LIB = -L/usr/lib/X11 + # standard location for XFree86 +-X11INC = -I/usr/X11R6/include +-X11LIB = -L/usr/X11R6/lib ++X11INC = -I${X11BASE}/include ++X11LIB = -L${X11BASE}/lib + # for Sun systems + # X11INC = -I/usr/openwin/include + # X11LIB = -L/usr/openwin/lib +@@ -322,9 +322,9 @@ + ############################################################################## -@@ -544,7 +547,7 @@ + ### Linux +-ARCH = linux ++# ARCH = linux + ### FreeBSD +-# ARCH = freebsd ++ARCH = freebsd + ### NetBSD + # ARCH = netbsd + ### Solaris / SunOS +@@ -476,7 +476,7 @@ + $(CC_COMPILE) $(LD) -o $@ $(OBJS) $(MY_LIBS) + + $(OBJDIRS): +- -mkdir $@ ++ -mkdir -p $@ + + xlistdev: contrib/tools/xlistdev.c + $(CC_COMMENT) @echo 'Compiling $< ...' +@@ -554,12 +554,12 @@ + + install-man: + @echo installing manual pages under $(MANDIR) ... +- -mkdir $(MANDIR) +- $(INSTALL) doc/xmame.man $(MANDIR)/xmame.6 ++ -mkdir -p $(MANDIR) ++ ${BSD_INSTALL_MAN} doc/xmame.man $(MANDIR)/xmame.6 doinstall: @echo installing binaries under $(DESTDIR)... - $(INSTALL) $(NAME).$(DISPLAY_METHOD) $(DESTDIR) -+ $(INSTALL) $(NAME).$(DISPLAY_METHOD) $(DESTDIR)/$(NAME) ++ ${BSD_INSTALL_PROGRAM} $(NAME).$(DISPLAY_METHOD) $(DESTDIR)/$(NAME) doinstallsuid: @echo installing binaries under $(DESTDIR)... diff -urN /usr/ports/emulators/xmame/patches/patch-ab emulators/xmame/patches/patch-ab --- /usr/ports/emulators/xmame/patches/patch-ab Sun Sep 5 05:22:28 1999 +++ emulators/xmame/patches/patch-ab Wed May 3 23:38:40 2000 @@ -1,47 +1,29 @@ ---- doc/xmamerc.dist.orig Mon Aug 9 23:49:19 1999 -+++ doc/xmamerc.dist Sat Sep 4 22:38:22 1999 -@@ -23,16 +23,16 @@ +--- doc/xmamerc.dist.orig Sat Apr 8 00:24:47 2000 ++++ doc/xmamerc.dist Wed May 3 21:00:00 2000 +@@ -60,7 +60,7 @@ + samples 1 + samplefreq 22050 + bufsize 2.000000 +-volume -3 ++volume -13 + # audiodevice (not set) + # mixerdevice (not set) + +@@ -70,12 +70,12 @@ + mouse 1 + + ### Fileio Related ### +-rompath /usr/games/lib/xmame +-spooldir /usr/games/lib/xmame ++rompath %%PREFIX%%/share/xmake/roms ++spooldir %%PREFIX%%/share/xmake/hi + screenshotdir . +-cheatfile /usr/games/lib/xmame/cheat.dat +-historyfile /usr/games/lib/xmame/history.dat +-mameinfofile /usr/games/lib/xmame/mameinfo.dat ++cheatfile %%PREFIX%%/share/xmake/cheat.dat ++historyfile %%PREFIX%%/share/xmake/history.dat ++mameinfofile %%PREFIX%%/share/xmake/mameinfo.dat - # Where does your Mame rom files reside? - # This option can be overriden by MAMEDIR environment variable --rompath /usr/games/lib/xmame:/usr/local/lib/xmame -+rompath /usr/local/lib/xmame - - # Also Mame needs a public-writable directory to store high scores --spooldir /usr/games/lib/xmame -+spooldir /usr/local/lib/xmame/hi - - # Where can xmame find the cheat database? --cheatfile /usr/games/lib/xmame/CHEAT.DAT -+cheatfile /usr/local/lib/xmame/cheat.dat - - # What is your loved game? ( remember that mame defaults to "pacman" ) --defaultgame galturbo -+defaultgame snowbros - - # Type here the name of the display where play xmame - # overriden by DISPLAY environment variable. Not usefull in config file but... -@@ -43,7 +43,7 @@ - # - - # Use sound if available. default is 0 (Don't) --sound 0 -+sound 1 - - # Use stereo sound if available - stereo 1 -@@ -105,11 +105,11 @@ - # Define X and Y axis scale related to original bitmap. Default is 1, - # since xmame-0.34b5.3 also used to scale vector games, vector games also - # except values like 1.5 and even 0.5 these are rounded for normal games --widthscale 2 --heightscale 2 -+#widthscale 2 -+#heightscale 2 - - #scale sets both widthscale and heightscale in one option --#scale 2 -+scale 2 - - # We want autoframeskip ;) - autoframeskip 1 + ### Mame Related ### + defaultgame pacman diff -urN /usr/ports/emulators/xmame/pkg/DESCR emulators/xmame/pkg/DESCR --- /usr/ports/emulators/xmame/pkg/DESCR Sun Sep 5 05:22:34 1999 +++ emulators/xmame/pkg/DESCR Wed May 3 23:36:06 2000 @@ -2,7 +2,7 @@ the hardware, video, sound, and other services, of many classic arcade game machines. -As of this release, XMAME supports an incredible 1642 arcade games, and +As of this release, XMAME supports an incredible 2073 arcade games, and the number grows every day! A partial list of the (more popular and well-known) games currently supported by this emulator include: @@ -19,6 +19,6 @@ (and you are aware of the possible legal ramifications of doing this), you can obtain ROM images for XMAME on the Net. -Official XMAME homepage: http://xmame.retrogames.com +WWW: http://x.mame.net/ -[ This port is maintained by Donald Burr . ] +[ Maintained by Jacob A. Hart . ] diff -urN /usr/ports/emulators/xmame/pkg/PLIST emulators/xmame/pkg/PLIST --- /usr/ports/emulators/xmame/pkg/PLIST Sun Sep 5 05:22:36 1999 +++ emulators/xmame/pkg/PLIST Wed May 3 23:32:47 2000 @@ -1,24 +1,28 @@ bin/xmame -lib/xmame/cheat.dat -lib/xmame/gamelist.txt -lib/xmame/history.dat -lib/xmame/README.unix -lib/xmame/xmamerc -lib/xmame/doc/Changes -lib/xmame/doc/cheat.doc -lib/xmame/doc/credits.unix -lib/xmame/doc/LEEME.unix -lib/xmame/doc/liesmich.unix -lib/xmame/doc/MailList.notes -lib/xmame/doc/multiplayer-readme.txt -lib/xmame/doc/readme.dos -lib/xmame/doc/README.fx -lib/xmame/doc/README.xgl -lib/xmame/doc/TODO -lib/xmame/doc/whatsnew.txt -@exec mkdir %D/lib/xmame/hi %D/lib/xmame/roms -@exec chmod 777 %D/lib/xmame/hi -@dirrm lib/xmame/doc -@dirrm lib/xmame/hi -@dirrm lib/xmame/roms -@dirrm lib/xmame +share/xmame/cheat.dat +share/xmame/hiscore.dat +share/xmame/history.dat +share/xmame/mameinfo.dat +share/xmame/modelines +share/xmame/xmamerc +share/doc/xmame/changes.mame +share/doc/xmame/changes.unix +share/doc/xmame/credits.unix +share/doc/xmame/hsnew.txt +share/doc/xmame/leeme.unix +share/doc/xmame/liesmich.unix +share/doc/xmame/maillist.txt +share/doc/xmame/multiplayer-readme.txt +share/doc/xmame/readhist.txt +share/doc/xmame/readme.fx +share/doc/xmame/readme.mame +share/doc/xmame/readme.unix +share/doc/xmame/readme.xgl +share/doc/xmame/todo +@exec mkdir -p %D/share/xmame/hi +@exec mkdir -p %D/share/xmame/roms +@exec chmod 777 %D/share/xmame/hi +@unexec rmdir %D/share/xmame/roms 2>/dev/null || true +@unexec rmdir %D/share/xmame/hi 2>/dev/null || true +@unexec rmdir %D/share/xmame 2>/dev/null || true +@dirrm share/doc/xmame -- KATO Tsuguru / tkato@prontomail.ne.jp Sent by Japanese ProntoMail To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message