7 files changed, 60 insertions, 13 deletions

diff --git a/net-im/prosody/Makefile b/net-im/prosody/Makefile
index 5c80c3b1d2e6..fec4d2191963 100644
--- a/net-im/prosody/Makefile
+++ b/net-im/prosody/Makefile
@@ -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 @@ RUN_DEPENDS=	${LUA_MODLIBDIR}/socket/core.so:${PORTSDIR}/net/luasocket \
 	${LUA_MODLIBDIR}/lxp.so:${PORTSDIR}/textproc/luaexpat
 
 USE_RC_SUBR=	prosody
-
-ONLY_FOR_ARCHS=	i386
+MAN1=		prosodyctl.1
+MANCOMPRESSED=	no
 
 USE_LUA=	5.1
 WANT_LUA_VER=	5.1
diff --git a/net-im/prosody/distinfo b/net-im/prosody/distinfo
index cd49c3617a53..46fb7f6d1cfd 100644
--- a/net-im/prosody/distinfo
+++ b/net-im/prosody/distinfo
@@ -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 --git a/net-im/prosody/files/patch-Makefile b/net-im/prosody/files/patch-Makefile
new file mode 100644
index 000000000000..65a99f983988
--- /dev/null
+++ b/net-im/prosody/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig	2009-07-27 18:22:51.000000000 +0000
++++ Makefile	2009-07-27 18:23:25.000000000 +0000
+@@ -6,7 +6,7 @@
+ MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules
+ SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody
+ DATA = $(DESTDIR)$(DATADIR)
+-MAN = $(DESTDIR)$(PREFIX)/share/man
++MAN = $(DESTDIR)$(PREFIX)/man
+ 
+ INSTALLEDSOURCE = $(PREFIX)/lib/prosody
+ INSTALLEDCONFIG = $(SYSCONFDIR)
diff --git a/net-im/prosody/files/patch-configure b/net-im/prosody/files/patch-configure
index ab8b1551a599..f9fdcff919e6 100644
--- a/net-im/prosody/files/patch-configure
+++ b/net-im/prosody/files/patch-configure
@@ -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 --git a/net-im/prosody/files/pkg-install.in b/net-im/prosody/files/pkg-install.in
index 8d742c19f3f2..b2d0a64c0d46 100644
--- a/net-im/prosody/files/pkg-install.in
+++ b/net-im/prosody/files/pkg-install.in
@@ -4,7 +4,7 @@
 #
 
 PW=/usr/sbin/pw
-UID=1789
+UID=242
 GID=$UID
 USER="prosody"
 GROUP="prosody"
diff --git a/net-im/prosody/files/prosody.cfg.lua.install.in b/net-im/prosody/files/prosody.cfg.lua.install.in
index 340bf4d76fd8..4dc9e9c93405 100644
--- a/net-im/prosody/files/prosody.cfg.lua.install.in
+++ b/net-im/prosody/files/prosody.cfg.lua.install.in
@@ -56,6 +56,7 @@ Host "*"
 				"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 --git a/net-im/prosody/pkg-plist b/net-im/prosody/pkg-plist
index 1952196d909c..d274db1a4793 100644
--- a/net-im/prosody/pkg-plist
+++ b/net-im/prosody/pkg-plist
@@ -13,25 +13,33 @@ lib/prosody/core/loggingmanager.lua
 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 +50,8 @@ lib/prosody/modules/mod_tls.lua
 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 +64,7 @@ lib/prosody/net/server.lua
 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 +74,14 @@ lib/prosody/util/discohelper.lua
 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
@@ -86,5 +100,6 @@ lib/prosody/util/ztact.lua
 @dirrm lib/prosody/util
 @dirrm lib/prosody/net
 @dirrm lib/prosody/modules
+@dirrm lib/prosody/fallbacks
 @dirrm lib/prosody/core
 @dirrm lib/prosody