- Update to 14.05[1]

- Add a separate tarball to contain dependencies.
- Add OPTIONS for HTTP, STUN, JSON, MYSQL, PGSQL, LAGER, and ICONV
- Add diff to install epam binary[2]

PR:		ports/189812[1]
Submitted by:	Joseph Benden <joe at thrallingpenguin.com>[1],
		Christophe Romain <christophe.romain at process-one.net>[2]

4 files changed, 112 insertions, 100 deletions

diff --git a/net-im/ejabberd/files/patch-Makefile.in b/net-im/ejabberd/files/patch-Makefile.in
new file mode 100644
index 000000000000..a3e6157a6db0
--- /dev/null
+++ b/net-im/ejabberd/files/patch-Makefile.in
@@ -0,0 +1,81 @@
+
+$FreeBSD$
+
+--- Makefile.in.orig
++++ Makefile.in
+@@ -15,7 +15,7 @@
+ SBINDIR = $(DESTDIR)@sbindir@
+ 
+ # /lib/ejabberd/
+-EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
++EJABBERDDIR = $(DESTDIR)@libdir@/erlang/lib/ejabberd-$(PORTVERSION)
+ 
+ # /share/doc/ejabberd
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
+@@ -41,7 +41,7 @@
+ MSGSDIR = $(PRIVDIR)/msgs
+ 
+ # /var/lib/ejabberd/
+-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
++SPOOLDIR = $(DESTDIR)@localstatedir@/spool/ejabberd
+ 
+ # /var/lock/ejabberdctl
+ CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl
+@@ -109,25 +109,22 @@
+ 	#
+ 	# Configuration files
+ 	$(INSTALL) -d -m 750 $(G_USER) $(ETCDIR)
+-	[ -f $(ETCDIR)/ejabberd.yml ] \
+-		&& $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml-new \
+-		|| $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml
++	$(INSTALL) -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)
+ 	$(SED) -e "s*{{rootdir}}*@prefix@*" \
+ 		-e "s*{{installuser}}*@INSTALLUSER@*" \
+ 		-e "s*{{libdir}}*@libdir@*" \
+ 		-e "s*{{sysconfdir}}*@sysconfdir@*" \
+ 		-e "s*{{localstatedir}}*@localstatedir@*" \
+ 		-e "s*{{docdir}}*@docdir@*" \
+-		-e "s*{{erl}}*@ERL@*" ejabberdctl.template \
+-		> ejabberdctl.example
+-	[ -f $(ETCDIR)/ejabberdctl.cfg ] \
+-		&& $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
+-		|| $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
+-	$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
++		-e "s*{{erl}}*@ERL@*" \
++ 		-e "s*lib/erlang/lib/ejabberd*lib/erlang/lib/ejabberd-$(PORTVERSION)*" \
++		ejabberdctl.template > ejabberdctl.example
++	$(INSTALL) -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)
++	$(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc.example
+ 	#
+ 	# Administration script
+ 	[ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR)
+-	$(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
++	$(INSTALL) -m 555 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
+ 	#
+ 	# Init script
+ 	$(SED) -e "s*@ctlscriptpath@*$(SBINDIR)*" \
+@@ -151,6 +148,8 @@
+ 	# Binary C programs
+ 	$(INSTALL) -d $(PBINDIR)
+ 	$(INSTALL) -m 750 $(O_USER) tools/captcha.sh $(PBINDIR)
++	-[ -f deps/p1_pam/priv/bin/epam ] \
++		&& $(INSTALL) -m 750 $(O_USER) deps/p1_pam/priv/bin/epam $(PBINDIR)
+ 	#
+ 	# Binary system libraries
+ 	$(INSTALL) -d $(SODIR)
+@@ -177,6 +176,7 @@
+ 	chmod -R 750 $(LOGDIR)
+ 	#
+ 	# Documentation
++ifndef NOPORTDOCS
+ 	$(INSTALL) -d $(DOCDIR)
+ 	$(INSTALL) -m 644 doc/dev.html $(DOCDIR)
+ 	$(INSTALL) -m 644 doc/guide.html $(DOCDIR)
+@@ -186,6 +186,7 @@
+ 		&& $(INSTALL) -m 644 doc/guide.pdf $(DOCDIR) \
+ 		|| echo "No doc/guide.pdf was built"
+ 	$(INSTALL) -m 644 COPYING $(DOCDIR)
++endif
+ 
+ uninstall: uninstall-binary
+ 
diff --git a/net-im/ejabberd/files/patch-ejabberdctl.template b/net-im/ejabberd/files/patch-ejabberdctl.template
new file mode 100644
index 000000000000..4b49be468b60
--- /dev/null
+++ b/net-im/ejabberd/files/patch-ejabberdctl.template
@@ -0,0 +1,31 @@
+
+$FreeBSD$
+
+--- ejabberdctl.template.orig
++++ ejabberdctl.template
+@@ -68,10 +68,10 @@
+     EJABBERD_CONFIG_PATH=$ETCDIR/ejabberd.yml
+ fi
+ if [ "$LOGS_DIR" = "" ] ; then
+-    LOGS_DIR={{localstatedir}}/log/ejabberd
++     LOGS_DIR=/var/log/ejabberd
+ fi
+ if [ "$SPOOLDIR" = "" ] ; then
+-    SPOOLDIR={{localstatedir}}/lib/ejabberd
++     SPOOLDIR=/var/spool/ejabberd
+ fi
+ if [ "$EJABBERD_DOC_PATH" = "" ] ; then
+     EJABBERD_DOC_PATH={{docdir}}
+@@ -85,10 +85,10 @@
+         EJABBERDDIR={{libdir}}/ejabberd
+     fi
+     if [ "$EJABBERD_EBIN_PATH" = "" ] ; then
+-        EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin
++     EJABBERD_EBIN_PATH={{rootdir}}/lib/erlang/lib/ejabberd/ebin
+     fi
+     if [ "$EJABBERD_PRIV_PATH" = "" ] ; then
+-        EJABBERD_PRIV_PATH=$EJABBERDDIR/priv
++     EJABBERD_PRIV_PATH={{rootdir}}/lib/erlang/lib/ejabberd/priv
+     fi
+     if [ "$EJABBERD_BIN_PATH" = "" ] ; then
+         EJABBERD_BIN_PATH=$EJABBERD_PRIV_PATH/bin
diff --git a/net-im/ejabberd/files/patch-src-Makefile.in b/net-im/ejabberd/files/patch-src-Makefile.in
deleted file mode 100644
index da041681cf7c..000000000000
--- a/net-im/ejabberd/files/patch-src-Makefile.in
+++ /dev/null
@@ -1,72 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.in.orig
-+++ Makefile.in
-@@ -95,7 +95,7 @@
- SBINDIR = $(DESTDIR)@sbindir@
- 
- # /lib/ejabberd/
--EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
-+EJABBERDDIR = $(DESTDIR)@libdir@/erlang/lib/ejabberd-$(PORTVERSION)
- 
- # /share/doc/ejabberd
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-@@ -121,7 +121,7 @@
- MSGSDIR = $(PRIVDIR)/msgs
- 
- # /var/lib/ejabberd/
--SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
-+SPOOLDIR = $(DESTDIR)@localstatedir@/spool/ejabberd
- 
- # /var/lock/ejabberdctl
- CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl
-@@ -184,25 +184,22 @@
- 	#
- 	# Configuration files
- 	install -d -m 750 $(G_USER) $(ETCDIR)
--	[ -f $(ETCDIR)/ejabberd.cfg ] \
--		&& install -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg-new \
--		|| install -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg
-+	install -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)
- 	sed -e "s*@rootdir@*@prefix@*" \
- 		-e "s*@installuser@*@INSTALLUSER@*" \
- 		-e "s*@LIBDIR@*@libdir@*" \
- 		-e "s*@SYSCONFDIR@*@sysconfdir@*" \
- 		-e "s*@LOCALSTATEDIR@*@localstatedir@*" \
- 		-e "s*@DOCDIR@*@docdir@*" \
--		-e "s*@erl@*@ERL@*" ejabberdctl.template \
--		> ejabberdctl.example
--	[ -f $(ETCDIR)/ejabberdctl.cfg ] \
--		&& install -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
--		|| install -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
--	install -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
-+		-e "s*@erl@*@ERL@*" \
-+		-e "s*lib/erlang/lib/ejabberd*lib/erlang/lib/ejabberd-$(PORTVERSION)*" \
-+		ejabberdctl.template > ejabberdctl.example
-+	install -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)
-+	install -m 640 $(G_USER) inetrc $(ETCDIR)/inetrc.example
- 	#
- 	# Administration script
- 	[ -d $(SBINDIR) ] || install -d -m 755 $(SBINDIR)
--	install -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
-+	install -m 555 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
- 	#
- 	# Init script
- 	sed -e "s*@ctlscriptpath@*$(SBINDIR)*" \
-@@ -260,6 +257,7 @@
- 	chmod -R 750 $(LOGDIR)
- 	#
- 	# Documentation
-+ifndef NOPORTDOCS
- 	install -d $(DOCDIR)
- 	install -m 644 ../doc/dev.html $(DOCDIR)
- 	install -m 644 ../doc/guide.html $(DOCDIR)
-@@ -269,6 +267,7 @@
- 		&& install -m 644 ../doc/guide.pdf $(DOCDIR) \
- 		|| echo "No ../doc/guide.pdf was built"
- 	install -m 644 ../COPYING $(DOCDIR)
-+endif
- 
- uninstall: uninstall-binary
- 
diff --git a/net-im/ejabberd/files/patch-src_ejabberdctl.template b/net-im/ejabberd/files/patch-src_ejabberdctl.template
deleted file mode 100644
index c4c693885fa8..000000000000
--- a/net-im/ejabberd/files/patch-src_ejabberdctl.template
+++ /dev/null
@@ -1,28 +0,0 @@
---- ejabberdctl.template.orig	2009-12-12 21:23:49.192455441 +0000
-+++ ejabberdctl.template	2009-12-12 21:35:11.121377666 +0000
-@@ -43,10 +43,10 @@
- fi
- [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
- if [ "$LOGS_DIR" = "" ] ; then
--    LOGS_DIR=@LOCALSTATEDIR@/log/ejabberd
-+    LOGS_DIR=/var/log/ejabberd
- fi
- if [ "$SPOOLDIR" = "" ] ; then
--    SPOOLDIR=@LOCALSTATEDIR@/lib/ejabberd
-+    SPOOLDIR=/var/spool/ejabberd
- fi
- if [ "$EJABBERD_DOC_PATH" = "" ] ; then
-     EJABBERD_DOC_PATH=@DOCDIR@
-@@ -86,10 +86,10 @@
-     EJABBERDDIR=@LIBDIR@/ejabberd
- fi
- if [ "$EJABBERD_EBIN_PATH" = "" ]; then
--    EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin
-+    EJABBERD_EBIN_PATH=@rootdir@/lib/erlang/lib/ejabberd/ebin
- fi
- if [ "$EJABBERD_PRIV_PATH" = "" ]; then
--    EJABBERD_PRIV_PATH=$EJABBERDDIR/priv
-+    EJABBERD_PRIV_PATH=@rootdir@/lib/erlang/lib/ejabberd/priv
- fi
- if [ "$EJABBRD_BIN_PATH" = "" ]; then
-     EJABBERD_BIN_PATH=$EJABBERD_PRIV_PATH/bin