Update to 2.3.1

   * Staging support
   * New style LIB_DEPENDS
   * Use OPTIONS helpers
   * OPTIONS_SINGLE to select between Cyrus SASL and gsasl
   * Two new options: EXPERIMENTAL and SUPERCEDED

The port requires OpenSSL >= 1.0.1, so set WANT_OPENSSL_PORTS=yes
everywhere except for on FreeBSD 10.x, where it's in the base system.

The github.org MASTER_SITE a) redirects to a server in the Amazon
cloud and b) requires use of HTTPS.

(a) implies setting fetch(1) to follow redirects, which is usually
frowned upon.  However, this pattern is recommended in bsd.sites.mk
for use with GitHub.

(b) is troublesome for FreeBSD 8.x, as fetch(1) hasn't grown HTTPS
support there yet.  Hence provide a copy of the distfile on
http://people.freebsd.org/ as a 2nd MASTER_SITE

Approved by:	mm (maintainer)

11 files changed, 103 insertions, 52 deletions

diff --git a/net-im/jabberd/files/patch-etc-Makefile.in b/net-im/jabberd/files/patch-etc-Makefile.in
deleted file mode 100644
index 5db085bde5bf..000000000000
--- a/net-im/jabberd/files/patch-etc-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- etc/Makefile.in.orig	2011-06-19 11:33:59.341460610 +0200
-+++ etc/Makefile.in	2011-06-19 11:35:29.949061936 +0200
-@@ -539,7 +539,7 @@
- uninstall: uninstall-recursive
- 
- install-am: all-am
--	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am
- 
- installcheck: installcheck-recursive
- install-strip:
-@@ -623,7 +623,7 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-initDATA uninstall-sysconfDATA
-+uninstall-am: uninstall-sysconfDATA
- 
- .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
- 	install-am install-data-am install-strip tags-recursive
diff --git a/net-im/jabberd/files/patch-etc__Makefile.in b/net-im/jabberd/files/patch-etc__Makefile.in
new file mode 100644
index 000000000000..11181f6eb6b3
--- /dev/null
+++ b/net-im/jabberd/files/patch-etc__Makefile.in
@@ -0,0 +1,29 @@
+--- ./etc/Makefile.in.orig	2013-11-28 11:16:25.000000000 +0000
++++ ./etc/Makefile.in	2013-12-15 10:29:42.301779845 +0000
+@@ -336,7 +336,7 @@
+ top_srcdir = @top_srcdir@
+ sysconf_DATA = c2s.xml.dist router.xml.dist s2s.xml.dist sm.xml.dist jabberd.cfg.dist router-users.xml.dist router-filter.xml.dist
+ initdir = $(prefix)/etc/init
+-init_DATA = jabberd-c2s.conf jabberd-router.conf jabberd-s2s.conf jabberd-sm.conf
++init_DATA = 
+ configs = $(sysconf_DATA) $(init_DATA)
+ EXTRA_DIST = $(sysconf_DATA:%.dist=%.dist.in) $(init_DATA:%.conf=%.conf.in)
+ SUBDIRS = templates
+@@ -721,14 +721,9 @@
+ 	mv $@.tmp $@ 
+ 
+ install-data-hook:
+-	@list='$(configs)'; for p in $$list; do \
+-      dest=`echo $$p | sed -e s/.dist//`; \
+-	  if test -f $(DESTDIR)$(sysconfdir)/$$dest; then \
+-        echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/$$dest"; \
+-      else \
+-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$dest"; \
+-	    $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$dest; \
+-	  fi; \
++	@list='$(configs)'; for dest in $$list; do \
++	    echo " $(INSTALL_DATA) $$dest $(DESTDIR)$(sysconfdir)/$$dest"; \
++	    $(INSTALL_DATA) $$dest $(DESTDIR)$(sysconfdir)/$$dest; \
+ 	done
+ 
+ clean-local:
diff --git a/net-im/jabberd/files/patch-etc__templates__Makefile.in b/net-im/jabberd/files/patch-etc__templates__Makefile.in
new file mode 100644
index 000000000000..861b3940eed5
--- /dev/null
+++ b/net-im/jabberd/files/patch-etc__templates__Makefile.in
@@ -0,0 +1,20 @@
+--- ./etc/templates/Makefile.in.orig	2013-11-28 11:16:25.000000000 +0000
++++ ./etc/templates/Makefile.in	2013-12-15 10:29:42.305779574 +0000
+@@ -506,14 +506,9 @@
+ 	mv $@.tmp $@
+ 
+ install-data-hook:
+-	@list='$(templates_DATA)'; for p in $$list; do \
+-      dest=`echo $$p | sed -e s/.dist//`; \
+-	  if test -f $(DESTDIR)$(templatesdir)/$$dest; then \
+-        echo "$@ will not overwrite existing $(DESTDIR)$(templatesdir)/$$dest"; \
+-      else \
+-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(templatesdir)/$$dest"; \
+-	    $(INSTALL_DATA) $$p $(DESTDIR)$(templatesdir)/$$dest; \
+-	  fi; \
++	@list='$(templates_DATA)'; for dest in $$list; do \
++	    echo " $(INSTALL_DATA) $$dest $(DESTDIR)$(templatesdir)/$$dest"; \
++	    $(INSTALL_DATA) $$dest $(DESTDIR)$(templatesdir)/$$dest; \
+ 	done
+ 
+ clean-local:
diff --git a/net-im/jabberd/files/patch-s2s-out.c b/net-im/jabberd/files/patch-s2s-out.c
deleted file mode 100644
index 64340715b7d9..000000000000
--- a/net-im/jabberd/files/patch-s2s-out.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- s2s/out.c.orig	2012-08-22 08:03:58.000000000 +0200
-+++ s2s/out.c	2013-06-13 23:25:13.528682146 +0200
-@@ -627,7 +627,7 @@
-             nad_free(pkt->nad);
-         free(pkt);
- 
--        return;
-+        return 0;
-     }
- 
-     /* new route key */
diff --git a/net-im/jabberd/files/patch-sm-mod_roster.c b/net-im/jabberd/files/patch-sm-mod_roster.c
deleted file mode 100644
index 8ca489bbd8db..000000000000
--- a/net-im/jabberd/files/patch-sm-mod_roster.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- sm/mod_roster.c.orig	2012-02-12 22:36:18.000000000 +0100
-+++ sm/mod_roster.c	2013-06-13 23:42:35.669583304 +0200
-@@ -460,7 +460,7 @@
-     log_debug(ZONE, "added %s to roster (to %d from %d ask %d name %s ngroups %d)", jid_full(item->jid), item->to, item->from, item->ask, item->name, item->ngroups);
- 
-     if (sm_storage_rate_limit(sess->user->sm, jid_user(sess->user->jid)))
--        return -stanza_err_RESOURCE_CONSTRAINT;
-+        return;
- 
-     /* save changes */
-     _roster_save_item(sess->user, item);
diff --git a/net-im/jabberd/files/patch-sm-mod_iq_time.c b/net-im/jabberd/files/patch-sm__mod_iq_time.c
index bfafb8a941ed..f3d6df7db740 100644
--- a/net-im/jabberd/files/patch-sm-mod_iq_time.c
+++ b/net-im/jabberd/files/patch-sm__mod_iq_time.c
@@ -1,5 +1,5 @@
---- sm/mod_iq_time.c.orig	2007-10-17 21:15:26.000000000 +0200
-+++ sm/mod_iq_time.c	2007-10-21 22:13:05.000000000 +0200
+--- ./sm/mod_iq_time.c.orig	2013-10-07 16:27:54.000000000 +0100
++++ ./sm/mod_iq_time.c	2013-12-15 10:29:42.308777764 +0000
 @@ -77,7 +77,7 @@
  
      datetime_out(t, dt_DATETIME, buf, 64);
