games/uqm: Update to 0.8.0

PR:		255350

9 files changed, 142 insertions, 212 deletions

diff --git a/games/uqm/Makefile b/games/uqm/Makefile
index 611161535f44..ab16f4df7141 100644
--- a/games/uqm/Makefile
+++ b/games/uqm/Makefile
@@ -1,103 +1,117 @@
-# Created by: benlutz@datacomm.ch
-
 PORTNAME=	uqm
-PORTVERSION=	0.7.0
-PORTREVISION=	5
+DISTVERSION=	0.8.0
 CATEGORIES=	games
-MASTER_SITES=	SF/sc2/UQM/${PORTVERSION:R}
-DISTFILES=	${DISTNAME}-source.tgz ${PORTNAME}-${DATAVERSION}-content.uqm
-EXTRACT_ONLY=	${DISTNAME}-source.tgz
+MASTER_SITES=	SF/sc2/UQM/${DISTVERSION:R}
+DISTFILES=	${DISTNAME}-src.tgz ${DISTNAME}-content.uqm
+EXTRACT_ONLY=	${DISTNAME}-src.tgz
 
 MAINTAINER=	mail@maxlor.com
-COMMENT=	Port of the original Star Control 2 for 3DO consoles
+COMMENT=	Space exploration game The Ur-Quan Masters
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+ CC-BY-NC-SA-2.5
+LICENSE_COMB=	multi
+LICENSE_DISTFILES_GPLv2+ =	${DISTNAME}-src.tgz
+LICENSE_DISTFILES_CC-BY-NC-SA-2.5=	${DISTNAME}-content.uqm
 
-LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
-		libmikmod.so:audio/libmikmod \
-		libpth.so:devel/pth
+LIB_DEPENDS=	libSDL2.so:devel/sdl20 \
+		libpng.so:graphics/png
 
 USES=		gmake pkgconfig sdl
-USE_SDL=	image sdl
-DATAVERSION=	0.7.0
-
-OPTIONS_DEFINE=	VOICE MUSIC OPENAL DOCS
-MUSIC_DESC=	3DO music add-on (18 MiB)
-VOICE_DESC=	Speech add-on (109 MiB)
-OPTIONS_GROUP=	SOUNDTRACK_REMIXES
-REMIX_PACKS=	1 2 3 4
-OPTIONS_GROUP_SOUNDTRACK_REMIXES=	REMIX1 REMIX2 REMIX3 REMIX4
-REMIX1_DESC=	"Super Meelee!"                  (47 MiB)
-REMIX2_DESC=	"Neutral Aliens, Don't Shoot!"   (57 MiB)
-REMIX3_DESC=	"Ur-Quan Hierarchy"              (38 MiB)
-REMIX4_DESC=	"The New Alliance of Free Stars" (82 MiB)
+USE_SDL=	sdl2
 
+OPTIONS_DEFINE=	DOCS MUSIC OPENAL VOICE
+DOCS_DESC=	Install game manual
+MUSIC_DESC=	3DO music package (19 MiB)
+OPENAL_DESC=	Positional sound through OpenAL (experimental)
+VOICE_DESC=	3DO speech package (110 MiB)
+OPTIONS_GROUP=	REMIXES
+OPTIONS_GROUP_REMIXES=	REMIX1 REMIX2 REMIX3 REMIX4
+REMIXES_DESC=	Soundtrack Remixes
+REMIX1_DESC=	"Super Meelee!"                  (48 MiB)
+REMIX2_DESC=	"Neutral Aliens, Don't Shoot!"   (58 MiB)
+REMIX3_DESC=	"Ur-Quan Hierarchy"              (39 MiB)
+REMIX4_DESC=	"The New Alliance of Free Stars" (84 MiB)
 OPTIONS_SUB=	yes
 
-VOICE_DISTFILES=	${PORTNAME}-${DATAVERSION}-voice.uqm
-MUSIC_DISTFILES=	${PORTNAME}-${DATAVERSION}-3domusic.uqm
+VOICE_DISTFILES=	${DISTNAME}-voice.uqm
+MUSIC_DISTFILES=	${DISTNAME}-3domusic.uqm
 OPENAL_USES=	openal:al
 
 .include <bsd.port.options.mk>
 
