Index: head/mail/automx/Makefile
===================================================================
--- head/mail/automx/Makefile	(revision 404955)
+++ head/mail/automx/Makefile	(revision 404956)
@@ -1,55 +1,55 @@
 # $FreeBSD$
 
 PORTNAME=	automx
 PORTVERSION=	0.10.2
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 
 MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Handles mail account profile requests from mail clients
 
 LICENSE=	GPLv3 # or later
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
 		${PYTHON_PKGNAMEPREFIX}ipaddr>=0:${PORTSDIR}/devel/py-ipaddr \
 		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \
 		${PYTHON_PKGNAMEPREFIX}m2crypto>=0:${PORTSDIR}/security/py-m2crypto \
 		wget:${PORTSDIR}/ftp/wget \
 		dig:${PORTSDIR}/dns/bind-tools
 
 GH_ACCOUNT=	sys4
 
 USES=		python
 USE_GITHUB=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
 PORTDATA=	*
 PORTDOCS=	*
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DOCS MEMCACHE
 MEMCACHE_DESC=	Add memcache support
 MEMCACHE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-memcached>=0:${PORTSDIR}/databases/py-python-memcached
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/src && \
 	    ${COPYTREE_SHARE} ${PORTNAME} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR})
 	${INSTALL_DATA} ${WRKSRC}/src/automx_wsgi.py ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/src/automx-test ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/src/conf/automx.conf \
 		${STAGEDIR}${PREFIX}/etc/automx.conf.sample
 .for s in 1 5
 	${INSTALL_MAN} ${WRKSRC}/doc/man/man$s/* ${STAGEDIR}${PREFIX}/man/man$s/
 .endfor
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "[^m]*" ${STAGEDIR}${DOCSDIR})
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/BASIC_CONFIGURATION_README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/mail/automx/files/patch-src-automx-test
===================================================================
--- head/mail/automx/files/patch-src-automx-test	(revision 404955)
+++ head/mail/automx/files/patch-src-automx-test	(revision 404956)
@@ -1,74 +1,76 @@
---- src/automx-test.orig	2014-01-03 08:38:38.000000000 +0000
-+++ src/automx-test	2014-04-14 22:20:41.000000000 +0100
+--- src/automx-test.orig	2014-04-26 16:16:55 UTC
++++ src/automx-test
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
  #
  # automx - auto configuration service
  # Copyright (c) 2011-2013 [*] sys4 AG
 @@ -19,17 +19,19 @@
  # along with this program.  If not, see <http://www.gnu.org/licenses/>.
  #
  #
 +# Ported to sh to avoid a dependency on bash by crees@FreeBSD.org
 +#
  VERSION="0.10.2"
  
  trap clean_exit EXIT
 -function clean_exit() {
 -	[[ -f "$OLREQUEST" ]] && rm "$OLREQUEST"
 -	[[ -f "$MBREQUEST" ]] && rm "$MBREQUEST"
 -	[[ -f "$MBCRESPONSE" ]] && rm "$MBCRESPONSE"
 +clean_exit() {
 +	[ -f "$OLREQUEST" ] && rm "$OLREQUEST"
 +	[ -f "$MBREQUEST" ] && rm "$MBREQUEST"
 +	[ -f "$MBCRESPONSE" ] && rm "$MBCRESPONSE"
  }
  
  # We need a mail address
 -if [[ $1 ]]; then
 +if [ -n "$1" ]; then
  	PROFILE="$1"
  else 
  	echo "Provide the mail address for which configuration settings should be retrieved."
-@@ -44,7 +46,7 @@
+@@ -44,7 +46,7 @@ MBCRESPONSE="$(mktemp /tmp/${PROGRAM_NAM
  
  # Test Mozilla schema
  AUTOCONF="autoconfig.$DOMAIN"
 -if [[ $(dig +short $AUTOCONF) ]]; then
 +if [ -n "$(dig +short $AUTOCONF)" ]; then
  	CON="http://$AUTOCONF/mail/config-v1.1.xml?emailaddress=$PROFILE"
  	echo
  	echo "Testing Autoconfig ..."
-@@ -60,13 +62,13 @@
+@@ -60,13 +62,13 @@ fi
  
  # Test Microsoft schema
  AUTODISC="autodiscover.$DOMAIN"
 -if [[ -z $(dig +short $AUTODISC) ]]; then
 +if [ -z "$(dig +short $AUTODISC)" ]; then
  	# default domain does not exist, try to discover non-default
  	AUTODISC="$(dig +short -t srv _autodiscover._tcp.$DOMAIN)"
-   	AUTODISC="${AUTODISC//* /}"
+-  	AUTODISC="${AUTODISC//* /}"
++  	AUTODISC="${AUTODISC##* }"
    	AUTODISC="${AUTODISC%.*}"
  fi
 -if [[ $AUTODISC ]]; then
 +if [ -n "$AUTODISC" ]; then
  	# Test Microsoft Outlook schema
  	CON="https://$AUTODISC/autodiscover/autodiscover.xml"
  	cat <<-REQ >$OLREQUEST
-@@ -111,13 +113,13 @@
+@@ -111,13 +113,13 @@ fi
  
  # Test mobileconfig schema
  AUTODISC="autodiscover.$DOMAIN"
 -if [[ -z $(dig +short $AUTODISC) ]]; then
 +if [ -z "$(dig +short $AUTODISC)" ]; then
  	# default domain does not exist, try to discover non-default
  	AUTODISC="$(dig +short -t srv _autodiscover._tcp.$DOMAIN)"
-   	AUTODISC="${AUTODISC//* /}"
+-  	AUTODISC="${AUTODISC//* /}"
++  	AUTODISC="${AUTODISC##* }"
    	AUTODISC="${AUTODISC%.*}"
  fi
 -if [[ $AUTODISC ]]; then
 +if [ -n "$AUTODISC" ]; then
  	# Test Apple mobileconfig schema
  	CON="https://$AUTODISC/mobileconfig"