update to prosody 0.8.2, from viq (taking MAINTAINER).

feedback from aja@

net/prosody/Makefile

@@ -1,15 +1,16 @@
-# $OpenBSD: Makefile,v 1.14 2011/08/01 02:13:45 jolan Exp $
+# $OpenBSD: Makefile,v 1.15 2012/01/26 10:27:15 sthen Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	communications server for Jabber/XMPP written in Lua
-DISTNAME=	prosody-0.7.0
-REVISION=	5
+DISTNAME=	prosody-0.8.2
 CATEGORIES=	net
 MASTER_SITES=	http://prosody.im/downloads/source/
 
 HOMEPAGE=	http://prosody.im/
 
+MAINTAINER=	Wiktor Izdebski <vicviq@gmail.com>
+
 # MIT
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
@@ -35,10 +36,14 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \
 		--with-lua="${LOCALBASE}" \
 		--c-compiler="${CC}" \
 		--linker="${CC}" \
+		--ldflags="-I/usr/include -I${LOCALBASE}/include -L/usr/lib -L${LOCALBASE}/lib -shared" \
 		--cflags="${CFLAGS} -fPIC"
 
 FAKE_FLAGS+=	CONFIG=${DESTDIR}${PREFIX}/share/examples/prosody
 
+pre-configure:
+	${SUBST_CMD} ${WRKSRC}/prosody ${WRKSRC}/prosodyctl
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/prosody
 	${INSTALL_DATA} ${WRKSRC}/README \

net/prosody/distinfo

@@ -1,5 +1,5 @@
-MD5 (prosody-0.7.0.tar.gz) = ac1PTonb72aKYkDN5Bne3w==
-RMD160 (prosody-0.7.0.tar.gz) = LkC0+Ae2EglxxhH1LU3zJkqCy7k=
-SHA1 (prosody-0.7.0.tar.gz) = PzpsTyYqBiqcAnzIQ81oJxBPuLo=
-SHA256 (prosody-0.7.0.tar.gz) = qLgmgF3VUoJwbFaDwgKImbNyHrD4TT41wFCabBvDI5A=
-SIZE (prosody-0.7.0.tar.gz) = 177412
+MD5 (prosody-0.8.2.tar.gz) = bpB78NCs8k8QEQgwILpv+w==
+RMD160 (prosody-0.8.2.tar.gz) = kIoE9dqnczxmq08J/VT7Uhdctww=
+SHA1 (prosody-0.8.2.tar.gz) = oCnE5p9tqvMyAGHmnJ+GOQ1+hFo=
+SHA256 (prosody-0.8.2.tar.gz) = 0DFRUPhIf8lgrfVs4FeYVChnmXX5xvP89CSDLSTqrmA=
+SIZE (prosody-0.8.2.tar.gz) = 212170

net/prosody/patches/patch-prosody

@@ -0,0 +1,9 @@
+$OpenBSD: patch-prosody,v 1.3 2012/01/26 10:27:15 sthen Exp $
+--- prosody.orig	Sun Nov  6 13:34:13 2011
++++ prosody	Sun Nov  6 13:37:36 2011
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env lua
++#!${TRUEPREFIX}/bin/lua
+ -- Prosody IM
+ -- Copyright (C) 2008-2010 Matthew Wild
+ -- Copyright (C) 2008-2010 Waqas Hussain

net/prosody/patches/patch-prosody_cfg_lua_dist

@@ -1,7 +1,7 @@
-$OpenBSD: patch-prosody_cfg_lua_dist,v 1.2 2010/07/26 18:11:42 jolan Exp $
---- prosody.cfg.lua.dist.orig	Sat Jun 12 19:23:02 2010
-+++ prosody.cfg.lua.dist	Mon Jul 26 12:56:05 2010
-@@ -22,8 +22,18 @@
+$OpenBSD: patch-prosody_cfg_lua_dist,v 1.3 2012/01/26 10:27:15 sthen Exp $
+--- prosody.cfg.lua.dist.orig	Tue May  3 19:18:54 2011
++++ prosody.cfg.lua.dist	Tue May  3 19:23:01 2011
+@@ -22,6 +22,14 @@
  -- Example: admins = { "user1@example.com", "user2@example.net" }
  admins = { }
  
@@ -15,26 +15,24 @@ $OpenBSD: patch-prosody_cfg_lua_dist,v 1.2 2010/07/26 18:11:42 jolan Exp $
 +
  -- Enable use of libevent for better performance under high load
  -- For more information see: http://prosody.im/doc/libevent
-+
-+--XXX libevent + daemonize don't work together for some reason
  --use_libevent = true;
