Attachment #145172 for bug #192280

Lines 17-24 Link Here

(-)net/luasocket/Makefile (-1 / +4 lines)
17	GH_TAGNAME= v3.0-rc1	17	GH_TAGNAME= v3.0-rc1
18	GH_COMMIT= 22cd583	18	GH_COMMIT= 22cd583
19		19
20	USES= lua:51 gmake pkgconfig	20	USES= lua gmake pkgconfig
21		21
		22	MAKE_ENV+= LUAV=${LUA_VER}
22	CFLAGS+= `pkgconf --cflags lua-${LUA_VER}`	23	CFLAGS+= `pkgconf --cflags lua-${LUA_VER}`
23	LDFLAGS+= -shared `pkgconf --libs lua-${LUA_VER}`	24	LDFLAGS+= -shared `pkgconf --libs lua-${LUA_VER}`
24		25
Lines 35-39 Link Here
35	post-install:	36	post-install:
36	@${MKDIR} ${STAGEDIR}/${DOCSDIR}	37	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
37	@${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}/${DOCSDIR}	38	@${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}/${DOCSDIR}
		39	@${STRIP_CMD} ${STAGEDIR}/${LUA_MODLIBDIR}/socket/core.so
		40	@${STRIP_CMD} ${STAGEDIR}/${LUA_MODLIBDIR}/mime/core.so
38		41
39	.include <bsd.port.mk>	42	.include <bsd.port.mk>

Lines 17-23 Link Here

(-)security/luasec/Makefile (-1 / +4 lines)
17	LIBDIR= -L${LUA_LIBDIR} -L${WRKSRC}/src/luasocket	17	LIBDIR= -L${LUA_LIBDIR} -L${WRKSRC}/src/luasocket
18	MAKE_ENV+= INCDIR="-I${LUA_INCDIR} -I${WRKSRC}/src" LUAPATH=${LUA_MODSHAREDIR} \	18	MAKE_ENV+= INCDIR="-I${LUA_INCDIR} -I${WRKSRC}/src" LUAPATH=${LUA_MODSHAREDIR} \
19	CPATH=${LUA_MODLIBDIR}	19	CPATH=${LUA_MODLIBDIR}
20	USES= lua:51	20	USES= lua
21	USE_OPENSSL= yes	21	USE_OPENSSL= yes
22		22
23	.include <bsd.port.options.mk>	23	.include <bsd.port.options.mk>
Lines 38-41 Link Here
38	${REINPLACE_CMD} -Ee '/^(INC\|LIB)DIR/s/[^?]=/?=/' \	38	${REINPLACE_CMD} -Ee '/^(INC\|LIB)DIR/s/[^?]=/?=/' \
39	${WRKSRC}/Makefile	39	${WRKSRC}/Makefile
40		40
		41	post-install:
		42	@${STRIP_CMD} ${STAGEDIR}/${LUA_MODLIBDIR}/ssl.so
		43
41	.include <bsd.port.mk>	44	.include <bsd.port.mk>

Lines 13-19 Link Here

(-)textproc/luaexpat/Makefile (-1 / +4 lines)
13		13
14	LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2	14	LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2
15		15
16	USES= gmake lua:51	16	USES= gmake lua
17	ALL_TARGET= lib	17	ALL_TARGET= lib
18		18
19	CFLAGS+= -fPIC	19	CFLAGS+= -fPIC
Lines 20-23 Link Here
20	LDFLAGS+= -L${LOCALBASE}/lib	20	LDFLAGS+= -L${LOCALBASE}/lib
21	MAKE_ENV= LUA_CDIR=${LUA_MODLIBDIR} LUA_LDIR=${LUA_MODSHAREDIR} LUA_INC="-I${LUA_INCDIR}" EXPAT_INC="-I${LOCALBASE}/include"	21	MAKE_ENV= LUA_CDIR=${LUA_MODLIBDIR} LUA_LDIR=${LUA_MODSHAREDIR} LUA_INC="-I${LUA_INCDIR}" EXPAT_INC="-I${LOCALBASE}/include"
22		22
		23	post-install:
		24	@${STRIP_CMD} ${STAGEDIR}/${LUA_MODLIBDIR}/lxp.so
		25
23	.include <bsd.port.mk>	26	.include <bsd.port.mk>





.include <bsd.port.options.mk>

USES=	gmake lua shebangfix
SHEBANG_LANG=	lua
SHEBANG_FILES=	prosody prosodyctl
lua_OLD_CMD=	${SETENV} lua

.else
CONFIGURE_ARGS+= --runwith=`which ${LUA_CMD}`
.endif
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

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>

Return to bug 192280

Lines 32-38 Link Here

(-)net-im/prosody/Makefile (-2 / +5 lines)
32		32
33	.include <bsd.port.options.mk>	33	.include <bsd.port.options.mk>
34		34
35	USES= gmake lua:51 shebangfix	35	USES= gmake lua shebangfix
36	SHEBANG_LANG= lua	36	SHEBANG_LANG= lua
37	SHEBANG_FILES= prosody prosodyctl	37	SHEBANG_FILES= prosody prosodyctl
38	lua_OLD_CMD= ${SETENV} lua	38	lua_OLD_CMD= ${SETENV} lua
Lines 47-53 Link Here
47	.else	47	.else
48	CONFIGURE_ARGS+= --runwith=`which ${LUA_CMD}`	48	CONFIGURE_ARGS+= --runwith=`which ${LUA_CMD}`
49	.endif	49	.endif
50	CONFIGURE_ARGS+= --ostype=freebsd --c-compiler="${CC}" --linker="${LD}"	50	CONFIGURE_ARGS+= --ostype=freebsd --c-compiler="${CC}" --linker="${LD}" --with-lua-include="${LUA_INCDIR}"
51	CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" PREFIX="${PREFIX}" LUA_SUFFIX="-${LUA_VER}" LUA_LIBDIR="${LUA_LIBDIR}" LUA_INCDIR="${LUA_INCDIR}"	51	CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}" PREFIX="${PREFIX}" LUA_SUFFIX="-${LUA_VER}" LUA_LIBDIR="${LUA_LIBDIR}" LUA_INCDIR="${LUA_INCDIR}"
52		52
53	SUB_FILES= pkg-deinstall	53	SUB_FILES= pkg-deinstall
Lines 54-57 Link Here
54	SUB_LIST= USERS=${USERS} GROUPS=${GROUPS}	54	SUB_LIST= USERS=${USERS} GROUPS=${GROUPS}
55	PLIST_SUB= PROSODY_USER=${USERS} PROSODY_GROUP=${GROUPS}	55	PLIST_SUB= PROSODY_USER=${USERS} PROSODY_GROUP=${GROUPS}
56		56
		57	post-install:
		58	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/prosody/util/*.so
		59
57	.include <bsd.port.post.mk>	60	.include <bsd.port.post.mk>