6 files changed, 49 insertions, 62 deletions

diff --git a/games/vavoom/Makefile b/games/vavoom/Makefile
index af5505e62384..02bbfa24e34a 100644
--- a/games/vavoom/Makefile
+++ b/games/vavoom/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vavoom
-PORTVERSION=	1.19.1
+PORTVERSION=	1.20
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -39,9 +39,10 @@ CFLAGS+=	-O3 -ffast-math -fomit-frame-pointer
 SUB_FILES=	pkg-message vavoom
 SUB_LIST=	"PREFIX=${PREFIX}" "PORTSDIR=${PORTSDIR}"
 
-.include "${.CURDIR}/../doom-data/Makefile.include"
-
 .include <bsd.port.pre.mk>
+.include "${PORTSDIR}/games/doom-data/Makefile.include"
+
+CONFIGURE_ARGS+=	--with-sdl-config=${SDL_CONFIG}
 
 OPENAL_CONFIG?=	${LOCALBASE}/bin/openal-config
 .if exists(${OPENAL_CONFIG})
@@ -120,7 +121,6 @@ pre-everything::
 	@${ECHO_CMD} ""
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|ALubyte|ALchar|' ${WRKSRC}/source/s_al.cpp
 	@${REINPLACE_CMD} -i '' -e 's|SDL\/||g' ${WRKSRC}/source/*.cpp
 	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
 		${WRKSRC}/utils/acc/parse.c ${WRKSRC}/utils/acc/strlist.c
@@ -138,23 +138,25 @@ do-install:
 
 	@${MKDIR} ${DATADIR}
 	@${MKDIR} ${DATADIR}/basev
-	${INSTALL_DATA} ${WRKSRC}/basev/default.cfg ${DATADIR}/basev
-	${INSTALL_DATA} ${WRKSRC}/basev/startup.vs ${DATADIR}/basev
 	${INSTALL_DATA} ${WRKSRC}/basev/games.txt ${DATADIR}/basev
+	@${MKDIR} ${DATADIR}/basev/common
+	${INSTALL_DATA} ${WRKSRC}/basev/common/default.cfg \
+			${WRKSRC}/basev/common/startup.vs \
+			${WRKSRC}/basev/common/wad0.wad ${DATADIR}/basev/common
 .for i in doom heretic hexen strife
 	@${MKDIR} ${DATADIR}/basev/${i}
 	${INSTALL_DATA} ${WRKSRC}/basev/${i}/wad0.wad ${DATADIR}/basev/${i}
 .endfor
 .for i in doom1 doom2 tnt plutonia
 	@${MKDIR} ${DATADIR}/basev/${i}
-	${INSTALL_DATA} ${WRKSRC}/basev/${i}/wad0.wad ${DATADIR}/basev/${i}
-	${INSTALL_DATA} ${WRKSRC}/basev/${i}/base.txt ${DATADIR}/basev/${i}
+	${INSTALL_DATA} ${WRKSRC}/basev/${i}/wad0.wad \
+			${WRKSRC}/basev/${i}/base.txt ${DATADIR}/basev/${i}
 .endfor
 
 .ifndef (NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/vavmref.txt ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/vavoom.txt ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/vavmref.txt \
+			${WRKSRC}/docs/vavoom.txt ${DOCSDIR}
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/games/vavoom/distinfo b/games/vavoom/distinfo
index c7561676c7fc..0a6bde432a79 100644
--- a/games/vavoom/distinfo
+++ b/games/vavoom/distinfo
@@ -1,3 +1,3 @@
-MD5 (vavoom-1.19.1.tar.bz2) = 190e1bec89b35ff956076b9eeedca6db
-SHA256 (vavoom-1.19.1.tar.bz2) = a13f2a195c80add54cbda1a50ff6d73f02157d427daf94d6050bfe4d4ef64696
-SIZE (vavoom-1.19.1.tar.bz2) = 1897147
+MD5 (vavoom-1.20.tar.bz2) = 6a08199b5b7bb8a2070e3f81be79a0ce
+SHA256 (vavoom-1.20.tar.bz2) = 495ac5446670ae963c0e8f624dc7978975fc5040a33e9667cf91e147f431b0fd
+SIZE (vavoom-1.20.tar.bz2) = 1883529
diff --git a/games/vavoom/files/patch-configure.ac b/games/vavoom/files/patch-configure.ac
index 409fe22afdf3..8fc353119d22 100644
--- a/games/vavoom/files/patch-configure.ac
+++ b/games/vavoom/files/patch-configure.ac
@@ -1,50 +1,45 @@
 --- configure.ac.orig
 +++ configure.ac
-@@ -77,13 +77,13 @@
- 	MAIN_EXE='Vavoom$(EXEEXT)'
+@@ -83,7 +83,7 @@
  
  	if test "x$with_allegro" = "xyes"; 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
+ 		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
--		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
-@@ -100,19 +100,19 @@
- 	if test "x$allegro_config" != "x"; 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 -lm -lstdc++"
-+		MAIN_LIBS="`${allegro_config} --libs` -lpng -lz -lm -lstdc++ -liconv"
+-		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 -lm -lstdc++"
-+		MAIN_LIBS="-lSDL_mixer `${sdl_config} --libs` -lpng -lz -lm -lstdc++ -liconv"
+-		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})"
- 
- 	AC_CHECK_HEADER([linux/cdrom.h], [
- 		OBJ_FILES="$OBJ_FILES \$(CDAUDIO_OBJ_LINUX)"
--	], [AC_CHECK_HEADER([sys/cdrom.h], [
-+	], [AC_CHECK_HEADER([sys/cdio.h], [
- 		OBJ_FILES="$OBJ_FILES \$(CDAUDIO_OBJ_BSD)"
- 	])])
- 
-@@ -166,7 +166,7 @@
- 
- AC_ARG_WITH([mikmod], AS_HELP_STRING([--with-mikmod], [Enable MikMod support]))
+@@ -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
--	AC_PATH_PROG([LIBMIKMOD_CONFIG], [libmikmod-config])
-+	AC_PATH_PROG([LIBMIKMOD_CONFIG], [libmikmod-config], [%%MIKMOD_CONFIG%%])
- 	if test "x$LIBMIKMOD_CONFIG" != "x"; then
- 		OBJ_FILES="$OBJ_FILES \$(MIKMOD_OBJS)"
- 		MAIN_CFLAGS="$MAIN_CFLAGS `$LIBMIKMOD_CONFIG --cflags`"
+ 	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_sys__sdl.cpp b/games/vavoom/files/patch-source_sys__sdl.cpp
deleted file mode 100644
index cb5803e03158..000000000000
--- a/games/vavoom/files/patch-source_sys__sdl.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- source/sys_sdl.cpp.orig	Mon Dec 12 14:39:33 2005
-+++ source/sys_sdl.cpp	Mon Dec 12 14:39:52 2005
-@@ -380,7 +380,7 @@
- 			char *out = buf;
- 			size_t inbytes = 1;
- 			size_t outbytes = 8;
--			iconv(cd, &in, &inbytes, &out, &outbytes);
-+			iconv(cd, (const char**)&in, &inbytes, &out, &outbytes);
- 			fwrite(buf, 1, out - buf, stdout);
- 		}
- 
diff --git a/games/vavoom/files/vavoom.in b/games/vavoom/files/vavoom.in
index bf22d688eb9d..8c36986babc6 100644
--- a/games/vavoom/files/vavoom.in
+++ b/games/vavoom/files/vavoom.in
@@ -1,10 +1,9 @@
 #!/bin/sh
 
+EXE="Vavoom"
 if test $# = 1 && test $1 = "-s"; then
 	EXE="VavoomSV"
 	shift
-else
-	EXE="Vavoom"
 fi
 
 cd ~/.vavoom && %%PREFIX%%/bin/${EXE} $*
diff --git a/games/vavoom/pkg-plist b/games/vavoom/pkg-plist
index 9d8a91703050..6c8412624743 100644
--- a/games/vavoom/pkg-plist
+++ b/games/vavoom/pkg-plist
@@ -1,6 +1,10 @@
 bin/vavoom
 bin/Vavoom
 bin/VavoomSV
+%%DATADIR%%/basev/common/default.cfg
+%%DATADIR%%/basev/common/startup.vs
+%%DATADIR%%/basev/common/wad0.wad
+@dirrm %%DATADIR%%/basev/common
 %%DATADIR%%/basev/doom/wad0.wad
 @dirrm %%DATADIR%%/basev/doom
 %%DATADIR%%/basev/doom1/base.txt
@@ -21,9 +25,7 @@ bin/VavoomSV
 %%DATADIR%%/basev/tnt/base.txt
 %%DATADIR%%/basev/tnt/wad0.wad
 @dirrm %%DATADIR%%/basev/tnt
-%%DATADIR%%/basev/default.cfg
 %%DATADIR%%/basev/games.txt
-%%DATADIR%%/basev/startup.vs
 @dirrm %%DATADIR%%/basev
 @dirrm %%DATADIR%%
 %%PORTDOCS%%%%DOCSDIR%%/vavmref.txt