Update to prosody 0.7.0, take maintainership and fix some PREFIX-related stuff.

Note that configuration file options and format have changed; however, existing
configs should work correctly.

Approved by:	kelly.hays@jkhfamily.org (maintainer)

6 files changed, 88 insertions, 53 deletions

diff --git a/net-im/prosody/Makefile b/net-im/prosody/Makefile
index 1cdcaa27671b..233ae2958adb 100644
--- a/net-im/prosody/Makefile
+++ b/net-im/prosody/Makefile
@@ -6,21 +6,22 @@
 #
 
 PORTNAME=	prosody
-PORTVERSION=	0.5.1
-PORTREVISION=	3
+PORTVERSION=	0.7.0
 CATEGORIES=	net-im
-MASTER_SITES=	http://prosody.im/downloads/source/
+MASTER_SITES=	http://prosody.im/downloads/source/ \
+				http://redundancy.redundancy.org/mirror/
 
-MAINTAINER=	kelly.hays@jkhfamily.org
+MAINTAINER=	lx@FreeBSD.org
 COMMENT=	A simple extensible XMPP server written in Lua
 
 BUILD_DEPENDS=	${LOCALBASE}/include/stringprep.h:${PORTSDIR}/dns/libidn
 RUN_DEPENDS=	${LUA_MODLIBDIR}/socket/core.so:${PORTSDIR}/net/luasocket \
 		${LUA_MODLIBDIR}/ssl.so:${PORTSDIR}/security/luasec \
-		${LUA_MODLIBDIR}/lxp.so:${PORTSDIR}/textproc/luaexpat
+		${LUA_MODLIBDIR}/lxp.so:${PORTSDIR}/textproc/luaexpat \
+		${LUA_MODLIBDIR}/lfs.so:${PORTSDIR}/devel/luafilesystem
 
 USE_RC_SUBR=	prosody
-MAN1=		prosodyctl.1
+MAN1=	prosodyctl.1
 MANCOMPRESSED=	no
 
 USE_LUA=	5.1
@@ -28,13 +29,13 @@ WANT_LUA_VER=	5.1
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+="--ostype=freebsd"
-CONFIGURE_ENV+=	LOCALBASE="${LOCALBASE}" LUA_SUFFIX="-${LUA_VER}" LUA_LIBDIR="${LUA_LIBDIR}" LUA_INCDIR="${LUA_INCDIR}"
+CONFIGURE_ENV+=	LOCALBASE="${LOCALBASE}" PREFIX="${PREFIX}" LUA_SUFFIX="-${LUA_VER}" LUA_LIBDIR="${LUA_LIBDIR}" LUA_INCDIR="${LUA_INCDIR}"
 
 SUB_FILES=	pkg-install pkg-deinstall
 
 pre-install:
 	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-	${REINPLACE_CMD} -e 's|/usr/bin/env lua|${LUA_CMD}|' ${WRKSRC}/prosody ${WRKSRC}/prosodyctl
+	${REINPLACE_CMD} -e 's|/usr/bin/env lua|${LUA_CMD}|' ${WRKSRC}/prosody.install ${WRKSRC}/prosodyctl.install
 
 post-install:
 	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/net-im/prosody/distinfo b/net-im/prosody/distinfo
index dda1560e5194..4a5d27f4891d 100644
--- a/net-im/prosody/distinfo
+++ b/net-im/prosody/distinfo
@@ -1,3 +1,2 @@
-MD5 (prosody-0.5.1.tar.gz) = 5d7973ba1ea2fd4c6cfd924fdc4ddd85
-SHA256 (prosody-0.5.1.tar.gz) = abaf4e90d473090c1276269e649d9bfc38872c8d31fcc521f9d597f87ae5f44e
-SIZE (prosody-0.5.1.tar.gz) = 135584
+SHA256 (prosody-0.7.0.tar.gz) = a8b826805dd55282706c5683c2028899b3721eb0f84d3e35c0509a6c1bc32390
+SIZE (prosody-0.7.0.tar.gz) = 177412
diff --git a/net-im/prosody/files/patch-Makefile b/net-im/prosody/files/patch-Makefile
index b5d5880ef3ac..5070130de0e2 100644
--- a/net-im/prosody/files/patch-Makefile
+++ b/net-im/prosody/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2009-07-29 12:54:54.000000000 -0500
-+++ Makefile	2009-08-06 21:25:36.000000000 -0500
+--- Makefile.orig	2010-06-12 17:23:01.000000000 -0700
++++ Makefile	2010-11-24 11:29:05.873218722 -0800
 @@ -6,7 +6,7 @@
  MODULES = $(DESTDIR)$(PREFIX)/lib/prosody/modules
  SOURCE = $(DESTDIR)$(PREFIX)/lib/prosody
@@ -9,14 +9,14 @@
  
  INSTALLEDSOURCE = $(PREFIX)/lib/prosody
  INSTALLEDCONFIG = $(SYSCONFDIR)