-.for i in ${REMIX_PACKS}
-.	if ${PORT_OPTIONS:MREMIX${i}}
-MASTER_SITES+=	SF/sc2/UQM%20Remix%20Packs/UQM%20Remix%20Pack%20${i}:remixpack${i}
-DISTFILES+=	${PORTNAME}-remix-disc${i}.uqm:remixpack${i}
-.	endif
-.endfor
+# libvorbis is not required for a minimal installations, only for addons
+.if ${PORT_OPTIONS:MMUSIC}${PORT_OPTIONS:MVOICE}${PORT_OPTIONS:MREMIX1}${PORT_OPTIONS:MREMIX2}${PORT_OPTIONS:MREMIX3}${PORT_OPTIONS:MREMIX4}
+LIB_DEPENDS+=	libvorbis.so:audio/libvorbis
+.endif
 
-post-extract:
-	@${MKDIR} ${WRKSRC}/content/addons ${WRKSRC}/content/packages
-	@${CP} ${DISTDIR}/${PORTNAME}-${DATAVERSION}-content.uqm ${WRKSRC}/content/packages/
-.if ${PORT_OPTIONS:MVOICE}
-	@${CP} ${DISTDIR}/${PORTNAME}-${DATAVERSION}-voice.uqm ${WRKSRC}/content/addons/
+.if ${PORT_OPTIONS:MDOCS}
+LICENSE+=	CC-BY-2.0
+LICENSE_DISTFILES_CC-BY-2.0=	${DISTNAME}-src.tgz
+.endif
+.if ${PORT_OPTIONS:MMUSIC}
+LICENSE_DISTFILES_CC-BY-NC-SA-2.5+=	${DISTNAME}-3domusic.uqm
 .endif
-.if	${PORT_OPTIONS:MMUSIC}
-	@${CP} ${DISTDIR}/${PORTNAME}-${DATAVERSION}-3domusic.uqm ${WRKSRC}/content/addons/
+.if ${PORT_OPTIONS:MVOICE}
+LICENSE_DISTFILES_CC-BY-NC-SA-2.5+=	${DISTNAME}-voice.uqm
 .endif
-.for i in ${REMIX_PACKS}
-.	if ${PORT_OPTIONS:MREMIX${i}}
-	@${CP} ${DISTDIR}/${PORTNAME}-remix-disc${i}.uqm ${WRKSRC}/content/addons/
+.for i in 1 2 3
+.	if ${PORT_OPTIONS:MREMIX${i}}	# portlint warning here is false positive
+MASTER_SITES+=	SF/sc2/UQM%20Remix%20Packs/UQM%20Remix%20Pack%20${i}:remix${i}
+DISTFILES+=	${PORTNAME}-remix-disc${i}.uqm:remix${i}
+LICENSE_DISTFILES_CC-BY-NC-SA-2.5+=	${PORTNAME}-remix-disc${i}.uqm
 .	endif
 .endfor
+.if ${PORT_OPTIONS:MREMIX4}
+MASTER_SITES+=	SF/sc2/UQM%20Remix%20Packs/UQM%20Remix%20Pack%204:remix4
+DISTFILES+=	${PORTNAME}-remix-disc4-1.uqm:remix4
+LICENSE_DISTFILES_CC-BY-NC-SA-2.5+=	${PORTNAME}-remix-disc4-1.uqm
+.endif
 
-do-configure:
-	@${ECHO_CMD} CHOICE_debug_VALUE=\'nodebug\' >  ${WRKSRC}/config.state
-	@${ECHO_CMD} CHOICE_graphics_VALUE=\'opengl\' >> ${WRKSRC}/config.state
+post-patch:
+	@${REINPLACE_CMD} -Ee \
+		's|^(SYSTEM_BUILD_LDFLAGS)=""|\1="-L${LOCALBASE}/lib"|; s|^(PROG_gcc_FILE)="gcc"|\1="${CC}"|; s|\(gcc --version\)|(${CC} --version)|' \
+		${WRKSRC}/build/unix/config_proginfo_build
+	@${REINPLACE_CMD} -Ee 's|/usr/X11R6/|${LOCALBASE}/|g; s|/usr/local/|${LOCALBASE}/|g' ${WRKSRC}/build/unix/config_proginfo_host
+	@${REINPLACE_CMD} -Ee 's|%PREFIX%|${PREFIX}|g' ${WRKSRC}/config.state
 .if ${PORT_OPTIONS:MOPENAL}
