Changes: * Add wrapper scripts for the executables cube_client and cube_server, and place the programs in libexec because it needs to write files in the data directory (otherwise it crashes). * Use %%DATADIR%% in pkg-plist. * Remove patch "files/patch-main.cpp". * Rename patch "patch-source::src::tools.h" to How-To-Repeat: # cd /usr/ports/games/cube # make install clean % cube_client
>Submitter-Id: current-users >Originator: Alejandro Pulver >Organization: >Confidential: no >Synopsis: Re: ports/85270: [UPDATE] games/cube: add wrapper script to make it work >Severity: non-critical >Priority: low >Category: ports >Class: update >Release: FreeBSD 5.4-RELEASE i386 >Environment: >Description: This patch has to be applied to the previous patch. Changes: * Fix wrapper scripts (weren't passing their arguments to the real executables). >How-To-Repeat: >Fix: --- new.diff begins here --- --- pkgd/sent/cube.diff Wed Aug 24 16:48:50 2005 +++ cube.diff Thu Sep 22 17:19:24 2005 @@ -1,6 +1,6 @@ diff -urN /usr/ports/games/cube/Makefile cube/Makefile --- /usr/ports/games/cube/Makefile Thu Sep 23 05:58:57 2004 -+++ cube/Makefile Wed Aug 24 15:56:01 2005 ++++ cube/Makefile Thu Sep 22 17:18:34 2005 @@ -15,7 +15,7 @@ MAINTAINER= avleeuwen@piwebs.com COMMENT= An OpenGL 3D First Person Shooter game @@ -39,7 +39,7 @@ ${CP} -Rp ${WRKSRC}/data ${DATADIR} diff -urN /usr/ports/games/cube/files/cube_client.in cube/files/cube_client.in --- /usr/ports/games/cube/files/cube_client.in Wed Dec 31 21:00:00 1969 -+++ cube/files/cube_client.in Wed Aug 24 15:27:36 2005 ++++ cube/files/cube_client.in Thu Sep 22 17:18:48 2005 @@ -0,0 +1,19 @@ +#!/bin/sh + @@ -59,10 +59,10 @@ + +cd ~/.cube || exit 1 + -+exec %%PREFIX%%/libexec/cube_client ++exec %%PREFIX%%/libexec/cube_client "$@" diff -urN /usr/ports/games/cube/files/cube_server.in cube/files/cube_server.in --- /usr/ports/games/cube/files/cube_server.in Wed Dec 31 21:00:00 1969 -+++ cube/files/cube_server.in Wed Aug 24 15:27:55 2005 ++++ cube/files/cube_server.in Thu Sep 22 17:18:56 2005 @@ -0,0 +1,19 @@ +#!/bin/sh + @@ -82,7 +82,7 @@ + +cd ~/.cube || exit 1 + -+exec %%PREFIX%%/libexec/cube_server ++exec %%PREFIX%%/libexec/cube_server "$@" diff -urN /usr/ports/games/cube/files/patch-main.cpp cube/files/patch-main.cpp --- /usr/ports/games/cube/files/patch-main.cpp Mon Jan 20 23:02:48 2003 +++ cube/files/patch-main.cpp Wed Dec 31 21:00:00 1969 @@ -108,7 +108,7 @@ - { diff -urN /usr/ports/games/cube/files/patch-source-src-tools.h cube/files/patch-source-src-tools.h --- /usr/ports/games/cube/files/patch-source-src-tools.h Wed Dec 31 21:00:00 1969 -+++ cube/files/patch-source-src-tools.h Fri Aug 19 17:41:24 2005 ++++ cube/files/patch-source-src-tools.h Thu Sep 22 17:18:34 2005 @@ -0,0 +1,19 @@ +--- source/src/tools.h.orig Wed Sep 22 16:54:56 2004 ++++ source/src/tools.h Wed Sep 22 17:00:21 2004 @@ -154,7 +154,7 @@ - inline char *newstringbuf(char *s) { return gp()->stringbuf(s); }; diff -urN /usr/ports/games/cube/pkg-plist cube/pkg-plist --- /usr/ports/games/cube/pkg-plist Fri Jun 4 13:34:17 2004 -+++ cube/pkg-plist Wed Aug 24 15:53:33 2005 ++++ cube/pkg-plist Thu Sep 22 17:18:34 2005 @@ -1,879 +1,881 @@ bin/cube_client bin/cube_server --- new.diff ends here ---
Responsible Changed From-To: freebsd-ports-bugs->garga I'll take it.
State Changed From-To: open->feedback Ask for maintainer approval.
Dear maintainer, please, take a look at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/85270 Do you approve this patch? -- Renato Botelho <garga @ FreeBSD.org> <freebsd @ galle.com.br> GnuPG Key: http://www.FreeBSD.org/~garga/pubkey.asc "Calvin Coolidge looks as if he had been weaned on a pickle." -- Alice Roosevelt Longworth
On Tuesday 04 October 2005 18:50, Renato Botelho wrote: > Dear maintainer, please, take a look at: > > http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/85270 > > Do you approve this patch? Approved. Best regards, Arjan
State Changed From-To: feedback->closed Committed. Thanks!