On Wed, Dec 25, 2013 at 08:47:45PM +0400, Sergey Bronnikov wrote:
> On 14:24 Tue 24 Dec , Jérémie Courrèges-Anglas wrote:
> > Alexandr Shadchin <[email protected]> writes:
> >
> > [...]
> >
> > > Now ok for me. Does anyone have objections to import these ports ? or OK ?
> >
> > Those ports look fine to me too. There are a few minor glitches:
> > - their build flags use -Wredundant-decls, this makes the build
> > unreadable and makes it hard to detect real problems. Patching
> > configure is enough.
> > - kyua-cli needs a patch for 32 bits archs (attached)
> > - lutok build fine with lua5.2 but kyua-cli has lua5.1 hardcoded in its
> > WANTLIB. I don't know what's the way to go, forcing one version of
> > lua for both ports, or using flavors and MODULES = /lang/lua in
> > kyua-cli?
> > - I modified Sergey's patch for kyua-testers so that mounting tmpfs is
> > supported, and emulated lchmod instead instead of just removing the
> > call (also attached).
>
> Thanks for review. I have corrected ports according to your comments.
>
> > --
> > jca | PGP: 0x06A11494 / 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494
>
Your kyua-cli is incorrect. I have attached a patch.
--
Alexandr Shadchin
diff --git a/devel/kyua-cli/Makefile b/devel/kyua-cli/Makefile
index e22af57..96b5d59 100644
--- a/devel/kyua-cli/Makefile
+++ b/devel/kyua-cli/Makefile
@@ -15,18 +15,25 @@ WANTLIB += atf-c atf-c++ c ${MODLUA_WANTLIB} lutok m
sqlite3 stdc++
MASTER_SITES = https://kyua.googlecode.com/files/
+MODULES = lang/lua
+
BUILD_DEPENDS = ${RUN_DEPENDS}
RUN_DEPENDS = devel/kyua-testers
-LIB_DEPENDS = devel/atf \
- devel/lutok
+LIB_DEPENDS = devel/atf
CONFIGURE_STYLE = gnu
-CONFIGURE_ENV= LUA_CFLAGS="`pkg-config --cflags ${MODLUA_DEP}`" \
- LUA_LIBS="`pkg-config --libs ${MODLUA_DEP}`"
-
PORTHOME = ${WRKDIR}
+FLAVOR ?=
+
+.if ${FLAVOR:L:Mlua52}
+MODLUA_VERSION = 5.2
+LIB_DEPENDS += devel/lutok,lua52
+.else
+LIB_DEPENDS += devel/lutok
+.endif
+
.include <bsd.port.mk>
diff --git a/devel/lutok/Makefile b/devel/lutok/Makefile
index 46112b9..b046589 100644
--- a/devel/lutok/Makefile
+++ b/devel/lutok/Makefile
@@ -29,4 +29,10 @@ CONFIGURE_ENV= LUA_CFLAGS="`pkg-config
--cflags ${MODLUA_DEP}`" \
PORTHOME = ${WRKDIR}
+FLAVOR ?=
+
+.if ${FLAVOR:L:Mlua52}
+MODLUA_VERSION = 5.2
+.endif
+
.include <bsd.port.mk>
