diff -ruN games/uqm.orig/Makefile games/uqm/Makefile
--- games/uqm.orig/Makefile	Tue Oct 10 17:18:16 2006
+++ games/uqm/Makefile	Tue Dec 26 21:40:11 2006
@@ -13,26 +13,24 @@
 #
 
 PORTNAME=	uqm
-PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTVERSION=	0.6.0
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sc2
-DISTFILES=	${PORTNAME}-${PORTVERSION}-source.tar.gz ${PORTNAME}-${PORTVERSION}-content.uqm
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}-source.tar.gz
+DISTFILES=	${PORTNAME}-${PORTVERSION}-source.tgz ${PORTNAME}-${PORTVERSION}-content.uqm
+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}-source.tgz
 
 MAINTAINER=	mail@maxlor.com
 COMMENT=	A port of the original Star Control 2 for 3DO consoles
 
-LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	vorbis.3:${PORTSDIR}/audio/libvorbis \
+		mikmod.2:${PORTSDIR}/audio/libmikmod
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_SDL=	image sdl
 NO_INSTALL_MANPAGES=	yes
 
-ONLY_FOR_ARCHS=	i386
-
 OPTIONS=	VOICE "Voice add-on (110MB)" Off \
 		MUSIC "Music add-on (18MB)" Off \
 		OPENAL "OpenAL support (experimental)" Off
@@ -62,44 +60,54 @@
 .endif
 
 post-extract:
-	${MKDIR} ${WRKSRC}/content/packages
-	${RM} -rf ${WRKSRC}/content/CVS # seems to have erroneously slipped into release tarball
-	${CP} ${DISTDIR}/${PORTNAME}-${PORTVERSION}-content.uqm ${WRKSRC}/content/packages/
+	${MKDIR} ${WRKSRC}/sc2/content/packages
+	${CP} ${DISTDIR}/${PORTNAME}-${PORTVERSION}-content.uqm ${WRKSRC}/sc2/content/packages/
 .ifdef(WITH_VOICE)
-	${CP} ${DISTDIR}/${PORTNAME}-${PORTVERSION}-voice.uqm ${WRKSRC}/content/packages/
+	${CP} ${DISTDIR}/${PORTNAME}-${PORTVERSION}-voice.uqm ${WRKSRC}/sc2/content/packages/
 .endif
 .ifdef(WITH_MUSIC)
-	${CP} ${DISTDIR}/${PORTNAME}-${PORTVERSION}-3domusic.uqm ${WRKSRC}/content/packages/
+	${CP} ${DISTDIR}/${PORTNAME}-${PORTVERSION}-3domusic.uqm ${WRKSRC}/sc2/content/packages/
 .endif
 
 do-configure:
-	@${ECHO_MSG} CHOICE_debug_VALUE=\'nodebug\' >  ${WRKSRC}/config.state
-	@${ECHO_MSG} CHOICE_graphics_VALUE=\'opengl\' >> ${WRKSRC}/config.state
+	@${ECHO_MSG} CHOICE_debug_VALUE=\'nodebug\' >  ${WRKSRC}/sc2/config.state
+	@${ECHO_MSG} CHOICE_graphics_VALUE=\'opengl\' >> ${WRKSRC}/sc2/config.state
 .ifdef(WITH_OPENAL)
-	@${ECHO_MSG} CHOICE_sound_VALUE=\'openal\' >> ${WRKSRC}/config.state
+	@${ECHO_MSG} CHOICE_sound_VALUE=\'openal\' >> ${WRKSRC}/sc2/config.state
+.else
+	@${ECHO_MSG} CHOICE_sound_VALUE=\'mixsdl\' >> ${WRKSRC}/sc2/config.state
+.endif
+	@${ECHO_MSG} CHOICE_mikmod_VALUE=\'external\' >> ${WRKSRC}/sc2/config.state
+	@${ECHO_MSG} CHOICE_ovcodec_VALUE=\'standard\' >> ${WRKSRC}/sc2/config.state
+.ifdef(NO_INET6)
+	@${ECHO_MSG} CHOICE_netplay_VALUE=\'full\' >> ${WRKSRC}/sc2/config.state
+.else
+	@${ECHO_MSG} CHOICE_netplay_VALUE=\'ipv4\' >> ${WRKSRC}/sc2/config.state
+.endif
+	@${ECHO_MSG} CHOICE_joystick_VALUE=\'enabled\' >> ${WRKSRC}/sc2/config.state
+	@${ECHO_MSG} CHOICE_ioformat_VALUE=\'stdio_zip\' >> ${WRKSRC}/sc2/config.state
+.if ${ARCH} == "i386"
+	@${ECHO_MSG} CHOICE_accel_VALUE=\'asm\' >> ${WRKSRC}/sc2/config.state
 .else
