Move net/prosody to use Lua 5.2.

- Defined `MODLUA_VERSION=5.2`
- Added `--lua-version=${MODLUA_VERSION}` to `CONFIGURE_ARGS`, otherwise
  the build was picking up Lua 5.1 if it was already installed
- Added `--no-example-certs` to `CONFIGURE_ARGS`, which results in
  `make` not generating certs for localhost and example.com, which
  changes PLIST a tiny bit. I don't think that generating this certs
  adds any value, but I can keep it off the patch if it's preferred.
- Added NO_TEST=yes

Update diff from maintainer
This commit is contained in:
rsadowski 2021-06-25 04:30:22 +00:00
parent 5dfc8bd410
commit 6031766f02
2 changed files with 36 additions and 41 deletions

View File

@ -1,45 +1,50 @@
# $OpenBSD: Makefile,v 1.61 2021/05/14 07:45:26 solene Exp $
# $OpenBSD: Makefile,v 1.62 2021/06/25 04:30:22 rsadowski Exp $
COMMENT= communications server for Jabber/XMPP written in Lua
DISTNAME= prosody-0.11.9
CATEGORIES= net
MASTER_SITES= https://prosody.im/downloads/source/
COMMENT = communications server for Jabber/XMPP written in Lua
DISTNAME = prosody-0.11.9
CATEGORIES = net
HOMEPAGE = https://prosody.im/
REVISION = 0
HOMEPAGE= https://prosody.im/
MAINTAINER = Lucas <lucas@sexy.is>
MAINTAINER= Lucas <lucas@sexy.is>
MASTER_SITES = https://prosody.im/downloads/source/
# MIT
PERMIT_PACKAGE= Yes
PERMIT_PACKAGE = Yes
FIX_EXTRACT_PERMISSIONS= Yes
MODULES = lang/lua
MODLUA_VERSION = 5.2
MAKE_FILE= makefile
MODULES= lang/lua
LIB_DEPENDS= devel/libidn
MODLUA_RUN_DEPENDS+= databases/luadbi \
devel/lua-bitop \
devel/luafs \
security/luasec \
textproc/luaexpat>=1.3.0
MODLUA_RUN_DEPENDS += databases/luadbi \
devel/lua-bitop \
devel/luafs \
security/luasec \
textproc/luaexpat
LIB_DEPENDS = devel/libidn
# fails, depends on busted not yet in
TEST_DEPENDS = ${MODLUA_RUN_DEPENDS}
NO_TEST = Yes
TEST_DEPENDS = ${MODLUA_RUN_DEPENDS}
WANTLIB+= crypto idn
WANTLIB += crypto idn
CONFIGURE_STYLE=simple
CONFIGURE_ARGS+=--prefix="${PREFIX}" \
--sysconfdir="${SYSCONFDIR}/prosody" \
--datadir="${VARBASE}/prosody" \
--with-lua="${LOCALBASE}" \
--with-lua-include="${MODLUA_INCL_DIR}" \
--c-compiler="${CC}" \
--linker="${CC}" \
--ldflags="-L/usr/lib -L${LOCALBASE}/lib -shared" \
--cflags="${CFLAGS} -I${LOCALBASE}/include -fPIC -std=c99"
CONFIGURE_STYLE = simple
CONFIGURE_ARGS += --prefix="${PREFIX}" \
--sysconfdir="${SYSCONFDIR}/prosody" \
--datadir="${VARBASE}/prosody" \
--with-lua="${LOCALBASE}" \
--with-lua-include="${MODLUA_INCL_DIR}" \
--lua-version="${MODLUA_VERSION}" \
--no-example-certs \
--c-compiler="${CC}" \
--linker="${CC}" \
--ldflags="-L/usr/lib -L${LOCALBASE}/lib -shared" \
--cflags="${CFLAGS} -I${LOCALBASE}/include -fPIC -std=c99"
FAKE_FLAGS+= CONFIG=${DESTDIR}${PREFIX}/share/examples/prosody
MAKE_FILE = makefile
FAKE_FLAGS += CONFIG=${DESTDIR}${PREFIX}/share/examples/prosody
pre-configure:
cd ${WRKSRC}; sed -i -e 's,^#!/usr/bin/env lua,#!${MODLUA_BIN},' -e \

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.17 2021/03/06 18:43:56 sthen Exp $
@comment $OpenBSD: PLIST,v 1.18 2021/06/25 04:30:22 rsadowski Exp $
@newgroup _prosody:638
@newuser _prosody:638:_prosody:daemon:prosody user:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/prosody
@ -237,16 +237,6 @@ share/examples/prosody/certs/
@sample ${SYSCONFDIR}/prosody/certs/
share/examples/prosody/certs/Makefile
@sample ${SYSCONFDIR}/prosody/certs/Makefile
share/examples/prosody/certs/example.com.crt
share/examples/prosody/certs/example.com.key
share/examples/prosody/certs/localhost.crt
@sample ${SYSCONFDIR}/prosody/certs/localhost.crt
@mode 400
@owner _prosody
share/examples/prosody/certs/localhost.key
@sample ${SYSCONFDIR}/prosody/certs/localhost.key
@mode
@owner
share/examples/prosody/certs/openssl.cnf
@sample ${SYSCONFDIR}/prosody/certs/openssl.cnf
share/examples/prosody/prosody.cfg.lua