- 
- -- This is the list of modules Prosody will load on startup.
-@@ -54,7 +64,7 @@ modules_enabled = {
- 		"register"; -- Allow users to register on this server using a client and change passwords
+@@ -59,7 +67,7 @@ modules_enabled = {
+ 		--"admin_telnet"; -- Opens telnet console interface on localhost port 5582
  
  	-- Other specific functionality
 -		--"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
 +		"posix"; -- POSIX functionality, sends server to background, enables syslog, etc.
- 		--"console"; -- Opens admin telnet interface on localhost port 5582
  		--"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP"
  		--"httpserver"; -- Serve static files from a directory over HTTP
-@@ -90,7 +100,7 @@ ssl = {
- 
+ 		--"groups"; -- Shared roster support
+@@ -123,8 +131,8 @@ authentication = "internal_plain"
  -- Logging configuration
  -- For advanced logging see http://prosody.im/doc/logging
--log = "prosody.log";
-+log = "/var/prosody/prosody.log"
- debug = false; -- Log debug messages?
- 
- ----------- Virtual hosts -----------
+ log = {
+-	info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
+-	error = "prosody.err";
++	info = "/var/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging
++	error = "/var/prosody/prosody.err";
+ 	-- "*syslog"; -- Uncomment this for logging to syslog
+ 	-- "*console"; -- Log to the console, useful for debugging with daemonize=false
+ }

net/prosody/patches/patch-prosodyctl

@@ -0,0 +1,9 @@
+$OpenBSD: patch-prosodyctl,v 1.3 2012/01/26 10:27:15 sthen Exp $
+--- prosodyctl.orig	Sun Nov  6 13:34:05 2011
++++ prosodyctl	Sun Nov  6 13:37:23 2011
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env lua
++#!${TRUEPREFIX}/bin/lua
+ -- Prosody IM
+ -- Copyright (C) 2008-2010 Matthew Wild
+ -- Copyright (C) 2008-2010 Waqas Hussain

net/prosody/patches/patch-util-src_signal_c

@@ -1,21 +0,0 @@
-$OpenBSD: patch-util-src_signal_c,v 1.1 2010/07/26 18:11:42 jolan Exp $
---- util-src/signal.c.orig	Sat Jun 12 19:23:02 2010
-+++ util-src/signal.c	Mon Jul 26 12:23:25 2010
-@@ -326,7 +326,7 @@ static int l_raise(lua_State *L)
-   return 1;
- }
- 
--#if defined _POSIX_SOURCE || (defined(sun) || defined(__sun))
-+#if defined _POSIX_SOURCE || (defined(sun) || defined(__sun)) || defined(__OpenBSD__)
- 
- /* define some posix only functions */
- 
-@@ -373,7 +373,7 @@ static int l_kill(lua_State *L)
- static const struct luaL_Reg lsignal_lib[] = {
-   {"signal", l_signal},
-   {"raise", l_raise},
--#if defined _POSIX_SOURCE || (defined(sun) || defined(__sun))
-+#if defined _POSIX_SOURCE || (defined(sun) || defined(__sun)) || defined(__OpenBSD__)
-   {"kill", l_kill},
- #endif
-   {NULL, NULL}

net/prosody/patches/patch-util_prosodyctl_lua

@@ -1,7 +1,7 @@
-$OpenBSD: patch-util_prosodyctl_lua,v 1.1 2010/07/26 18:11:42 jolan Exp $
---- util/prosodyctl.lua.orig	Sat Jun 12 19:23:02 2010
-+++ util/prosodyctl.lua	Mon Jul 26 10:48:24 2010
-@@ -110,7 +110,7 @@ function start()
+$OpenBSD: patch-util_prosodyctl_lua,v 1.2 2012/01/26 10:27:15 sthen Exp $
+--- util/prosodyctl.lua.orig	Tue May  3 19:43:53 2011
++++ util/prosodyctl.lua	Tue May  3 19:44:19 2011
+@@ -218,7 +218,7 @@ function start()
  	if not CFG_SOURCEDIR then
  		os.execute("./prosody");
  	else

net/prosody/pkg/README

@@ -1,4 +1,4 @@
-$OpenBSD: README,v 1.3 2011/06/02 13:41:40 ajacoutot Exp $
+$OpenBSD: README,v 1.4 2012/01/26 10:27:15 sthen Exp $
 
 +-----------------------------------------------------------------------
 | Running ${FULLPKGNAME} on OpenBSD
@@ -16,11 +16,19 @@ Using Prosody in an OpenBSD environment
 
    to your liking.
 
-2) Prosody uses privilege dropping.  As such, you will need to initially
-   start prosody as root via prosodyctl:
+2) Prosody includes an rc script for starting and stopping. You can
+   start it by running:
 
-   # ${PREFIX}/sbin/prosodyctl start
+   # /etc/rc.d/prosody start
 
-   You should now be able to start adding users:
+   You can have it start automatically on boot by adding prosody to your
+   pkg_scripts line in /etc/rc.conf.local
 
-   # ${PREFIX}/sbin/prosodyctl adduser username@domain.tld
+3) Prosody comes with prosodyctl script for controlling the daemon. Run
+   it without parameters to get list of commands:
+
+   # ${TRUEPREFIX}/sbin/prosodyctl
+
+   For example, to add users you would use something like:
+
+   # ${TRUEPREFIX}/sbin/prosodyctl adduser username@domain.tld

net/prosody/pkg/prosody.rc

@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# $OpenBSD: prosody.rc,v 1.1 2012/01/26 10:27:15 sthen Exp $
+
+daemon="${TRUEPREFIX}/sbin/prosodyctl"
+daemon_user="_prosody"
+daemon_flags="start"
+
+. /etc/rc.d/rc.subr
+
+rc_reload=NO
+
+rc_check() {
+	# return 1 is needed: prosodyctl returns a higher error code on failure
+	${TRUEPREFIX}/sbin/prosodyctl status || return 1
+}
+
+rc_stop() {
+	${TRUEPREFIX}/sbin/prosodyctl stop
+}
+
+rc_cmd $1