3 files changed, 19 insertions, 18 deletions

diff --git a/games/vavoom/Makefile b/games/vavoom/Makefile
index 89abb7f5f88f..138409ec3ed6 100644
--- a/games/vavoom/Makefile
+++ b/games/vavoom/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	vavoom
-PORTVERSION=	1.21.2
-PORTREVISION=	1
+PORTVERSION=	1.22.1
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -16,12 +15,14 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Doom, Doom II, Heretic, Hexen and Strife source port
 
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+		png.5:${PORTSDIR}/graphics/png
 
 USE_BZIP2=	yes
+USE_GCC=	3.4+
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
@@ -143,6 +144,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|SDL/||g' ${WRKSRC}/source/s_sdl.cpp
 	@${REINPLACE_CMD} -e 's|\.$$host_cpu||' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e '/animated\.lmp/d' \
+		${WRKSRC}/basev/doom/basepak.ls.in
 	@cd ${WRKSRC} && ${SH} fixunix.sh
 
 post-install:
diff --git a/games/vavoom/distinfo b/games/vavoom/distinfo
index ddb4b004e2c4..7828f73ac7bf 100644
--- a/games/vavoom/distinfo
+++ b/games/vavoom/distinfo
@@ -1,6 +1,6 @@
-MD5 (vavoom-1.21.2.tar.bz2) = 6dc2486597502abd6addd6d1582e54b0
-SHA256 (vavoom-1.21.2.tar.bz2) = 8f9be9c791c7f5eae06f6c4d816af704dd3dfffb1dc1ffdea0c1dbc32dee0f69
-SIZE (vavoom-1.21.2.tar.bz2) = 1891354
+MD5 (vavoom-1.22.1.tar.bz2) = a85b41b8592f7f0f1b8eed1e55ec426b
+SHA256 (vavoom-1.22.1.tar.bz2) = 373eba002966875e7ae40b9f62547654e9609f26394bef7c9a9264cfd31dc59f
+SIZE (vavoom-1.22.1.tar.bz2) = 1885306
 MD5 (vmdl_doom_13.zip) = 19df0e08b48e78f45cda1db4b66f04f9
 SHA256 (vmdl_doom_13.zip) = ff1cbe04bf9097bb8311990f3ae9dcf64abfc1211fff1970cc5f2a452e7781c2
 SIZE (vmdl_doom_13.zip) = 10749692
diff --git a/games/vavoom/pkg-plist b/games/vavoom/pkg-plist
index edc2149e469d..c09428d7c210 100644
--- a/games/vavoom/pkg-plist
+++ b/games/vavoom/pkg-plist
@@ -7,9 +7,7 @@ libexec/vavoom/vavoom
 libexec/vavoom/vavoom-dedicated
 %%DEVEL%%libexec/vavoom/vcc
 %%DEVEL%%libexec/vavoom/vlumpy
-%%DATADIR%%/basev/common/default.cfg
-%%DATADIR%%/basev/common/startup.vs
-%%DATADIR%%/basev/common/wad0.wad
+%%DATADIR%%/basev/common/basepak.pk3
 %%MODELS%%%%DATADIR%%/basev/doom/models/ammo/ammo.md2
 %%MODELS%%%%DATADIR%%/basev/doom/models/ammo/ammo.pcx
 %%MODELS%%%%DATADIR%%/basev/doom/models/ammo/backpack.md2
@@ -415,11 +413,11 @@ libexec/vavoom/vavoom-dedicated
 %%MODELS%%%%DATADIR%%/basev/doom/models/weapons/v_shotg.png
 %%MODELS%%%%DATADIR%%/basev/doom/models/weapons/v_super.md2
 %%MODELS%%%%DATADIR%%/basev/doom/models/weapons/v_super.pcx
-%%DATADIR%%/basev/doom/wad0.wad
+%%DATADIR%%/basev/doom/basepak.pk3
 %%DATADIR%%/basev/doom1/base.txt
-%%DATADIR%%/basev/doom1/wad0.wad
+%%DATADIR%%/basev/doom1/basepak.pk3
 %%DATADIR%%/basev/doom2/base.txt
-%%DATADIR%%/basev/doom2/wad0.wad
+%%DATADIR%%/basev/doom2/basepak.pk3
 %%DATADIR%%/basev/games.txt
 %%MODELS%%%%DATADIR%%/basev/heretic/models/Models.txt
 %%MODELS%%%%DATADIR%%/basev/heretic/models/Readme.txt
@@ -568,7 +566,7 @@ libexec/vavoom/vavoom-dedicated
 %%MODELS%%%%DATADIR%%/basev/heretic/models/weapons/v_wand.md2
 %%MODELS%%%%DATADIR%%/basev/heretic/models/weapons/v_wand.pcx
 %%MODELS%%%%DATADIR%%/basev/heretic/models/weapons/v_wandg.pcx
-%%DATADIR%%/basev/heretic/wad0.wad
+%%MODELS%%%%DATADIR%%/basev/heretic/basepak.pk3
 %%MODELS%%%%DATADIR%%/basev/hexen/models/Models.txt
 %%MODELS%%%%DATADIR%%/basev/hexen/models/Readme.txt
 %%MODELS%%%%DATADIR%%/basev/hexen/models/artifact/blast.md2
@@ -691,9 +689,9 @@ libexec/vavoom/vavoom-dedicated
 %%MODELS%%%%DATADIR%%/basev/hexen/models/weapons/g_sword3.md2
 %%MODELS%%%%DATADIR%%/basev/hexen/models/weapons/v_mace.md2
 %%MODELS%%%%DATADIR%%/basev/hexen/models/weapons/v_mace.png
-%%DATADIR%%/basev/hexen/wad0.wad
+%%DATADIR%%/basev/hexen/basepak.pk3
 %%DATADIR%%/basev/plutonia/base.txt
-%%DATADIR%%/basev/plutonia/wad0.wad
+%%DATADIR%%/basev/plutonia/basepak.pk3
 %%MODELS%%%%DATADIR%%/basev/strife/models/items/medkit.md2
 %%MODELS%%%%DATADIR%%/basev/strife/models/items/medkit.tga
 %%MODELS%%%%DATADIR%%/basev/strife/models/items/stimpack.md2
@@ -702,9 +700,9 @@ libexec/vavoom/vavoom-dedicated
 %%MODELS%%%%DATADIR%%/basev/strife/models/items/surgkit.tga
 %%MODELS%%%%DATADIR%%/basev/strife/models/items/surgkit2.md2
 %%MODELS%%%%DATADIR%%/basev/strife/models/readme.txt
-%%DATADIR%%/basev/strife/wad0.wad
+%%DATADIR%%/basev/strife/basepak.pk3
 %%DATADIR%%/basev/tnt/base.txt
-%%DATADIR%%/basev/tnt/wad0.wad
+%%DATADIR%%/basev/tnt/basepak.pk3
 %%DEVEL%%%%DATADIR%%/editing/acs/strfhelp.acs
 %%DEVEL%%%%DATADIR%%/editing/acs/stspec.acs
 %%DEVEL%%%%DATADIR%%/editing/acs/vcommon.acs