5 files changed, 101 insertions, 115 deletions

diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index 9d0935a5fa2c..3e771405076a 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -7,49 +7,47 @@
 
 PORTNAME=	xracer
 PORTVERSION=	0.94
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
-MASTER_SITES=	http://xracer.annexia.org/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} xracer-data.tar.gz
+MASTER_SITES=	${MASTER_SITE_FREEBSD_ORG}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}-data${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bsdkaffee@gmail.com
 COMMENT=	Awesome WipeOut clone for OpenGL and X11!
 
-BROKEN=		"Unfetchable"
-
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		glut.4:${PORTSDIR}/graphics/libglut
 
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	automake:14 autoconf:213
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--disable-esd
 
+PORTDOCS=	AUTHORS README README.html
+
+SUB_FILES=	pkg-message
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != i386 && ${ARCH} != "amd64"
-BROKEN=		"Does not build on ${ARCH}"
+BROKEN=		Does not build on ${ARCH}
 .endif
 
-
-post-patch:
+post-extract:
 	@${TOUCH} ${WRKSRC}/stamp-h.in
-
+	@cd ${WRKSRC} && \
+		${REINPLACE_CMD} -e 's|machine/joystick.h|sys/joystick.h|g' \
+			configure.in src/joystick/freebsd.c
+	${CHMOD} -R a=r ${WRKDIR}/${PORTNAME}-data
+	${CHMOD} -R +X ${WRKDIR}/${PORTNAME}-data
 post-install:
-	@${ECHO} "===>   Installing Tracks and Sound"
-	@${MKDIR} ${PREFIX}/share/xracer
-	${TAR} -C ${WRKDIR}/xracer-data -cf - . | \
-		${TAR} -C ${PREFIX}/share/xracer --unlink -xf -
-	@${CHMOD} -R 744 ${PREFIX}/share/xracer
-	@${CHMOD} -R a+X ${PREFIX}/share/xracer
+	@${MKDIR} ${DATADIR}
+	@${TAR} -C ${WRKDIR}/xracer-data -cf - . | \
+		${TAR} -C ${DATADIR} --unlink -xf -
 .if !defined(NOPORTDOCS)
-	@${ECHO} "===>   Installing Documentation"
-	@${MKDIR} ${PREFIX}/share/doc/xracer
-.for file in AUTHORS ChangeLog NEWS README README.html
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/xracer
-.endfor
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/games/xracer/files/pkg-message.in b/games/xracer/files/pkg-message.in
new file mode 100644
index 000000000000..a4fb65e20297
--- /dev/null
+++ b/games/xracer/files/pkg-message.in
@@ -0,0 +1,11 @@
+ =========================================================================
+ >>> XRACER INSTALLATION NOTES <<<
+ =========================================================================
+ The xracer data files have been installed into:
+	%%DATADIR%%
+ You'll NEED to set the enviroment variable XRACER_HOME to this directory
+ otherwise xracer will not work.
+
+ The xracer documentation has been installed into:
+	%%DOCSDIR%%
+ =========================================================================
diff --git a/games/xracer/pkg-descr b/games/xracer/pkg-descr
index 5383272c562b..879a9c3a9514 100644
--- a/games/xracer/pkg-descr
+++ b/games/xracer/pkg-descr
@@ -3,4 +3,4 @@
 XRacer is an unfinished game I wrote several years back, aiming to clone
 Wipeout. It's looking for a new maintainer.
 
-WWW: http://xracer.annexia.org/
+WWW: http://www.annexia.org/freeware/xracer
diff --git a/games/xracer/pkg-message b/games/xracer/pkg-message
deleted file mode 100644
index a2c32dfe696e..000000000000
--- a/games/xracer/pkg-message
+++ /dev/null
@@ -1,17 +0,0 @@
- - ----------------------------------------------------------------------- -
- - XRACER PORT NOTES                                      ported by trolld -
- - ----------------------------------------------------------------------- -
- -  The xracer data files have been installed to: /usr/local/share/xracer  -
- -  You'll NEED to set the enviroment variable $XRACER_HOME to this dir    -
- -  otherwise xracer will not work.                                        -
- -                                                                         -
- -  The xracer documentation has been installed in:                        -
- -     /usr/local/share/doc/xracer/                                        -
- -                                                                         -
- -  That's it, after setting the enviroment, type xracer to run!           -
- -                                                         Enjoy!          -
- -                                                         - trolld        -
- -                                                                         -
- - ----------------------------------------------------------------------- -
- -  xracer website: http://xracer.annexia.org/                             -
- - ----------------------------------------------------------------------- -
diff --git a/games/xracer/pkg-plist b/games/xracer/pkg-plist
index 2640ec06efb0..9b9267b1826c 100644
--- a/games/xracer/pkg-plist
+++ b/games/xracer/pkg-plist
@@ -3,78 +3,72 @@ bin/mktrackmodel
 bin/perlin
 bin/test-poly-opts
 bin/xracer
-share/doc/xracer/AUTHORS
-share/doc/xracer/ChangeLog
-share/doc/xracer/NEWS
-share/doc/xracer/README
-share/doc/xracer/README.html
-share/xracer/images/andre-logo.jpg
-share/xracer/images/beestripes1-large.jpg
-share/xracer/images/beestripes1.jpg
-share/xracer/images/clouds1.jpg
-share/xracer/images/clouds2-large.jpg
-share/xracer/images/clouds2.jpg
-share/xracer/images/clouds3.jpg
-share/xracer/images/clouds4.jpg
-share/xracer/images/clouds5.jpg
-share/xracer/images/craft1-back-side.jpg
-share/xracer/images/craft1-inner-side.jpg
-share/xracer/images/craft1-side.jpg
-share/xracer/images/craft1-under.jpg
-share/xracer/images/craft1-windscreen.jpg
-share/xracer/images/crillee14.jpg
-share/xracer/images/crillee24.jpg
-share/xracer/images/crillee36.jpg
-share/xracer/images/crillee48.jpg
-share/xracer/images/menus-bg.jpg
-share/xracer/images/mountains4-alpha.jpg
-share/xracer/images/mountains4.jpg
-share/xracer/images/powerup-autopilot-alpha.jpg
-share/xracer/images/powerup-autopilot.jpg
-share/xracer/images/powerup-energy-alpha.jpg
-share/xracer/images/powerup-energy.jpg
-share/xracer/images/powerup-faster-alpha.jpg
-share/xracer/images/powerup-faster.jpg
-share/xracer/images/powerup-shield-alpha.jpg
-share/xracer/images/powerup-shield.jpg
-share/xracer/images/skyscraper1.jpg
-share/xracer/images/snow1.jpg
-share/xracer/images/snow2.jpg
-share/xracer/images/snowtex1.jpg
-share/xracer/images/snowtex2.jpg
-share/xracer/images/snowtex3.jpg
-share/xracer/images/track1-large.jpg
-share/xracer/images/track1.jpg
-share/xracer/images/track2.jpg
-share/xracer/images/track3.jpg
-share/xracer/images/track5+left-fast+right-fast.jpg
-share/xracer/images/track5+left-fast+right-faster.jpg
-share/xracer/images/track5+left-fast+right-powerup.jpg
-share/xracer/images/track5+left-fast.jpg
-share/xracer/images/track5+left-faster+right-fast.jpg
-share/xracer/images/track5+left-faster+right-faster.jpg
-share/xracer/images/track5+left-faster+right-powerup.jpg
-share/xracer/images/track5+left-faster.jpg
-share/xracer/images/track5+left-powerup+right-fast.jpg
-share/xracer/images/track5+left-powerup+right-faster.jpg
-share/xracer/images/track5+left-powerup+right-powerup.jpg
-share/xracer/images/track5+left-powerup.jpg
-share/xracer/images/track5+right-fast.jpg
-share/xracer/images/track5+right-faster.jpg
-share/xracer/images/track5+right-powerup.jpg
-share/xracer/images/track5.jpg
-share/xracer/images/xracer-logo-3.jpg
-share/xracer/objects/start-lamp/start-lamp-green-texture.jpg
-share/xracer/objects/start-lamp/start-lamp-orange-texture.jpg
-share/xracer/objects/start-lamp/start-lamp-red-texture.jpg
-share/xracer/sounds/faster.wav
-share/xracer/sounds/powerup.wav
-share/xracer/sounds/wind.wav
-share/xracer/tracks/demo.trk.gz
-@dirrm share/xracer/tracks
-@dirrm share/xracer/sounds
-@dirrm share/xracer/objects/start-lamp
-@dirrm share/xracer/objects
-@dirrm share/xracer/images
-@dirrm share/xracer
-@dirrm share/doc/xracer
+%%DATADIR%%/images/andre-logo.jpg
+%%DATADIR%%/images/beestripes1-large.jpg
+%%DATADIR%%/images/beestripes1.jpg
+%%DATADIR%%/images/clouds1.jpg
+%%DATADIR%%/images/clouds2-large.jpg
+%%DATADIR%%/images/clouds2.jpg
+%%DATADIR%%/images/clouds3.jpg
+%%DATADIR%%/images/clouds4.jpg
+%%DATADIR%%/images/clouds5.jpg
+%%DATADIR%%/images/craft1-back-side.jpg
+%%DATADIR%%/images/craft1-inner-side.jpg
+%%DATADIR%%/images/craft1-side.jpg
+%%DATADIR%%/images/craft1-under.jpg
+%%DATADIR%%/images/craft1-windscreen.jpg
+%%DATADIR%%/images/crillee14.jpg
+%%DATADIR%%/images/crillee24.jpg
+%%DATADIR%%/images/crillee36.jpg
+%%DATADIR%%/images/crillee48.jpg
+%%DATADIR%%/images/menus-bg.jpg
+%%DATADIR%%/images/mountains4-alpha.jpg
+%%DATADIR%%/images/mountains4.jpg
+%%DATADIR%%/images/powerup-autopilot-alpha.jpg
+%%DATADIR%%/images/powerup-autopilot.jpg
+%%DATADIR%%/images/powerup-energy-alpha.jpg
+%%DATADIR%%/images/powerup-energy.jpg
+%%DATADIR%%/images/powerup-faster-alpha.jpg
+%%DATADIR%%/images/powerup-faster.jpg
+%%DATADIR%%/images/powerup-shield-alpha.jpg
+%%DATADIR%%/images/powerup-shield.jpg
+%%DATADIR%%/images/skyscraper1.jpg
+%%DATADIR%%/images/snow1.jpg
+%%DATADIR%%/images/snow2.jpg
+%%DATADIR%%/images/snowtex1.jpg
+%%DATADIR%%/images/snowtex2.jpg
+%%DATADIR%%/images/snowtex3.jpg
+%%DATADIR%%/images/track1-large.jpg
+%%DATADIR%%/images/track1.jpg
+%%DATADIR%%/images/track2.jpg
+%%DATADIR%%/images/track3.jpg
+%%DATADIR%%/images/track5+left-fast+right-fast.jpg
+%%DATADIR%%/images/track5+left-fast+right-faster.jpg
+%%DATADIR%%/images/track5+left-fast+right-powerup.jpg
+%%DATADIR%%/images/track5+left-fast.jpg
+%%DATADIR%%/images/track5+left-faster+right-fast.jpg
+%%DATADIR%%/images/track5+left-faster+right-faster.jpg
+%%DATADIR%%/images/track5+left-faster+right-powerup.jpg
+%%DATADIR%%/images/track5+left-faster.jpg
+%%DATADIR%%/images/track5+left-powerup+right-fast.jpg
+%%DATADIR%%/images/track5+left-powerup+right-faster.jpg
+%%DATADIR%%/images/track5+left-powerup+right-powerup.jpg
+%%DATADIR%%/images/track5+left-powerup.jpg
+%%DATADIR%%/images/track5+right-fast.jpg
+%%DATADIR%%/images/track5+right-faster.jpg
+%%DATADIR%%/images/track5+right-powerup.jpg
+%%DATADIR%%/images/track5.jpg
+%%DATADIR%%/images/xracer-logo-3.jpg
+%%DATADIR%%/objects/start-lamp/start-lamp-green-texture.jpg
+%%DATADIR%%/objects/start-lamp/start-lamp-orange-texture.jpg
+%%DATADIR%%/objects/start-lamp/start-lamp-red-texture.jpg
+%%DATADIR%%/sounds/faster.wav
+%%DATADIR%%/sounds/powerup.wav
+%%DATADIR%%/sounds/wind.wav
+%%DATADIR%%/tracks/demo.trk.gz
+@dirrm %%DATADIR%%/tracks
+@dirrm %%DATADIR%%/sounds
+@dirrm %%DATADIR%%/objects/start-lamp
+@dirrm %%DATADIR%%/objects
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%