Update to version 0.36b3.1

PR:		13572
Submitted by:	Jacob Hart <c9710216@atlas.newcastle.edu.au>

6 files changed, 95 insertions, 67 deletions

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 4306b87e2484..b83f2f596177 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,17 +1,19 @@
 # New ports collection makefile for:    xmame
-# Version required:     0.33b6.1
-# Date created:         8 Feb 1998
+# Version required:     0.36b3.1
+# Date created:         4 Sep 1999
 # Whom:                 Donald Burr <dburr@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	xmame-0.33b6.1
+DISTNAME=	xmame-0.36b3.1
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://drake.dit.upm.es/xmame/ftpsite/
+MASTER_SITES=	http://xmame.retrogames.com/download/ \
+		ftp://ftp.kaupp.cx/pub/xmame/ \
+		ftp://ftp.bingo-ev.de/pub/software/emulator/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	dburr@FreeBSD.org
+MAINTAINER=     dburr@FreeBSD.org
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
@@ -21,14 +23,10 @@ MAKEFILE=	makefile.unix
 MAN6=		xmame.6
 
 post-install:
-.ifdef NOPORTDOCS
-	@${ECHO_MSG} "==> Extra documentation WILL NOT be installed."
-.else
-	@${ECHO_MSG} "==> Installing extra documentation..."
-	${MKDIR} ${PREFIX}/lib/mame
-	for DOC in CHEAT.DOC Changes MailList.notes README.unix mamelist.txt readme.dos whatsnew.txt; do ${INSTALL} -c -o bin -g bin -m 444 ${WRKSRC}/doc/$${DOC} ${PREFIX}/lib/mame/$${DOC}; done
-.endif
-	(cd ${PREFIX}/lib/mame; sh ${FILESDIR}/dos2unx CHEAT.DOC Changes MailList.notes README.unix cheat.dat mamelist.txt readme.dos whatsnew.txt)
-	@${CAT} ${PKGDIR}/MESSAGE
+	${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>
diff --git a/emulators/xmame/distinfo b/emulators/xmame/distinfo
index 2dd4025610c6..917a3e00373d 100644
--- a/emulators/xmame/distinfo
+++ b/emulators/xmame/distinfo
@@ -1 +1 @@
-MD5 (xmame-0.33b6.1.tgz) = 6d0a801031f33ae5610005ed82e7e35f
+MD5 (xmame-0.36b3.1.tgz) = 708c424175f08dde4bc52a8b4b8f96d1
diff --git a/emulators/xmame/files/patch-ab b/emulators/xmame/files/patch-ab
index 24d9ecafd6ad..99168e7b578c 100644
--- a/emulators/xmame/files/patch-ab
+++ b/emulators/xmame/files/patch-ab
@@ -1,29 +1,47 @@
-diff -ruN ../../OLD/xmame-0.30.1/./conv2zip ./conv2zip
---- ../../OLD/xmame-0.30.1/./conv2zip	Wed Dec 31 16:00:00 1969
-+++ ./conv2zip	Fri Jan 30 19:54:06 1998
-@@ -0,0 +1,25 @@
-+#!/bin/sh
-+
-+if [ ! -x /usr/local/bin/zip ]
-+then
-+	echo "ZIP program not installed.  Check /usr/ports/archivers."
-+	exit 1
-+fi
-+
-+cd /usr/local/lib/mame
-+find . -type d -print | sed 's/^\.\///g' | grep -v ^\\. | grep -v cfg | \
-+grep -v hi | grep -v roms | grep -v samples > /tmp/dirs.$$
-+
-+for D in `cat /tmp/dirs.$$`
-+do
-+	cd ${D}
-+	echo "Converting: ${D}"
-+	zip -9 ../roms/${D}.zip *
-+	echo ""
-+	cd ..
-+	rm -rf ${D}
-+done
-+
-+echo "All ROM directories have been converted to zipfiles."
-+
-+rm -f /tmp/dirs.$$
+--- 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
diff --git a/emulators/xmame/pkg-comment b/emulators/xmame/pkg-comment
index e343a2e14237..413e685c3558 100644
--- a/emulators/xmame/pkg-comment
+++ b/emulators/xmame/pkg-comment
@@ -1 +1 @@
-Emulator that emulates many classic arcade game machines
+UNIX/X11 port of the Multi Arcade Machine Emulator (MAME).
diff --git a/emulators/xmame/pkg-descr b/emulators/xmame/pkg-descr
index c004470f18f4..180dbc531dfb 100644
--- a/emulators/xmame/pkg-descr
+++ b/emulators/xmame/pkg-descr
@@ -1,23 +1,24 @@
-X-Mame 0.30.1 is an emulator.  It emulates many classic coin-operated arcade
-game machines, right on your FreeBSD PC.
+XMAME is an arcade game machine emulator for UNIX/X11.  It will emulate
+the hardware, video, sound, and other services, of many classic arcade
+game machines.
 
-This emulator supports over 200 arcade games, and the nunmber grows every
-day!  A partial list of the (more popular and well-known) games currently
-supported by this emulator include:
+As of this release, XMAME supports an incredible 1642 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:
 
 PacMan, Ms. PacMan, Jr. PacMan, Super PacMan, Dig Dug, Star Trek, Galaga,
 Space Invaders, Tempest, Frogger, Mr. Do!, Battle Zone, Missile Command,
-Asteroids, Burger Time, Centipede, Millipede, Gorf, Donkey Kong, Donkey
-Kong III, Donkey Kong Jr., Mario Bros., Defender, Stargate, Galaxians,
 Gyruss, Kangaroo, Moon Patrol, Phoenix, Q*Bert, Rally X, Robotron,
-Star Wars, Zaxxon, ... you get the idea.
+Star Wars, Zaxxon, Bubble Bobble, Snow Bros, ... you get the idea.
 
 To run these games, however, you will need images of the ROM chips that
 are used on these games.  If you actually have one of these games (or the
 motherboard to one of them), and access to a ROM burner, it is a fairly
-trivial process to make ROM image files for use with MAME.  If you DON'T
+trivial process to make ROM image files for use with XMAME.  If you DON'T
 have access to a ROM burner, or you don't own one of these video games
 (and you are aware of the possible legal ramifications of doing this),
-you can obtain ROM images for MAME on the Net.
+you can obtain ROM images for XMAME on the Net.
+
+Official XMAME homepage:	http://xmame.retrogames.com
 
 [ This port is maintained by Donald Burr <dburr@FreeBSD.ORG>. ]
diff --git a/emulators/xmame/pkg-plist b/emulators/xmame/pkg-plist
index 0e3930383253..3057a79dd5d4 100644
--- a/emulators/xmame/pkg-plist
+++ b/emulators/xmame/pkg-plist
@@ -1,13 +1,24 @@
 bin/xmame
-lib/mame/CHEAT.DOC
-lib/mame/Changes
-lib/mame/MailList.notes
-lib/mame/README.port
-lib/mame/README.unix
-lib/mame/cheat.dat
-lib/mame/conv2zip
-lib/mame/mamelist.txt
-lib/mame/mov
-lib/mame/readme.dos
-lib/mame/whatsnew.txt
-@dirrm lib/mame
+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