This version is closer but there are a couple of things remaining.
On 2016/01/29 18:47, Henrique N. Lengler wrote:
> @@ -38,8 +36,8 @@ MODGCC4_LANGS = c++
> MODULES = gcc4 lang/lua
> WANTLIB = c m ${MODLUA_WANTLIB} sqlite3
>
> -BUILD_DEPENDS = devel/bison \
> - graphics/pngcrush
> +BUILD_DEPENDS = graphics/pngcrush \
> + lang/lua/5.1
That BUILD_DEPENDS isn't needed, it is added automatically
by lang/lua on the MODULES line. Check for yourself with
'make show=BUILD_DEPENDS'.
> - ifneq ($(shell $(PKGCONFIG) lua5.1 --exists || echo no),)
> - ifneq ($(shell $(PKGCONFIG) lua-5.1 --exists || echo no),)
> -+ ifneq ($(shell $(PKGCONFIG) lua${MODLUA_DEP_VERSION} --exists || echo
> no),)
> -+ ifneq ($(shell $(PKGCONFIG) lua-${MODLUA_DEP_VERSION} --exists ||
> echo no),)
> ++ ifneq ($(shell $(PKGCONFIG) lua51 --exists || echo no),)
> ++ ifneq ($(shell $(PKGCONFIG) lua51 --exists || echo no),)
This should keep using ${MODLUA_DEP_VERSION} instead of the
hardcoded '51', and same for the other instances setting
LUA_PACKAGE.
> +share/applications/stone-soup.desktop
This port has a no_x11 flavour, and there's a "PFRAG.no-no_x11"
file which contains all of the files which are *not* used in the
no_x11 packages.
That is to say, PLIST should contain the common files, and
PFRAG.no-no_x11 should contain the files only used for the x11
version.
PFRAG.no-no_x11 already contains the stone-soup.desktop file and
a number of other files (tiles etc) and it is pulled in by the
!%%no_x11%% line that you removed from PLIST.
Basically you need to build the no_x11 version, fix up the PLIST
for that (the PFRAG is ignored there). Then build the normal
version; all of the *other* files (.desktop, tiles, etc) should
go in the PFRAG file. "make plist" will get you part of the way
there but you'll need to move entries between files (or more to
the point, put them back when 'make plist' has moved them to the
wrong place).
One other thing (and it's not new to your diff but I noticed it
while looking over it, this isn't going to be one of those
ports which supports multiple lua versions, so it should have
MODLUA_VERSION=5.1 added to the Makefile to force it (or more
specifically, remove the extra lua52/lua53 flavours that are
added if you don't force it)..
