Update to 0.37b5.2. Can't find extras tarball so people will need to

install those themselves now.  MAINTAINER changed to someone who said he'd
keep the port up to date.  Add sed regex to replace patch-aa to extend
the port's life.  At least, now portlint doesn't whine so much..

PR:				18047, 18368
Some patch submitted by:	Ports Fury

5 files changed, 93 insertions, 86 deletions

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index ea77644805c8..77beae71adaa 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -6,26 +6,54 @@
 #
 
 PORTNAME=	xmame
-PORTVERSION=	0.36b3.1
+PORTVERSION=	0.37b5.1
 CATEGORIES=	emulators
-MASTER_SITES=	http://xmame.retrogames.com/download/ \
+MASTER_SITES=	http://x.mame.net/download/ \
 		ftp://ftp.kaupp.cx/pub/xmame/ \
-		ftp://ftp.bingo-ev.de/pub/software/emulator/
+		http://www.ozemail.com.au/~knebauer/xmame/files/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=     dburr@FreeBSD.org
+MAINTAINER=     c9710216@studentmail.newcastle.edu.au
 
-USE_XPM=	YES
-USE_GMAKE=	YES
+USE_XPM=	yes
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
 MAKEFILE=	makefile.unix
 
 MAN6=		xmame.6
 
-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
+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
+
+.if !defined(NOPORTDOCS)
+PLIST_SUB+=	PORTDOCS=""
+.else
+PLIST_SUB+=	PORTDOCS="@comment "
+.endif
 
+# 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.
+post-patch:
+	${PERL} -pi -e "s@%%PREFIX%%@${PREFIX}@g" ${WRKSRC}/doc/xmamerc.dist
+	@${CP} ${WRKSRC}/makefile.unix ${WRKSRC}/makefile.unix.sed
+	${SED} -e "s@= gcc@?=  ${CC}@g" -e "s@= -O -Wall@s?=  ${CFLAGS}@g" \
+		-e "s@= cp@?=  ${INSTALL} ${COPY}@g" -e "s@/usr/games@${PREFIX}/bin@g" \
+		-e "s@/usr/local/man/man6@${PREFIX}/man/man6@g" \
+		-e "s@/usr/games/lib/\$\(NAME\)@${PREFIX}/share/\$\(NAME\)@g" \
+		-e "s@/usr/X11R6@${X11BASE}@g" -e "s@ARCH  = linux@ARCH  = freebsd@g" \
+			${WRKSRC}/makefile.unix.sed > ${WRKSRC}/makefile.unix
+
+post-install:
+	${MV} ${PREFIX}/bin/xmame.x11 ${PREFIX}/bin/xmame
+	${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
+.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 --git a/emulators/xmame/distinfo b/emulators/xmame/distinfo
index 917a3e00373d..7c54a01af611 100644
--- a/emulators/xmame/distinfo
+++ b/emulators/xmame/distinfo
@@ -1 +1 @@
-MD5 (xmame-0.36b3.1.tgz) = 708c424175f08dde4bc52a8b4b8f96d1
+MD5 (xmame-0.37b5.1.tgz) = f534d9157e6f922a98af670c93fb28e5
diff --git a/emulators/xmame/files/patch-ab b/emulators/xmame/files/patch-ab
index 99168e7b578c..a1bb449b1673 100644
--- a/emulators/xmame/files/patch-ab
+++ b/emulators/xmame/files/patch-ab
@@ -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 @@
- 
- # 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
+--- 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           <NULL> (not set)
+ # mixerdevice           <NULL> (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
+ 
+ ### Mame Related ###
+ defaultgame             pacman
diff --git a/emulators/xmame/pkg-descr b/emulators/xmame/pkg-descr
index 180dbc531dfb..c0dbd88c2645 100644
--- a/emulators/xmame/pkg-descr
+++ b/emulators/xmame/pkg-descr
@@ -2,7 +2,7 @@ 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.
 
-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 @@ 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 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>. ]
+[ Maintained by Jacob A. Hart <c9710216@studentmail.newcastle.edu.au>. ]
diff --git a/emulators/xmame/pkg-plist b/emulators/xmame/pkg-plist
index 3057a79dd5d4..ac3c94fb282b 100644
--- a/emulators/xmame/pkg-plist
+++ b/emulators/xmame/pkg-plist
@@ -1,24 +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
-@dirrm lib/xmame/hi
-@dirrm lib/xmame/roms
-@dirrm lib/xmame
+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.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