-	@${ECHO_MSG} CHOICE_sound_VALUE=\'mixsdl\' >> ${WRKSRC}/config.state
+	@${ECHO_MSG} CHOICE_accel_VALUE=\'plainc\' >> ${WRKSRC}/sc2/config.state
 .endif
-	@${ECHO_MSG} CHOICE_ovcodec_VALUE=\'standard\' >> ${WRKSRC}/config.state
-	@${ECHO_MSG} CHOICE_ioformat_VALUE=\'stdio_zip\' >> ${WRKSRC}/config.state
-	@${ECHO_MSG} CHOICE_accel_VALUE=\'asm\' >> ${WRKSRC}/config.state
-	@${ECHO_MSG} INPUT_install_prefix_VALUE=\'${PREFIX}\' >> ${WRKSRC}/config.state
-	@${ECHO_MSG} INPUT_install_bindir_VALUE=\''$$prefix/bin'\' >> ${WRKSRC}/config.state
-	@${ECHO_MSG} INPUT_install_libdir_VALUE=\''$$prefix/lib'\' >> ${WRKSRC}/config.state
-	@${ECHO_MSG} INPUT_install_sharedir_VALUE=\''$$prefix/share'\' >> ${WRKSRC}/config.state
-	cd ${WRKSRC} && ${SETENV} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} PREFIX=${PREFIX} ./build.sh uqm config
+	@${ECHO_MSG} INPUT_install_prefix_VALUE=\'${PREFIX}\' >> ${WRKSRC}/sc2/config.state
+	@${ECHO_MSG} INPUT_install_bindir_VALUE=\''$$prefix/bin'\' >> ${WRKSRC}/sc2/config.state
+	@${ECHO_MSG} INPUT_install_libdir_VALUE=\''$$prefix/lib'\' >> ${WRKSRC}/sc2/config.state
+	@${ECHO_MSG} INPUT_install_sharedir_VALUE=\''$$prefix/share'\' >> ${WRKSRC}/sc2/config.state
+	cd ${WRKSRC}/sc2 && ${SETENV} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} PREFIX=${PREFIX} ./build.sh uqm config
 
 do-build:
-	cd ${WRKSRC} && ./build.sh uqm
+	cd ${WRKSRC}/sc2 && ./build.sh uqm
 
 do-install:
