From owner-svn-ports-all@FreeBSD.ORG  Sat Jan 25 05:06:31 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 87A1365E;
 Sat, 25 Jan 2014 05:06:31 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 735321F45;
 Sat, 25 Jan 2014 05:06:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0P56VZZ023424;
 Sat, 25 Jan 2014 05:06:31 GMT (envelope-from lx@svn.freebsd.org)
Received: (from lx@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0P56Vg4023422;
 Sat, 25 Jan 2014 05:06:31 GMT (envelope-from lx@svn.freebsd.org)
Message-Id: <201401250506.s0P56Vg4023422@svn.freebsd.org>
From: David Thiel <lx@FreeBSD.org>
Date: Sat, 25 Jan 2014 05:06:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r340984 - 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-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Jan 2014 05:06:31 -0000

Author: lx
Date: Sat Jan 25 05:06:30 2014
New Revision: 340984
URL: http://svnweb.freebsd.org/changeset/ports/340984
QAT: https://qat.redports.org/buildarchive/r340984/

Log:
  Fix on 10 and tweak rc script.

Modified:
  head/net-im/prosody/Makefile
  head/net-im/prosody/files/prosody.in

Modified: head/net-im/prosody/Makefile
==============================================================================
--- head/net-im/prosody/Makefile	Sat Jan 25 02:42:22 2014	(r340983)
+++ head/net-im/prosody/Makefile	Sat Jan 25 05:06:30 2014	(r340984)
@@ -26,7 +26,7 @@ WANT_LUA_VER=	5.1
 USE_GMAKE=	yes
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+="--ostype=freebsd"
+CONFIGURE_ARGS+=	--ostype=freebsd --c-compiler="${CC}" --linker="${LD}"
 CONFIGURE_ENV+=	LOCALBASE="${LOCALBASE}" PREFIX="${PREFIX}" LUA_SUFFIX="-${LUA_VER}" LUA_LIBDIR="${LUA_LIBDIR}" LUA_INCDIR="${LUA_INCDIR}"
 
 SUB_FILES=	pkg-install pkg-deinstall

Modified: head/net-im/prosody/files/prosody.in
==============================================================================
--- head/net-im/prosody/files/prosody.in	Sat Jan 25 02:42:22 2014	(r340983)
+++ head/net-im/prosody/files/prosody.in	Sat Jan 25 05:06:30 2014	(r340984)
@@ -16,12 +16,12 @@
 
 name="prosody"
 rcvar=prosody_enable
-pidfile="%%PREFIX%%/var/lib/prosody/prosody.pid"
 command="%%PREFIX%%/bin/prosodyctl"
 
 load_rc_config $name
 
-prosody=${prosody_enable-"NO"}
+prosody_enable=${prosody_enable:-"NO"}
+pidfile=${prosody_pidfile:-"%%PREFIX%%/var/lib/prosody/prosody.pid"}
 
 extra_commands="status"