- Update to version 1.23.1.

- Rename DEVEL option to EDITING.
- Move MODELS option to separate port "games/vavoom-extras".
- Add note in pkg-message.in about "games/vavoom-extras".
- Reformat and update pkg-descr.

games/vavoom/Makefile

@@ -6,12 +6,9 @@
 #
 
 PORTNAME=	vavoom
-PORTVERSION=	1.23
-PORTREVISION=	1
+PORTVERSION=	1.23.1
 CATEGORIES=	games
 MASTER_SITES=	SF
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Doom, Doom II, Heretic, Hexen and Strife source port
@@ -23,15 +20,13 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
 OPTIONS=	ALLEGRO "Use Allegro for hardware API" off \
-		DEVEL "Install development tools (Doom/Vavoom)" off \
+		EDITING "Install Doom and Vavoom editing tools" off \
 		FLAC "Enable FLAC support" off \
 		LIBMAD "Enable MP3 support" off \
 		MIKMOD "Enable MikMod support" off \
-		MODELS "Install 3D models for supported games" off \
 		OPENAL "Enable OpenAL support" off \
 		OPENGL "Enable OpenGL support" on \
 		OPTIMIZED_CFLAGS "Enable compilation optimizations" off \
@@ -41,7 +36,6 @@ OPTIONS=	ALLEGRO "Use Allegro for hardware API" off \
 SUB_FILES=	${PORTNAME} pkg-message
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/games/doom-data/Makefile.include"
 
 # The `-fno-strict-aliasing' flag (default on FreeBSD 6.0+) produces
 # non-working code for `vcc', so we remove it here if present.
@@ -64,10 +58,10 @@ CONFIGURE_ARGS+=--with-allegro
 CONFIGURE_ARGS+=--without-allegro
 .endif
 
-.if defined(WITH_DEVEL)
-PLIST_SUB+=	DEVEL=""
+.if defined(WITH_EDITING)
+PLIST_SUB+=	EDITING=""
 .else
-PLIST_SUB+=	DEVEL="@comment "
+PLIST_SUB+=	EDITING="@comment "
 .endif
 
 .if defined(WITH_FLAC)
@@ -91,16 +85,6 @@ CONFIGURE_ARGS+=--with-mikmod
 CONFIGURE_ARGS+=--without-mikmod
 .endif
 
-.if defined(WITH_MODELS)
-EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-.for f in doom heretic hexen strife
-DISTFILES+=	vmdl_${f}_13.zip
-.endfor
-PLIST_SUB+=	MODELS=""
-.else
-PLIST_SUB+=	MODELS="@comment "
-.endif
-
 .if defined(WITH_OPENAL)
 LIB_DEPENDS+=	openal.0:${PORTSDIR}/audio/openal
 CONFIGURE_ARGS+=--with-openal
@@ -128,39 +112,30 @@ CONFIGURE_ARGS+=--without-vorbis
 
 .if defined(WITH_SDL)
 USE_SDL=	mixer sdl
-CONFIGURE_ARGS+=--with-sdl --with-sdl-config=${SDL_CONFIG}
+CONFIGURE_ARGS+=--with-sdl
 .else
 CONFIGURE_ARGS+=--without-sdl
 .endif
 
