Attachment 145168 Details for Bug 192280 – unbreak prosody, dependencies

[patch] unbreak prosody, dependencies

prosody.diff (text/plain), 2.93 KB, created by Nikolai Lifanov on 2014-07-30 22:39:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nikolai Lifanov

Created: 2014-07-30 22:39:29 UTC

Size: 2.93 KB

patch

obsolete

>Index: net/luasocket/Makefile
>===================================================================
>--- net/luasocket/Makefile	(revision 29871)
>+++ net/luasocket/Makefile	(revision 29877)
>@@ -17,8 +17,9 @@
> GH_TAGNAME=	v3.0-rc1
> GH_COMMIT=	22cd583
> 
>-USES=		lua:51 gmake pkgconfig
>+USES=		lua gmake pkgconfig
> 
>+MAKE_ENV+=	LUAV=${LUA_VER}
> CFLAGS+=    `pkgconf --cflags lua-${LUA_VER}`
> LDFLAGS+=   -shared  `pkgconf --libs lua-${LUA_VER}`
> 
>@@ -35,5 +36,7 @@
> post-install:
> 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
> 	@${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}/${DOCSDIR}
>+	@${STRIP_CMD} ${STAGEDIR}/${LUA_MODLIBDIR}/socket/core.so
>+	@${STRIP_CMD} ${STAGEDIR}/${LUA_MODLIBDIR}/mime/core.so
> 
> .include <bsd.port.mk>
>Index: security/luasec/Makefile
>===================================================================
>--- security/luasec/Makefile	(revision 29871)
>+++ security/luasec/Makefile	(revision 29877)
>@@ -17,7 +17,7 @@
> LIBDIR=		-L${LUA_LIBDIR} -L${WRKSRC}/src/luasocket
> MAKE_ENV+=	INCDIR="-I${LUA_INCDIR} -I${WRKSRC}/src" LUAPATH=${LUA_MODSHAREDIR} \
> 		CPATH=${LUA_MODLIBDIR}
>-USES=		lua:51
>+USES=		lua
> USE_OPENSSL=	yes
> 
> .include <bsd.port.options.mk>
>@@ -38,4 +38,7 @@
> 	${REINPLACE_CMD} -Ee '/^(INC|LIB)DIR/s/[^?]=/?=/' \
> 		${WRKSRC}/Makefile
> 
>+post-install:
>+	@${STRIP_CMD} ${STAGEDIR}/${LUA_MODLIBDIR}/ssl.so
>+
> .include <bsd.port.mk>
>Index: textproc/luaexpat/Makefile
>===================================================================
>--- textproc/luaexpat/Makefile	(revision 29871)
>+++ textproc/luaexpat/Makefile	(revision 29877)
>@@ -13,7 +13,7 @@
> 
> LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
> 
>-USES=		gmake lua:51
>+USES=		gmake lua
> ALL_TARGET=	lib
> 
> CFLAGS+=	-fPIC
>@@ -20,4 +20,7 @@
> LDFLAGS+=	-L${LOCALBASE}/lib
> MAKE_ENV=	LUA_CDIR=${LUA_MODLIBDIR} LUA_LDIR=${LUA_MODSHAREDIR} LUA_INC="-I${LUA_INCDIR}" EXPAT_INC="-I${LOCALBASE}/include"
> 
>+post-install:
>+	@${STRIP_CMD} ${STAGEDIR}/${LUA_MODLIBDIR}/lxp.so
>+
> .include <bsd.port.mk>
>Index: net-im/prosody/Makefile
>===================================================================
>--- net-im/prosody/Makefile	(revision 29871)
>+++ net-im/prosody/Makefile	(revision 29877)
>@@ -32,7 +32,7 @@
> 
> .include <bsd.port.options.mk>
> 
>-USES=	gmake lua:51 shebangfix
>+USES=	gmake lua shebangfix
> SHEBANG_LANG=	lua
> SHEBANG_FILES=	prosody prosodyctl
> lua_OLD_CMD=	${SETENV} lua
>@@ -47,7 +47,7 @@
> .else
> CONFIGURE_ARGS+= --runwith=`which ${LUA_CMD}`
> .endif
>-CONFIGURE_ARGS+=	--ostype=freebsd --c-compiler="${CC}" --linker="${LD}"
>+CONFIGURE_ARGS+=	--ostype=freebsd --c-compiler="${CC}" --linker="${LD}" --with-lua-include="${LUA_INCDIR}"
> CONFIGURE_ENV+=	LOCALBASE="${LOCALBASE}" PREFIX="${PREFIX}" LUA_SUFFIX="-${LUA_VER}" LUA_LIBDIR="${LUA_LIBDIR}" LUA_INCDIR="${LUA_INCDIR}"
> 
> SUB_FILES=	pkg-deinstall
>@@ -54,4 +54,7 @@
> SUB_LIST=	USERS=${USERS} GROUPS=${GROUPS}
> PLIST_SUB=	PROSODY_USER=${USERS} PROSODY_GROUP=${GROUPS}
> 
>+post-install:
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/prosody/util/*.so
>+
> .include <bsd.port.post.mk>

Actions: View | Diff

Attachments on bug 192280: 145167 | 145168 | 145172 | 145173