On Thu, Jan 28, 2016 at 05:08:53PM -0200, Henrique N. Lengler wrote:
> Updated the game now that sdl2 is fixed. Looks like there is no more need to
> keep some older patches. Lua is needed to build. Bison is not needed, only
> optional, and some other changes.
Hi Henrique,
Thanks for taking care of this!
> I'm new on porting, so I'm doubt about how to properly set egcc to be used,
> since even that new gcc is installed, the make wasn't using it. I did by
> setting
> CC and CXX to egcc and eg++, if there is a better way of doing it please
> correct.
The port already uses the MODULES construct for this.
MODGCC4_ARCHS = *
MODGCC4_LANGS = c++
MODULES = gcc4 lang/lua
This should select ports GCC for both C++ and C (the latter is always
implicitly selected). I'm not sure why it would not do so. Hmm.
> @@ -70,7 +67,16 @@ post-install:
> mv ${PREFIX}/bin/crawl ${PREFIX}/bin/crawl-ss
> chmod 755 ${PREFIX}/bin/crawl-ss
> ${INSTALL_MAN} ${WRKDIST}/docs/crawl.6 ${PREFIX}/man/man6/crawl-ss.6
> - ${INSTALL_DATA} ${WRKDIST}/README.txt ${PREFIX}/share/crawl/docs
> +# install docs manually
Above comment should be indented by a tab.
> + @mkdir -p ${PREFIX}/share/doc/crawl/
> + @mkdir -p ${PREFIX}/share/doc/crawl/develop/levels
> + @mkdir -p ${PREFIX}/share/doc/crawl/license
> + ${INSTALL_DATA} ${WRKDIST}/docs/quickstart.txt
> ${PREFIX}/share/doc/crawl/quickstart.txt
> + ${INSTALL_DATA} ${WRKDIST}/docs/*.txt ${PREFIX}/share/doc/crawl/
> + ${INSTALL_DATA} ${WRKDIST}/docs/develop/*.txt
> ${PREFIX}/share/doc/crawl/develop
> + ${INSTALL_DATA} ${WRKDIST}/docs/develop/levels/*.txt
> ${PREFIX}/share/doc/crawl/develop/levels
> + ${INSTALL_DATA} ${WRKDIST}/docs/license/*.txt
> ${PREFIX}/share/doc/crawl/license
> + ${INSTALL_DATA} ${WRKDIST}/CREDITS.txt ${PREFIX}/share/doc/crawl/
Is installing all these files really necessary? Some of it is irrelevant to
users of our stone-soup package. E.g. develop/ -- if someone were to
hack on stone-soup code they would not use our port, they would get the
latest version of the code and compile it themselves. They won't refer
to our package for docs about stone-soup development.
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-source_command_cc,v 1.3 2015/04/07 10:10:28 stsp Exp $
> ---- source/command.cc.orig Thu Aug 28 04:29:10 2014
> -+++ source/command.cc Mon Apr 6 15:27:57 2015
> -@@ -698,7 +698,7 @@ struct help_file
> - static help_file help_files[] =
> - {
> - { "crawl_manual.txt", '*', true },
> -- { "../README.txt", '!', false },
> -+ { "README.txt", '!', false },
> - { "aptitudes.txt", '%', false },
> - { "quickstart.txt", '^', false },
> - { "macros_guide.txt", '~', false },
Are you sure removing the above patch is a good idea?
IIRC, without this patch, the README text only shows up inside the
game when the crawl binary is run from the compiled source tree.
It fails to show up when the installed crawl binary is run.