diff --git a/net-im/jabberd/files/patch-storage__authreg_ldapfull.c b/net-im/jabberd/files/patch-storage__authreg_ldapfull.c
new file mode 100644
index 000000000000..b9f0575b35fb
--- /dev/null
+++ b/net-im/jabberd/files/patch-storage__authreg_ldapfull.c
@@ -0,0 +1,11 @@
+--- ./storage/authreg_ldapfull.c.orig	2013-10-07 16:27:54.000000000 +0100
++++ ./storage/authreg_ldapfull.c	2013-12-15 10:29:42.316778126 +0000
+@@ -29,6 +29,8 @@
+  * !!! this blocks for every auth.
+  */
+ 
++#include <stdio.h>
++
+ #define _XOPEN_SOURCE 500	// need this to get crypt()
+ #include "c2s.h"
+ 
diff --git a/net-im/jabberd/files/patch-storage__authreg_mysql.c b/net-im/jabberd/files/patch-storage__authreg_mysql.c
new file mode 100644
index 000000000000..e9d66ee02766
--- /dev/null
+++ b/net-im/jabberd/files/patch-storage__authreg_mysql.c
@@ -0,0 +1,11 @@
+--- ./storage/authreg_mysql.c.orig	2013-11-12 09:53:47.000000000 +0000
++++ ./storage/authreg_mysql.c	2013-12-15 10:29:42.318779446 +0000
+@@ -20,6 +20,8 @@
+ 
+ /* this module talks to a MySQL server via libmysqlclient */
+ 
++#include <stdio.h>
++
+ #define _XOPEN_SOURCE 500
+ #include "c2s.h"
+ #include <mysql.h>
diff --git a/net-im/jabberd/files/patch-storage__authreg_pgsql.c b/net-im/jabberd/files/patch-storage__authreg_pgsql.c
new file mode 100644
index 000000000000..42f8ad010e03
--- /dev/null
+++ b/net-im/jabberd/files/patch-storage__authreg_pgsql.c
@@ -0,0 +1,11 @@
+--- ./storage/authreg_pgsql.c.orig	2013-11-12 10:09:39.000000000 +0000
++++ ./storage/authreg_pgsql.c	2013-12-15 10:29:42.320778996 +0000
+@@ -20,6 +20,8 @@
+ 
+ /* this module talks to a PostgreSQL server via libpq */
+ 
++#include <stdio.h>
++
+ #define _XOPEN_SOURCE 500
+ #include "c2s.h"
+ #include <libpq-fe.h>
diff --git a/net-im/jabberd/files/patch-storage__authreg_sqlite.c b/net-im/jabberd/files/patch-storage__authreg_sqlite.c
new file mode 100644
index 000000000000..d7032691b09c
--- /dev/null
+++ b/net-im/jabberd/files/patch-storage__authreg_sqlite.c
@@ -0,0 +1,11 @@
+--- ./storage/authreg_sqlite.c.orig	2013-10-30 12:38:17.000000000 +0000
++++ ./storage/authreg_sqlite.c	2013-12-15 10:29:42.322779475 +0000
+@@ -29,6 +29,8 @@
+  * to the Jabberd project.
+  */
+ 
++#include <stdio.h>
++
+ #define _XOPEN_SOURCE 500
+ #include "c2s.h"
+ #include <sqlite3.h>
diff --git a/net-im/jabberd/files/patch-tools-jabberd.in b/net-im/jabberd/files/patch-tools__jabberd.in
index ae11dd7d64db..74f5717d97d8 100644
--- a/net-im/jabberd/files/patch-tools-jabberd.in
+++ b/net-im/jabberd/files/patch-tools__jabberd.in
@@ -1,5 +1,5 @@
---- tools/jabberd.in.orig	2008-05-22 17:36:30.000000000 +0200
-+++ tools/jabberd.in	2008-06-20 13:24:34.000000000 +0200
+--- ./tools/jabberd.in.orig	2013-10-07 16:27:54.000000000 +0100
++++ ./tools/jabberd.in	2013-12-15 10:29:42.333778600 +0000
 @@ -1,9 +1,4 @@
 -#!/bin/sh
 -#-*-Perl-*-
