diff -ruN /usr/ports/net-im/prosody/Makefile /var/ports/net-im/prosody/Makefile
--- /usr/ports/net-im/prosody/Makefile	2009-07-14 06:36:53.000000000 +0000
+++ /var/ports/net-im/prosody/Makefile	2009-07-22 16:54:05.000000000 +0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	prosody
-PORTVERSION=	0.4.2
+PORTVERSION=	0.5.0
 CATEGORIES=	net-im
 MASTER_SITES=	http://prosody.im/downloads/source/
 
@@ -19,8 +19,8 @@
 	${LUA_MODLIBDIR}/lxp.so:${PORTSDIR}/textproc/luaexpat
 
 USE_RC_SUBR=	prosody
-
-ONLY_FOR_ARCHS=	i386
+MAN1=		prosodyctl.1
+MAN1PREFIX=	${PREFIX}/share
 
 USE_LUA=	5.1
 WANT_LUA_VER=	5.1
diff -ruN /usr/ports/net-im/prosody/distinfo /var/ports/net-im/prosody/distinfo
--- /usr/ports/net-im/prosody/distinfo	2009-07-14 06:30:55.000000000 +0000
+++ /var/ports/net-im/prosody/distinfo	2009-07-21 19:44:50.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (prosody-0.4.2.tar.gz) = 2669478311b3a67522669acdf03cf85c
-SHA256 (prosody-0.4.2.tar.gz) = 4ba7a58832a15cc942dbc1dfcdfbc0157a8dfae3b940ee5a6743e7870433803f
-SIZE (prosody-0.4.2.tar.gz) = 114291
+MD5 (prosody-0.5.0.tar.gz) = c7e79e765617150bf0dd491be682ffd5
+SHA256 (prosody-0.5.0.tar.gz) = bb82615b6311512888b62568faf4c5baa3631abb2fb048479ed2eef8faae4fb2
+SIZE (prosody-0.5.0.tar.gz) = 134292
diff -ruN /usr/ports/net-im/prosody/files/patch-configure /var/ports/net-im/prosody/files/patch-configure
--- /usr/ports/net-im/prosody/files/patch-configure	2009-07-14 06:30:55.000000000 +0000
+++ /var/ports/net-im/prosody/files/patch-configure	2009-07-21 20:33:19.000000000 +0000
@@ -1,6 +1,6 @@
---- orig.configure	2009-06-12 14:35:23.000000000 +0000
-+++ configure	2009-06-25 19:03:24.000000000 +0000
-@@ -5,11 +5,11 @@
+--- configure.orig	2009-07-20 14:00:03.000000000 +0000
++++ configure	2009-07-21 20:19:47.000000000 +0000
+@@ -5,17 +5,17 @@
  PREFIX=/usr/local
  SYSCONFDIR="$PREFIX/etc/prosody"
  DATADIR="$PREFIX/var/lib/prosody"
@@ -14,7 +14,15 @@
 +#LUA_LIBDIR="/usr/lib"
  IDN_LIB=idn
  OPENSSL_LIB=crypto
- CC=gcc
+-CC=gcc
++#CC=gcc
+ LD=gcc
+ 
+-CFLAGS="-fPIC -Wall"
++#CFLAGS="-fPIC -Wall"
+ LFLAGS="-shared"
+ 
+ # Help
 @@ -26,7 +26,7 @@
  
  --help                      This help.
@@ -32,7 +40,7 @@
 +	then 
 +	LUA_INCDIR_SET=yes
 +	LUA_LIBDIR_SET=yes
-+	CFLAGS="-D_POSIX_SOURCE -I${LOCALBASE}/include"
++	CFLAGS="-fPIC -D_POSIX_SOURCE -I${LOCALBASE}/include"
 +	LFLAGS="-lm -shared -L${LOCALBASE}/lib"
 +	LUA_SUFFIX_SET=yes
 +	LUA_LIB=lua
@@ -40,3 +48,15 @@
  fi
  
  if [ "$PREFIX_SET" = "yes" -a ! "$SYSCONFDIR_SET" = "yes" ]
+@@ -298,9 +307,9 @@
+ REQUIRE_CONFIG=$REQUIRE_CONFIG
+ IDN_LIB=$IDN_LIB
+ OPENSSL_LIB=$OPENSSL_LIB
+-CFLAGS=$CFLAGS
++CFLAGS+=$CFLAGS
+ LFLAGS=$LFLAGS
+-CC=$CC
++CC?=$CC
+ LD=$LD
+ 
+ EOF
diff -ruN /usr/ports/net-im/prosody/files/pkg-install.in /var/ports/net-im/prosody/files/pkg-install.in
--- /usr/ports/net-im/prosody/files/pkg-install.in	2009-07-14 06:30:55.000000000 +0000
+++ /var/ports/net-im/prosody/files/pkg-install.in	2009-07-21 20:38:01.000000000 +0000
@@ -4,7 +4,7 @@
 #
 
 PW=/usr/sbin/pw
-UID=1789
+UID=242
 GID=$UID
 USER="prosody"
 GROUP="prosody"
diff -ruN /usr/ports/net-im/prosody/files/prosody.cfg.lua.install.in /var/ports/net-im/prosody/files/prosody.cfg.lua.install.in
--- /usr/ports/net-im/prosody/files/prosody.cfg.lua.install.in	2009-07-14 06:30:55.000000000 +0000
+++ /var/ports/net-im/prosody/files/prosody.cfg.lua.install.in	2009-07-21 20:25:12.000000000 +0000
@@ -56,6 +56,7 @@
 				"version"; -- Replies to server version requests
 			  	"uptime"; -- Report how long server has been running
 			  	"time"; -- Let others know the time here on this server