-@@ -29,10 +29,11 @@
- 	install -m644 util/* $(SOURCE)/util
- 	install -m644 fallbacks/* $(SOURCE)/fallbacks
- 	install -m644 plugins/* $(MODULES)
+@@ -33,10 +33,11 @@
+ 	install -m644 plugins/*.lua $(MODULES)
+ 	install -d $(MODULES)/muc
+ 	install -m644 plugins/muc/* $(MODULES)/muc
 -	install -m644 certs/* $(CONFIG)/certs
 +	install -m644 certs/localhost.cert $(CONFIG)/certs/localhost.cert.sample
 +	install -m644 certs/localhost.key $(CONFIG)/certs/localhost.key.sample
- 	install -m644 plugins/* $(MODULES)
+ 	install -m644 plugins/*.lua $(MODULES)
  	install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1
 -	test -e $(CONFIG)/prosody.cfg.lua || install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
 +	install -m644 prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua.sample
diff --git a/net-im/prosody/files/patch-configure b/net-im/prosody/files/patch-configure
index f9fdcff919e6..c7bb6ca14479 100644
--- a/net-im/prosody/files/patch-configure
+++ b/net-im/prosody/files/patch-configure
@@ -1,15 +1,20 @@
---- 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
+--- configure.orig	2010-06-12 17:23:01.000000000 -0700
++++ configure	2010-11-24 11:15:06.435111085 -0800
+@@ -2,20 +2,19 @@
+ 
+ # Defaults
+ 
+-PREFIX=/usr/local
++#PREFIX=/usr/local
  SYSCONFDIR="$PREFIX/etc/prosody"
  DATADIR="$PREFIX/var/lib/prosody"
 -LUA_SUFFIX=""
-+#LUA_SUFFIX=""
- LUA_DIR="/usr"
- LUA_BINDIR="/usr/bin"
+-LUA_DIR="/usr"
+-LUA_BINDIR="/usr/bin"
 -LUA_INCDIR="/usr/include"
 -LUA_LIBDIR="/usr/lib"
++LUA_DIR="$PREFIX"
++LUA_BINDIR="$PREFIX/bin"
 +#LUA_INCDIR="/usr/include"
 +#LUA_LIBDIR="/usr/lib"
  IDN_LIB=idn
@@ -20,41 +25,63 @@
  
 -CFLAGS="-fPIC -Wall"
 +#CFLAGS="-fPIC -Wall"
- LFLAGS="-shared"
+ LDFLAGS="-shared"
  
  # Help
-@@ -26,7 +26,7 @@
+@@ -26,7 +25,7 @@
  
  --help                      This help.
  --ostype=OS                 Use one of the OS presets.
--                            May be one of: debian, macosx
-+                            May be one of: debian, macosx, freebsd
+-                            May be one of: debian, macosx, linux
++                            May be one of: debian, macosx, linux, freebsd
  --prefix=DIR                Prefix where Prosody should be installed.
                              Default is $PREFIX
  --sysconfdir=DIR            Location where the config file should be installed.
-@@ -150,6 +150,15 @@
- 	CFLAGS="-Wall"
- 	LFLAGS="-bundle -undefined dynamic_lookup"
- 	fi	
+@@ -142,22 +141,24 @@
+ 	LUA_INCDIR=/usr/include/lua5.1;
+ 	LUA_INCDIR_SET=yes
+ 	fi
+-	if [ "$OSTYPE" = "macosx" ]
+-	then LUA_INCDIR=/usr/local/include;
++    if [ "$OSTYPE" = "linux" ]
++    then LUA_INCDIR=/usr/local/include;
++    LUA_INCDIR_SET=yes
++    LUA_LIBDIR=/usr/local/lib
++    LUA_LIBDIR_SET=yes
++    CFLAGS="-Wall -fPIC"
++    LDFLAGS="-shared"
++    fi
++
 +	if [ "$OSTYPE" = "freebsd" ]
 +	then 
-+	LUA_INCDIR_SET=yes
-+	LUA_LIBDIR_SET=yes
+ 	LUA_INCDIR_SET=yes
+-	LUA_LIBDIR=/usr/local/lib
+ 	LUA_LIBDIR_SET=yes
+-	CFLAGS="-Wall"
+-	LDFLAGS="-bundle -undefined dynamic_lookup"
 +	CFLAGS="-fPIC -D_POSIX_SOURCE -I${LOCALBASE}/include"
 +	LFLAGS="-lm -shared -L${LOCALBASE}/lib"
 +	LUA_SUFFIX_SET=yes
 +	LUA_LIB=lua
-+	fi
+ 	fi
+-        if [ "$OSTYPE" = "linux" ]
+-        then LUA_INCDIR=/usr/local/include;
+-        LUA_INCDIR_SET=yes
+-        LUA_LIBDIR=/usr/local/lib
+-        LUA_LIBDIR_SET=yes
+-        CFLAGS="-Wall -fPIC"
+-        LDFLAGS="-shared"
+-        fi
  fi
  
  if [ "$PREFIX_SET" = "yes" -a ! "$SYSCONFDIR_SET" = "yes" ]
-@@ -298,9 +307,9 @@
+@@ -306,9 +307,9 @@
  REQUIRE_CONFIG=$REQUIRE_CONFIG
  IDN_LIB=$IDN_LIB
  OPENSSL_LIB=$OPENSSL_LIB
 -CFLAGS=$CFLAGS
 +CFLAGS+=$CFLAGS
- LFLAGS=$LFLAGS
+ LDFLAGS=$LDFLAGS
 -CC=$CC
 +CC?=$CC
  LD=$LD
diff --git a/net-im/prosody/files/pkg-deinstall.in b/net-im/prosody/files/pkg-deinstall.in
index b6fa824ac934..5cafa9c90b58 100644
--- a/net-im/prosody/files/pkg-deinstall.in
+++ b/net-im/prosody/files/pkg-deinstall.in
@@ -11,10 +11,14 @@ POST-DEINSTALL)
 	echo "     Prosody related user accounts and groups were not removed."
 	echo ""
 	echo "     To remove the 'prosody' user and the 'prosody' group which were"
-	echo "     created by a default installation of this package, run"
+	echo "     created by a default installation of this package, run:"
 	echo ""
 	echo "     pw userdel -n prosody"
 	echo "     pw groupdel -n prosody"
+	echo ""
+    echo "     and to remove all server data:"
+    echo "     rm -rf  /usr/local/var/lib/prosody"
+    echo ""
 	;;
 *)
 	;;
diff --git a/net-im/prosody/pkg-plist b/net-im/prosody/pkg-plist
index ba83e8c95f43..74a156cde7af 100644
--- a/net-im/prosody/pkg-plist
+++ b/net-im/prosody/pkg-plist
@@ -11,15 +11,13 @@ etc/prosody/certs/localhost.key.sample
 @exec if [ ! -f %D/etc/prosody/certs/localhost.key ]; then cp -p %D/etc/prosody/certs/localhost.key.sample %D/etc/prosody/certs/localhost.key; fi
 @dirrmtry etc/prosody/certs
 @dirrmtry etc/prosody
-lib/prosody/core/actions.lua
+lib/prosody/core/certmanager.lua
 lib/prosody/core/componentmanager.lua
 lib/prosody/core/configmanager.lua
-lib/prosody/core/discomanager.lua
 lib/prosody/core/eventmanager.lua
 lib/prosody/core/hostmanager.lua
 lib/prosody/core/loggingmanager.lua
 lib/prosody/core/modulemanager.lua
-lib/prosody/core/objectmanager.lua
 lib/prosody/core/offlinemanager.lua
 lib/prosody/core/rostermanager.lua
 lib/prosody/core/s2smanager.lua
@@ -27,32 +25,29 @@ 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_compression.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_lastactivity.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_proxy65.lua
 lib/prosody/modules/mod_register.lua
 lib/prosody/modules/mod_roster.lua
 lib/prosody/modules/mod_saslauth.lua
-lib/prosody/modules/mod_selftests.lua
 lib/prosody/modules/mod_time.lua
 lib/prosody/modules/mod_tls.lua
 lib/prosody/modules/mod_uptime.lua
@@ -60,7 +55,8 @@ 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/modules/muc/mod_muc.lua
+lib/prosody/modules/muc/muc.lib.lua
 lib/prosody/net/adns.lua
 lib/prosody/net/connlisteners.lua
 lib/prosody/net/dns.lua
@@ -68,32 +64,39 @@ lib/prosody/net/http.lua
 lib/prosody/net/httpclient_listener.lua
 lib/prosody/net/httpserver.lua
 lib/prosody/net/httpserver_listener.lua
+lib/prosody/net/multiplex_listener.lua
 lib/prosody/net/server.lua
+lib/prosody/net/server_event.lua
+lib/prosody/net/server_select.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/broadcast.lua
 lib/prosody/util/dataforms.lua
 lib/prosody/util/datamanager.lua
 lib/prosody/util/datetime.lua
 lib/prosody/util/dependencies.lua
-lib/prosody/util/discohelper.lua
 lib/prosody/util/encodings.so
 lib/prosody/util/events.lua
 lib/prosody/util/hashes.so
+lib/prosody/util/helpers.lua
 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
 lib/prosody/util/sasl.lua
+lib/prosody/util/sasl/anonymous.lua
+lib/prosody/util/sasl/digest-md5.lua
+lib/prosody/util/sasl/plain.lua
+lib/prosody/util/sasl/scram.lua
+lib/prosody/util/sasl_cyrus.lua
 lib/prosody/util/serialization.lua
 lib/prosody/util/set.lua
 lib/prosody/util/signal.so
@@ -103,9 +106,10 @@ lib/prosody/util/timer.lua
 lib/prosody/util/uuid.lua
 lib/prosody/util/xmlrpc.lua
 lib/prosody/util/ztact.lua
+@dirrm lib/prosody/util/sasl
 @dirrm lib/prosody/util
 @dirrm lib/prosody/net
+@dirrm lib/prosody/modules/muc
 @dirrm lib/prosody/modules
-@dirrm lib/prosody/fallbacks
 @dirrm lib/prosody/core
 @dirrm lib/prosody