@@ -7,12 +7,12 @@
 -exec perl -w -x $0 "$@"
 -
 -#!perl
-+#!%%PERL%%
++#!/usr/local/bin/perl
  
  ##############################################################################
  #
-@@ -27,8 +22,7 @@
- my $Bin = "@bindir@";
+@@ -28,8 +23,7 @@
+ my $LibExec = "@libexecdir@";
  my $VERSION = "@VERSION@";
  my $config_dir = "@sysconfdir@";
 -my $config = $config_dir."/jabberd.cfg";
@@ -20,8 +20,8 @@
 +my $config = "jabberd.cfg";
  my $debug = 0;
  my $daemon = 0;
- my $select = IO::Select->new();
-@@ -42,13 +36,20 @@
+ my $g_kill_signal = "";
+@@ -44,13 +38,20 @@
  # Process the command line arguments
  #-----------------------------------------------------------------------------
  my %opts;
@@ -43,7 +43,7 @@
  
  $debug = 1 if exists($opts{D});
  $daemon = 1 if exists($opts{b});
-@@ -113,6 +114,7 @@
+@@ -120,6 +121,7 @@
      &debug("jabberd","stdout","debug on\n");
      &debug("jabberd","stdout","version($VERSION)\n");
      &debug("jabberd","stdout","config_dir($config_dir)\n");