Date: Wed, 31 May 2006 23:42:59 +0400 (MSD) From: Igor Pokrovsky <ip@doom.homeunix.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/98235: Update port: games/vavoom 1.19.1 -> 1.20 Message-ID: <200605311942.k4VJgx2E022261@doom.homeunix.org> Resent-Message-ID: <200605311950.k4VJoBIP071821@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 98235
>Category: ports
>Synopsis: Update port: games/vavoom 1.19.1 -> 1.20
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed May 31 19:50:11 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Igor Pokrovsky
>Release: FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD doom.homeunix.org 6.1-STABLE FreeBSD 6.1-STABLE #0: Wed May 24 18:19:40 MSD 2006 root@doom.homeunix.org:/usr/obj/usr/src/sys/KERNEL-amd64 i386
>Description:
Update to 1.20.
>How-To-Repeat:
>Fix:
--- vavoom.diff begins here ---
diff -ruN /usr/ports/games/vavoom/Makefile vavoom/Makefile
--- /usr/ports/games/vavoom/Makefile Fri May 12 13:24:57 2006
+++ vavoom/Makefile Wed May 31 23:35:46 2006
@@ -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 @@
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 @@
@${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 @@
@${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 -ruN /usr/ports/games/vavoom/distinfo vavoom/distinfo
--- /usr/ports/games/vavoom/distinfo Thu Feb 2 12:57:22 2006
+++ vavoom/distinfo Tue May 30 22:58:46 2006
@@ -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 -ruN /usr/ports/games/vavoom/files/patch-configure.ac vavoom/files/patch-configure.ac
--- /usr/ports/games/vavoom/files/patch-configure.ac Mon Jan 2 12:26:41 2006
+++ vavoom/files/patch-configure.ac Wed May 31 22:45:15 2006
@@ -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 -ruN /usr/ports/games/vavoom/files/patch-source_sys__sdl.cpp vavoom/files/patch-source_sys__sdl.cpp
--- /usr/ports/games/vavoom/files/patch-source_sys__sdl.cpp Tue Dec 13 00:03:34 2005
+++ vavoom/files/patch-source_sys__sdl.cpp Thu Jan 1 03:00:00 1970
@@ -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 -ruN /usr/ports/games/vavoom/files/vavoom.in vavoom/files/vavoom.in
--- /usr/ports/games/vavoom/files/vavoom.in Thu Nov 17 15:00:51 2005
+++ vavoom/files/vavoom.in Tue May 30 23:13:58 2006
@@ -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 -ruN /usr/ports/games/vavoom/pkg-plist vavoom/pkg-plist
--- /usr/ports/games/vavoom/pkg-plist Thu Nov 17 15:00:51 2005
+++ vavoom/pkg-plist Wed May 31 23:34:29 2006
@@ -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 @@
%%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
--- vavoom.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200605311942.k4VJgx2E022261>