Date: Mon, 12 Sep 2016 03:01:45 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421901 - head/net-im/prosody Message-ID: <201609120301.u8C31jgU009893@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Mon Sep 12 03:01:44 2016 New Revision: 421901 URL: https://svnweb.freebsd.org/changeset/ports/421901 Log: net-im/prosody: Document SSL requirement and rework port makefile This makefile had both <pre> and <options> but only the <options> include was necesssary so the <pre> and <post> includes were remoed. Most of the variables conventionally introduced before the <options> include were wrapped and moved up to ensure they were defined when needed. Finally SSL flags were added to support non-base SSL linkage. Approved by: SSL blanket + general blankets Modified: head/net-im/prosody/Makefile Modified: head/net-im/prosody/Makefile ============================================================================== --- head/net-im/prosody/Makefile Mon Sep 12 02:41:08 2016 (r421900) +++ head/net-im/prosody/Makefile Mon Sep 12 03:01:44 2016 (r421901) @@ -20,37 +20,43 @@ RUN_DEPENDS= ${LUA_MODLIBDIR}/socket/cor LIB_DEPENDS= libidn.so:dns/libidn +USES= cpe gmake lua:51 shebangfix ssl +SHEBANG_FILES= prosody prosodyctl +LUA_PREMK= yes +HAS_CONFIGURE= yes +CFLAGS+= -I${OPENSSLINC} +LDFLAGS+= -L${OPENSSLLIB} +CONFIGURE_ARGS= --ostype=freebsd \ + --c-compiler="${CC}" \ + --linker="${CC}" \ + --with-lua-include="${LUA_INCDIR}" +CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" \ + PREFIX="${PREFIX}" \ + LUA_SUFFIX="-${LUA_VER}" \ + LUA_LIBDIR="${LUA_LIBDIR}" \ + LUA_INCDIR="${LUA_INCDIR}" + USERS= prosody GROUPS= ${USERS} USE_RC_SUBR= prosody +SUB_FILES= pkg-deinstall +SUB_LIST= USERS=${USERS} GROUPS=${GROUPS} +PLIST_SUB= PROSODY_USER=${USERS} PROSODY_GROUP=${GROUPS} OPTIONS_DEFINE= LUAJIT -LUAJIT_DESC= Run prosody using luajit +LUAJIT_DESC= Run prosody using luajit LUAJIT_LIB_DEPENDS= libluajit-5.1.so:lang/luajit .include <bsd.port.options.mk> -USES= cpe gmake lua:51 shebangfix -SHEBANG_FILES= prosody prosodyctl .if ${PORT_OPTIONS:MLUAJIT} lua_CMD= ${LOCALBASE}/bin/luajit .else lua_CMD= ${LOCALBASE}/bin/${LUA_CMD} .endif -LUA_PREMK= yes - -.include <bsd.port.pre.mk> - -HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --ostype=freebsd --c-compiler="${CC}" --linker="${CC}" --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> +.include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609120301.u8C31jgU009893>