Date: Sat, 29 Jul 2000 20:33:53 +0200 (CEST) From: Jimmy Olgeni <olgeni@uli.it> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/20290: [PATCH] Update mame port to 0.37b2.2 Message-ID: <Pine.BSF.4.21.0007291817530.94586-100000@olgeni.localdomain.net>
next in thread | raw e-mail | index | archive | help
>Number: 20290 >Category: ports >Synopsis: [PATCH] Update mame port to 0.37b2.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: wish >Submitter-Id: current-users >Arrival-Date: Sat Jul 29 11:40:01 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Jimmy Olgeni >Release: FreeBSD 4.1-STABLE i386 >Organization: Colby >Environment: >Description: This patch updates xmame to version 0.37b2.2. >How-To-Repeat: >Fix: The previous port patches won't apply to the new sources, so I applied them by hand and made some new patch files. diff -rcN xmame.orig/Makefile xmame/Makefile *** xmame.orig/Makefile Wed Jun 14 19:35:33 2000 --- xmame/Makefile Sat Jul 29 18:07:42 2000 *************** *** 6,12 **** # PORTNAME= xmame ! PORTVERSION= 0.36b3.1 CATEGORIES= emulators MASTER_SITES= http://xmame.retrogames.com/download/ \ ftp://ftp.kaupp.cx/pub/xmame/ \ --- 6,12 ---- # PORTNAME= xmame ! PORTVERSION= 0.37b2.2 CATEGORIES= emulators MASTER_SITES= http://xmame.retrogames.com/download/ \ ftp://ftp.kaupp.cx/pub/xmame/ \ *************** *** 25,32 **** 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 .include <bsd.port.mk> --- 25,31 ---- post-install: ${MKDIR} ${PREFIX}/lib/xmame ${PREFIX}/lib/xmame/doc ${PREFIX}/lib/xmame/hi ${PREFIX}/lib/xmame/roms ${CHMOD} 777 ${PREFIX}/lib/xmame/hi ${INSTALL} -C -o root -g wheel -m 644 ${WRKSRC}/doc/xmamerc.dist ${PREFIX}/lib/xmame/xmamerc ! for file in changes.mame changes.unix credits.unix leeme.unix liesmich.unix maillist.txt multiplayer-readme.txt readme.fx readme.mame readme.mess readme.unix readme.xgl; do ${INSTALL} -C -o root -g wheel -m 444 ${WRKSRC}/doc/$${file} ${PREFIX}/lib/xmame/doc/$${file}; done .include <bsd.port.mk> diff -rcN xmame.orig/files/md5 xmame/files/md5 *** xmame.orig/files/md5 Sat Sep 4 22:22:27 1999 --- xmame/files/md5 Sat Jul 29 17:30:15 2000 *************** *** 1 **** ! MD5 (xmame-0.36b3.1.tgz) = 708c424175f08dde4bc52a8b4b8f96d1 --- 1 ---- ! MD5 (xmame-0.37b2.2.tgz) = ffa498132dee79c08aba802cff058eae diff -rcN xmame.orig/patches/patch-aa xmame/patches/patch-aa *** xmame.orig/patches/patch-aa Sat Sep 4 22:22:28 1999 --- xmame/patches/patch-aa Sat Jul 29 18:16:12 2000 *************** *** 1,92 **** ! --- 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 ! ! # *** Choose your compiler ! -CC = gcc ! +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 @@ ! # RANLIB = true ! ! # *** How to install executable? ( some OS's doesn't support install command ) ! -INSTALL = cp ! +INSTALL = install -C ! ! # *** 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 @@ ! # *** 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 ! 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) ! ! ! ############################################################################## ! @@ -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 $< ! ! @@ -544,7 +547,7 @@ ! ! doinstall: ! @echo installing binaries under $(DESTDIR)... ! - $(INSTALL) $(NAME).$(DISPLAY_METHOD) $(DESTDIR) ! + $(INSTALL) $(NAME).$(DISPLAY_METHOD) $(DESTDIR)/$(NAME) ! ! doinstallsuid: ! @echo installing binaries under $(DESTDIR)... --- 1,139 ---- ! *** makefile.unix.orig Wed May 10 10:20:06 2000 ! --- makefile.unix Sat Jul 29 18:15:58 2000 ! *************** ! *** 46,55 **** ! ############################################################################## ! ! # GNU MAKE is MANDATORY !!! ! ! # *** Choose your compiler ! # Use gcc if available ! ! CC = gcc ! # otherwise try the default cc ! # CC = cc ! # Use of `c89' is recommend for ultrix as it generates faster code (which ! --- 46,56 ---- ! ############################################################################## ! ! # GNU MAKE is MANDATORY !!! ! + MAKE = gmake ! ! # *** Choose your compiler ! # Use gcc if available ! ! CC = cc ! # otherwise try the default cc ! # CC = cc ! # Use of `c89' is recommend for ultrix as it generates faster code (which ! *************** ! *** 70,76 **** ! # next/macosx needs -traditional-cpp ! # ! ### for normal optimalisation, full warnings ! ! CFLAGS = -O -Wall ! ### this should work with all compilers ! # CFLAGS = ! ### to get full optimization under gcc/x Intel based OS's.. ! --- 71,77 ---- ! # next/macosx needs -traditional-cpp ! # ! ### for normal optimalisation, full warnings ! ! # CFLAGS = -O -Wall ! ### this should work with all compilers ! # CFLAGS = ! ### to get full optimization under gcc/x Intel based OS's.. ! *************** ! *** 116,122 **** ! # RANLIB = true ! ! # *** How to install executable? ( some OS's doesn't support install command ) ! ! INSTALL = cp ! ! # *** Extra include and or library paths, sometimes needed for zlib, ! # with suse linux -L/usr/X11R6/lib is needed for example, ! --- 117,123 ---- ! # RANLIB = true ! ! # *** How to install executable? ( some OS's doesn't support install command ) ! ! INSTALL = install -C ! ! # *** Extra include and or library paths, sometimes needed for zlib, ! # with suse linux -L/usr/X11R6/lib is needed for example, ! *************** ! *** 143,157 **** ! # *** 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 ! MANDIR = /usr/local/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) ! ! ! ! ############################################################################## ! # *** Special features ! --- 144,157 ---- ! # *** 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/local/bin/ ! MANDIR = /usr/local/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/local/lib/$(NAME) ! ! ############################################################################## ! # *** Special features ! *************** ! *** 322,330 **** ! ############################################################################## ! ! ### Linux ! ! ARCH = linux ! ### FreeBSD ! ! # ARCH = freebsd ! ### NetBSD ! # ARCH = netbsd ! ### Solaris / SunOS ! --- 322,330 ---- ! ############################################################################## ! ! ### Linux ! ! # ARCH = linux ! ### FreeBSD ! ! ARCH = freebsd ! ### NetBSD ! # ARCH = netbsd ! ### Solaris / SunOS ! *************** ! *** 554,565 **** ! ! install-man: ! @echo installing manual pages under $(MANDIR) ... ! - -mkdir $(MANDIR) ! $(INSTALL) doc/xmame.man $(MANDIR)/xmame.6 ! ! doinstall: ! @echo installing binaries under $(DESTDIR)... ! ! $(INSTALL) $(NAME).$(DISPLAY_METHOD) $(DESTDIR) ! ! doinstallsuid: ! @echo installing binaries under $(DESTDIR)... ! --- 554,564 ---- ! ! install-man: ! @echo installing manual pages under $(MANDIR) ... ! $(INSTALL) doc/xmame.man $(MANDIR)/xmame.6 ! ! doinstall: ! @echo installing binaries under $(DESTDIR)... ! ! $(INSTALL) $(NAME).$(DISPLAY_METHOD) $(DESTDIR)/$(NAME) ! ! doinstallsuid: ! @echo installing binaries under $(DESTDIR)... diff -rcN xmame.orig/patches/patch-ab xmame/patches/patch-ab *** xmame.orig/patches/patch-ab Sat Sep 4 22:22:28 1999 --- xmame/patches/patch-ab Sat Jul 29 17:54:32 2000 *************** *** 1,47 **** ! --- 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 @@ ! ! # 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 --- 1,54 ---- ! *** doc/xmamerc.dist.orig Mon May 8 20:57:08 2000 ! --- doc/xmamerc.dist Sat Jul 29 17:54:04 2000 ! *************** ! *** 9,16 **** ! ! ### Video Related ### ! bpp 0 ! ! heightscale 1.000000 ! ! widthscale 1.000000 ! autodouble 1 ! dirty 1 ! scanlines 0 ! --- 9,16 ---- ! ! ### Video Related ### ! bpp 0 ! ! heightscale 2.000000 ! ! widthscale 2.000000 ! autodouble 1 ! dirty 1 ! scanlines 0 ! *************** ! *** 70,84 **** ! mouse 1 ! ! ### Fileio Related ### ! ! rompath /usr/games/lib/xmame ! ! spooldir /usr/games/lib/xmame ! screenshotdir . ! ! cheatfile /usr/games/lib/xmame/cheat.dat ! historyfile /usr/games/lib/xmame/history.dat ! mameinfofile /usr/games/lib/xmame/mameinfo.dat ! ! ### Mame Related ### ! ! defaultgame pacman ! cheat 0 ! ! ### Frontend Related ### ! --- 70,84 ---- ! mouse 1 ! ! ### Fileio Related ### ! ! rompath /usr/local/lib/xmame ! ! spooldir /usr/local/lib/xmame/hi ! screenshotdir . ! ! cheatfile /usr/local/lib/xmame/cheat.dat ! historyfile /usr/games/lib/xmame/history.dat ! mameinfofile /usr/games/lib/xmame/mameinfo.dat ! ! ### Mame Related ### ! ! defaultgame snowbros ! cheat 0 ! ! ### Frontend Related ### diff -rcN xmame.orig/pkg/PLIST xmame/pkg/PLIST *** xmame.orig/pkg/PLIST Sat Sep 4 22:22:36 1999 --- xmame/pkg/PLIST Sat Jul 29 18:07:43 2000 *************** *** 1,21 **** 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 --- 1,17 ---- bin/xmame lib/xmame/xmamerc ! lib/xmame/doc/changes.mame ! lib/xmame/doc/changes.unix lib/xmame/doc/credits.unix ! lib/xmame/doc/leeme.unix lib/xmame/doc/liesmich.unix ! lib/xmame/doc/maillist.txt lib/xmame/doc/multiplayer-readme.txt ! lib/xmame/doc/readme.fx ! lib/xmame/doc/readme.mame ! lib/xmame/doc/readme.mess ! lib/xmame/doc/readme.unix ! lib/xmame/doc/readme.xgl @exec mkdir %D/lib/xmame/hi %D/lib/xmame/roms @exec chmod 777 %D/lib/xmame/hi @dirrm lib/xmame/doc >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?Pine.BSF.4.21.0007291817530.94586-100000>