Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 17 Apr 2000 04:22:08 -0700 (PDT)
From:      tkato@prontomail.ne.jp
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/18047: Update port: emulators/xmame to 0.36.1
Message-ID:  <200004171122.EAA96690@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         18047
>Category:       ports
>Synopsis:       Update port: emulators/xmame to 0.36.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 17 04:30:01 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.0-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 0.36.1
- Add WWW: line into pkg/DESCR

>How-To-Repeat:

>Fix:
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 Apr 12 21:23:31 2000
@@ -1,32 +1,44 @@
-# New ports collection makefile for:    xmame
-# Date created:         4 Sep 1999
-# Whom:                 Donald Burr <dburr@FreeBSD.org>
+# New ports collection makefile for:	xmame
+# Date created:		4 Sep 1999
+# Whom:			Donald Burr <dburr@FreeBSD.org>
 #
 # $FreeBSD: ports/emulators/xmame/Makefile,v 1.11 2000/04/12 04:56:13 mharo Exp $
 #
 
 PORTNAME=	xmame
-PORTVERSION=	0.36b3.1
+PORTVERSION=	0.36.1
 CATEGORIES=	emulators
-MASTER_SITES=	http://xmame.retrogames.com/download/ \
-		ftp://ftp.kaupp.cx/pub/xmame/ \
-		ftp://ftp.bingo-ev.de/pub/software/emulator/
+MASTER_SITES=	http://x.mame.net/download/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=     dburr@FreeBSD.org
-
-LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
+MAINTAINER=	dburr@FreeBSD.org
 
+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.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}/doc/xmamerc.dist ${PREFIX}/share/xmame/xmamerc
+.for file in gamelist.mame readme.unix
+	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/xmame
+.endfor
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/xmame
+.for file in ${XMAMEDOCS}
+	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/xmame
+.endfor
+.endif
 
 .include <bsd.port.mk>
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	Sun Apr  9 16:04:32 2000
@@ -1 +1 @@
-MD5 (xmame-0.36b3.1.tgz) = 708c424175f08dde4bc52a8b4b8f96d1
+MD5 (xmame-0.36.1.tgz) = e356600dc9c428a4f660a2705e41f002
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	Tue Apr 11 01:30:34 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	Sat Apr  8 20:00:52 2000
++++ makefile.unix	Tue Apr 11 01:30:19 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 @@
+ # 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..
+@@ -117,7 +117,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,
+@@ -144,14 +144,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 $<
+@@ -280,8 +280,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
+@@ -323,9 +323,9 @@
+ ##############################################################################
  
-@@ -544,7 +547,7 @@
+ ### Linux 
+-ARCH  = linux
++# ARCH  = linux
+ ### FreeBSD
+-# ARCH  = freebsd
++ARCH  = freebsd
+ ### NetBSD
+ # ARCH  = netbsd
+ ### Solaris / SunOS
+@@ -477,7 +477,7 @@
+ 	$(CC_COMPILE) $(LD) -o $@ $(OBJS) $(MY_LIBS)
+ 
+ $(OBJDIRS):
+-	-mkdir $@
++	-mkdir -p $@
+ 
+ xlistdev: contrib/tools/xlistdev.c
+ 	$(CC_COMMENT) @echo 'Compiling $< ...'
+@@ -555,12 +555,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	Tue Apr 11 02:23:18 2000
@@ -1,47 +1,24 @@
---- 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	Tue Apr 11 02:20:55 2000
++++ doc/xmamerc.dist	Tue Apr 11 02:22:59 2000
+@@ -70,15 +70,15 @@
+ 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
+ 
+ ### Mame Related ###
+-defaultgame             pacman
++defaultgame             snowbros
+ cheat                   0
  
- # 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
+ ### Frontend Related ###
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	Thu Mar 16 01:34:30 2000
@@ -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 <dburr@FreeBSD.ORG>. ]
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	Tue Apr 11 01:26:40 2000
@@ -1,24 +1,22 @@
 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/gamelist.mame
+share/xmame/readme.unix
+share/xmame/xmamerc
+share/doc/xmame/changes.mame
+share/doc/xmame/changes.unix
+share/doc/xmame/credits.unix
+share/doc/xmame/leeme.unix
+share/doc/xmame/liesmich.unix
+share/doc/xmame/maillist.txt
+share/doc/xmame/multiplayer-readme.txt
+share/doc/xmame/readme.fx
+share/doc/xmame/readme.mame
+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


>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?200004171122.EAA96690>