-	@${ECHO_CMD} CHOICE_sound_VALUE=\'openal\' >> ${WRKSRC}/config.state
-.else
-	@${ECHO_CMD} CHOICE_sound_VALUE=\'mixsdl\' >> ${WRKSRC}/config.state
+	@${REINPLACE_CMD} -Ee "s|(CHOICE_sound_VALUE)='mixsdl'|\1='openal'|g" ${WRKSRC}/config.state
 .endif
-	@${ECHO_CMD} CHOICE_mikmod_VALUE=\'external\' >> ${WRKSRC}/config.state
-	@${ECHO_CMD} CHOICE_ovcodec_VALUE=\'standard\' >> ${WRKSRC}/config.state
-.if	${PORT_OPTIONS:MINET6}
-	@${ECHO_CMD} CHOICE_netplay_VALUE=\'full\' >> ${WRKSRC}/config.state
-.else
-	@${ECHO_CMD} CHOICE_netplay_VALUE=\'ipv4\' >> ${WRKSRC}/config.state
+.if ${LIB_DEPENDS:Mlibvorbis*}
+	@${REINPLACE_CMD} -Ee "s|(CHOICE_ovcodec_VALUE)='none'|\1='standard'|g" ${WRKSRC}/config.state
 .endif
-	@${ECHO_CMD} CHOICE_joystick_VALUE=\'enabled\' >> ${WRKSRC}/config.state
-	@${ECHO_CMD} CHOICE_ioformat_VALUE=\'stdio_zip\' >> ${WRKSRC}/config.state
-.if ${ARCH} == "i386"
-	@${ECHO_CMD} CHOICE_accel_VALUE=\'asm\' >> ${WRKSRC}/config.state
-.else
-	@${ECHO_CMD} CHOICE_accel_VALUE=\'plainc\' >> ${WRKSRC}/config.state
-.endif
-	@${ECHO_CMD} CHOICE_threadlib_VALUE=\'sdl\' >> ${WRKSRC}/config.state
-	@${ECHO_CMD} INPUT_install_prefix_VALUE=\'${PREFIX}\' >> ${WRKSRC}/config.state
-	@${ECHO_CMD} INPUT_install_bindir_VALUE=\''$$prefix/bin'\' >> ${WRKSRC}/config.state
-	@${ECHO_CMD} INPUT_install_libdir_VALUE=\''$$prefix/lib'\' >> ${WRKSRC}/config.state
-	@${ECHO_CMD} INPUT_install_sharedir_VALUE=\''$$prefix/share'\' >> ${WRKSRC}/config.state
-	@(cd ${WRKSRC} && ${SETENV} LOCALBASE=${LOCALBASE} PREFIX=${PREFIX} ./build.sh uqm config)
+
+do-configure:
+	@(cd ${WRKSRC} && ${SETENV} LDFLAGS=-lm ./build.sh uqm reprocess_config)
 
 do-build:
-	@(cd ${WRKSRC} && ./build.sh uqm)
+	@(cd ${WRKSRC} && ./build.sh uqm ${_MAKE_JOBS})
 
 do-install:
-	@(cd ${WRKSRC} && ${SETENV} STAGEDIR="${STAGEDIR}" ./build.sh uqm install)
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/uqm/uqm
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/uqm ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${DATADIR}/content/packages
+	${MKDIR} ${STAGEDIR}${DATADIR}/content/addons
+	${INSTALL_DATA} ${WRKSRC}/content/version ${STAGEDIR}${DATADIR}/content
+	${INSTALL_DATA} ${DISTDIR}/${DISTNAME}-content.uqm ${STAGEDIR}${DATADIR}/content/packages
+.if ${PORT_OPTIONS:MMUSIC}
+	${INSTALL_DATA} ${DISTDIR}/${DISTNAME}-3domusic.uqm ${STAGEDIR}${DATADIR}/content/addons
+.endif
+.if ${PORT_OPTIONS:MVOICE}
+	${INSTALL_DATA} ${DISTDIR}/${DISTNAME}-voice.uqm ${STAGEDIR}${DATADIR}/content/addons
+.endif
+.if ${PORT_OPTIONS:MREMIX1}
+	${INSTALL_DATA} ${DISTDIR}/${PORTNAME}-remix-disc1.uqm ${STAGEDIR}${DATADIR}/content/addons
+.endif
+.if ${PORT_OPTIONS:MREMIX2}
+	${INSTALL_DATA} ${DISTDIR}/${PORTNAME}-remix-disc2.uqm ${STAGEDIR}${DATADIR}/content/addons
+.endif
+.if ${PORT_OPTIONS:MREMIX3}
+	${INSTALL_DATA} ${DISTDIR}/${PORTNAME}-remix-disc3.uqm ${STAGEDIR}${DATADIR}/content/addons
+.endif
+.if ${PORT_OPTIONS:MREMIX4}
+	${INSTALL_DATA} ${DISTDIR}/${PORTNAME}-remix-disc4-1.uqm ${STAGEDIR}${DATADIR}/content/addons
+.endif
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/users/manual.txt ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKSRC}/doc/users/uqm.6 ${STAGEDIR}${PREFIX}/man/man6
 
 .include <bsd.port.mk>
