On Tue, Sep 15, 2015 at 01:01:43AM +0200, Ingo Schwarze wrote:
> Hi,
>
> Alessandro Gallo wrote on Mon, Sep 14, 2015 at 10:56:10PM +0200:
>
> > Like this? I'm not good at this kind of stuff:
>
> Nearly.
>
> * Remove REVISION when raising the version number.
> * Your mailer mangled leading blanks and wrapped lines.
> * make update-plist told me there are some new files.
>
> > Also, the 'patches' directory must be deleted,
>
> In CVS, you can't ever delete a directories,
>
> > as those fixes have already been merged upstream.
> > I don't know why it doesn't show up in the unified diff.
>
> But you can rm and cvs rm the files inside the dir.
> And don't forget to diff -Nup.
>
> Tested on i386.
>
> Ryan, OK?
> Ingo
Thanks Ingo! Couple extras I noticed:
* convert perl -pi -e into sed -i, update expression to suite
this release of chocolate-doom (they added XDG_DATA_* paths,
so this code changed)
* tore hair out because for some reason it seems the autotools
no-longer respected MAKE_FLAGS execgamesdir setting in the
port Makefile, replaced with another sed -i to update it
directly in src/Makefile.in. If this isn't necessary, no
idea why MAKE_FLAGS isn't applying..
* remove share/appdata/ and share/icons/ from PLIST as they
are created elsewhere, I believe this is preferred?
tested the package out and it loads the game files from
/usr/local/share/doom/ as it should, seems to run fine here on
amd64. ports updated before editing this.
OpenBSD 5.8-current (GENERIC.MP) #1346: Fri Sep 4 21:57:00 MDT 2015
OK? Thoughts?
Cheers,
--ryan
? chocolate-update.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile 24 Feb 2015 23:40:02 -0000 1.18
+++ Makefile 15 Sep 2015 02:24:45 -0000
@@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.18 2015/02/24 23:40:02 bentley 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-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.
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/chocolate-doom/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 11 Dec 2014 08:10:51 -0000 1.6
+++ distinfo 15 Sep 2015 02:24:45 -0000
@@ -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
Index: patches/patch-src_net_client_c
===================================================================
RCS file: /cvs/ports/games/chocolate-doom/patches/patch-src_net_client_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_net_client_c
--- patches/patch-src_net_client_c 24 Feb 2015 23:40:02 -0000 1.1
+++ patches/patch-src_net_client_c 15 Sep 2015 02:24:45 -0000
@@ -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));
-
Index: patches/patch-src_net_server_c
===================================================================
RCS file: /cvs/ports/games/chocolate-doom/patches/patch-src_net_server_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_net_server_c
--- patches/patch-src_net_server_c 24 Feb 2015 23:40:02 -0000 1.1
+++ patches/patch-src_net_server_c 15 Sep 2015 02:24:45 -0000
@@ -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;
-
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/chocolate-doom/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 11 Dec 2014 08:10:51 -0000 1.5
+++ pkg/PLIST 15 Sep 2015 02:24:45 -0000
@@ -22,6 +22,10 @@
@man man/man6/chocolate-server.6
@man man/man6/chocolate-setup.6
@man man/man6/chocolate-strife.6
+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
@@ -56,7 +60,6 @@ share/doc/chocolate-strife/README
share/doc/chocolate-strife/README.Music
share/doc/chocolate-strife/README.Strife
share/doom/
-share/icons/
share/icons/chocolate-doom.png
share/icons/chocolate-setup.png
@exec %D/bin/update-desktop-database