-.if defined(WITH_MODELS)
-post-extract:
-.for f in doom heretic hexen strife
-	@${UNZIP_CMD} -aqo ${DISTDIR}/vmdl_${f}_13.zip -d ${WRKDIR}
-.endfor
-.endif
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|SDL/||g' ${WRKSRC}/source/s_sdl.cpp
 	@${REINPLACE_CMD} -e 's|\.$$host_cpu||' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@cd ${WRKSRC} && ${SH} fixunix.sh
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
-.if defined(WITH_DEVEL)
+.if defined(WITH_EDITING)
 	${INSTALL_PROGRAM} ${WRKSRC}/utils/bin/* ${PREFIX}/libexec/${PORTNAME}
-	${CP} -r ${WRKSRC}/utils/editing ${WRKSRC}/progs ${DATADIR}
+. for f in utils/editing progs
+	${CP} -r ${WRKSRC}/${f} ${DATADIR}
+	@${FIND} ${DATADIR}/${f:T} -type d -print0 | \
+		${XARGS} -0 ${CHMOD} ${BINMODE}
+	@${FIND} ${DATADIR}/${f:T} -type f -print0 | \
+		${XARGS} -0 ${CHMOD} ${SHAREMODE}
+. endfor
 	@${FIND} ${DATADIR}/progs -type f -name "Makefile*" -print0 | \
 		${XARGS} -0 ${REINPLACE_CMD} -i '' -Ee 's|^(VCC =).*|\1 vcc|'
 .endif
-.if defined(WITH_MODELS)
-	${CP} -r ${WRKDIR}/basev ${DATADIR}
-.endif
-.if defined(WITH_DEVEL) || defined(WITH_MODELS)
-	@${FIND} ${DATADIR} -type d -print0 | ${XARGS} -0 ${CHMOD} ${BINMODE}
-	@${FIND} ${DATADIR} -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE}
-.endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/vavoom.txt ${DOCSDIR}
@@ -169,4 +144,6 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_CMD}
 
+.include "${PORTSDIR}/games/doom-data/Makefile.include"
+
 .include <bsd.port.post.mk>

games/vavoom/distinfo

@@ -1,15 +1,3 @@
-MD5 (vavoom-1.23.tar.bz2) = f27b5bd75939f7f139d521b48bb0a1d4
-SHA256 (vavoom-1.23.tar.bz2) = 9a0e0e1b69af2bb4c35ac7bff440d0072f3fe6f6b936964fa2424abfb0d0c3ae
-SIZE (vavoom-1.23.tar.bz2) = 1685478
-MD5 (vmdl_doom_13.zip) = 19df0e08b48e78f45cda1db4b66f04f9
-SHA256 (vmdl_doom_13.zip) = ff1cbe04bf9097bb8311990f3ae9dcf64abfc1211fff1970cc5f2a452e7781c2
-SIZE (vmdl_doom_13.zip) = 10749692
-MD5 (vmdl_heretic_13.zip) = 91b4054ee4decedbda3f8af97afb2237
-SHA256 (vmdl_heretic_13.zip) = 7e3f8b506bad894f5177c138624d8c3d49e80c03570936f11ce2a786377e260b
-SIZE (vmdl_heretic_13.zip) = 2474954
-MD5 (vmdl_hexen_13.zip) = 3ec78cc6c7451f2b1a515049a529c582
-SHA256 (vmdl_hexen_13.zip) = b8409570334e5ef15a2e01f19b1b30493d5b0c08f97605610ca5947d33d6a4af
-SIZE (vmdl_hexen_13.zip) = 1705590
-MD5 (vmdl_strife_13.zip) = 2c29582c62940d4f17ba676d80bb5e3f
-SHA256 (vmdl_strife_13.zip) = c936559f6ca0b94a2f4b1d30c893387dfbf849abe4ce3d324beb1e308e7516f7
-SIZE (vmdl_strife_13.zip) = 91790
+MD5 (vavoom-1.23.1.tar.bz2) = 59df0ce8b84711b9c569014e349cb0d6
+SHA256 (vavoom-1.23.1.tar.bz2) = 85d95ff9fda0dc0c2e4a106cefaf849f2409a1e57c04c3a9a046fedc25c5f390
+SIZE (vavoom-1.23.1.tar.bz2) = 1694668

games/vavoom/files/pkg-message.in

@@ -9,4 +9,9 @@ additional IWAD files in "%%DMDIR%%".
 
 The real executables (and utils) are in "%%PREFIX%%/libexec/vavoom".
 
+To run in OpenGL mode add the "-opengl" parameter.
+
+If you want to install additional textures, models, editing tools or
+soundtracks (needs VORBIS option) use the "games/vavoom-extras" port.
+
 ==============================================================================

games/vavoom/pkg-descr

@@ -1,8 +1,9 @@
-Vavoom is a source port based on sources of Doom, Heretic, Hexen
-and a little bit from Quake. To play Vavoom you need main wad file
-from Doom, Ultimate Doom, Doom II, Heretic, Hexen or Strife.
+Vavoom is a source port based on sources of Doom, Heretic, Hexen and a little
+bit from Quake. To play Vavoom you need main wad file from Doom, Ultimate
+Doom, Doom II, Heretic, Hexen or Strife.
 
 Differences from original game:
+
 * Polygonal engine with colored lighting, with software mode, OpenGL support;
 * Translucency;
 * Complete support for freelook (look up & down) in all games;
@@ -12,9 +13,6 @@ Differences from original game:
 * Indirect support for DeHackEd;
 * Crosshair;
 * Jumping;
-....
+* And many other cool things...
 
 WWW:	http://www.vavoom-engine.com/
-
-- Igor Pokrovsky
-tiamat@comset.net