4 files changed, 61 insertions, 68 deletions

diff --git a/games/vavoom/files/patch-configure.ac b/games/vavoom/files/patch-configure.ac
deleted file mode 100644
index 8fc353119d22..000000000000
--- a/games/vavoom/files/patch-configure.ac
+++ /dev/null
@@ -1,45 +0,0 @@
---- configure.ac.orig
-+++ configure.ac
-@@ -83,7 +83,7 @@
- 
- 	if test "x$with_allegro" = "xyes"; then
- 		if test "x$with_allegro_config" = "x"; then
--			AC_PATH_PROG([allegro_config], [allegro-config])
-+			AC_PATH_PROG([allegro_config], [allegro-config], [%%ALLEGRO_CONFIG%%])
- 			if test "x$allegro_config" = "x"; then
- 				AC_MSG_ERROR(['cannot find Allegro instalation'])
- 			fi
-@@ -93,7 +93,7 @@
- 	else
- 	if test "x$with_sdl" = "xyes"; then
- 		if test "x$with_sdl_config" = "x"; then
--			AC_PATH_PROG([sdl_config], [sdl-config])
-+			AC_PATH_PROG([sdl_config], [sdl-config], [%%SDL_CONFIG%%])
- 			if test "x$sdl_config" = "x"; then
- 				AC_MSG_ERROR(['cannot find SDL instalation'])
- 			fi
-@@ -122,13 +122,13 @@
- 		AC_MSG_NOTICE([Using Allegro])
- 		MAIN_PLATFORM='UNIX_ALLEGRO'
- 		MAIN_CFLAGS="`${allegro_config} --cflags`"
--		MAIN_LIBS="`${allegro_config} --libs` -lpng -lz -lstdc++"
-+		MAIN_LIBS="`${allegro_config} --libs` -lpng -lz -lstdc++ -liconv"
- 	else
- 	if test "x$sdl_config" != "x"; then
- 		AC_MSG_NOTICE([Using SDL])
- 		MAIN_PLATFORM='UNIX_SDL'
- 		MAIN_CFLAGS="`${sdl_config} --cflags`"
--		MAIN_LIBS="-lSDL_mixer `${sdl_config} --libs` -lpng -lz -lstdc++"
-+		MAIN_LIBS="-lSDL_mixer `${sdl_config} --libs` -lpng -lz -lstdc++ -liconv"
- 	fi
- 	fi
- 	OBJ_FILES="$OBJ_FILES \$(SYS_OBJS_${MAIN_PLATFORM})"
-@@ -246,7 +246,7 @@
- AC_ARG_WITH([mikmod-config], AS_HELP_STRING([--with-mikmod-config], [Set MikMod config script]))
- if test "x$with_mikmod" != "xno"; then
- 	if test "x$with_mikmod_config" = "x"; then
--		AC_PATH_PROG([LIBMIKMOD_CONFIG], [libmikmod-config])
-+		AC_PATH_PROG([LIBMIKMOD_CONFIG], [libmikmod-config], [%%MIKMOD_CONFIG%%])
- 	else
- 		mikmod_config=$with_mikmod_config
- 	fi
diff --git a/games/vavoom/files/patch-source__Makefile.in b/games/vavoom/files/patch-source__Makefile.in
new file mode 100644
index 000000000000..38750a30b8cf
--- /dev/null
+++ b/games/vavoom/files/patch-source__Makefile.in
@@ -0,0 +1,29 @@
+--- ./source/Makefile.in.orig	Sun Aug 13 05:01:36 2006
++++ ./source/Makefile.in	Fri Sep  8 22:22:35 2006
+@@ -847,14 +847,14 @@
+ 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++	test -z "$(libexecdir)" || $(mkdir_p) "$(DESTDIR)$(libexecdir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+ 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ 	  if test -f $$p \
+ 	  ; then \
+ 	    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; \
+ 	  else :; fi; \
+ 	done
+ 
+@@ -4038,7 +4038,7 @@
+ 
+ install-data-am: install-dist_baseDATA
+ 
+-install-exec-am: install-binPROGRAMS install-binSCRIPTS
++install-exec-am: install-binPROGRAMS
+ 
+ install-info: install-info-recursive
+ 
diff --git a/games/vavoom/files/pkg-message.in b/games/vavoom/files/pkg-message.in
index 22bd23977763..9f635b38390e 100644
--- a/games/vavoom/files/pkg-message.in
+++ b/games/vavoom/files/pkg-message.in
@@ -1,19 +1,12 @@
-*****************************************************************************
-* In order to run Vavoom you will need original IWAD file from either:
-* 	Doom, Doom II, TNT, Plutonia, Heretic, Hexen or Strife.
-* You should install any of them using games/doom-data meta port.
-*
-* Vavoom needs to be run from a directory containing its data files and
-* IWAD files taken from original games. So before starting to play Vavoom
-* you should create required symlinks in users home directory.
-* This process is automated by 'installuser' target in vavoom port makefile.
-* You can run something like this after installing the port:
-*	cd %%PORTSDIR%%/games/vavoom && make installuser
-* This should be done only once on per user basis.
-*
-* Once done you are ready to play Vavoom. Run it as
-*	%%PREFIX%%/bin/vavoom ...
-* or as
-*	%%PREFIX%%/bin/vavoom -s ...
-* to start its dedicated server.
-*****************************************************************************
+==============================================================================
+
+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%%.
+
+The real executables are in "%%PREFIX%%/libexec".
+
+==============================================================================
diff --git a/games/vavoom/files/vavoom.in b/games/vavoom/files/vavoom.in
index 8c36986babc6..7b05faeb420c 100644
--- a/games/vavoom/files/vavoom.in
+++ b/games/vavoom/files/vavoom.in
@@ -1,9 +1,25 @@
 #!/bin/sh
 
-EXE="Vavoom"
-if test $# = 1 && test $1 = "-s"; then
-	EXE="VavoomSV"
+# The executable needs to run from its data directory, so we mirror it to
+# ~/.vavoom (with symlinks) and run it from there.
+
+if [ "$1" = "-s" ]
+then
+	CMD="vavoom-dedicated"
 	shift
+else
+	CMD="vavoom"
+fi
+
+if [ -d ~/.vavoom ]
+then
+	echo "Using existing ~/.vavoom directory."
+else
+	echo "Creating ~/.vavoom directory."
+	cd %%DATADIR%% || exit 1
+	find . -type d -exec mkdir -p ~/.vavoom/{} \;
+	find . -type f -exec ln -sf %%DATADIR%%/{} ~/.vavoom/{} \;
 fi
 
-cd ~/.vavoom && %%PREFIX%%/bin/${EXE} $*
+cd ~/.vavoom || exit 1
+exec %%PREFIX%%/libexec/${CMD} -iwaddir %%DMDIR%% "$@"