From owner-svn-ports-head@FreeBSD.ORG Wed Oct 22 23:56:03 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3ABD28E3; Wed, 22 Oct 2014 23:56:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0C829793; Wed, 22 Oct 2014 23:56:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9MNu2Q2054817; Wed, 22 Oct 2014 23:56:02 GMT (envelope-from lx@FreeBSD.org) Received: (from lx@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9MNu2pv054813; Wed, 22 Oct 2014 23:56:02 GMT (envelope-from lx@FreeBSD.org) Message-Id: <201410222356.s9MNu2pv054813@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: lx set sender to lx@FreeBSD.org using -f From: David Thiel Date: Wed, 22 Oct 2014 23:56:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371371 - in head/net-im/prosody: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Oct 2014 23:56:03 -0000 Author: lx Date: Wed Oct 22 23:56:02 2014 New Revision: 371371 URL: https://svnweb.freebsd.org/changeset/ports/371371 QAT: https://qat.redports.org/buildarchive/r371371/ Log: Add reload command to rc script, fix luajit support PR: 194037 194039 Submitted by: Anton Yuzhaninov Modified: head/net-im/prosody/Makefile head/net-im/prosody/files/prosody.in Modified: head/net-im/prosody/Makefile ============================================================================== --- head/net-im/prosody/Makefile Wed Oct 22 22:35:11 2014 (r371370) +++ head/net-im/prosody/Makefile Wed Oct 22 23:56:02 2014 (r371371) @@ -3,7 +3,7 @@ PORTNAME= prosody PORTVERSION= 0.9.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-im MASTER_SITES= http://prosody.im/downloads/source/ \ http://redundancy.redundancy.org/mirror/ @@ -25,9 +25,9 @@ GROUPS= ${USERS} USE_RC_SUBR= prosody -OPTIONS_DEFINE= LUAJIT -LUAJIT_DESC= Run prosody using luajit -LUAJIT_LIB_DEPENDS= libluajit-5.1.so:${PORTSDIR}/lang/luajit +OPTIONS_DEFINE= LUAJIT +LUAJIT_DESC= Run prosody using luajit +LUAJIT_LIB_DEPENDS= libluajit-5.1.so:${PORTSDIR}/lang/luajit .include @@ -35,17 +35,16 @@ USES= gmake lua:51 shebangfix SHEBANG_LANG= lua SHEBANG_FILES= prosody prosodyctl lua_OLD_CMD= ${SETENV} lua +.if ${PORT_OPTIONS:MLUAJIT} +lua_CMD= ${LOCALBASE}/bin/luajit +.else lua_CMD= ${LOCALBASE}/bin/${LUA_CMD} +.endif LUA_PREMK= yes .include HAS_CONFIGURE= yes -.if ${PORT_OPTIONS:MLUAJIT} -CONFIGURE_ARGS+= --runwith=`which luajit` -.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}" Modified: head/net-im/prosody/files/prosody.in ============================================================================== --- head/net-im/prosody/files/prosody.in Wed Oct 22 22:35:11 2014 (r371370) +++ head/net-im/prosody/files/prosody.in Wed Oct 22 23:56:02 2014 (r371371) @@ -23,10 +23,11 @@ load_rc_config $name prosody_enable=${prosody_enable:-"NO"} pidfile=${prosody_pidfile:-"%%PREFIX%%/var/lib/prosody/prosody.pid"} -extra_commands="status" +extra_commands="reload status" start_cmd="prosody_start" stop_cmd="prosody_cmd stop" +reload_cmd="prosody_cmd reload" restart_cmd="$stop_cmd; $start_cmd" status_cmd="prosody_cmd status"