diff --git a/games/uqm/distinfo b/games/uqm/distinfo
index 4b97280aeeb1..b9f433975164 100644
--- a/games/uqm/distinfo
+++ b/games/uqm/distinfo
@@ -1,16 +1,17 @@
-SHA256 (uqm-0.7.0-source.tgz) = a3695c5f7f0be7ec9c0f80ec569907b382023a1fee6e635532bd53b7b53bb221
-SIZE (uqm-0.7.0-source.tgz) = 1562003
-SHA256 (uqm-0.7.0-content.uqm) = b8f6db8ba29f0628fb1d5c233830896b19f441aee3744bda671ea264b44da3bf
-SIZE (uqm-0.7.0-content.uqm) = 11538533
-SHA256 (uqm-0.7.0-voice.uqm) = bcccf801b4ba37594ff6217b292744ea586ee2d447e927804842ccae8b73c979
-SIZE (uqm-0.7.0-voice.uqm) = 115143439
-SHA256 (uqm-0.7.0-3domusic.uqm) = c57085e64dad4bddf8a679a9aa2adf63f2156d5f6cbabe63af80519033dbcb82
-SIZE (uqm-0.7.0-3domusic.uqm) = 18980671
+TIMESTAMP = 1619194935
+SHA256 (uqm-0.8.0-src.tgz) = 24f2f7db9cf7faf53b95f9e2580e6f596205a98ed0c335cfe834c64785ad4f5a
+SIZE (uqm-0.8.0-src.tgz) = 1611401
+SHA256 (uqm-0.8.0-content.uqm) = 77d75ac25e6fb755a33c4ba3b38a7b7bc41fcbc02896891b0cc9ac9214b72eef
+SIZE (uqm-0.8.0-content.uqm) = 11547353
+SHA256 (uqm-0.8.0-3domusic.uqm) = 44cd3cec7e9569b4117adb4d77f1522890972566267391ae09631485d231d8b9
+SIZE (uqm-0.8.0-3domusic.uqm) = 18980671
+SHA256 (uqm-0.8.0-voice.uqm) = 9edbf51d77d8b533399c5f3afb549314a8210d7aab71ca2c51b4f24832337a45
+SIZE (uqm-0.8.0-voice.uqm) = 115164704
 SHA256 (uqm-remix-disc1.uqm) = b697694745d939311e8ebffdd5edf692e010c25d7966e1481074940a4d0487e8
 SIZE (uqm-remix-disc1.uqm) = 50188876
 SHA256 (uqm-remix-disc2.uqm) = 7fbb4744102e31273e4459b01a156da052ec537c128fe91793643e348bc1bade
 SIZE (uqm-remix-disc2.uqm) = 60282662
 SHA256 (uqm-remix-disc3.uqm) = e6d89f8f66cf1df1cb278fca1e92261b1776ee670dff26132e33f14dbd31e91d
 SIZE (uqm-remix-disc3.uqm) = 39924875
