On Fri, Apr 22, 2016 at 01:45:06PM +1000, Jonathan Gray wrote:
> On Thu, Apr 21, 2016 at 07:08:13PM +0200, Florian Stinglmayr wrote:
> > On Thu, Apr 21, 2016 at 08:47:46PM +1000, Jonathan Gray wrote:
> > > This could now drop the SHARED_ONLY part.
> > >
> >
> > Yes.
> >
> > > Why the need to rerun autoconf? Could configure be used as is? Currently
> > > the build fails here with:
> > >
> > > ===> Configuring for lua-lyaml-6.0
> > > Using /usr/ports/pobj/lua-lyaml-6.0/config.site (generated)
> > > /usr/local/bin/autoreconf[35]: /usr/local/bin/autoreconf-2.13: not found
> > >
> >
> > You are correct. The previous release didn't have a configure, and was
> > just a .tar.gz from git master. The appropriate lines have been removed,
> > and it still builds and works fine.
> >
> > Regards,
> > Florian
> >
>
> The WRKDIST/LIBTOOL_FLAGS lines could go as well.
>
> And libyaml should be LIB_DEPENDS with WANTLIB.
>
> I added LUA_INCLUDE to env as below also.
>
> I'd like to commit it with these changes unless there are any objections?
Thinking about it some more "lua-yaml" makes more sense than
"lua-lyaml".
This also fixes the distfile name to include a version.
diff -upr lua-lyaml.orig/Makefile lua-yaml/Makefile
--- lua-lyaml.orig/Makefile Fri Apr 22 13:14:20 2016
+++ lua-yaml/Makefile Fri Apr 22 14:09:56 2016
@@ -3,9 +3,7 @@
COMMENT = Lua library for parsing and emitting YAML
V = 6.0
-DISTNAME = lua-${GH_PROJECT}
-PKGNAME = ${DISTNAME}-${V}
-WRKDIST = ${WRKDIR}/${GH_PROJECT}-${GH_TAGNAME}
+PKGNAME = lua-yaml-${V}
GH_ACCOUNT = gvvaughan
GH_PROJECT = lyaml
@@ -18,15 +16,16 @@ MAINTAINER = Florian Stinglmayr <flor...@n0la.org>
# MIT
PERMIT_PACKAGE_CDROM = Yes
+WANTLIB = yaml-0
MODULES = lang/lua
-BUILD_DEPENDS = devel/libyaml
+LIB_DEPENDS = devel/libyaml
CONFIGURE_STYLE = gnu
-CONFIGURE_ENV = CPPFLAGS="-I${PREFIX}/include -L${PREFIX}/lib" \
- LUA="${MODLUA_BIN}"
-
-LIBTOOL_FLAGS += --tag=disable-static
+CONFIGURE_ENV = CPPFLAGS="-I${PREFIX}/include" \
+ LDFLAGS="-L${PREFIX}/lib" \
+ LUA=${MODLUA_BIN} \
+ LUA_INCLUDE=-I${MODLUA_INCL_DIR}
# Test requires specl, specl requires lyaml.
NO_TEST = Yes
diff -upr lua-lyaml.orig/distinfo lua-yaml/distinfo
--- lua-lyaml.orig/distinfo Fri Apr 22 13:14:20 2016
+++ lua-yaml/distinfo Fri Apr 22 14:09:56 2016
@@ -1,2 +1,2 @@
-SHA256 (lua-lyaml.tar.gz) = nXz3TXdpmf9vdYxWnVIC/12h8wPG9CKdO0H3HNOj56c=
-SIZE (lua-lyaml.tar.gz) = 475288
+SHA256 (lyaml-release-v6.0.tar.gz) =
nXz3TXdpmf9vdYxWnVIC/12h8wPG9CKdO0H3HNOj56c=
+SIZE (lyaml-release-v6.0.tar.gz) = 475288
