- Add DEVEL (development tools) and MODELS (3D models for

Doom/Doom2/Heretic/Hexen/Strife) options.

games/vavoom/Makefile

@@ -9,6 +9,8 @@ PORTNAME=	vavoom
 PORTVERSION=	1.21.2
 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,9 +25,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 OPTIONS=	ALLEGRO "Use Allegro for hardware API" off \
+		DEVEL "Install development tools (Doom/Vavoom)" 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 \
@@ -58,6 +62,12 @@ CONFIGURE_ARGS+=--with-allegro
 CONFIGURE_ARGS+=--without-allegro
 .endif
 
+.if defined(WITH_DEVEL)
+PLIST_SUB+=	DEVEL=""
+.else
+PLIST_SUB+=	DEVEL="@comment "
+.endif
+
 .if defined(WITH_FLAC)
 LIB_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac
 CONFIGURE_ARGS+=--with-flac
@@ -79,6 +89,16 @@ 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
@@ -111,6 +131,13 @@ CONFIGURE_ARGS+=--with-sdl --with-sdl-config=${SDL_CONFIG}
 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||' \
@@ -119,6 +146,15 @@ post-patch:
 
 post-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
+.if defined(WITH_DEVEL)
+	${INSTALL_PROGRAM} ${WRKSRC}/utils/bin/* ${PREFIX}/libexec/${PORTNAME}
+	${CP} -r ${WRKSRC}/utils/editing ${WRKSRC}/progs ${DATADIR}
+	@${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(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/vavoom.txt ${DOCSDIR}

games/vavoom/distinfo

@@ -1,3 +1,15 @@
 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 (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

games/vavoom/files/patch-source__Makefile.in

@@ -5,7 +5,7 @@
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
 -	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-+	test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
++	test -z "$(libexecdir)/vavoom" || $(mkdir_p) "$(DESTDIR)$(libexecdir)/vavoom"
  	@list='$(bin_PROGRAMS)'; for p in $$list; do \
  	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
  	  if test -f $$p \
@@ -13,8 +13,8 @@
  	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
 -	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
 -	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/vavoom/$$f'"; \
++	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/vavoom/$$f" || exit 1; \
  	  else :; fi; \
  	done
  

games/vavoom/files/pkg-message.in

@@ -5,8 +5,8 @@ Vavoom has been installed.
 The wrapper script is named "vavoom" and accepts a "-s" argument to run the
 dedicated server instead of the client. It creates/enters ~/.vavoom (if it
 does not exist creates symlinks) and runs the programs from there, looking for
-additional IWAD files in %%DMDIR%%.
+additional IWAD files in "%%DMDIR%%".
 
-The real executables are in "%%PREFIX%%/libexec".
+The real executables (and utils) are in "%%PREFIX%%/libexec/vavoom".
 
 ==============================================================================

games/vavoom/files/vavoom.in

@@ -17,9 +17,9 @@ then
 else
 	echo "Creating ~/.vavoom directory."
 	cd %%DATADIR%% || exit 1
-	find . -type d -exec mkdir -p ~/.vavoom/{} \;
-	find . -type f -exec ln -sf %%DATADIR%%/{} ~/.vavoom/{} \;
+	find . -type d -exec mkdir -p ~/.vavoom/basev/{} \;
+	find . -type f -exec ln -sf %%DATADIR%%/basev/{} ~/.vavoom/basev/{} \;
 fi
 
 cd ~/.vavoom || exit 1
-exec %%PREFIX%%/libexec/${CMD} -iwaddir %%DMDIR%% "$@"
+exec %%PREFIX%%/libexec/vavoom/${CMD} -iwaddir %%DMDIR%% "$@"