Attachment #66485 for bug #98235

View | Details | Raw Unified | Return to bug 98235
Collapse All | Expand All

Lines 6-12 Link Here

(-)vavoom/Makefile (-10 / +12 lines)
6	#	6	#
7		7
8	PORTNAME= vavoom	8	PORTNAME= vavoom
9	PORTVERSION= 1.19.1	9	PORTVERSION= 1.20
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 39-47 Link Here
39	SUB_FILES= pkg-message vavoom	39	SUB_FILES= pkg-message vavoom
40	SUB_LIST= "PREFIX=${PREFIX}" "PORTSDIR=${PORTSDIR}"	40	SUB_LIST= "PREFIX=${PREFIX}" "PORTSDIR=${PORTSDIR}"
41		41
42	.include "${.CURDIR}/../doom-data/Makefile.include"
43
44	.include <bsd.port.pre.mk>	42	.include <bsd.port.pre.mk>
		43	.include "${PORTSDIR}/games/doom-data/Makefile.include"
		44
		45	CONFIGURE_ARGS+= --with-sdl-config=${SDL_CONFIG}
45		46
46	OPENAL_CONFIG?= ${LOCALBASE}/bin/openal-config	47	OPENAL_CONFIG?= ${LOCALBASE}/bin/openal-config
47	.if exists(${OPENAL_CONFIG})	48	.if exists(${OPENAL_CONFIG})
Lines 120-126 Link Here
120	@${ECHO_CMD} ""	121	@${ECHO_CMD} ""
121		122
122	post-patch:	123	post-patch:
123	@${REINPLACE_CMD} -e 's\|ALubyte\|ALchar\|' ${WRKSRC}/source/s_al.cpp
124	@${REINPLACE_CMD} -i '' -e 's\|SDL\/\|\|g' ${WRKSRC}/source/*.cpp	124	@${REINPLACE_CMD} -i '' -e 's\|SDL\/\|\|g' ${WRKSRC}/source/*.cpp
125	@${REINPLACE_CMD} -e 's\|<malloc.h>\|<stdlib.h>\|' \	125	@${REINPLACE_CMD} -e 's\|<malloc.h>\|<stdlib.h>\|' \
126	${WRKSRC}/utils/acc/parse.c ${WRKSRC}/utils/acc/strlist.c	126	${WRKSRC}/utils/acc/parse.c ${WRKSRC}/utils/acc/strlist.c
Lines 138-160 Link Here
138		138
139	@${MKDIR} ${DATADIR}	139	@${MKDIR} ${DATADIR}
140	@${MKDIR} ${DATADIR}/basev	140	@${MKDIR} ${DATADIR}/basev
141	${INSTALL_DATA} ${WRKSRC}/basev/default.cfg ${DATADIR}/basev
142	${INSTALL_DATA} ${WRKSRC}/basev/startup.vs ${DATADIR}/basev
143	${INSTALL_DATA} ${WRKSRC}/basev/games.txt ${DATADIR}/basev	141	${INSTALL_DATA} ${WRKSRC}/basev/games.txt ${DATADIR}/basev
		142	@${MKDIR} ${DATADIR}/basev/common
		143	${INSTALL_DATA} ${WRKSRC}/basev/common/default.cfg \
		144	${WRKSRC}/basev/common/startup.vs \
		145	${WRKSRC}/basev/common/wad0.wad ${DATADIR}/basev/common
144	.for i in doom heretic hexen strife	146	.for i in doom heretic hexen strife
145	@${MKDIR} ${DATADIR}/basev/${i}	147	@${MKDIR} ${DATADIR}/basev/${i}
146	${INSTALL_DATA} ${WRKSRC}/basev/${i}/wad0.wad ${DATADIR}/basev/${i}	148	${INSTALL_DATA} ${WRKSRC}/basev/${i}/wad0.wad ${DATADIR}/basev/${i}
147	.endfor	149	.endfor
148	.for i in doom1 doom2 tnt plutonia	150	.for i in doom1 doom2 tnt plutonia
149	@${MKDIR} ${DATADIR}/basev/${i}	151	@${MKDIR} ${DATADIR}/basev/${i}
150	${INSTALL_DATA} ${WRKSRC}/basev/${i}/wad0.wad ${DATADIR}/basev/${i}	152	${INSTALL_DATA} ${WRKSRC}/basev/${i}/wad0.wad \
151	${INSTALL_DATA} ${WRKSRC}/basev/${i}/base.txt ${DATADIR}/basev/${i}	153	${WRKSRC}/basev/${i}/base.txt ${DATADIR}/basev/${i}
152	.endfor	154	.endfor
153		155
154	.ifndef (NOPORTDOCS)	156	.ifndef (NOPORTDOCS)
155	@${MKDIR} ${DOCSDIR}	157	@${MKDIR} ${DOCSDIR}
156	${INSTALL_DATA} ${WRKSRC}/docs/vavmref.txt ${DOCSDIR}	158	${INSTALL_DATA} ${WRKSRC}/docs/vavmref.txt \
157	${INSTALL_DATA} ${WRKSRC}/docs/vavoom.txt ${DOCSDIR}	159	${WRKSRC}/docs/vavoom.txt ${DOCSDIR}
158	.endif	160	.endif
159	@${CAT} ${PKGMESSAGE}	161	@${CAT} ${PKGMESSAGE}
160		162

Lines 1-3 Link Here

(-)vavoom/distinfo (-3 / +3 lines)
1	MD5 (vavoom-1.19.1.tar.bz2) = 190e1bec89b35ff956076b9eeedca6db	1	MD5 (vavoom-1.20.tar.bz2) = 6a08199b5b7bb8a2070e3f81be79a0ce
2	SHA256 (vavoom-1.19.1.tar.bz2) = a13f2a195c80add54cbda1a50ff6d73f02157d427daf94d6050bfe4d4ef64696	2	SHA256 (vavoom-1.20.tar.bz2) = 495ac5446670ae963c0e8f624dc7978975fc5040a33e9667cf91e147f431b0fd
3	SIZE (vavoom-1.19.1.tar.bz2) = 1897147	3	SIZE (vavoom-1.20.tar.bz2) = 1883529




--- configure.ac.orig
+++ configure.ac
@@ -83,7 +83,7 @@
 	MAIN_EXE='Vavoom$(EXEEXT)'
 
 	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]))
 		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]))
 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

Lines 1-11 Link Here

(-)vavoom/files/patch-source_sys__sdl.cpp (-11 lines)
1	--- source/sys_sdl.cpp.orig Mon Dec 12 14:39:33 2005
2	+++ source/sys_sdl.cpp Mon Dec 12 14:39:52 2005
3	@@ -380,7 +380,7 @@
4	char *out = buf;
5	size_t inbytes = 1;
6	size_t outbytes = 8;
7	- iconv(cd, &in, &inbytes, &out, &outbytes);
8	+ iconv(cd, (const char**)&in, &inbytes, &out, &outbytes);
9	fwrite(buf, 1, out - buf, stdout);
10	}
11

Lines 1-10 Link Here

(-)vavoom/files/vavoom.in (-2 / +1 lines)
1	#!/bin/sh	1	#!/bin/sh
2		2
		3	EXE="Vavoom"
3	if test $# = 1 && test $1 = "-s"; then	4	if test $# = 1 && test $1 = "-s"; then
4	EXE="VavoomSV"	5	EXE="VavoomSV"
5	shift	6	shift
6	else
7	EXE="Vavoom"
8	fi	7	fi
9		8
10	cd ~/.vavoom && %%PREFIX%%/bin/${EXE} $*	9	cd ~/.vavoom && %%PREFIX%%/bin/${EXE} $*

Lines 1-6 Link Here

(-)vavoom/pkg-plist (-2 / +4 lines)
1	bin/vavoom	1	bin/vavoom
2	bin/Vavoom	2	bin/Vavoom
3	bin/VavoomSV	3	bin/VavoomSV
		4	%%DATADIR%%/basev/common/default.cfg
		5	%%DATADIR%%/basev/common/startup.vs
		6	%%DATADIR%%/basev/common/wad0.wad
		7	@dirrm %%DATADIR%%/basev/common
4	%%DATADIR%%/basev/doom/wad0.wad	8	%%DATADIR%%/basev/doom/wad0.wad
5	@dirrm %%DATADIR%%/basev/doom	9	@dirrm %%DATADIR%%/basev/doom
6	%%DATADIR%%/basev/doom1/base.txt	10	%%DATADIR%%/basev/doom1/base.txt
Lines 21-29 Link Here
21	%%DATADIR%%/basev/tnt/base.txt	25	%%DATADIR%%/basev/tnt/base.txt
22	%%DATADIR%%/basev/tnt/wad0.wad	26	%%DATADIR%%/basev/tnt/wad0.wad
23	@dirrm %%DATADIR%%/basev/tnt	27	@dirrm %%DATADIR%%/basev/tnt
24	%%DATADIR%%/basev/default.cfg
25	%%DATADIR%%/basev/games.txt	28	%%DATADIR%%/basev/games.txt
26	%%DATADIR%%/basev/startup.vs
27	@dirrm %%DATADIR%%/basev	29	@dirrm %%DATADIR%%/basev
28	@dirrm %%DATADIR%%	30	@dirrm %%DATADIR%%
29	%%PORTDOCS%%%%DOCSDIR%%/vavmref.txt	31	%%PORTDOCS%%%%DOCSDIR%%/vavmref.txt

Return to bug 98235

Lines 1-50 Link Here

(-)vavoom/files/patch-configure.ac (-34 / +29 lines)
1	--- configure.ac.orig	1	--- configure.ac.orig
2	+++ configure.ac	2	+++ configure.ac
3	@@ -77,13 +77,13 @@	3	@@ -83,7 +83,7 @@
4	MAIN_EXE='Vavoom$(EXEEXT)'
5		4
6	if test "x$with_allegro" = "xyes"; then	5	if test "x$with_allegro" = "xyes"; then
7	- AC_PATH_PROG([allegro_config], [allegro-config])	6	if test "x$with_allegro_config" = "x"; then
8	+ AC_PATH_PROG([allegro_config], [allegro-config], [%%ALLEGRO_CONFIG%%])	7	- AC_PATH_PROG([allegro_config], [allegro-config])
9	if test "x$allegro_config" = "x"; then	8	+ AC_PATH_PROG([allegro_config], [allegro-config], [%%ALLEGRO_CONFIG%%])
10	AC_MSG_ERROR(['cannot find Allegro instalation'])	9	if test "x$allegro_config" = "x"; then
11	fi	10	AC_MSG_ERROR(['cannot find Allegro instalation'])
		11	fi
		12	@@ -93,7 +93,7 @@
12	else	13	else
13	if test "x$with_sdl" = "xyes"; then	14	if test "x$with_sdl" = "xyes"; then
14	- AC_PATH_PROG([sdl_config], [sdl-config])	15	if test "x$with_sdl_config" = "x"; then
15	+ AC_PATH_PROG([sdl_config], [sdl-config], [%%SDL_CONFIG%%])	16	- AC_PATH_PROG([sdl_config], [sdl-config])
16	if test "x$sdl_config" = "x"; then	17	+ AC_PATH_PROG([sdl_config], [sdl-config], [%%SDL_CONFIG%%])
17	AC_MSG_ERROR(['cannot find SDL instalation'])	18	if test "x$sdl_config" = "x"; then
18	fi	19	AC_MSG_ERROR(['cannot find SDL instalation'])
19	@@ -100,19 +100,19 @@	20	fi
20	if test "x$allegro_config" != "x"; then	21	@@ -122,13 +122,13 @@
		22	AC_MSG_NOTICE([Using Allegro])
21	MAIN_PLATFORM='UNIX_ALLEGRO'	23	MAIN_PLATFORM='UNIX_ALLEGRO'
22	MAIN_CFLAGS="`${allegro_config} --cflags`"	24	MAIN_CFLAGS="`${allegro_config} --cflags`"
23	- MAIN_LIBS="`${allegro_config} --libs` -lpng -lz -lm -lstdc++"	25	- MAIN_LIBS="`${allegro_config} --libs` -lpng -lz -lstdc++"
24	+ MAIN_LIBS="`${allegro_config} --libs` -lpng -lz -lm -lstdc++ -liconv"	26	+ MAIN_LIBS="`${allegro_config} --libs` -lpng -lz -lstdc++ -liconv"
25	else	27	else
26	if test "x$sdl_config" != "x"; then	28	if test "x$sdl_config" != "x"; then
		29	AC_MSG_NOTICE([Using SDL])
27	MAIN_PLATFORM='UNIX_SDL'	30	MAIN_PLATFORM='UNIX_SDL'
28	MAIN_CFLAGS="`${sdl_config} --cflags`"	31	MAIN_CFLAGS="`${sdl_config} --cflags`"
29	- MAIN_LIBS="-lSDL_mixer `${sdl_config} --libs` -lpng -lz -lm -lstdc++"	32	- MAIN_LIBS="-lSDL_mixer `${sdl_config} --libs` -lpng -lz -lstdc++"
30	+ MAIN_LIBS="-lSDL_mixer `${sdl_config} --libs` -lpng -lz -lm -lstdc++ -liconv"	33	+ MAIN_LIBS="-lSDL_mixer `${sdl_config} --libs` -lpng -lz -lstdc++ -liconv"
31	fi	34	fi
32	fi	35	fi
33	OBJ_FILES="$OBJ_FILES \$(SYS_OBJS_${MAIN_PLATFORM})"	36	OBJ_FILES="$OBJ_FILES \$(SYS_OBJS_${MAIN_PLATFORM})"
34		37	@@ -246,7 +246,7 @@
35	AC_CHECK_HEADER([linux/cdrom.h], [	38	AC_ARG_WITH([mikmod-config], AS_HELP_STRING([--with-mikmod-config], [Set MikMod config script]))
36	OBJ_FILES="$OBJ_FILES \$(CDAUDIO_OBJ_LINUX)"
37	- ], [AC_CHECK_HEADER([sys/cdrom.h], [
38	+ ], [AC_CHECK_HEADER([sys/cdio.h], [
39	OBJ_FILES="$OBJ_FILES \$(CDAUDIO_OBJ_BSD)"
40	])])
41
42	@@ -166,7 +166,7 @@
43
44	AC_ARG_WITH([mikmod], AS_HELP_STRING([--with-mikmod], [Enable MikMod support]))
45	if test "x$with_mikmod" != "xno"; then	39	if test "x$with_mikmod" != "xno"; then
46	- AC_PATH_PROG([LIBMIKMOD_CONFIG], [libmikmod-config])	40	if test "x$with_mikmod_config" = "x"; then
47	+ AC_PATH_PROG([LIBMIKMOD_CONFIG], [libmikmod-config], [%%MIKMOD_CONFIG%%])	41	- AC_PATH_PROG([LIBMIKMOD_CONFIG], [libmikmod-config])
48	if test "x$LIBMIKMOD_CONFIG" != "x"; then	42	+ AC_PATH_PROG([LIBMIKMOD_CONFIG], [libmikmod-config], [%%MIKMOD_CONFIG%%])
49	OBJ_FILES="$OBJ_FILES \$(MIKMOD_OBJS)"	43	else
50	MAIN_CFLAGS="$MAIN_CFLAGS `$LIBMIKMOD_CONFIG --cflags`"	44	mikmod_config=$with_mikmod_config
		45	fi