5 files changed, 26 insertions, 13 deletions

diff --git a/games/vavoom/Makefile b/games/vavoom/Makefile
index 5a38143f4531..26ef42b61c1a 100644
--- a/games/vavoom/Makefile
+++ b/games/vavoom/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	vavoom
-PORTVERSION=	1.24
-PORTREVISION=	1
+PORTVERSION=	1.25
 CATEGORIES=	games
 MASTER_SITES=	SF
 
@@ -26,6 +25,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 OPTIONS=	ALLEGRO "Use Allegro for hardware API" off \
 		EDITING "Install Doom and Vavoom editing tools" off \
 		FLAC "Enable FLAC support" off \
+		LAUNCHER "Build GUI launcher" on \
 		LIBMAD "Enable MP3 support" off \
 		MIKMOD "Enable MikMod support" off \
 		OPENAL "Enable OpenAL support" off \
@@ -72,6 +72,16 @@ CONFIGURE_ARGS+=--with-flac
 CONFIGURE_ARGS+=--without-flac
 .endif
 
+.if defined(WITH_LAUNCHER)
+USE_WX=		2.4+
+WX_CONF_ARGS=	absolute
+CONFIGURE_ARGS+=--enable-launcher
+PLIST_SUB+=	LAUNCHER=""
+.else
+CONFIGURE_ARGS+=--disable-launcher
+PLIST_SUB+=	LAUNCHER="@comment "
+.endif
+
 .if defined(WITH_LIBMAD)
 LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
 CONFIGURE_ARGS+=--with-libmad
diff --git a/games/vavoom/distinfo b/games/vavoom/distinfo
index c541ac7b1840..f451e213a261 100644
--- a/games/vavoom/distinfo
+++ b/games/vavoom/distinfo
@@ -1,3 +1,3 @@
-MD5 (vavoom-1.24.tar.bz2) = 449cc9cef561b05b7214a5bdf80a0b87
-SHA256 (vavoom-1.24.tar.bz2) = 26d9f036f8429924d71dc16d805e9272b3c44cccc2067e82cb632170a21dd80b
-SIZE (vavoom-1.24.tar.bz2) = 1683706
+MD5 (vavoom-1.25.tar.bz2) = be616e527770055c7de802445f203243
+SHA256 (vavoom-1.25.tar.bz2) = bba1ac08ff82ca77da684af049ac68fa16dbb099755e41372b82ec6817b140ba
+SIZE (vavoom-1.25.tar.bz2) = 1731228
diff --git a/games/vavoom/files/patch-source__Makefile.in b/games/vavoom/files/patch-source__Makefile.in
index 8550629a996f..44019e1b49ff 100644
--- a/games/vavoom/files/patch-source__Makefile.in
+++ b/games/vavoom/files/patch-source__Makefile.in
@@ -1,11 +1,11 @@
---- ./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 @@
+--- source/Makefile.in.orig	Thu Oct  4 15:27:31 2007
++++ source/Makefile.in	Mon Nov 19 04:25:26 2007
+@@ -937,14 +937,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)/vavoom" || $(mkdir_p) "$(DESTDIR)$(libexecdir)/vavoom"
+-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
++	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 \
@@ -18,12 +18,12 @@
  	  else :; fi; \
  	done
  
-@@ -4038,7 +4038,7 @@
+@@ -5162,7 +5162,7 @@
  
- install-data-am: install-dist_baseDATA
+ install-dvi: install-dvi-recursive
  
 -install-exec-am: install-binPROGRAMS install-binSCRIPTS
 +install-exec-am: install-binPROGRAMS
  
- install-info: install-info-recursive
+ install-html: install-html-recursive
  
diff --git a/games/vavoom/files/pkg-message.in b/games/vavoom/files/pkg-message.in
index 893c71793856..3533cf4b800d 100644
--- a/games/vavoom/files/pkg-message.in
+++ b/games/vavoom/files/pkg-message.in
@@ -18,4 +18,6 @@ If you want to install enhaced textures, models or soundtracks use the
 "games/vavoom-extras" port. Note that textures require OPENGL and soundtracks
 need VORBIS (build options).
 
+If you enabled LAUNCHER (build option), run "vlaunch" for a launcher GUI.
+
 ==============================================================================
diff --git a/games/vavoom/pkg-plist b/games/vavoom/pkg-plist
index aab999631a1f..12b97acd7d55 100644
--- a/games/vavoom/pkg-plist
+++ b/games/vavoom/pkg-plist
@@ -1,4 +1,5 @@
 bin/vavoom
+%%LAUNCHER%%bin/vlaunch
 %%EDITING%%libexec/vavoom/acc
 %%EDITING%%libexec/vavoom/fixmd2
 %%EDITING%%libexec/vavoom/glvis