+				"pep"; -- Enables users to publish their mood, activity, playing music and more
 			  	"ping"; -- Replies to XMPP pings with pongs
 
 			-- Other specific functionality
diff -ruN /usr/ports/net-im/prosody/files/prosody.in /var/ports/net-im/prosody/files/prosody.in
--- /usr/ports/net-im/prosody/files/prosody.in	2009-07-14 06:30:55.000000000 +0000
+++ /var/ports/net-im/prosody/files/prosody.in	2009-07-22 17:15:31.000000000 +0000
@@ -22,10 +22,21 @@
 command_args="$1"
 
 status_cmd=prosody_status_cmd
+stop_cmd=prosody_stop_cmd
+start_cmd=prosody_start_cmd
 
 prosody_status_cmd()
 {
 	%%PREFIX%%/bin/prosodyctl status
 }
 
+prosody_start_cmd()
+{
+        %%PREFIX%%/bin/prosodyctl start
+}
+prosody_stop_cmd()
+{
+        %%PREFIX%%/bin/prosodyctl stop
+}
+
 run_rc_command "$1"
diff -ruN /usr/ports/net-im/prosody/pkg-plist /var/ports/net-im/prosody/pkg-plist
--- /usr/ports/net-im/prosody/pkg-plist	2009-07-14 06:30:55.000000000 +0000
+++ /var/ports/net-im/prosody/pkg-plist	2009-07-21 19:52:48.000000000 +0000
@@ -1,8 +1,5 @@
 bin/prosody
 bin/prosodyctl
-%%ETCDIR%%/certs/localhost.cert
-%%ETCDIR%%/certs/localhost.key
-%%ETCDIR%%/prosody.cfg.lua
 lib/prosody/core/actions.lua
 lib/prosody/core/componentmanager.lua
 lib/prosody/core/configmanager.lua
@@ -13,25 +10,33 @@
 lib/prosody/core/modulemanager.lua
 lib/prosody/core/objectmanager.lua
 lib/prosody/core/offlinemanager.lua
-lib/prosody/core/presencemanager.lua
 lib/prosody/core/rostermanager.lua
 lib/prosody/core/s2smanager.lua
 lib/prosody/core/sessionmanager.lua
 lib/prosody/core/stanza_router.lua
 lib/prosody/core/usermanager.lua
 lib/prosody/core/xmlhandlers.lua
+lib/prosody/fallbacks/bit.lua
 lib/prosody/modules/mod_actions_http.lua
+lib/prosody/modules/mod_announce.lua
 lib/prosody/modules/mod_bosh.lua
 lib/prosody/modules/mod_component.lua
 lib/prosody/modules/mod_console.lua
 lib/prosody/modules/mod_debug.lua
 lib/prosody/modules/mod_dialback.lua
 lib/prosody/modules/mod_disco.lua
+lib/prosody/modules/mod_groups.lua
 lib/prosody/modules/mod_httpserver.lua
+lib/prosody/modules/mod_iq.lua
 lib/prosody/modules/mod_legacyauth.lua
+lib/prosody/modules/mod_message.lua
 lib/prosody/modules/mod_muc.lua
+lib/prosody/modules/mod_offline.lua
+lib/prosody/modules/mod_pep.lua
 lib/prosody/modules/mod_ping.lua
 lib/prosody/modules/mod_posix.lua
+lib/prosody/modules/mod_presence.lua
+lib/prosody/modules/mod_privacy.lua
 lib/prosody/modules/mod_private.lua
 lib/prosody/modules/mod_register.lua
 lib/prosody/modules/mod_roster.lua
@@ -42,6 +47,8 @@
 lib/prosody/modules/mod_uptime.lua
 lib/prosody/modules/mod_vcard.lua
 lib/prosody/modules/mod_version.lua
+lib/prosody/modules/mod_watchregistrations.lua
+lib/prosody/modules/mod_welcome.lua
 lib/prosody/modules/mod_xmlrpc.lua
 lib/prosody/net/adns.lua
 lib/prosody/net/connlisteners.lua
@@ -54,6 +61,7 @@
 lib/prosody/net/xmppclient_listener.lua
 lib/prosody/net/xmppcomponent_listener.lua
 lib/prosody/net/xmppserver_listener.lua
+lib/prosody/prosody.version
 lib/prosody/util/array.lua
 lib/prosody/util/dataforms.lua
 lib/prosody/util/datamanager.lua
@@ -63,11 +71,14 @@
 lib/prosody/util/encodings.so
 lib/prosody/util/events.lua
 lib/prosody/util/hashes.so
+lib/prosody/util/hmac.lua
 lib/prosody/util/import.lua
 lib/prosody/util/iterators.lua
 lib/prosody/util/jid.lua
 lib/prosody/util/logger.lua
+lib/prosody/util/muc.lua
 lib/prosody/util/multitable.lua
+lib/prosody/util/pluginloader.lua
 lib/prosody/util/pposix.so
 lib/prosody/util/prosodyctl.lua
 lib/prosody/util/pubsub.lua
@@ -81,10 +92,9 @@
 lib/prosody/util/uuid.lua
 lib/prosody/util/xmlrpc.lua
 lib/prosody/util/ztact.lua
-@dirrm %%ETCDIR%%/certs
-@dirrm %%ETCDIR%%
 @dirrm lib/prosody/util
 @dirrm lib/prosody/net
 @dirrm lib/prosody/modules
+@dirrm lib/prosody/fallbacks
 @dirrm lib/prosody/core
 @dirrm lib/prosody