update to 2.2.1; with Alessandro Gallo <llgxela at gmail dot com>

and MAINTAINER rfreeman@
This commit is contained in:
schwarze 2015-09-16 09:34:12 +00:00
parent 15b06e762f
commit d7fc4c077c
5 changed files with 14 additions and 35 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.18 2015/02/24 23:40:02 bentley Exp $
# $OpenBSD: Makefile,v 1.19 2015/09/16 09:34:12 schwarze Exp $
COMMENT = portable release of Doom, Heretic, Hexen, and Strife
V = 2.1.0
V = 2.2.1
DISTNAME = chocolate-doom-${V}
CATEGORIES = games x11
REVISION = 0
HOMEPAGE = http://www.chocolate-doom.org/
@ -31,9 +30,6 @@ USE_GMAKE = Yes
# we don't need to require python to build
CONFIGURE_ENV += HAVE_PYTHON=false
# set correct program directory
MAKE_FLAGS = execgamesdir="${TRUEPREFIX}/bin"
MAN_5 = chocolate-doom.cfg default.cfg \
chocolate-heretic.cfg heretic.cfg \
chocolate-hexen.cfg hexen.cfg \
@ -42,9 +38,11 @@ MAN_6 = chocolate-doom chocolate-server chocolate-setup \
chocolate-heretic chocolate-hexen chocolate-strife
post-extract:
# set correct program directory
@sed -i 's,{exec_prefix}/games,{exec_prefix}/bin,' \
${WRKSRC}/src/Makefile.in
# set correct data directory
@perl -pi -e "s,/usr/share/games/doom,${TRUEPREFIX}/share/doom," \
${WRKSRC}/src/d_iwad.c
@sed -i 's,"/games/doom","/doom",g' ${WRKSRC}/src/d_iwad.c
post-install:
# Data files get installed to this directory.

View File

@ -1,2 +1,2 @@
SHA256 (chocolate-doom-2.1.0.tar.gz) = YpMF5/MoZZ8+k+ibk63J2k6ZtaNR5RzrdJ3PPj2ovNM=
SIZE (chocolate-doom-2.1.0.tar.gz) = 2129632
SHA256 (chocolate-doom-2.2.1.tar.gz) = rRHihxZnxvoGWKvy3LoM2bJvvWUe6N9Vrf3Bitj9Z0o=
SIZE (chocolate-doom-2.2.1.tar.gz) = 2127538

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_net_client_c,v 1.1 2015/02/24 23:40:02 bentley Exp $
--- src/net_client.c.orig Tue Feb 24 00:09:49 2015
+++ src/net_client.c Tue Feb 24 00:09:50 2015
@@ -279,7 +279,7 @@ static void NET_CL_AdvanceWindow(void)
// Advance the window
- memcpy(recvwindow, recvwindow + 1,
+ memmove(recvwindow, recvwindow + 1,
sizeof(net_server_recv_t) * (BACKUPTICS - 1));
memset(&recvwindow[BACKUPTICS-1], 0, sizeof(net_server_recv_t));

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_net_server_c,v 1.1 2015/02/24 23:40:02 bentley Exp $
--- src/net_server.c.orig Tue Feb 24 00:09:57 2015
+++ src/net_server.c Tue Feb 24 00:10:04 2015
@@ -514,7 +514,7 @@ static void NET_SV_AdvanceWindow(void)
// Advance the window
- memcpy(recvwindow, recvwindow + 1, sizeof(*recvwindow) * (BACKUPTICS - 1));
+ memmove(recvwindow, recvwindow + 1, sizeof(*recvwindow) * (BACKUPTICS - 1));
memset(&recvwindow[BACKUPTICS-1], 0, sizeof(*recvwindow));
++recvwindow_start;

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2014/12/11 08:10:51 daniel Exp $
@comment $OpenBSD: PLIST,v 1.6 2015/09/16 09:34:12 schwarze Exp $
@bin bin/chocolate-doom
@bin bin/chocolate-doom-setup
@bin bin/chocolate-heretic
@ -22,6 +22,11 @@
@man man/man6/chocolate-server.6
@man man/man6/chocolate-setup.6
@man man/man6/chocolate-strife.6
share/appdata/
share/appdata/chocolate-doom.appdata.xml
share/appdata/chocolate-heretic.appdata.xml
share/appdata/chocolate-hexen.appdata.xml
share/appdata/chocolate-strife.appdata.xml
share/applications/chocolate-doom.desktop
share/applications/chocolate-heretic.desktop
share/applications/chocolate-hexen.desktop