-	cd ${WRKSRC} && ./build.sh uqm install
+	cd ${WRKSRC}/sc2 && ./build.sh uqm install
 
 post-install:
 	${STRIP_CMD} ${PREFIX}/lib/uqm/uqm
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/doc/users/manual.txt ${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/sc2/doc/users/manual.txt ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff -ruN games/uqm.orig/distinfo games/uqm/distinfo
--- games/uqm.orig/distinfo	Tue Feb  7 23:20:39 2006
+++ games/uqm/distinfo	Tue Dec 26 21:01:58 2006
@@ -1,12 +1,12 @@
-MD5 (uqm-0.5.0-source.tar.gz) = 9002b1bc2de9285588dd97b618a867a7
-SHA256 (uqm-0.5.0-source.tar.gz) = bdb715784bf0c94825cf40f97c60a5ec83fd3e17e9e186a78cd145781c4d9804
-SIZE (uqm-0.5.0-source.tar.gz) = 1267039
-MD5 (uqm-0.5.0-content.uqm) = 1d03864b141a2626a7284bc7cfdefb47
-SHA256 (uqm-0.5.0-content.uqm) = 060a0da6aedc231c11714a7a2174831f0cd6345075c80e682a8ff50f1f6cedc6
-SIZE (uqm-0.5.0-content.uqm) = 11584345
-MD5 (uqm-0.5.0-voice.uqm) = 52a084cfaa0bc7fcc63a295feb8cbd28
-SHA256 (uqm-0.5.0-voice.uqm) = 8ddbfe831cc20eac78c8153d1c706516fe97126612f9384f02d31be90480ae0c
-SIZE (uqm-0.5.0-voice.uqm) = 114823413
-MD5 (uqm-0.5.0-3domusic.uqm) = a20cacc8e66f5ff1fdf5e1d3a3b93fd2
-SHA256 (uqm-0.5.0-3domusic.uqm) = c3e72569720d1e17ab2d08301d9dc90f2c4ab272811c488e18f878f38b84cac8
-SIZE (uqm-0.5.0-3domusic.uqm) = 18980071
+MD5 (uqm-0.6.0-source.tgz) = 92b835869b4717c91e4d41e4c6de8614
+SHA256 (uqm-0.6.0-source.tgz) = 3c0c262cbe214ea52fc87f293c3bdbf594ba4c182e806f4eccfe2f7077e61024
+SIZE (uqm-0.6.0-source.tgz) = 1567978
+MD5 (uqm-0.6.0-content.uqm) = 7e8f0ed8490e24231431420ea2ba6a03
+SHA256 (uqm-0.6.0-content.uqm) = 727679a66351d435c1a3c53ca3d2e87079f1f05c09fa0748035ed68fff1cd63d
+SIZE (uqm-0.6.0-content.uqm) = 11580000
+MD5 (uqm-0.6.0-voice.uqm) = d31577b896be935cc2238afd07299b8b
+SHA256 (uqm-0.6.0-voice.uqm) = ee84c90873a996771ddfa2154640620e374366fffb51e18dfdfb4236050bc27a
+SIZE (uqm-0.6.0-voice.uqm) = 114823409
+MD5 (uqm-0.6.0-3domusic.uqm) = a20cacc8e66f5ff1fdf5e1d3a3b93fd2
+SHA256 (uqm-0.6.0-3domusic.uqm) = c3e72569720d1e17ab2d08301d9dc90f2c4ab272811c488e18f878f38b84cac8
+SIZE (uqm-0.6.0-3domusic.uqm) = 18980071
diff -ruN games/uqm.orig/files/patch-build-unix-build_functions games/uqm/files/patch-build-unix-build_functions
--- games/uqm.orig/files/patch-build-unix-build_functions	Tue Feb  7 23:20:39 2006
+++ games/uqm/files/patch-build-unix-build_functions	Tue Dec 26 21:10:56 2006
@@ -1,6 +1,6 @@
---- build/unix/build_functions.orig	Tue Feb  7 03:43:34 2006
-+++ build/unix/build_functions	Tue Feb  7 03:44:25 2006
-@@ -55,7 +55,7 @@
+--- sc2/build/unix/build_functions.orig	Tue Dec 26 21:05:30 2006
++++ sc2/build/unix/build_functions	Tue Dec 26 21:05:38 2006
+@@ -56,7 +56,7 @@
  	eval "${TARGET}_requirements"
  	eval "${TARGET}_prepare_config"
  	eval "${TARGET}_load_config"
diff -ruN games/uqm.orig/files/patch-build-unix-config_proginfo_host games/uqm/files/patch-build-unix-config_proginfo_host
--- games/uqm.orig/files/patch-build-unix-config_proginfo_host	Wed Sep 20 13:21:33 2006
+++ games/uqm/files/patch-build-unix-config_proginfo_host	Tue Dec 26 21:11:04 2006
@@ -1,5 +1,5 @@
---- build/unix/config_proginfo_host.orig	Thu Jan 19 22:13:38 2006
-+++ build/unix/config_proginfo_host	Tue Sep 12 19:12:07 2006
+--- sc2/build/unix/config_proginfo_host.orig	Tue Dec 26 21:07:45 2006
++++ sc2/build/unix/config_proginfo_host	Tue Dec 26 21:09:26 2006
 @@ -55,9 +55,9 @@
  LIB_SDL_NAME="Simple DirectMedia Layer"
  case "$HOST_SYSTEM" in
diff -ruN games/uqm.orig/pkg-plist games/uqm/pkg-plist
--- games/uqm.orig/pkg-plist	Tue Feb  7 23:20:39 2006
+++ games/uqm/pkg-plist	Tue Dec 26 21:34:06 2006
@@ -1,9 +1,9 @@
 bin/uqm
 lib/uqm/uqm
-%%DATADIR%%/content/packages/uqm-0.5.0-content.uqm
+%%DATADIR%%/content/packages/uqm-0.6.0-content.uqm
 %%DATADIR%%/content/version
-%%VOICEADDON%%%%DATADIR%%/content/packages/uqm-0.5.0-voice.uqm
-%%MUSICADDON%%%%DATADIR%%/content/packages/uqm-0.5.0-3domusic.uqm
+%%VOICEADDON%%%%DATADIR%%/content/packages/uqm-0.6.0-voice.uqm
+%%MUSICADDON%%%%DATADIR%%/content/packages/uqm-0.6.0-3domusic.uqm
 @dirrm %%DATADIR%%/content/packages
 @dirrm %%DATADIR%%/content
 @dirrm %%DATADIR%%