-SHA256 (uqm-remix-disc4.uqm) = a4c8197712a5b72a81c7ef7a2a33ea7d3ac90ab063c929dd68e7328a559a86d0
-SIZE (uqm-remix-disc4.uqm) = 86545760
+SHA256 (uqm-remix-disc4-1.uqm) = ec2fa22a1fdd8640e2d27b75c1531f29c4f7773130423235dcb645a7cbc831d5
+SIZE (uqm-remix-disc4-1.uqm) = 87927958
diff --git a/games/uqm/files/patch-build-unix-build_functions b/games/uqm/files/patch-build-unix-build_functions
deleted file mode 100644
index c3c0c9485e56..000000000000
--- a/games/uqm/files/patch-build-unix-build_functions
+++ /dev/null
@@ -1,57 +0,0 @@
---- build/unix/build_functions.orig	2011-05-20 23:25:22.000000000 +0400
-+++ build/unix/build_functions	2014-09-11 17:04:15.000000000 +0400
-@@ -56,7 +56,7 @@
- 	eval "${TARGET}_requirements"
- 	eval "${TARGET}_prepare_config"
- 	eval "${TARGET}_load_config"
--	eval "${TARGET}_do_config"
-+#	eval "${TARGET}_do_config"
- 	eval "${TARGET}_save_config"
- }
- 
-@@ -264,39 +264,39 @@
- 	echo "Installing system-dependent data..." >&2
- 	eval LIBS="\${${BUILD_PROJECT}_INSTALL_LIBS}"
- 	eval LIBDIR="\${${BUILD_PROJECT}_INSTALL_LIBDIR%/}/"
--	mkdirhier "$LIBDIR" 0755
-+	mkdirhier "${STAGEDIR}$LIBDIR" 0755
- 	for LIB in $LIBS; do
- 		eval SRC="\${${BUILD_PROJECT}_INSTALL_LIB_${LIB}_SRC%/}"
- 		eval DEST="\$LIBDIR\${${BUILD_PROJECT}_INSTALL_LIB_${LIB}_DEST}"
- 		eval MODE="\${${BUILD_PROJECT}_INSTALL_LIB_${LIB}_MODE}"
- 		eval OWNER="\${${BUILD_PROJECT}_INSTALL_LIB_${LIB}_OWNER}"
--		installsome "$SRC" "$DEST" "$MODE" "$OWNER"
-+		installsome "$SRC" "${STAGEDIR}$DEST" "$MODE" "$OWNER"
- 	done
- 
- 	local SHARE SHARED SHAREDIR
- 	echo "Installing system-independent data..." >&2
- 	eval SHARED="\${${BUILD_PROJECT}_INSTALL_SHARED}"
- 	eval SHAREDIR="\${${BUILD_PROJECT}_INSTALL_SHAREDIR%/}/"
--	mkdirhier "$SHAREDIR" 0755
-+	mkdirhier "${STAGEDIR}$SHAREDIR" 0755
- 	for SHARE in $SHARED; do
- 		eval SRC="\${${BUILD_PROJECT}_INSTALL_SHARED_${SHARE}_SRC%/}"
- 		eval DEST="\$SHAREDIR\${${BUILD_PROJECT}_INSTALL_SHARED_${SHARE}_DEST}"
- 		eval MODE="\${${BUILD_PROJECT}_INSTALL_SHARED_${SHARE}_MODE}"
- 		eval OWNER="\${${BUILD_PROJECT}_INSTALL_SHARED_${SHARE}_OWNER}"
--		installsome "$SRC" "$DEST" "$MODE" "$OWNER"
-+		installsome "$SRC" "${STAGEDIR}$DEST" "$MODE" "$OWNER"
- 	done
- 
- 	local BINS BINDIR
- 	echo "Installing binaries..." >&2
- 	eval BINS="\${${BUILD_PROJECT}_INSTALL_BINS}"
- 	eval BINDIR="\${${BUILD_PROJECT}_INSTALL_BINDIR%/}/"
--	mkdirhier "$BINDIR" 0755
-+	mkdirhier "${STAGEDIR}$BINDIR" 0755
- 	for BIN in $BINS; do
- 		eval SRC="\${${BUILD_PROJECT}_INSTALL_BIN_${BIN}_SRC%/}"
- 		eval DEST="\$BINDIR\${${BUILD_PROJECT}_INSTALL_BIN_${BIN}_DEST}"
- 		eval MODE="\${${BUILD_PROJECT}_INSTALL_BIN_${BIN}_MODE}"
- 		eval OWNER="\${${BUILD_PROJECT}_INSTALL_BIN_${BIN}_OWNER}"
--		installsome "$SRC" "$DEST" "$MODE" "$OWNER"
-+		installsome "$SRC" "${STAGEDIR}$DEST" "$MODE" "$OWNER"
- 	done
- 
- 	eval "${TARGET}_post_install"
diff --git a/games/uqm/files/patch-build-unix-config_proginfo_build b/games/uqm/files/patch-build-unix-config_proginfo_build
deleted file mode 100644
index 063156957f34..000000000000
--- a/games/uqm/files/patch-build-unix-config_proginfo_build
+++ /dev/null
@@ -1,16 +0,0 @@
---- build/unix/config_proginfo_build.orig	2011-05-20 21:25:22.000000000 +0200
-+++ build/unix/config_proginfo_build	2013-11-25 19:19:42.000000000 +0100
-@@ -166,10 +166,10 @@
-
-
- ### gcc ###
--PROG_gcc_NAME="GNU C compiler"
--PROG_gcc_FILE="gcc"
-+PROG_gcc_NAME="C compiler"
-+PROG_gcc_FILE="cc"
- PROG_gcc_ACTION=""
--PROG_gcc_VERSION='$(gcc --version)'
-+PROG_gcc_VERSION='$(cc --version)'
-
-
- ### sed ###
diff --git a/games/uqm/files/patch-build-unix-config_proginfo_host b/games/uqm/files/patch-build-unix-config_proginfo_host
deleted file mode 100644
index d49c4a1c9ada..000000000000
--- a/games/uqm/files/patch-build-unix-config_proginfo_host
+++ /dev/null
@@ -1,44 +0,0 @@
---- build/unix/config_proginfo_host.orig	2011-05-20 23:25:22.000000000 +0400
-+++ build/unix/config_proginfo_host	2013-01-08 19:49:40.000000000 +0400
-@@ -115,7 +115,7 @@
- LIB_openal_CFLAGS=""
- case "$HOST_SYSTEM" in
- 	FreeBSD|OpenBSD)
--		LIB_openal_LDFLAGS="-L/usr/local/lib -pthread -lopenal"
-+		LIB_openal_LDFLAGS="-L${LOCALBASE}/lib -pthread -lopenal"
- 		;;
- 	MINGW32*|CYGWIN*|cegcc)
- 		LIB_openal_LDFLAGS="-lopenal32"
-@@ -144,8 +144,8 @@
- LIB_opengl_NAME="OpenGL"
- case "$HOST_SYSTEM" in
- 	FreeBSD|OpenBSD)
--		LIB_opengl_CFLAGS="-I/usr/X11R6/include -D_THREAD_SAFE"
--		LIB_opengl_LDFLAGS="-L/usr/X11R6/lib -lX11 -lXext -pthread -lGL"
-+		LIB_opengl_CFLAGS="-I${LOCALBASE}/include -D_THREAD_SAFE"
-+		LIB_opengl_LDFLAGS="-L${LOCALBASE}/lib -lX11 -lXext -pthread -lGL"
- 		;;
- 	MINGW32*|CYGWIN*|cegcc)
- 		LIB_opengl_CFLAGS=""
-@@ -182,8 +182,8 @@
- LIB_vorbisfile_NAME="vorbisfile"
- case "$HOST_SYSTEM" in
- 	FreeBSD|OpenBSD)
--		LIB_vorbisfile_CFLAGS="-I/usr/local/include"
--		LIB_vorbisfile_LDFLAGS="-L/usr/local/lib -lvorbisfile -lvorbis"
-+		LIB_vorbisfile_CFLAGS="-I${LOCALBASE}/include"
-+		LIB_vorbisfile_LDFLAGS="-L${LOCALBASE}/lib -lvorbisfile -lvorbis"
- 		;;
- 	MINGW32*|CYGWIN*|cegcc)
- 		LIB_vorbisfile_CFLAGS=""
-@@ -221,8 +221,8 @@
- LIB_tremor_NAME="tremor"
- case "$HOST_SYSTEM" in
- 	FreeBSD|OpenBSD)
--		LIB_tremor_CFLAGS="-I/usr/local/include"
--		LIB_tremor_LDFLAGS="-L/usr/local/lib -lvorbisidec"
-+		LIB_tremor_CFLAGS="-I${LOCALBASE}/include"
-+		LIB_tremor_LDFLAGS="-L${LOCALBASE}/lib -lvorbisidec"
- 		;;
- 	Darwin)
- 		# Assumed values - please let me know if you can verify this.
diff --git a/games/uqm/files/patch-build_unix_build__functions b/games/uqm/files/patch-build_unix_build__functions
new file mode 100644
index 000000000000..a6b51955b805
--- /dev/null
+++ b/games/uqm/files/patch-build_unix_build__functions
@@ -0,0 +1,10 @@
+--- build/unix/build_functions.orig	2020-12-27 04:34:23 UTC
++++ build/unix/build_functions
+@@ -65,6 +65,7 @@ build_reconfig() {
+ 		echo "*** Warning: file 'config.state' not found - using defaults."
+ 	fi
+ 
++	set_system
+ 	prepare_build_system
+ 	config_requirements
+ 	prepare_host_system
diff --git a/games/uqm/files/patch-config.state b/games/uqm/files/patch-config.state
new file mode 100644
index 000000000000..3c63bda1c5ac
--- /dev/null
+++ b/games/uqm/files/patch-config.state
@@ -0,0 +1,17 @@
+--- config.state.orig	2021-04-23 17:15:09 UTC
++++ config.state
+@@ -0,0 +1,14 @@
++CHOICE_debug_VALUE='nodebug'
++CHOICE_graphics_VALUE='sdl2'
++CHOICE_sound_VALUE='mixsdl'
++CHOICE_mikmod_VALUE='internal'
++CHOICE_ovcodec_VALUE='none'
++CHOICE_netplay_VALUE='full'
++CHOICE_joystick_VALUE='enabled'
++CHOICE_ioformat_VALUE='stdio_zip'
++CHOICE_accel_VALUE='asm'
++CHOICE_threadlib_VALUE='sdl'
++INPUT_install_prefix_VALUE='%PREFIX%'
++INPUT_install_bindir_VALUE='$prefix/bin'
++INPUT_install_libdir_VALUE='$prefix/lib'
++INPUT_install_sharedir_VALUE='$prefix/share'
diff --git a/games/uqm/pkg-descr b/games/uqm/pkg-descr
index ddc7224df106..4697c3a5d24d 100644
--- a/games/uqm/pkg-descr
+++ b/games/uqm/pkg-descr
@@ -1,9 +1,12 @@
-Ur-Quan Masters is a port of the original Star Control 2 for 3DO Consoles.
+The Ur-Quan Masters is a port of the original Star Control 2 for 3DO Consoles.
 
-The project started in August 2002, when Toys For Bob  released the partially
-ported sources of Star Control 2 3DO version to the fan community. Our goal
-is to port this wonderful game to current personal computers and operating
-systems. It is and will remain 100% free of charge, and anyone can contribute
-to the project and thus help make it even better.
+The game features space exploration, diplomacy and combat as well as resource
+gathering and building. The player can freely explore hundreds of star systems,
+planets and moons. To defeat the evil Ur-Quan that have enslaved earth, he will
+need to gather knowledge and materials, and build alliances with alien races.
+
+The project started in August 2002, when Toys For Bob released the partially
+ported sources of the Star Control 2 3DO version to the fan community. That
+community has since updated and extended the code to run on modern computers.
 
 WWW: http://sc2.sourceforge.net
diff --git a/games/uqm/pkg-plist b/games/uqm/pkg-plist
index e4632801878e..7c7d297b2efe 100644
--- a/games/uqm/pkg-plist
+++ b/games/uqm/pkg-plist
@@ -1,12 +1,14 @@
 bin/uqm
-lib/uqm/uqm
-%%DATADIR%%/content/packages/uqm-0.7.0-content.uqm
+man/man6/uqm.6.gz
+@dir %%DATADIR%%/content
+@dir %%DATADIR%%/content/addons
+@dir %%DATADIR%%/content/packages
 %%DATADIR%%/content/version
-%%VOICE%%%%DATADIR%%/content/addons/uqm-0.7.0-voice.uqm
-%%MUSIC%%%%DATADIR%%/content/addons/uqm-0.7.0-3domusic.uqm
+%%DATADIR%%/content/packages/uqm-0.8.0-content.uqm
+%%MUSIC%%%%DATADIR%%/content/addons/uqm-0.8.0-3domusic.uqm
+%%VOICE%%%%DATADIR%%/content/addons/uqm-0.8.0-voice.uqm
 %%REMIX1%%%%DATADIR%%/content/addons/uqm-remix-disc1.uqm
 %%REMIX2%%%%DATADIR%%/content/addons/uqm-remix-disc2.uqm
 %%REMIX3%%%%DATADIR%%/content/addons/uqm-remix-disc3.uqm
-%%REMIX4%%%%DATADIR%%/content/addons/uqm-remix-disc4.uqm
-%%PORTDOCS%%%%DOCSDIR%%/manual.txt
-@dir %%DATADIR%%/content/addons
+%%REMIX4%%%%DATADIR%%/content/addons/uqm-remix-disc4-1.uqm
+%%DOCS%%%%DOCSDIR%%/manual.txt